projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DecodeTrace: Remove hide_hover_annotation() as it's only used once
[pulseview.git]
/
pv
/
view
/
view.hpp
diff --git
a/pv/view/view.hpp
b/pv/view/view.hpp
index 4561cec661f95c546dd979129460f2b089d74249..5fc6e4e0a619c94442dea0e34e87dab8438af02c 100644
(file)
--- a/
pv/view/view.hpp
+++ b/
pv/view/view.hpp
@@
-90,6
+90,11
@@
public:
const Viewport* viewport() const;
const Viewport* viewport() const;
+ /**
+ * Gets a list of time markers.
+ */
+ std::vector< std::shared_ptr<TimeItem> > time_items() const;
+
/**
* Returns the view time scale in seconds per pixel.
*/
/**
* Returns the view time scale in seconds per pixel.
*/
@@
-154,12
+159,7
@@
public:
/**
* Returns a reference to the pair of cursors.
*/
/**
* Returns a reference to the pair of cursors.
*/
- CursorPair& cursors();
-
- /**
- * Returns a reference to the pair of cursors.
- */
- const CursorPair& cursors() const;
+ std::shared_ptr<CursorPair> cursors() const;
const QPoint& hover_point() const;
const QPoint& hover_point() const;
@@
-200,19
+200,17
@@
private:
/**
* Satisifies RowItem functionality.
* @param p the QPainter to paint into.
/**
* Satisifies RowItem functionality.
* @param p the QPainter to paint into.
- * @param right the x-coordinate of the right edge of the header
- * area.
+ * @param rect the rectangle of the header area.
* @param hover true if the label is being hovered over by the mouse.
*/
* @param hover true if the label is being hovered over by the mouse.
*/
- void paint_label(QPainter &p,
int righ
t, bool hover);
+ void paint_label(QPainter &p,
const QRect &rec
t, bool hover);
/**
* Computes the outline rectangle of a label.
/**
* Computes the outline rectangle of a label.
- * @param right the x-coordinate of the right edge of the header
- * area.
+ * @param rect the rectangle of the header area.
* @return Returns the rectangle of the signal label.
*/
* @return Returns the rectangle of the signal label.
*/
- QRectF label_rect(
int righ
t);
+ QRectF label_rect(
const QRectF &rec
t);
static bool add_channels_to_owner(
const std::vector< std::shared_ptr<sigrok::Channel> > &channels,
static bool add_channels_to_owner(
const std::vector< std::shared_ptr<sigrok::Channel> > &channels,
@@
-274,7
+272,7
@@
private:
unsigned int tick_prefix_;
bool show_cursors_;
unsigned int tick_prefix_;
bool show_cursors_;
-
CursorPair
cursors_;
+
std::shared_ptr<CursorPair>
cursors_;
QPoint hover_point_;
QPoint hover_point_;