X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=inline;f=pv%2Fview%2Ftimemarker.cpp;h=4874eb233c7ebf7d9fe5e282883dc93a1efbc8a7;hb=aca9aa834c742ba70f49d1ac3eb2d1e02e759416;hp=2b17184408a4ba8a5fb5f44f03320d832afdca8f;hpb=6abffa979b89440af383cf1142648e34dcbdfc44;p=pulseview.git
diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 2b17184..4874eb2 100644
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include
@@ -24,11 +23,12 @@
#include "timemarker.hpp"
+#include "pv/widgets/timestampspinbox.hpp"
#include "view.hpp"
#include
-#include
#include
+#include
#include
#include
@@ -37,26 +37,28 @@ using std::max;
using std::min;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const int TimeMarker::ArrowSize = 4;
-TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
+TimeMarker::TimeMarker(
+ View &view, const QColor &colour, const pv::util::Timestamp& time) :
TimeItem(view),
colour_(colour),
time_(time),
- value_action_(NULL),
- value_widget_(NULL),
+ value_action_(nullptr),
+ value_widget_(nullptr),
updating_value_widget_(false)
{
}
-double TimeMarker::time() const
+const pv::util::Timestamp& TimeMarker::time() const
{
return time_;
}
-void TimeMarker::set_time(double time)
+void TimeMarker::set_time(const pv::util::Timestamp& time)
{
time_ = time;
@@ -71,32 +73,33 @@ void TimeMarker::set_time(double time)
float TimeMarker::get_x() const
{
- return (time_ - view_.offset()) / view_.scale();
+ return ((time_ - view_.offset()) / view_.scale()).convert_to();
}
-QPoint TimeMarker::point() const
+QPoint TimeMarker::point(const QRect &rect) const
{
- return QPoint(get_x(), 0);
+ return QPoint(get_x(), rect.bottom());
}
QRectF TimeMarker::label_rect(const QRectF &rect) const
{
- const float x = (time_ - view_.offset()) / view_.scale();
-
QFontMetrics m(QApplication::font());
- const float text_width =
- max(m.boundingRect(get_text()).size().width(), ArrowSize);
- const float text_height = m.height();
-
- const QSizeF label_size(
- text_width + View::LabelPadding.width() * 2,
- text_height + View::LabelPadding.height() * 2);
+ const QSizeF text_size(
+ max(m.boundingRect(get_text()).size().width(), ArrowSize),
+ m.height());
+ const QSizeF label_size(text_size + LabelPadding * 2);
const float top = rect.height() - label_size.height() -
TimeMarker::ArrowSize - 0.5f;
- const float height = label_size.height();
+ const float x = get_x();
- return QRectF(x - label_size.width() / 2, top,
- label_size.width(), height);
+ return QRectF(QPointF(x - label_size.width() / 2, top), label_size);
+}
+
+QRectF TimeMarker::hit_box_rect(const ViewItemPaintParams &pp) const
+{
+ const float x = get_x();
+ const float h = QFontMetrics(QApplication::font()).height();
+ return QRectF(x - h / 2.0f, pp.top(), h, pp.height());
}
void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
@@ -104,7 +107,7 @@ void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
if (!enabled())
return;
- const qreal x = (time_ - view_.offset()) / view_.scale();
+ const qreal x = ((time_ - view_.offset()) / view_.scale()).convert_to();
const QRectF r(label_rect(rect));
const QPointF points[] = {
@@ -165,29 +168,29 @@ pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
using pv::widgets::Popup;
Popup *const popup = new Popup(parent);
+ popup->set_position(parent->mapToGlobal(
+ point(parent->rect())), Popup::Bottom);
+
QFormLayout *const form = new QFormLayout(popup);
popup->setLayout(form);
- value_widget_ = new QDoubleSpinBox(parent);
- value_widget_->setDecimals(9);
- value_widget_->setSuffix("s");
- value_widget_->setSingleStep(1e-6);
- value_widget_->setRange(-1.0e9, 1.0e9);
+ value_widget_ = new pv::widgets::TimestampSpinBox(parent);
value_widget_->setValue(time_);
- connect(value_widget_, SIGNAL(valueChanged(double)),
- this, SLOT(on_value_changed(double)));
+ connect(value_widget_, SIGNAL(valueChanged(const pv::util::Timestamp&)),
+ this, SLOT(on_value_changed(const pv::util::Timestamp&)));
form->addRow(tr("Time"), value_widget_);
return popup;
}
-void TimeMarker::on_value_changed(double value)
+void TimeMarker::on_value_changed(const pv::util::Timestamp& value)
{
if (!updating_value_widget_)
set_time(value);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv