projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ruler: Fix tick mark calculation
[pulseview.git]
/
pv
/
view
/
timemarker.hpp
diff --git
a/pv/view/timemarker.hpp
b/pv/view/timemarker.hpp
index 57d6c9b04ecc1bb7cb58d3c812688ecd31cfb2d5..371b6e4a54ce607edbdfd7dc3ead53c55e9ae447 100644
(file)
--- a/
pv/view/timemarker.hpp
+++ b/
pv/view/timemarker.hpp
@@
-18,8
+18,8
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PULSEVIEW_PV_VIEW_MARKER_H
-#define PULSEVIEW_PV_VIEW_MARKER_H
+#ifndef PULSEVIEW_PV_VIEW_MARKER_H
PP
+#define PULSEVIEW_PV_VIEW_MARKER_H
PP
#include <QColor>
#include <QDoubleSpinBox>
#include <QColor>
#include <QDoubleSpinBox>
@@
-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;
@@
-43,7
+47,6
@@
class TimeMarker : public TimeItem
public:
static const int ArrowSize;
public:
static const int ArrowSize;
- static const int Offset;
protected:
/**
protected:
/**
@@
-52,25
+55,26
@@
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;
/**
- * Gets the drag point of the row item.
+ * Gets the arrow-tip point of the time marker.
+ * @param rect the rectangle of the ruler area.
*/
*/
- QPoint point() const;
+ QPoint point(
const QRect &rect
) const;
/**
* Computes the outline rectangle of a label.
/**
* Computes the outline rectangle of a label.
@@
-79,6
+83,13
@@
public:
*/
QRectF label_rect(const QRectF &rect) const;
*/
QRectF label_rect(const QRectF &rect) const;
+ /**
+ * Computes the outline rectangle of the viewport 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;
+
/**
* Gets the text to show in the marker.
*/
/**
* Gets the text to show in the marker.
*/
@@
-102,21
+113,21
@@
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_;
};
} // namespace view
} // namespace pv
bool updating_value_widget_;
};
} // namespace view
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_MARKER_H
+#endif // PULSEVIEW_PV_VIEW_MARKER_H
PP