projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8664316
)
Session: Clean up header a little
author
Soeren Apel
<soeren@apelpie.net>
Wed, 24 Jan 2018 08:35:23 +0000
(09:35 +0100)
committer
Soeren Apel
<soeren@apelpie.net>
Wed, 7 Feb 2018 18:41:56 +0000
(19:41 +0100)
pv/session.hpp
patch
|
blob
|
history
diff --git
a/pv/session.hpp
b/pv/session.hpp
index ead2f82df47955773e53a562f91c18a3e75f94d6..19fd993872edc04ba8bae3ca8ad11568dce9a894 100644
(file)
--- a/
pv/session.hpp
+++ b/
pv/session.hpp
@@
-193,7
+193,6
@@
private:
vector<string> user_spec,
map<string, shared_ptr<Option>> fmt_opts);
vector<string> user_spec,
map<string, shared_ptr<Option>> fmt_opts);
-private:
void sample_thread_proc(function<void (const QString)> error_handler);
void free_unused_memory();
void sample_thread_proc(function<void (const QString)> error_handler);
void free_unused_memory();
@@
-217,6
+216,27
@@
private:
void data_feed_in(shared_ptr<sigrok::Device> device,
shared_ptr<sigrok::Packet> packet);
void data_feed_in(shared_ptr<sigrok::Device> device,
shared_ptr<sigrok::Packet> packet);
+Q_SIGNALS:
+ void capture_state_changed(int state);
+ void device_changed();
+
+ void signals_changed();
+
+ void name_changed();
+
+ void trigger_event(util::Timestamp location);
+
+ void new_segment(int new_segment_id);
+ void segment_completed(int segment_id);
+
+ void data_received();
+
+ void add_view(const QString &title, views::ViewType type,
+ Session *session);
+
+public Q_SLOTS:
+ void on_data_saved();
+
private:
DeviceManager &device_manager_;
shared_ptr<devices::Device> device_;
private:
DeviceManager &device_manager_;
shared_ptr<devices::Device> device_;
@@
-246,27
+266,6
@@
private:
bool out_of_memory_;
bool data_saved_;
bool frame_began_;
bool out_of_memory_;
bool data_saved_;
bool frame_began_;
-
-Q_SIGNALS:
- void capture_state_changed(int state);
- void device_changed();
-
- void signals_changed();
-
- void name_changed();
-
- void trigger_event(util::Timestamp location);
-
- void new_segment(int new_segment_id);
- void segment_completed(int segment_id);
-
- void data_received();
-
- void add_view(const QString &title, views::ViewType type,
- Session *session);
-
-public Q_SLOTS:
- void on_data_saved();
};
} // namespace pv
};
} // namespace pv