X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Flogic.cpp;h=d2f89e856cd4ae58a9e682341670b88a8d003c3f;hb=9431e2d3d256f3602c3637847a8ec3ad3fdcd590;hp=9bcfd0a382ac39c020d396007d07a4e1885fbef8;hpb=d9aecf1fcd9af471db3b59de7efc65b9632a6d79;p=pulseview.git

diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp
index 9bcfd0a3..d2f89e85 100644
--- a/pv/data/logic.cpp
+++ b/pv/data/logic.cpp
@@ -14,57 +14,95 @@
  * 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>
+
+#include "logic.hpp"
+#include "logicsegment.hpp"
 
-using boost::shared_ptr;
 using std::deque;
 using std::max;
+using std::shared_ptr;
+using std::vector;
 
 namespace pv {
 namespace data {
 
-Logic::Logic(unsigned int num_probes) :
+Logic::Logic(unsigned int num_channels) :
 	SignalData(),
-	_num_probes(num_probes)
+	samplerate_(1),  // Default is 1 Hz to prevent division-by-zero errors
+	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)
+{
+	segments_.push_back(segment);
+
+	if ((samplerate_ == 1) && (segment->samplerate() > 1))
+		samplerate_ = segment->samplerate();
+}
+
+const deque< shared_ptr<LogicSegment> >& Logic::logic_segments() const
 {
-	assert(_num_probes > 0);
+	return segments_;
 }
 
-int Logic::get_num_probes() const
+deque< shared_ptr<LogicSegment> >& Logic::logic_segments()
 {
-	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());
 }
 
-deque< shared_ptr<LogicSnapshot> >& Logic::get_snapshots()
+uint32_t Logic::get_segment_count() const
 {
-	return _snapshots;
+	return (uint32_t)segments_.size();
 }
 
 void Logic::clear()
 {
-	_snapshots.clear();
+	segments_.clear();
+
+	samples_cleared();
+}
+
+void Logic::set_samplerate(double value)
+{
+	samplerate_ = value;
+}
+
+double Logic::get_samplerate() const
+{
+	return samplerate_;
 }
 
-uint64_t Logic::get_max_sample_count() const
+uint64_t Logic::max_sample_count() const
 {
 	uint64_t l = 0;
-	for (boost::shared_ptr<LogicSnapshot> s : _snapshots) {
+	for (const shared_ptr<LogicSegment>& s : segments_) {
 		assert(s);
 		l = max(l, s->get_sample_count());
 	}
 	return l;
 }
 
+void Logic::notify_samples_added(shared_ptr<Segment> segment, uint64_t start_sample,
+	uint64_t end_sample)
+{
+	samples_added(segment, start_sample, end_sample);
+}
+
 } // namespace data
 } // namespace pv