projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update cli usage hint and remove unnecessary description text
[pulseview.git]
/
pv
/
session.hpp
diff --git
a/pv/session.hpp
b/pv/session.hpp
index c6a317def7b61b5f1b61a6bef5ffa65847372fc4..c7e1699bbac1193342e35e81df919be33b7fcfe6 100644
(file)
--- a/
pv/session.hpp
+++ b/
pv/session.hpp
@@
-14,12
+14,11
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* 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 <http://www.gnu.org/licenses/>.
*/
*/
-#ifndef PULSEVIEW_PV_S
IGSESSION_H
-#define PULSEVIEW_PV_S
IGSESSION_H
+#ifndef PULSEVIEW_PV_S
ESSION_HPP
+#define PULSEVIEW_PV_S
ESSION_HPP
#include <map>
#include <memory>
#include <map>
#include <memory>
@@
-27,25
+26,39
@@
#include <set>
#include <string>
#include <thread>
#include <set>
#include <string>
#include <thread>
+#include <unordered_set>
#include <vector>
#include <vector>
-#include <boost/thread.hpp>
-
#include <QObject>
#include <QObject>
+#include <QSettings>
#include <QString>
#include <QString>
+#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;
namespace sigrok {
struct srd_decoder;
struct srd_channel;
namespace sigrok {
- class Analog;
- class Channel;
- class Device;
- class Logic;
- class Meta;
- class Packet;
- class Session;
-}
+class Analog;
+class Channel;
+class Device;
+class InputFormat;
+class Logic;
+class Meta;
+class OutputFormat;
+class Packet;
+class Session;
+} // namespace sigrok
namespace pv {
namespace pv {
@@
-53,16
+66,23
@@
class DeviceManager;
namespace data {
class Analog;
namespace data {
class Analog;
-class AnalogS
napsho
t;
+class AnalogS
egmen
t;
class Logic;
class Logic;
-class LogicSnapshot;
+class LogicSegment;
+class SignalBase;
class SignalData;
}
class SignalData;
}
-namespace view {
-class DecodeTrace;
-class LogicSignal;
-class Signal;
+namespace devices {
+class Device;
+}
+
+namespace toolbars {
+class MainBar;
+}
+
+namespace views {
+class ViewBase;
}
class Session : public QObject
}
class Session : public QObject
@@
-77,7
+97,7
@@
public:
};
public:
};
public:
- Session(DeviceManager &device_manager);
+ Session(DeviceManager &device_manager
, QString name
);
~Session();
~Session();
@@
-85,106
+105,151
@@
public:
const DeviceManager& device_manager() const;
const DeviceManager& device_manager() const;
-
const std::shared_ptr<sigrok::Session>&
session() const;
+
shared_ptr<sigrok::Session>
session() const;
- std::shared_ptr<sigrok::Device> device() const;
+ shared_ptr<devices::Device> device() const;
+
+ QString name() const;
+
+ void set_name(QString name);
+
+ const list< shared_ptr<views::ViewBase> > views() const;
+
+ shared_ptr<views::ViewBase> main_view() const;
+
+ shared_ptr<pv::toolbars::MainBar> main_bar() const;
+
+ void set_main_bar(shared_ptr<pv::toolbars::MainBar> main_bar);
/**
/**
- * Sets device instance that will be used in the next capture session.
+ * 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 se
t_device(std::shared_ptr<sigrok
::Device> device);
+ void se
lect_device(shared_ptr<devices
::Device> device);
- void set_file(const std::string &name);
+ /**
+ * Sets device instance that will be used in the next capture session.
+ */
+ void set_device(shared_ptr<devices::Device> device);
void set_default_device();
void set_default_device();
+ void load_init_file(const string &file_name, const string &format);
+
+ void load_file(QString file_name,
+ shared_ptr<sigrok::InputFormat> format = nullptr,
+ const map<string, Glib::VariantBase> &options =
+ map<string, Glib::VariantBase>());
+
capture_state get_capture_state() const;
capture_state get_capture_state() const;
- void start_capture(
std::
function<void (const QString)> error_handler);
+ void start_capture(function<void (const QString)> error_handler);
void stop_capture();
void stop_capture();
- std::set< std::shared_ptr<data::SignalData> > get_data() const;
+ double get_samplerate() const;
+
+ void register_view(shared_ptr<views::ViewBase> view);
-
boost::shared_mutex& signals_mutex() const
;
+
void deregister_view(shared_ptr<views::ViewBase> view)
;
- const std::vector< std::shared_ptr<view::Signal> >& signals() const;
+ bool has_view(shared_ptr<views::ViewBase> view);
+
+ const unordered_set< shared_ptr<data::SignalBase> > signalbases() const;
#ifdef ENABLE_DECODE
bool add_decoder(srd_decoder *const dec);
#ifdef ENABLE_DECODE
bool add_decoder(srd_decoder *const dec);
- std::vector< std::shared_ptr<view::DecodeTrace> >
- get_decode_signals() const;
-
- void remove_decode_signal(view::DecodeTrace *signal);
+ void remove_decode_signal(shared_ptr<data::SignalBase> signalbase);
#endif
private:
void set_capture_state(capture_state state);
#endif
private:
void set_capture_state(capture_state state);
- void update_signals(
std::shared_ptr<sigrok::Device> device
);
+ void update_signals();
- std::shared_ptr<view::Signal> signal_from_channel(
- std::shared_ptr<sigrok::Channel> channel) const;
-
- void read_sample_rate(std::shared_ptr<sigrok::Device>);
+ shared_ptr<data::SignalBase> signalbase_from_channel(
+ shared_ptr<sigrok::Channel> channel) const;
private:
private:
- void sample_thread_proc(std::shared_ptr<sigrok::Device> device,
- std::function<void (const QString)> error_handler);
+ void sample_thread_proc(function<void (const QString)> error_handler);
+
+ void free_unused_memory();
+
+ void feed_in_header();
- void feed_in_
header(std::shared_ptr<sigrok::Device> device
);
+ void feed_in_
meta(shared_ptr<sigrok::Meta> meta
);
- void feed_in_meta(std::shared_ptr<sigrok::Device> device,
- std::shared_ptr<sigrok::Meta> meta);
+ void feed_in_trigger();
void feed_in_frame_begin();
void feed_in_frame_begin();
- void feed_in_logic(s
td::s
hared_ptr<sigrok::Logic> logic);
+ void feed_in_logic(shared_ptr<sigrok::Logic> logic);
- void feed_in_analog(s
td::s
hared_ptr<sigrok::Analog> analog);
+ void feed_in_analog(shared_ptr<sigrok::Analog> analog);
- void data_feed_in(s
td::s
hared_ptr<sigrok::Device> device,
- s
td::s
hared_ptr<sigrok::Packet> packet);
+ void data_feed_in(shared_ptr<sigrok::Device> device,
+ shared_ptr<sigrok::Packet> packet);
private:
DeviceManager &device_manager_;
private:
DeviceManager &device_manager_;
- std::shared_ptr<sigrok::Session> session_;
+ shared_ptr<devices::Device> device_;
+ QString default_name_, name_;
- /**
- * The device instance that will be used in the next capture session.
- */
- std::shared_ptr<sigrok::Device> device_;
+ list< shared_ptr<views::ViewBase> > views_;
+ shared_ptr<pv::views::ViewBase> main_view_;
- s
td::vector< std::shared_ptr<view::DecodeTrace> > decode_traces
_;
+ s
hared_ptr<pv::toolbars::MainBar> main_bar
_;
- mutable
std::mutex sampling_mutex_;
+ mutable
mutex sampling_mutex_; //!< Protects access to capture_state_.
capture_state capture_state_;
capture_state capture_state_;
-
mutable boost::shared_mutex signals_mutex
_;
-
std::vector< std::shared_ptr<view::Signal> > signals
_;
+
unordered_set< shared_ptr<data::SignalBase> > signalbases
_;
+
unordered_set< shared_ptr<data::SignalData> > all_signal_data
_;
- mutable std::mutex data_mutex_;
- std::shared_ptr<data::Logic> logic_data_;
- std::shared_ptr<data::LogicSnapshot> cur_logic_snapshot_;
- std::map< std::shared_ptr<sigrok::Channel>, std::shared_ptr<data::AnalogSnapshot> >
- cur_analog_snapshots_;
+ mutable recursive_mutex data_mutex_;
+ shared_ptr<data::Logic> logic_data_;
+ uint64_t cur_samplerate_;
+ shared_ptr<data::LogicSegment> cur_logic_segment_;
+ map< shared_ptr<sigrok::Channel>, shared_ptr<data::AnalogSegment> >
+ cur_analog_segments_;
std::thread sampling_thread_;
std::thread sampling_thread_;
+ bool out_of_memory_;
+ bool data_saved_;
+
Q_SIGNALS:
void capture_state_changed(int state);
Q_SIGNALS:
void capture_state_changed(int state);
- void device_
select
ed();
+ void device_
chang
ed();
void signals_changed();
void signals_changed();
+ void name_changed();
+
+ void trigger_event(util::Timestamp location);
+
void frame_began();
void data_received();
void frame_ended();
void frame_began();
void data_received();
void frame_ended();
+
+ void add_view(const QString &title, views::ViewType type,
+ Session *session);
+
+public Q_SLOTS:
+ void on_data_saved();
};
} // namespace pv
};
} // namespace pv
-#endif // PULSEVIEW_PV_S
IGSESSION_H
+#endif // PULSEVIEW_PV_S
ESSION_HPP