projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainBar: fixup file extension filter in "Import File" dialog
[pulseview.git]
/
pv
/
views
/
viewbase.hpp
diff --git
a/pv/views/viewbase.hpp
b/pv/views/viewbase.hpp
index 61430136f5b032a347bf495ea7cb6ecd56cce45f..5d7d2adbb181a7cdaca7913404ea3ab3f07fa75e 100644
(file)
--- a/
pv/views/viewbase.hpp
+++ b/
pv/views/viewbase.hpp
@@
-32,6
+32,10
@@
#include <pv/data/signalbase.hpp>
#include <pv/util.hpp>
#include <pv/data/signalbase.hpp>
#include <pv/util.hpp>
+#ifdef ENABLE_DECODE
+#include <pv/data/decodesignal.hpp>
+#endif
+
using std::shared_ptr;
using std::unordered_set;
using std::shared_ptr;
using std::unordered_set;
@@
-78,9
+82,9
@@
public:
#ifdef ENABLE_DECODE
virtual void clear_decode_signals();
#ifdef ENABLE_DECODE
virtual void clear_decode_signals();
- virtual void add_decode_signal(shared_ptr<data::
SignalBase> signalbase
);
+ virtual void add_decode_signal(shared_ptr<data::
DecodeSignal> signal
);
- virtual void remove_decode_signal(shared_ptr<data::
SignalBase> signalbase
);
+ virtual void remove_decode_signal(shared_ptr<data::
DecodeSignal> signal
);
#endif
virtual void save_settings(QSettings &settings) const;
#endif
virtual void save_settings(QSettings &settings) const;
@@
-88,12
+92,17
@@
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 signals_changed();
virtual void capture_state_updated(int state);
+ virtual void on_new_segment(int new_segment_id);
+ virtual void on_segment_completed(int new_segment_id);
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,
+ uint64_t end_sample);
+
void on_data_updated();
protected:
void on_data_updated();
protected:
@@
-101,10
+110,14
@@
protected:
const bool is_main_view_;
const bool is_main_view_;
+ util::Timestamp ruler_shift_;
util::TimeUnit time_unit_;
unordered_set< shared_ptr<data::SignalBase> > signalbases_;
util::TimeUnit time_unit_;
unordered_set< shared_ptr<data::SignalBase> > signalbases_;
+ /// The ID of the currently displayed segment
+ uint32_t current_segment_;
+
QTimer delayed_view_updater_;
};
QTimer delayed_view_updater_;
};