projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow, View::View: Fix two memory errors reported by valgrind
[pulseview.git]
/
pv
/
view
/
timemarker.hpp
diff --git
a/pv/view/timemarker.hpp
b/pv/view/timemarker.hpp
index 4e9d1fa2ebf5158842b6314e0b906da5c318c6d7..2280363a4c127697b1e09759e82793e9856e4ba9 100644
(file)
--- a/
pv/view/timemarker.hpp
+++ b/
pv/view/timemarker.hpp
@@
-18,8
+18,8
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PULSEVIEW_PV_VIEW
_MARKER_H
-#define PULSEVIEW_PV_VIEW
_MARKER_H
+#ifndef PULSEVIEW_PV_VIEW
S_TRACEVIEW_MARKER_HPP
+#define PULSEVIEW_PV_VIEW
S_TRACEVIEW_MARKER_HPP
#include <QColor>
#include <QDoubleSpinBox>
#include <QColor>
#include <QDoubleSpinBox>
@@
-33,7
+33,12
@@
class QPainter;
class QRect;
namespace pv {
class QRect;
namespace pv {
-namespace view {
+namespace widgets {
+ class TimestampSpinBox;
+}
+
+namespace views {
+namespace TraceView {
class View;
class View;
@@
-43,7
+48,6
@@
class TimeMarker : public TimeItem
public:
static const int ArrowSize;
public:
static const int ArrowSize;
- static const int Offset;
protected:
/**
protected:
/**
@@
-52,73
+56,80
@@
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(View &view, const QColor &colour,
double
time);
+ TimeMarker(View &view, const QColor &colour,
const pv::util::Timestamp&
time);
public:
/**
* Gets the time of the marker.
*/
public:
/**
* Gets the time of the marker.
*/
-
double
time() const;
+
const pv::util::Timestamp&
time() const;
/**
* Sets the time of the marker.
*/
/**
* Sets the time of the marker.
*/
- void set_time(
double time)
;
+ void set_time(
const pv::util::Timestamp& time) override
;
- float get_x() const;
+ float get_x() const
override
;
/**
/**
- * Gets the drag point of the row item.
+ * Gets the arrow-tip point of the time marker.
+ * @param rect the rectangle of the ruler area.
*/
*/
- QPoint point(
) const
;
+ QPoint point(
const QRect &rect) const override
;
/**
/**
- *
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 override
;
/**
/**
- * Gets the text to show in the marker.
+ * Computes the outline rectangle of the viewport hit-box.
+ * @param rect the rectangle of the viewport area.
+ * @return Returns the rectangle of the hit-box.
*/
*/
-
virtual QString get_text() const = 0
;
+
QRectF hit_box_rect(const ViewItemPaintParams &pp) const override
;
/**
/**
- * 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 label_rect(const QRectF &rect) const
;
+ virtual Q
String get_text() const = 0
;
/**
* 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 hover true if the label is being hovered over by the mouse.
*/
*/
- void paint_label(QPainter &p, const QRect &rect
)
;
+ void paint_label(QPainter &p, const QRect &rect
, bool hover) override
;
- pv::widgets::Popup* create_popup(QWidget *parent);
+ /**
+ * 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) override;
-private Q_SLOTS:
- void on_value_changed(double value);
+ virtual pv::widgets::Popup* create_popup(QWidget *parent) override;
-
Q_SIGNAL
S:
- void
time_changed(
);
+
private Q_SLOT
S:
+ void
on_value_changed(const pv::util::Timestamp& value
);
protected:
const QColor &colour_;
protected:
const QColor &colour_;
-
double
time_;
+
pv::util::Timestamp
time_;
QSizeF text_size_;
QWidgetAction *value_action_;
QSizeF text_size_;
QWidgetAction *value_action_;
-
QDouble
SpinBox *value_widget_;
+
pv::widgets::Timestamp
SpinBox *value_widget_;
bool updating_value_widget_;
};
bool updating_value_widget_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW
_MARKER_H
+#endif // PULSEVIEW_PV_VIEW
S_TRACEVIEW_MARKER_HPP