projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use QMessageBox::setInformativeText()
[pulseview.git]
/
pv
/
data
/
logic.hpp
diff --git
a/pv/data/logic.hpp
b/pv/data/logic.hpp
index 6e5749a31ee86daac20bf38f2b963a66ed69ebb3..e0fb7dd14dd05dab2dc93451d999350f0d6dd60f 100644
(file)
--- a/
pv/data/logic.hpp
+++ b/
pv/data/logic.hpp
@@
-24,6
+24,12
@@
#include <deque>
#include <deque>
+#include <QObject>
+
+using std::deque;
+using std::shared_ptr;
+using std::vector;
+
namespace pv {
namespace data {
namespace pv {
namespace data {
@@
-31,26
+37,39
@@
class LogicSegment;
class Logic : public SignalData
{
class Logic : public SignalData
{
+ Q_OBJECT
+
public:
Logic(unsigned int num_channels);
unsigned int num_channels() const;
public:
Logic(unsigned int num_channels);
unsigned int num_channels() const;
- void push_segment(
- std::shared_ptr<LogicSegment> &segment);
+ void push_segment(shared_ptr<LogicSegment> &segment);
+
+ const deque< shared_ptr<LogicSegment> >& logic_segments() const;
- const std::deque< std::shared_ptr<LogicSegment> >&
- logic_segments() const;
+ vector< shared_ptr<Segment> > segments() const;
-
std::vector< std::shared_ptr<Segment> > segments
() const;
+
uint32_t get_segment_count
() const;
void clear();
void clear();
+ double get_samplerate() const;
+
uint64_t max_sample_count() const;
uint64_t max_sample_count() const;
+ void notify_samples_added(QObject* segment, uint64_t start_sample,
+ uint64_t end_sample);
+
+Q_SIGNALS:
+ void samples_cleared();
+
+ void samples_added(QObject* segment, uint64_t start_sample,
+ uint64_t end_sample);
+
private:
const unsigned int num_channels_;
private:
const unsigned int num_channels_;
-
std::deque< std::
shared_ptr<LogicSegment> > segments_;
+
deque<
shared_ptr<LogicSegment> > segments_;
};
} // namespace data
};
} // namespace data