projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compilation on 32-bit systems
[pulseview.git]
/
pv
/
view
/
timemarker.h
diff --git
a/pv/view/timemarker.h
b/pv/view/timemarker.h
index 63733f7a5c9a4a9040f4660db5b0ebf152c490c0..fc058c2713134bab227eeb6ec0cece3c1d0f43a1 100644
(file)
--- a/
pv/view/timemarker.h
+++ b/
pv/view/timemarker.h
@@
-61,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.
@@
-84,11
+86,7
@@
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:
void on_value_changed(double value);
private slots:
void on_value_changed(double value);
@@
-104,8
+102,8
@@
protected:
QSizeF _text_size;
QSizeF _text_size;
- QWidgetAction _value_action;
- QDoubleSpinBox _value_widget;
+ QWidgetAction
*
_value_action;
+ QDoubleSpinBox
*
_value_widget;
bool _updating_value_widget;
};
bool _updating_value_widget;
};