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 37e10a3f0e386e14feb688193bed686c99c60e6b..d57b4dd1d6d0b654d8d46214d34cada4ad8c6cdd 100644
(file)
--- a/
pv/view/timemarker.h
+++ b/
pv/view/timemarker.h
@@
-22,8
+22,10
@@
#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"
#include "selectableitem.h"
@@
-46,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:
/**
@@
-64,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.
@@
-87,16
+91,25
@@
public:
virtual void paint_label(QPainter &p, const QRect &rect,
unsigned int prefix) = 0;
virtual void paint_label(QPainter &p, const QRect &rect,
unsigned int prefix) = 0;
-signals:
+ pv::widgets::Popup* create_popup(QWidget *parent);
+
+private Q_SLOTS:
+ void on_value_changed(double value);
+
+Q_SIGNALS:
void time_changed();
protected:
void time_changed();
protected:
- const View &_view;
- const QColor &_colour;
+ View &view_;
+ const QColor &colour_;
+
+ double time_;
-
double _time
;
+
QSizeF text_size_
;
- QSizeF _text_size;
+ QWidgetAction *value_action_;
+ QDoubleSpinBox *value_widget_;
+ bool updating_value_widget_;
};
} // namespace view
};
} // namespace view