projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SignalBase: Implement A2D conversions
[pulseview.git]
/
pv
/
views
/
viewbase.hpp
diff --git
a/pv/views/viewbase.hpp
b/pv/views/viewbase.hpp
index 8e09043b22ec811a56a8cfe086047c8bb1af9325..f83187e56e73eaf514d2ef2073f85f6d963efdcd 100644
(file)
--- a/
pv/views/viewbase.hpp
+++ b/
pv/views/viewbase.hpp
@@
-32,6
+32,8
@@
#include <pv/data/signalbase.hpp>
#include <pv/util.hpp>
#include <pv/data/signalbase.hpp>
#include <pv/util.hpp>
+using std::shared_ptr;
+
namespace pv {
class Session;
namespace pv {
class Session;
@@
-52,7
+54,7
@@
class ViewBase : public QWidget {
Q_OBJECT
public:
Q_OBJECT
public:
- explicit ViewBase(Session &session, QWidget *parent = 0);
+ explicit ViewBase(Session &session,
bool is_main_view=false,
QWidget *parent = 0);
Session& session();
const Session& session() const;
Session& session();
const Session& session() const;
@@
-62,9
+64,9
@@
public:
#ifdef ENABLE_DECODE
virtual void clear_decode_signals();
#ifdef ENABLE_DECODE
virtual void clear_decode_signals();
- virtual void add_decode_signal(s
td::s
hared_ptr<data::SignalBase> signalbase);
+ virtual void add_decode_signal(shared_ptr<data::SignalBase> signalbase);
- virtual void remove_decode_signal(s
td::s
hared_ptr<data::SignalBase> signalbase);
+ virtual void remove_decode_signal(shared_ptr<data::SignalBase> signalbase);
#endif
virtual void save_settings(QSettings &settings) const;
#endif
virtual void save_settings(QSettings &settings) const;
@@
-80,6
+82,8
@@
public Q_SLOTS:
protected:
Session &session_;
protected:
Session &session_;
+ const bool is_main_view_;
+
util::TimeUnit time_unit_;
};
util::TimeUnit time_unit_;
};