projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make member variable underscores a suffix instead of a prefix
[pulseview.git]
/
pv
/
view
/
timemarker.h
diff --git
a/pv/view/timemarker.h
b/pv/view/timemarker.h
index 616221b23ba139afd1992b9ac7d6acc9332db1d8..d57b4dd1d6d0b654d8d46214d34cada4ad8c6cdd 100644
(file)
--- a/
pv/view/timemarker.h
+++ b/
pv/view/timemarker.h
@@
-22,6
+22,12
@@
#define PULSEVIEW_PV_VIEW_MARKER_H
#include <QColor>
#define PULSEVIEW_PV_VIEW_MARKER_H
#include <QColor>
+#include <QDoubleSpinBox>
+#include <QObject>
+#include <QRectF>
+#include <QWidgetAction>
+
+#include "selectableitem.h"
class QPainter;
class QRect;
class QPainter;
class QRect;
@@
-31,8
+37,10
@@
namespace view {
class View;
class View;
-class TimeMarker
+class TimeMarker
: public SelectableItem
{
{
+ Q_OBJECT
+
protected:
/**
* Constructor.
protected:
/**
* Constructor.
@@
-40,7
+48,7
@@
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(
const
View &view, const QColor &colour, double time);
+ TimeMarker(View &view, const QColor &colour, double time);
public:
/**
public:
/**
@@
-53,6
+61,13
@@
public:
*/
void set_time(double time);
*/
void set_time(double time);
+ float get_x() const;
+
+ /**
+ * Gets the drag point of the row item.
+ */
+ QPoint point() const;
+
/**
* Paints the marker to the viewport.
* @param p The painter to draw with.
/**
* Paints the marker to the viewport.
* @param p The painter to draw with.
@@
-60,21
+75,44
@@
public:
*/
virtual void paint(QPainter &p, const QRect &rect);
*/
virtual void paint(QPainter &p, const QRect &rect);
+ /**
+ * Gets the marker label rectangle.
+ * @param rect The rectangle of the ruler client area.
+ * @return Returns the label rectangle.
+ */
+ virtual QRectF get_label_rect(const QRect &rect) const = 0;
+
/**
* Paints the marker's label to the ruler.
* @param p The painter to draw with.
* @param rect The rectangle of the ruler client area.
/**
* Paints the marker's label to the ruler.
* @param p The painter to draw with.
* @param rect The rectangle of the ruler client area.
+ * @param prefix The SI prefix to paint time value with.
*/
*/
- virtual void paint_label(QPainter &p, const QRect &rect) = 0;
+ virtual void paint_label(QPainter &p, const QRect &rect,
+ unsigned int prefix) = 0;
+
+ pv::widgets::Popup* create_popup(QWidget *parent);
+
+private Q_SLOTS:
+ void on_value_changed(double value);
+
+Q_SIGNALS:
+ void time_changed();
protected:
protected:
- const View &_view;
- const QColor &_colour;
+ View &view_;
+ const QColor &colour_;
+
+ double time_;
+
+ QSizeF text_size_;
- double _time;
+ QWidgetAction *value_action_;
+ QDoubleSpinBox *value_widget_;
+ bool updating_value_widget_;
};
} // namespace view
} // namespace pv
};
} // namespace view
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_MARKER_H
\ No newline at end of file
+#endif // PULSEVIEW_PV_VIEW_MARKER_H