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

diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp
index fe29aea4..d2f89e85 100644
--- a/pv/data/logic.cpp
+++ b/pv/data/logic.cpp
@@ -14,8 +14,7 @@
  * 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 <cassert>
@@ -33,20 +32,23 @@ namespace data {
 
 Logic::Logic(unsigned int num_channels) :
 	SignalData(),
+	samplerate_(1),  // Default is 1 Hz to prevent division-by-zero errors
 	num_channels_(num_channels)
 {
 	assert(num_channels_ > 0);
 }
 
-int Logic::get_num_channels() const
+unsigned int Logic::num_channels() const
 {
 	return num_channels_;
 }
 
-void Logic::push_segment(
-	shared_ptr<LogicSegment> &segment)
+void Logic::push_segment(shared_ptr<LogicSegment> &segment)
 {
-	segments_.push_front(segment);
+	segments_.push_back(segment);
+
+	if ((samplerate_ == 1) && (segment->samplerate() > 1))
+		samplerate_ = segment->samplerate();
 }
 
 const deque< shared_ptr<LogicSegment> >& Logic::logic_segments() const
@@ -54,26 +56,53 @@ const deque< shared_ptr<LogicSegment> >& Logic::logic_segments() const
 	return segments_;
 }
 
+deque< shared_ptr<LogicSegment> >& Logic::logic_segments()
+{
+	return segments_;
+}
+
 vector< shared_ptr<Segment> > Logic::segments() const
 {
-	return vector< shared_ptr<Segment> >(
-		segments_.begin(), segments_.end());
+	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();
 }
 
-uint64_t Logic::get_max_sample_count() const
+void Logic::set_samplerate(double value)
+{
+	samplerate_ = value;
+}
+
+double Logic::get_samplerate() const
+{
+	return samplerate_;
+}
+
+uint64_t Logic::max_sample_count() const
 {
 	uint64_t l = 0;
-	for (std::shared_ptr<LogicSegment> s : segments_) {
+	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