projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #615 by opening the output stream only if needed
[pulseview.git]
/
pv
/
view
/
timemarker.hpp
diff --git
a/pv/view/timemarker.hpp
b/pv/view/timemarker.hpp
index 7534dbd7c2708c615b9d36179806ec521facac9b..c72dedf56f79e0a1c223436e8841c8796337e125 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_MARKER_H
PP
+#define PULSEVIEW_PV_VIEW_MARKER_H
PP
#include <QColor>
#include <QDoubleSpinBox>
#include <QColor>
#include <QDoubleSpinBox>
@@
-43,7
+43,6
@@
class TimeMarker : public TimeItem
public:
static const int ArrowSize;
public:
static const int ArrowSize;
- static const int Offset;
protected:
/**
protected:
/**
@@
-68,9
+67,10
@@
public:
float get_x() const;
/**
float get_x() const;
/**
- * 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;
/**
* Computes the outline rectangle of a label.
/**
* Computes the outline rectangle of a label.
@@
-79,6
+79,13
@@
public:
*/
QRectF label_rect(const QRectF &rect) const;
*/
QRectF label_rect(const QRectF &rect) const;
+ /**
+ * 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.
+ */
+ QRectF hit_box_rect(const QRectF &rect) const;
+
/**
* Gets the text to show in the marker.
*/
/**
* Gets the text to show in the marker.
*/
@@
-88,8
+95,9
@@
public:
* 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
);
/**
* Paints the foreground layer of the item with a QPainter
/**
* Paints the foreground layer of the item with a QPainter
@@
-98,14
+106,11
@@
public:
**/
void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
**/
void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
- pv::widgets::Popup* create_popup(QWidget *parent);
+
virtual
pv::widgets::Popup* create_popup(QWidget *parent);
private Q_SLOTS:
void on_value_changed(double value);
private Q_SLOTS:
void on_value_changed(double value);
-Q_SIGNALS:
- void time_changed();
-
protected:
const QColor &colour_;
protected:
const QColor &colour_;
@@
-121,4
+126,4
@@
protected:
} // namespace view
} // namespace pv
} // namespace view
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_MARKER_H
+#endif // PULSEVIEW_PV_VIEW_MARKER_H
PP