projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change the number of minor ticks to be either 4 or 5
[pulseview.git]
/
pv
/
views
/
trace
/
view.hpp
diff --git
a/pv/views/trace/view.hpp
b/pv/views/trace/view.hpp
index e80198d329062f8175b04e9e28dbf4c1be543c75..4514989765b9603d4b8809c1eaa0c3a209fc3783 100644
(file)
--- a/
pv/views/trace/view.hpp
+++ b/
pv/views/trace/view.hpp
@@
-151,11
+151,17
@@
public:
double scale() const;
/**
double scale() const;
/**
- * Returns the
time offset of the left edge of the view in
- * seconds.
+ * Returns the
internal view version of the time offset of the left edge
+ *
of the view in
seconds.
*/
const pv::util::Timestamp& offset() const;
*/
const pv::util::Timestamp& offset() const;
+ /**
+ * Returns the ruler version of the time offset of the left edge
+ * of the view in seconds.
+ */
+ const pv::util::Timestamp& ruler_offset() const;
+
/**
* Returns the vertical scroll offset.
*/
/**
* Returns the vertical scroll offset.
*/
@@
-181,6
+187,11
@@
public:
*/
const pv::util::Timestamp& tick_period() const;
*/
const pv::util::Timestamp& tick_period() const;
+ /**
+ * Returns number of minor division ticks per time marking.
+ */
+ unsigned int minor_tick_count() const;
+
/**
* Returns the unit of time currently used.
*/
/**
* Returns the unit of time currently used.
*/
@@
-397,7
+408,7
@@
private Q_SLOTS:
void process_sticky_events();
/**
void process_sticky_events();
/**
- * Sets the 'offset_'
member
and emits the 'offset_changed'
+ * Sets the 'offset_'
and ruler_offset_ members
and emits the 'offset_changed'
* signal if needed.
*/
void set_offset(const pv::util::Timestamp& offset);
* signal if needed.
*/
void set_offset(const pv::util::Timestamp& offset);
@@
-458,8
+469,10
@@
private:
/// The view time scale in seconds per pixel.
double scale_;
/// The view time scale in seconds per pixel.
double scale_;
- /// The
view
time offset in seconds.
+ /// The
internal view version of the
time offset in seconds.
pv::util::Timestamp offset_;
pv::util::Timestamp offset_;
+ /// The ruler version of the time offset in seconds.
+ pv::util::Timestamp ruler_offset_;
bool updating_scroll_;
bool settings_restored_;
bool updating_scroll_;
bool settings_restored_;
@@
-471,6
+484,7
@@
private:
pv::util::Timestamp tick_period_;
pv::util::SIPrefix tick_prefix_;
pv::util::Timestamp tick_period_;
pv::util::SIPrefix tick_prefix_;
+ unsigned int minor_tick_count_;
unsigned int tick_precision_;
util::TimeUnit time_unit_;
unsigned int tick_precision_;
util::TimeUnit time_unit_;