projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ViewItem: Make hit_box_rect take ViewItemPaintParams
[pulseview.git]
/
pv
/
view
/
timemarker.hpp
diff --git
a/pv/view/timemarker.hpp
b/pv/view/timemarker.hpp
index c72dedf56f79e0a1c223436e8841c8796337e125..1116eb460d3193987931d6b762cf6a8a229782c3 100644
(file)
--- a/
pv/view/timemarker.hpp
+++ b/
pv/view/timemarker.hpp
@@
-33,6
+33,10
@@
class QPainter;
class QRect;
namespace pv {
class QRect;
namespace pv {
+namespace widgets {
+ class TimestampSpinBox;
+}
+
namespace view {
class View;
namespace view {
class View;
@@
-51,18
+55,18
@@
protected:
* @param colour A reference to the colour of this cursor.
* @param time The time to set the flag to.
*/
* @param colour A reference to the colour of this cursor.
* @param time The time to set the flag to.
*/
- TimeMarker(View &view, const QColor &colour,
double
time);
+ TimeMarker(View &view, const QColor &colour,
const pv::util::Timestamp&
time);
public:
/**
* Gets the time of the marker.
*/
public:
/**
* Gets the time of the marker.
*/
-
double
time() const;
+
const pv::util::Timestamp&
time() const;
/**
* Sets the time of the marker.
*/
/**
* Sets the time of the marker.
*/
- void set_time(
double time)
;
+ void set_time(
const pv::util::Timestamp& time) override
;
float get_x() const;
float get_x() const;
@@
-84,7
+88,7
@@
public:
* @param rect the rectangle of the viewport area.
* @return Returns the rectangle of the hit-box.
*/
* @param rect the rectangle of the viewport area.
* @return Returns the rectangle of the hit-box.
*/
- QRectF hit_box_rect(const
QRectF &rect
) const;
+ QRectF hit_box_rect(const
ViewItemPaintParams &pp
) const;
/**
* Gets the text to show in the marker.
/**
* Gets the text to show in the marker.
@@
-109,17
+113,17
@@
public:
virtual pv::widgets::Popup* create_popup(QWidget *parent);
private Q_SLOTS:
virtual pv::widgets::Popup* create_popup(QWidget *parent);
private Q_SLOTS:
- void on_value_changed(
double
value);
+ void on_value_changed(
const pv::util::Timestamp&
value);
protected:
const QColor &colour_;
protected:
const QColor &colour_;
-
double
time_;
+
pv::util::Timestamp
time_;
QSizeF text_size_;
QWidgetAction *value_action_;
QSizeF text_size_;
QWidgetAction *value_action_;
-
QDouble
SpinBox *value_widget_;
+
pv::widgets::Timestamp
SpinBox *value_widget_;
bool updating_value_widget_;
};
bool updating_value_widget_;
};