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 c6e585b7cbdd4cae86290b4e142395c908cb5fc9..5fc6e4e0a619c94442dea0e34e87dab8438af02c 100644
(file)
--- a/
pv/view/view.hpp
+++ b/
pv/view/view.hpp
@@
-39,7
+39,7
@@
namespace pv {
namespace pv {
-class S
igS
ession;
+class Session;
namespace view {
namespace view {
@@
-63,16
+63,18
@@
private:
static const int MaxScrollValue;
static const int MaxScrollValue;
+ static const int ScaleUnits[3];
+
public:
static const QColor CursorAreaColour;
static const QSizeF LabelPadding;
public:
public:
static const QColor CursorAreaColour;
static const QSizeF LabelPadding;
public:
- explicit View(S
igS
ession &session, QWidget *parent = 0);
+ explicit View(Session &session, QWidget *parent = 0);
- S
igS
ession& session();
- const S
igS
ession& session() const;
+ Session& session();
+ const Session& session() const;
/**
* Returns the view of the owner.
/**
* Returns the view of the owner.
@@
-88,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.
*/
@@
-100,6
+107,16
@@
public:
double offset() const;
int owner_visual_v_offset() const;
double offset() const;
int owner_visual_v_offset() const;
+ /**
+ * Returns the SI prefix to apply to the graticule time markings.
+ */
+ unsigned int tick_prefix() const;
+
+ /**
+ * Returns period of the graticule time markings.
+ */
+ double tick_period() const;
+
/**
* Returns the number of nested parents that this row item owner has.
*/
/**
* Returns the number of nested parents that this row item owner has.
*/
@@
-142,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;
@@
-175,6
+187,12
@@
private:
*/
void set_zoom(double scale, int offset);
*/
void set_zoom(double scale, int offset);
+ /**
+ * Find a tick spacing and number formatting that does not cause
+ * the values to collide.
+ */
+ void calculate_tick_spacing();
+
void update_scroll();
void update_layout();
void update_scroll();
void update_layout();
@@
-182,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,
@@
-236,7
+252,7
@@
private Q_SLOTS:
void on_hover_point_changed();
private:
void on_hover_point_changed();
private:
- S
igS
ession &session_;
+ Session &session_;
Viewport *viewport_;
Ruler *ruler_;
Viewport *viewport_;
Ruler *ruler_;
@@
-252,8
+268,11
@@
private:
int v_offset_;
bool updating_scroll_;
int v_offset_;
bool updating_scroll_;
+ double tick_period_;
+ unsigned int tick_prefix_;
+
bool show_cursors_;
bool show_cursors_;
-
CursorPair
cursors_;
+
std::shared_ptr<CursorPair>
cursors_;
QPoint hover_point_;
QPoint hover_point_;