projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainBar: fixup file extension filter in "Import File" dialog
[pulseview.git]
/
pv
/
data
/
logic.cpp
diff --git
a/pv/data/logic.cpp
b/pv/data/logic.cpp
index c62a2f2e3ad693833b1a55dbac3977d72c62deb5..e78c28468d71ef42da07e7e0eb102076889cfd38 100644
(file)
--- a/
pv/data/logic.cpp
+++ b/
pv/data/logic.cpp
@@
-14,45
+14,75
@@
* 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/>.
*/
*/
-#include "logic.h"
-#include "logicsnapshot.h"
+#include <cassert>
-using namespace boost;
-using namespace std;
+#include "logic.hpp"
+#include "logicsegment.hpp"
+
+using std::deque;
+using std::max;
+using std::shared_ptr;
+using std::vector;
namespace pv {
namespace data {
namespace pv {
namespace data {
-Logic::Logic(unsigned int num_
probe
s) :
+Logic::Logic(unsigned int num_
channel
s) :
SignalData(),
SignalData(),
- _num_probes(num_probes)
+ num_channels_(num_channels)
+{
+ assert(num_channels_ > 0);
+}
+
+unsigned int Logic::num_channels() const
+{
+ return num_channels_;
+}
+
+void Logic::push_segment(shared_ptr<LogicSegment> &segment)
{
{
-
assert(_num_probes > 0
);
+
segments_.push_back(segment
);
}
}
-
int Logic::get_num_probe
s() const
+
const deque< shared_ptr<LogicSegment> >& Logic::logic_segment
s() const
{
{
- return
_num_probes
;
+ return
segments_
;
}
}
-void Logic::push_snapshot(
- shared_ptr<LogicSnapshot> &snapshot)
+vector< shared_ptr<Segment> > Logic::segments() const
{
{
- _snapshots.push_front(snapshot);
+ return vector< shared_ptr<Segment> >(segments_.begin(), segments_.end());
+}
+
+uint32_t Logic::get_segment_count() const
+{
+ return (uint32_t)segments_.size();
+}
+
+void Logic::clear()
+{
+ segments_.clear();
+
+ samples_cleared();
}
}
-deque< shared_ptr<LogicSnapshot> >& Logic::get_snapshots()
+uint64_t Logic::max_sample_count() const
{
{
- return _snapshots;
+ uint64_t l = 0;
+ for (shared_ptr<LogicSegment> s : segments_) {
+ assert(s);
+ l = max(l, s->get_sample_count());
+ }
+ return l;
}
}
-void Logic::clear_snapshots()
+void Logic::notify_samples_added(QObject* segment, uint64_t start_sample,
+ uint64_t end_sample)
{
{
-
_snapshots.clear(
);
+
samples_added(segment, start_sample, end_sample
);
}
} // namespace data
}
} // namespace data