projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
main.cpp: Minor consistency fixes found by clang-tidy.
[pulseview.git]
/
pv
/
session.hpp
diff --git
a/pv/session.hpp
b/pv/session.hpp
index 95a50c21c73a098e4ab89f1e3060843d90d1e071..4ac7f509b516dcf18b4738753b1dd5038041f6ec 100644
(file)
--- 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
* 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_SESSION_HPP
*/
#ifndef PULSEVIEW_PV_SESSION_HPP
@@
-44,6
+43,15
@@
#include "util.hpp"
#include "views/viewbase.hpp"
#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;
struct srd_decoder;
struct srd_channel;
@@
-51,8
+59,10
@@
namespace sigrok {
class Analog;
class Channel;
class Device;
class Analog;
class Channel;
class Device;
+class InputFormat;
class Logic;
class Meta;
class Logic;
class Meta;
+class OutputFormat;
class Packet;
class Session;
}
class Packet;
class Session;
}
@@
-102,54
+112,71
@@
public:
const DeviceManager& device_manager() const;
const DeviceManager& device_manager() const;
- s
td::s
hared_ptr<sigrok::Session> session() const;
+ shared_ptr<sigrok::Session> session() const;
- s
td::s
hared_ptr<devices::Device> device() const;
+ shared_ptr<devices::Device> device() const;
QString name() const;
void set_name(QString name);
QString name() const;
void set_name(QString name);
- const std::list< std::shared_ptr<views::ViewBase> > views() const;
+ const list< shared_ptr<views::ViewBase> > views() const;
+
+ shared_ptr<views::ViewBase> main_view() const;
- s
td::shared_ptr<views::ViewBase> main_view
() const;
+ s
hared_ptr<pv::toolbars::MainBar> main_bar
() const;
- void set_main_bar(s
td::s
hared_ptr<pv::toolbars::MainBar> main_bar);
+ void set_main_bar(shared_ptr<pv::toolbars::MainBar> main_bar);
- std::shared_ptr<pv::toolbars::MainBar> 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);
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<devices::Device> device);
+
/**
* 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(s
td::s
hared_ptr<devices::Device> device);
+ 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();
double get_samplerate() const;
void stop_capture();
double get_samplerate() const;
- void register_view(s
td::s
hared_ptr<views::ViewBase> view);
+ void register_view(shared_ptr<views::ViewBase> view);
- void deregister_view(s
td::s
hared_ptr<views::ViewBase> view);
+ void deregister_view(shared_ptr<views::ViewBase> view);
- bool has_view(s
td::s
hared_ptr<views::ViewBase> view);
+ bool has_view(shared_ptr<views::ViewBase> view);
- const
std::unordered_set< std::
shared_ptr<data::SignalBase> >
+ const
unordered_set<
shared_ptr<data::SignalBase> >
signalbases() const;
#ifdef ENABLE_DECODE
bool add_decoder(srd_decoder *const dec);
signalbases() const;
#ifdef ENABLE_DECODE
bool add_decoder(srd_decoder *const dec);
- void remove_decode_signal(s
td::s
hared_ptr<data::SignalBase> signalbase);
+ void remove_decode_signal(shared_ptr<data::SignalBase> signalbase);
#endif
private:
#endif
private:
@@
-157,53
+184,56
@@
private:
void update_signals();
void update_signals();
- s
td::s
hared_ptr<data::SignalBase> signalbase_from_channel(
- s
td::s
hared_ptr<sigrok::Channel> channel) const;
+ shared_ptr<data::SignalBase> signalbase_from_channel(
+ shared_ptr<sigrok::Channel> channel) const;
private:
private:
- void sample_thread_proc(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();
- void feed_in_meta(s
td::s
hared_ptr<sigrok::Meta> meta);
+ void feed_in_meta(shared_ptr<sigrok::Meta> meta);
void feed_in_trigger();
void feed_in_frame_begin();
void feed_in_trigger();
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_;
- s
td::s
hared_ptr<devices::Device> device_;
+ shared_ptr<devices::Device> device_;
QString default_name_, name_;
QString default_name_, name_;
-
std::list< std::
shared_ptr<views::ViewBase> > views_;
- s
td::s
hared_ptr<pv::views::ViewBase> main_view_;
+
list<
shared_ptr<views::ViewBase> > views_;
+ shared_ptr<pv::views::ViewBase> main_view_;
- s
td::s
hared_ptr<pv::toolbars::MainBar> main_bar_;
+ shared_ptr<pv::toolbars::MainBar> main_bar_;
- mutable
std::
mutex sampling_mutex_; //!< Protects access to capture_state_.
+ mutable mutex sampling_mutex_; //!< Protects access to capture_state_.
capture_state capture_state_;
capture_state capture_state_;
-
std::unordered_set< std::
shared_ptr<data::SignalBase> > signalbases_;
-
std::unordered_set< std::
shared_ptr<data::SignalData> > all_signal_data_;
+
unordered_set<
shared_ptr<data::SignalBase> > signalbases_;
+
unordered_set<
shared_ptr<data::SignalData> > all_signal_data_;
- mutable
std::
recursive_mutex data_mutex_;
- s
td::s
hared_ptr<data::Logic> logic_data_;
+ mutable recursive_mutex data_mutex_;
+ shared_ptr<data::Logic> logic_data_;
uint64_t cur_samplerate_;
uint64_t cur_samplerate_;
- s
td::s
hared_ptr<data::LogicSegment> cur_logic_segment_;
-
std::map< std::shared_ptr<sigrok::Channel>, std::
shared_ptr<data::AnalogSegment> >
+ shared_ptr<data::LogicSegment> cur_logic_segment_;
+
map< shared_ptr<sigrok::Channel>,
shared_ptr<data::AnalogSegment> >
cur_analog_segments_;
std::thread sampling_thread_;
bool out_of_memory_;
cur_analog_segments_;
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);
@@
-223,6
+253,9
@@
Q_SIGNALS:
void add_view(const QString &title, views::ViewType type,
Session *session);
void add_view(const QString &title, views::ViewType type,
Session *session);
+
+public Q_SLOTS:
+ void on_data_saved();
};
} // namespace pv
};
} // namespace pv