projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #510 by disabling removal of the last decoder from the popup
[pulseview.git]
/
pv
/
session.hpp
diff --git
a/pv/session.hpp
b/pv/session.hpp
index d71b1d6cec3f267bab7044b52dd69d375a1987a3..3d303da47f198a6b3f88d046298126b4d5453270 100644
(file)
--- a/
pv/session.hpp
+++ b/
pv/session.hpp
@@
-18,8
+18,8
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PULSEVIEW_PV_S
IGS
ESSION_HPP
-#define PULSEVIEW_PV_S
IGS
ESSION_HPP
+#ifndef PULSEVIEW_PV_SESSION_HPP
+#define PULSEVIEW_PV_SESSION_HPP
#include <map>
#include <memory>
#include <map>
#include <memory>
@@
-27,6
+27,7
@@
#include <set>
#include <string>
#include <thread>
#include <set>
#include <string>
#include <thread>
+#include <unordered_set>
#include <vector>
#ifdef _WIN32
#include <vector>
#ifdef _WIN32
@@
-64,6
+65,10
@@
class LogicSegment;
class SignalData;
}
class SignalData;
}
+namespace devices {
+class Device;
+}
+
namespace view {
class DecodeTrace;
class LogicSignal;
namespace view {
class DecodeTrace;
class LogicSignal;
@@
-90,20
+95,14
@@
public:
const DeviceManager& device_manager() const;
const DeviceManager& device_manager() const;
-
const std::shared_ptr<sigrok::Session>&
session() const;
+
std::shared_ptr<sigrok::Session>
session() const;
- std::shared_ptr<
sigrok
::Device> device() const;
+ std::shared_ptr<
devices
::Device> device() const;
/**
* Sets device instance that will be used in the next capture session.
*/
/**
* Sets device instance that will be used in the next capture session.
*/
- void set_device(std::shared_ptr<sigrok::Device> device);
-
- /**
- * Sets a sigrok session file as the capture device.
- * @param name the path to the file.
- */
- void set_session_file(const std::string &name);
+ void set_device(std::shared_ptr<devices::Device> device);
void set_default_device();
void set_default_device();
@@
-117,7
+116,8
@@
public:
boost::shared_mutex& signals_mutex() const;
boost::shared_mutex& signals_mutex() const;
- const std::vector< std::shared_ptr<view::Signal> >& signals() const;
+ const std::unordered_set< std::shared_ptr<view::Signal> >&
+ signals() const;
#ifdef ENABLE_DECODE
bool add_decoder(srd_decoder *const dec);
#ifdef ENABLE_DECODE
bool add_decoder(srd_decoder *const dec);
@@
-131,21
+131,18
@@
public:
private:
void set_capture_state(capture_state state);
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;
std::shared_ptr<view::Signal> signal_from_channel(
std::shared_ptr<sigrok::Channel> channel) const;
- void read_sample_rate(std::shared_ptr<sigrok::Device>);
-
private:
private:
- void sample_thread_proc(std::shared_ptr<
sigrok
::Device> device,
+ void sample_thread_proc(std::shared_ptr<
devices
::Device> device,
std::function<void (const QString)> error_handler);
std::function<void (const QString)> error_handler);
- void feed_in_header(
std::shared_ptr<sigrok::Device> device
);
+ void feed_in_header();
- void feed_in_meta(std::shared_ptr<sigrok::Device> device,
- std::shared_ptr<sigrok::Meta> meta);
+ void feed_in_meta(std::shared_ptr<sigrok::Meta> meta);
void feed_in_frame_begin();
void feed_in_frame_begin();
@@
-158,12
+155,7
@@
private:
private:
DeviceManager &device_manager_;
private:
DeviceManager &device_manager_;
- std::shared_ptr<sigrok::Session> session_;
-
- /**
- * The device instance that will be used in the next capture session.
- */
- std::shared_ptr<sigrok::Device> device_;
+ std::shared_ptr<devices::Device> device_;
std::vector< std::shared_ptr<view::DecodeTrace> > decode_traces_;
std::vector< std::shared_ptr<view::DecodeTrace> > decode_traces_;
@@
-171,9
+163,9
@@
private:
capture_state capture_state_;
mutable boost::shared_mutex signals_mutex_;
capture_state capture_state_;
mutable boost::shared_mutex signals_mutex_;
- std::
vector
< std::shared_ptr<view::Signal> > signals_;
+ std::
unordered_set
< std::shared_ptr<view::Signal> > signals_;
- mutable std::mutex data_mutex_;
+ mutable std::
recursive_
mutex data_mutex_;
std::shared_ptr<data::Logic> logic_data_;
uint64_t cur_samplerate_;
std::shared_ptr<data::LogicSegment> cur_logic_segment_;
std::shared_ptr<data::Logic> logic_data_;
uint64_t cur_samplerate_;
std::shared_ptr<data::LogicSegment> cur_logic_segment_;
@@
-182,6
+174,8
@@
private:
std::thread sampling_thread_;
std::thread sampling_thread_;
+ bool out_of_memory_;
+
Q_SIGNALS:
void capture_state_changed(int state);
void device_selected();
Q_SIGNALS:
void capture_state_changed(int state);
void device_selected();
@@
-197,4
+191,4
@@
Q_SIGNALS:
} // namespace pv
} // namespace pv
-#endif // PULSEVIEW_PV_S
IGS
ESSION_HPP
+#endif // PULSEVIEW_PV_SESSION_HPP