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 328d428f0e52ca547c48840d5a4071e247c78e14..d57b4dd1d6d0b654d8d46214d34cada4ad8c6cdd 100644
(file)
--- a/
pv/view/timemarker.h
+++ b/
pv/view/timemarker.h
@@
-51,8
+51,6
@@
protected:
TimeMarker(View &view, const QColor &colour, double time);
public:
TimeMarker(View &view, const QColor &colour, double time);
public:
- virtual void init_context_bar_actions(QWidget *parent);
-
/**
* Gets the time of the marker.
*/
/**
* Gets the time of the marker.
*/
@@
-63,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.
@@
-86,29
+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;
- /**
- * Returns a list of context menu items to show in the context
- * bar.
- */
- const std::list<QAction*> get_context_bar_actions();
+ pv::widgets::Popup* create_popup(QWidget *parent);
-private
slots
:
+private
Q_SLOTS
:
void on_value_changed(double value);
void on_value_changed(double value);
-
signals
:
+
Q_SIGNALS
:
void time_changed();
protected:
void time_changed();
protected:
- 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
;
+ QWidgetAction *
value_action_
;
+ QDoubleSpinBox *
value_widget_
;
+ bool
updating_value_widget_
;
};
} // namespace view
};
} // namespace view