projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use typesafe enum classes in pv::util
[pulseview.git]
/
pv
/
view
/
view.hpp
diff --git
a/pv/view/view.hpp
b/pv/view/view.hpp
index b7d35e3c4102207998243147b0d2ab942c31d8c7..ed1c92633da5348384e6f4081f185448986656df 100644
(file)
--- a/
pv/view/view.hpp
+++ b/
pv/view/view.hpp
@@
-66,8
+66,8
@@
private:
};
private:
};
private:
- static const
double
MaxScale;
- static const
double
MinScale;
+ static const
pv::util::Timestamp
MaxScale;
+ static const
pv::util::Timestamp
MinScale;
static const int MaxScrollValue;
static const int MaxViewAutoUpdateRate;
static const int MaxScrollValue;
static const int MaxViewAutoUpdateRate;
@@
-108,7
+108,7
@@
public:
* Returns the time offset of the left edge of the view in
* seconds.
*/
* Returns the time offset of the left edge of the view in
* seconds.
*/
-
double
offset() const;
+
const pv::util::Timestamp&
offset() const;
/**
* Returns the vertical scroll offset.
/**
* Returns the vertical scroll offset.
@@
-123,7
+123,12
@@
public:
/**
* Returns the SI prefix to apply to the graticule time markings.
*/
/**
* Returns the SI prefix to apply to the graticule time markings.
*/
- unsigned int tick_prefix() const;
+ pv::util::SIPrefix 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.
/**
* Returns period of the graticule time markings.
@@
-152,12
+157,12
@@
public:
* @param scale The new view scale in seconds per pixel.
* @param offset The view time offset in seconds.
*/
* @param scale The new view scale in seconds per pixel.
* @param offset The view time offset in seconds.
*/
- void set_scale_offset(double scale,
double
offset);
+ void set_scale_offset(double scale,
const pv::util::Timestamp&
offset);
std::set< std::shared_ptr<pv::data::SignalData> >
get_visible_data() const;
std::set< std::shared_ptr<pv::data::SignalData> >
get_visible_data() const;
- std::pair<
double, double
> get_time_extents() const;
+ std::pair<
pv::util::Timestamp, pv::util::Timestamp
> get_time_extents() const;
/**
* Enables or disables sticky scrolling, i.e. the view always shows
/**
* Enables or disables sticky scrolling, i.e. the view always shows
@@
-188,7
+193,7
@@
public:
/**
* Adds a new flag at a specified time.
*/
/**
* Adds a new flag at a specified time.
*/
- void add_flag(
double
time);
+ void add_flag(
const pv::util::Timestamp&
time);
/**
* Removes a flag from the list.
/**
* Removes a flag from the list.
@@
-218,7
+223,7
@@
Q_SIGNALS:
void always_zoom_to_fit_changed(bool state);
private:
void always_zoom_to_fit_changed(bool state);
private:
- void get_scroll_layout(double &length,
double
&offset) const;
+ void get_scroll_layout(double &length,
pv::util::Timestamp
&offset) const;
/**
* Simultaneously sets the zoom and offset.
/**
* Simultaneously sets the zoom and offset.
@@
-286,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();
@@
-305,7
+311,7
@@
private:
double scale_;
/// The view time offset in seconds.
double scale_;
/// The view time offset in seconds.
-
double
offset_;
+
pv::util::Timestamp
offset_;
bool updating_scroll_;
bool sticky_scrolling_;
bool updating_scroll_;
bool sticky_scrolling_;
@@
-313,7
+319,8
@@
private:
QTimer delayed_view_updater_;
double tick_period_;
QTimer delayed_view_updater_;
double tick_period_;
- unsigned int tick_prefix_;
+ pv::util::SIPrefix tick_prefix_;
+ unsigned int tick_precision_;
util::TimeUnit time_unit_;
bool show_cursors_;
util::TimeUnit time_unit_;
bool show_cursors_;