projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #975 by overallocating memory to leave spare for PV to use
[pulseview.git]
/
pv
/
views
/
trace
/
view.hpp
diff --git
a/pv/views/trace/view.hpp
b/pv/views/trace/view.hpp
index 4514989765b9603d4b8809c1eaa0c3a209fc3783..4f364404ce01acf2c9f9b4ee18d8cfb2dc517843 100644
(file)
--- a/
pv/views/trace/view.hpp
+++ b/
pv/views/trace/view.hpp
@@
-31,8
+31,9
@@
#include <QSizeF>
#include <QSplitter>
#include <QSizeF>
#include <QSplitter>
-#include <pv/
data/signaldata
.hpp>
+#include <pv/
globalsettings
.hpp>
#include <pv/util.hpp>
#include <pv/util.hpp>
+#include <pv/data/signaldata.hpp>
#include <pv/views/viewbase.hpp>
#include "cursorpair.hpp"
#include <pv/views/viewbase.hpp>
#include "cursorpair.hpp"
@@
-81,7
+82,7
@@
public:
bool viewportEvent(QEvent *event);
};
bool viewportEvent(QEvent *event);
};
-class View : public ViewBase, public TraceTreeItemOwner
+class View : public ViewBase, public TraceTreeItemOwner
, public GlobalSettingsInterface
{
Q_OBJECT
{
Q_OBJECT
@@
-102,6
+103,14
@@
private:
public:
explicit View(Session &session, bool is_main_view=false, QWidget *parent = nullptr);
public:
explicit View(Session &session, bool is_main_view=false, QWidget *parent = nullptr);
+ ~View();
+
+ /**
+ * Resets the view to its default state after construction. It does however
+ * not reset the signal bases or any other connections with the session.
+ */
+ virtual void reset_view_state();
+
Session& session();
const Session& session() const;
Session& session();
const Session& session() const;
@@
-162,6
+171,10
@@
public:
*/
const pv::util::Timestamp& ruler_offset() const;
*/
const pv::util::Timestamp& ruler_offset() const;
+ void set_zero_position(pv::util::Timestamp& position);
+
+ void reset_zero_position();
+
/**
* Returns the vertical scroll offset.
*/
/**
* Returns the vertical scroll offset.
*/
@@
-221,8
+234,6
@@
public:
void zoom_fit(bool gui_state);
void zoom_fit(bool gui_state);
- void zoom_one_to_one();
-
/**
* Sets the scale and offset.
* @param scale The new view scale in seconds per pixel.
/**
* Sets the scale and offset.
* @param scale The new view scale in seconds per pixel.
@@
-235,15
+246,15
@@
public:
pair<pv::util::Timestamp, pv::util::Timestamp> get_time_extents() const;
/**
pair<pv::util::Timestamp, pv::util::Timestamp> get_time_extents() const;
/**
- * Enables or disables colo
u
red trace backgrounds. If they're not
- * colo
u
red then they will use alternating colors.
+ * Enables or disables colored trace backgrounds. If they're not
+ * colored then they will use alternating colors.
*/
*/
- void enable_colo
u
red_bg(bool state);
+ void enable_colored_bg(bool state);
/**
/**
- * Returns true if the trace background should be drawn with a colo
u
red background.
+ * Returns true if the trace background should be drawn with a colored background.
*/
*/
- bool colo
u
red_bg() const;
+ bool colored_bg() const;
/**
* Enable or disable showing sampling points.
/**
* Enable or disable showing sampling points.
@@
-294,6
+305,8
@@
public:
void restack_all_trace_tree_items();
void restack_all_trace_tree_items();
+ void on_setting_changed(const QString &key, const QVariant &value);
+
Q_SIGNALS:
void hover_point_changed(const QPoint &hp);
Q_SIGNALS:
void hover_point_changed(const QPoint &hp);
@@
-328,8
+341,11
@@
Q_SIGNALS:
/// @param mode is a value of Trace::SegmentDisplayMode
void segment_display_mode_changed(int mode, bool segment_selectable);
/// @param mode is a value of Trace::SegmentDisplayMode
void segment_display_mode_changed(int mode, bool segment_selectable);
+ /// Emitted when the cursors are shown/hidden
+ void cursor_state_changed(bool show);
+
public Q_SLOTS:
public Q_SLOTS:
- void trigger_event(util::Timestamp location);
+ void trigger_event(
int segment_id,
util::Timestamp location);
private:
void get_scroll_layout(double &length, pv::util::Timestamp &offset) const;
private:
void get_scroll_layout(double &length, pv::util::Timestamp &offset) const;
@@
-403,6
+419,8
@@
private Q_SLOTS:
void on_segment_completed(int new_segment_id);
void on_segment_changed(int segment);
void on_segment_completed(int new_segment_id);
void on_segment_changed(int segment);
+ void on_settingViewTriggerIsZeroTime_changed(const QVariant new_value);
+
virtual void perform_delayed_view_update();
void process_sticky_events();
virtual void perform_delayed_view_update();
void process_sticky_events();
@@
-411,7
+429,7
@@
private Q_SLOTS:
* Sets the 'offset_' and ruler_offset_ members and emits the 'offset_changed'
* signal if needed.
*/
* Sets the 'offset_' and ruler_offset_ members and emits the 'offset_changed'
* signal if needed.
*/
- void set_offset(const pv::util::Timestamp& offset);
+ void set_offset(const pv::util::Timestamp& offset
, bool force_update = false
);
/**
* Sets the 'scale_' member and emits the 'scale_changed'
/**
* Sets the 'scale_' member and emits the 'scale_changed'
@@
-479,7
+497,7
@@
private:
bool header_was_shrunk_;
bool sticky_scrolling_;
bool header_was_shrunk_;
bool sticky_scrolling_;
- bool colo
u
red_bg_;
+ bool colored_bg_;
bool always_zoom_to_fit_;
pv::util::Timestamp tick_period_;
bool always_zoom_to_fit_;
pv::util::Timestamp tick_period_;