projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't try to store a reference to a shared pointer.
[pulseview.git]
/
pv
/
view
/
view.hpp
diff --git
a/pv/view/view.hpp
b/pv/view/view.hpp
index b29fb157dce383eec55535fcd187ecf104eaa9b7..ff7795c5a68dbd55b92204d7236817e2dce35182 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"
@@
-124,11
+125,21
@@
public:
*/
unsigned int tick_prefix() const;
*/
unsigned int tick_prefix() const;
+ /**
+ * Returns the number of fractional digits shown for the time markings.
+ */
+ unsigned int tick_precision() const;
+
/**
* Returns period of the graticule time markings.
*/
double tick_period() const;
/**
* Returns period of the graticule time markings.
*/
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.
*/
@@
-137,7
+148,7
@@
public:
void zoom(double steps);
void zoom(double steps, int offset);
void zoom(double steps);
void zoom(double steps, int offset);
- void zoom_fit();
+ void zoom_fit(
bool gui_state
);
void zoom_one_to_one();
void zoom_one_to_one();
@@
-209,6
+220,8
@@
Q_SIGNALS:
void sticky_scrolling_changed(bool state);
void sticky_scrolling_changed(bool state);
+ void always_zoom_to_fit_changed(bool state);
+
private:
void get_scroll_layout(double &length, double &offset) const;
private:
void get_scroll_layout(double &length, double &offset) const;
@@
-257,6
+270,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);
@@
-276,6
+291,7
@@
private Q_SLOTS:
void v_scroll_value_changed();
void signals_changed();
void v_scroll_value_changed();
void signals_changed();
+ void capture_state_updated(int state);
void data_updated();
void perform_delayed_view_update();
void data_updated();
void perform_delayed_view_update();
@@
-299,10
+315,13
@@
private:
bool updating_scroll_;
bool sticky_scrolling_;
bool updating_scroll_;
bool sticky_scrolling_;
+ bool always_zoom_to_fit_;
QTimer delayed_view_updater_;
double tick_period_;
unsigned int tick_prefix_;
QTimer delayed_view_updater_;
double tick_period_;
unsigned int tick_prefix_;
+ unsigned int tick_precision_;
+ util::TimeUnit time_unit_;
bool show_cursors_;
std::shared_ptr<CursorPair> cursors_;
bool show_cursors_;
std::shared_ptr<CursorPair> cursors_;