X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=19fd993872edc04ba8bae3ca8ad11568dce9a894;hp=95a50c21c73a098e4ab89f1e3060843d90d1e071;hb=056f443e2a6f8db80161ce08d7ff8111175bc3d6;hpb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede
diff --git a/pv/session.hpp b/pv/session.hpp
index 95a50c21..19fd9938 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#ifndef PULSEVIEW_PV_SESSION_HPP
@@ -30,13 +29,6 @@
#include
#include
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-#include
-
#include
#include
#include
@@ -44,6 +36,15 @@
#include "util.hpp"
#include "views/viewbase.hpp"
+using std::function;
+using std::list;
+using std::map;
+using std::mutex;
+using std::recursive_mutex;
+using std::shared_ptr;
+using std::string;
+using std::unordered_set;
+
struct srd_decoder;
struct srd_channel;
@@ -51,11 +52,16 @@ namespace sigrok {
class Analog;
class Channel;
class Device;
+class InputFormat;
class Logic;
class Meta;
+class Option;
+class OutputFormat;
class Packet;
class Session;
-}
+} // namespace sigrok
+
+using sigrok::Option;
namespace pv {
@@ -64,6 +70,7 @@ class DeviceManager;
namespace data {
class Analog;
class AnalogSegment;
+class DecodeSignal;
class Logic;
class LogicSegment;
class SignalBase;
@@ -93,6 +100,8 @@ public:
Running
};
+ static shared_ptr sr_context;
+
public:
Session(DeviceManager &device_manager, QString name);
@@ -102,54 +111,74 @@ public:
const DeviceManager& device_manager() const;
- std::shared_ptr session() const;
+ shared_ptr session() const;
- std::shared_ptr device() const;
+ shared_ptr device() const;
QString name() const;
void set_name(QString name);
- const std::list< std::shared_ptr > views() const;
+ const list< shared_ptr > views() const;
+
+ shared_ptr main_view() const;
- std::shared_ptr main_view() const;
+ shared_ptr main_bar() const;
- void set_main_bar(std::shared_ptr main_bar);
+ void set_main_bar(shared_ptr main_bar);
- std::shared_ptr main_bar() const;
+ /**
+ * Indicates whether the captured data was saved to disk already or not
+ */
+ bool data_saved() const;
void save_settings(QSettings &settings) const;
void restore_settings(QSettings &settings);
+ /**
+ * Attempts to set device instance, may fall back to demo if needed
+ */
+ void select_device(shared_ptr device);
+
/**
* Sets device instance that will be used in the next capture session.
*/
- void set_device(std::shared_ptr device);
+ void set_device(shared_ptr device);
void set_default_device();
+ void load_init_file(const string &file_name, const string &format);
+
+ void load_file(QString file_name,
+ shared_ptr format = nullptr,
+ const map &options =
+ map());
+
capture_state get_capture_state() const;
- void start_capture(std::function error_handler);
+ void start_capture(function error_handler);
void stop_capture();
double get_samplerate() const;
- void register_view(std::shared_ptr view);
+ uint32_t get_segment_count() const;
- void deregister_view(std::shared_ptr view);
+ void register_view(shared_ptr view);
- bool has_view(std::shared_ptr view);
+ void deregister_view(shared_ptr view);
- const std::unordered_set< std::shared_ptr >
- signalbases() const;
+ bool has_view(shared_ptr view);
+
+ const unordered_set< shared_ptr > signalbases() const;
+
+ bool all_segments_complete(uint32_t segment_id) const;
#ifdef ENABLE_DECODE
- bool add_decoder(srd_decoder *const dec);
+ shared_ptr add_decode_signal();
- void remove_decode_signal(std::shared_ptr signalbase);
+ void remove_decode_signal(shared_ptr signal);
#endif
private:
@@ -157,53 +186,35 @@ private:
void update_signals();
- std::shared_ptr signalbase_from_channel(
- std::shared_ptr channel) const;
+ shared_ptr signalbase_from_channel(
+ shared_ptr channel) const;
-private:
- void sample_thread_proc(std::function error_handler);
+ static map input_format_options(
+ vector user_spec,
+ map> fmt_opts);
- void feed_in_header();
+ void sample_thread_proc(function error_handler);
- void feed_in_meta(std::shared_ptr meta);
+ void free_unused_memory();
- void feed_in_trigger();
-
- void feed_in_frame_begin();
-
- void feed_in_logic(std::shared_ptr logic);
-
- void feed_in_analog(std::shared_ptr analog);
-
- void data_feed_in(std::shared_ptr device,
- std::shared_ptr packet);
-
-private:
- DeviceManager &device_manager_;
- std::shared_ptr device_;
- QString default_name_, name_;
+ void signal_new_segment();
+ void signal_segment_completed();
- std::list< std::shared_ptr > views_;
- std::shared_ptr main_view_;
+ void feed_in_header();
- std::shared_ptr main_bar_;
+ void feed_in_meta(shared_ptr meta);
- mutable std::mutex sampling_mutex_; //!< Protects access to capture_state_.
- capture_state capture_state_;
+ void feed_in_trigger();
- std::unordered_set< std::shared_ptr > signalbases_;
- std::unordered_set< std::shared_ptr > all_signal_data_;
+ void feed_in_frame_begin();
+ void feed_in_frame_end();
- mutable std::recursive_mutex data_mutex_;
- std::shared_ptr logic_data_;
- uint64_t cur_samplerate_;
- std::shared_ptr cur_logic_segment_;
- std::map< std::shared_ptr, std::shared_ptr >
- cur_analog_segments_;
+ void feed_in_logic(shared_ptr logic);
- std::thread sampling_thread_;
+ void feed_in_analog(shared_ptr analog);
- bool out_of_memory_;
+ void data_feed_in(shared_ptr device,
+ shared_ptr packet);
Q_SIGNALS:
void capture_state_changed(int state);
@@ -215,14 +226,46 @@ Q_SIGNALS:
void trigger_event(util::Timestamp location);
- void frame_began();
+ void new_segment(int new_segment_id);
+ void segment_completed(int segment_id);
void data_received();
- void frame_ended();
-
void add_view(const QString &title, views::ViewType type,
Session *session);
+
+public Q_SLOTS:
+ void on_data_saved();
+
+private:
+ DeviceManager &device_manager_;
+ shared_ptr device_;
+ QString default_name_, name_;
+
+ list< shared_ptr > views_;
+ shared_ptr main_view_;
+
+ shared_ptr main_bar_;
+
+ mutable mutex sampling_mutex_; //!< Protects access to capture_state_.
+ capture_state capture_state_;
+
+ unordered_set< shared_ptr > signalbases_;
+ unordered_set< shared_ptr > all_signal_data_;
+
+ mutable recursive_mutex data_mutex_;
+ shared_ptr logic_data_;
+ uint64_t cur_samplerate_;
+ shared_ptr cur_logic_segment_;
+ map< shared_ptr, shared_ptr >
+ cur_analog_segments_;
+ int32_t highest_segment_id_;
+
+ std::thread sampling_thread_;
+
+ bool out_of_memory_;
+ bool data_saved_;
+ bool frame_began_;
};
} // namespace pv