projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ruler: Moved calculate_tick_spacing into View
[pulseview.git]
/
pv
/
view
/
view.hpp
diff --git
a/pv/view/view.hpp
b/pv/view/view.hpp
index c6e585b7cbdd4cae86290b4e142395c908cb5fc9..4561cec661f95c546dd979129460f2b089d74249 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.
@@
-100,6
+102,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.
*/
@@
-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();
@@
-236,7
+254,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,6
+270,9
@@
private:
int v_offset_;
bool updating_scroll_;
int v_offset_;
bool updating_scroll_;
+ double tick_period_;
+ unsigned int tick_prefix_;
+
bool show_cursors_;
CursorPair cursors_;
bool show_cursors_;
CursorPair cursors_;