projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Segments: Fix iterator access to underlying value
[pulseview.git]
/
pv
/
views
/
viewbase.hpp
diff --git
a/pv/views/viewbase.hpp
b/pv/views/viewbase.hpp
index 0a7605db153f822693aff9ae6c709265d86cd887..b524c1797d0d1478ba4bd1eac36ee538a400d69a 100644
(file)
--- a/
pv/views/viewbase.hpp
+++ b/
pv/views/viewbase.hpp
@@
-65,6
+65,12
@@
private:
public:
explicit ViewBase(Session &session, bool is_main_view = false, QWidget *parent = nullptr);
public:
explicit ViewBase(Session &session, bool is_main_view = false, QWidget *parent = nullptr);
+ /**
+ * 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;
@@
-92,7
+98,7
@@
public:
virtual void restore_settings(QSettings &settings);
public Q_SLOTS:
virtual void restore_settings(QSettings &settings);
public Q_SLOTS:
- virtual void trigger_event(util::Timestamp location);
+ virtual void trigger_event(
int segment_id,
util::Timestamp location);
virtual void signals_changed();
virtual void capture_state_updated(int state);
virtual void on_new_segment(int new_segment_id);
virtual void signals_changed();
virtual void capture_state_updated(int state);
virtual void on_new_segment(int new_segment_id);
@@
-100,7
+106,7
@@
public Q_SLOTS:
virtual void perform_delayed_view_update();
private Q_SLOTS:
virtual void perform_delayed_view_update();
private Q_SLOTS:
- void on_samples_added(
QObject* segment
, uint64_t start_sample,
+ void on_samples_added(
uint64_t segment_id
, uint64_t start_sample,
uint64_t end_sample);
void on_data_updated();
uint64_t end_sample);
void on_data_updated();