projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
View: Determine time unit and use it in other classes
[pulseview.git]
/
pv
/
view
/
view.hpp
diff --git
a/pv/view/view.hpp
b/pv/view/view.hpp
index 2c81e74782cbbac3d3948aec2c9ca963d90632ae..b7d35e3c4102207998243147b0d2ab942c31d8c7 100644
(file)
--- a/
pv/view/view.hpp
+++ b/
pv/view/view.hpp
@@
-34,6
+34,7
@@
#include <QTimer>
#include <pv/data/signaldata.hpp>
#include <QTimer>
#include <pv/data/signaldata.hpp>
+#include <pv/util.hpp>
#include "cursorpair.hpp"
#include "flag.hpp"
#include "cursorpair.hpp"
#include "flag.hpp"
@@
-129,6
+130,11
@@
public:
*/
double tick_period() const;
*/
double tick_period() const;
+ /**
+ * Returns the unit of time currently used.
+ */
+ util::TimeUnit time_unit() 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.
*/
@@
-259,6
+265,8
@@
private:
std::shared_ptr<Signal> > &signal_map,
std::set< std::shared_ptr<Trace> > &add_list);
std::shared_ptr<Signal> > &signal_map,
std::set< std::shared_ptr<Trace> > &add_list);
+ void determine_time_unit();
+
private:
bool eventFilter(QObject *object, QEvent *event);
private:
bool eventFilter(QObject *object, QEvent *event);
@@
-306,6
+314,7
@@
private:
double tick_period_;
unsigned int tick_prefix_;
double tick_period_;
unsigned int tick_prefix_;
+ util::TimeUnit time_unit_;
bool show_cursors_;
std::shared_ptr<CursorPair> cursors_;
bool show_cursors_;
std::shared_ptr<CursorPair> cursors_;