projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made decode an optional feature disabled by default.
[pulseview.git]
/
pv
/
view
/
timemarker.h
diff --git
a/pv/view/timemarker.h
b/pv/view/timemarker.h
index 08ed93890b6e4f8647e1855b08162f133387955f..fc058c2713134bab227eeb6ec0cece3c1d0f43a1 100644
(file)
--- a/
pv/view/timemarker.h
+++ b/
pv/view/timemarker.h
@@
-22,8
+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 <QObject>
#include <QRectF>
+#include <QWidgetAction>
+
+#include "selectableitem.h"
class QPainter;
class QRect;
class QPainter;
class QRect;
@@
-33,7
+37,7
@@
namespace view {
class View;
class View;
-class TimeMarker : public
QObject
+class TimeMarker : public
SelectableItem
{
Q_OBJECT
{
Q_OBJECT
@@
-44,12
+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);
-
- /**
- * Copy constructor
- */
- TimeMarker(const TimeMarker &s);
+ TimeMarker(View &view, const QColor &colour, double time);
public:
/**
public:
/**
@@
-62,6
+61,8
@@
public:
*/
void set_time(double time);
*/
void set_time(double time);
+ float get_x() 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.
@@
-80,20
+81,33
@@
public:
* 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 slots:
+ void on_value_changed(double value);
signals:
void time_changed();
protected:
signals:
void time_changed();
protected:
-
const
View &_view;
+ View &_view;
const QColor &_colour;
double _time;
const QColor &_colour;
double _time;
+
+ QSizeF _text_size;
+
+ 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