projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TimeMarker: Replaced time_changed signal with View::time_item_apparance_changed
[pulseview.git]
/
pv
/
view
/
timemarker.hpp
diff --git
a/pv/view/timemarker.hpp
b/pv/view/timemarker.hpp
index 21de26258f4b4153ce4e970236ded0e2511360e7..864a4e3865dc007c722cedbee04179f5c437e49e 100644
(file)
--- a/
pv/view/timemarker.hpp
+++ b/
pv/view/timemarker.hpp
@@
-27,7
+27,7
@@
#include <QRectF>
#include <QWidgetAction>
#include <QRectF>
#include <QWidgetAction>
-#include "
selectabl
eitem.hpp"
+#include "
tim
eitem.hpp"
class QPainter;
class QRect;
class QPainter;
class QRect;
@@
-37,7
+37,7
@@
namespace view {
class View;
class View;
-class TimeMarker : public
Selectabl
eItem
+class TimeMarker : public
Tim
eItem
{
Q_OBJECT
{
Q_OBJECT
@@
-73,18
+73,16
@@
public:
QPoint point() const;
/**
QPoint point() const;
/**
- *
Paints the marker to the viewport
.
- * @param
p The painter to draw with
.
- * @
param rect The rectangle of the viewport client area
.
+ *
Computes the outline rectangle of a label
.
+ * @param
rect the rectangle of the header area
.
+ * @
return Returns the rectangle of the signal label
.
*/
*/
-
virtual void paint(QPainter &p, const QRect &rect)
;
+
QRectF label_rect(const QRectF &rect) const
;
/**
/**
- * Gets the marker label rectangle.
- * @param rect The rectangle of the ruler client area.
- * @return Returns the label rectangle.
+ * Gets the text to show in the marker.
*/
*/
- virtual Q
RectF get_label_rect(const QRect &rect
) const = 0;
+ virtual Q
String get_text(
) const = 0;
/**
* Paints the marker's label to the ruler.
/**
* Paints the marker's label to the ruler.
@@
-93,16
+91,19
@@
public:
*/
void paint_label(QPainter &p, const QRect &rect);
*/
void paint_label(QPainter &p, const QRect &rect);
+ /**
+ * Paints the foreground layer of the item with a QPainter
+ * @param p the QPainter to paint into.
+ * @param pp the painting parameters object to paint with.
+ **/
+ void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
+
pv::widgets::Popup* create_popup(QWidget *parent);
private Q_SLOTS:
void on_value_changed(double value);
pv::widgets::Popup* create_popup(QWidget *parent);
private Q_SLOTS:
void on_value_changed(double value);
-Q_SIGNALS:
- void time_changed();
-
protected:
protected:
- View &view_;
const QColor &colour_;
double time_;
const QColor &colour_;
double time_;