X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fanalog.cpp;h=ed15867c2734d071ab843737284fc41f63aab208;hp=c7430432613c3eadbf373e25b16374f0a1cb980f;hb=ba5f21864c459a24f71ce3b0045805813c032134;hpb=d9aecf1fcd9af471db3b59de7efc65b9632a6d79

diff --git a/pv/data/analog.cpp b/pv/data/analog.cpp
index c7430432..ed15867c 100644
--- a/pv/data/analog.cpp
+++ b/pv/data/analog.cpp
@@ -14,16 +14,18 @@
  * 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 "analog.h"
-#include "analogsnapshot.h"
+#include <cassert>
+
+#include "analog.hpp"
+#include "analogsegment.hpp"
 
-using boost::shared_ptr;
 using std::deque;
 using std::max;
+using std::shared_ptr;
+using std::vector;
 
 namespace pv {
 namespace data {
@@ -33,30 +35,54 @@ Analog::Analog() :
 {
 }
 
-void Analog::push_snapshot(shared_ptr<AnalogSnapshot> &snapshot)
+void Analog::push_segment(shared_ptr<AnalogSegment> &segment)
+{
+	segments_.push_back(segment);
+}
+
+const deque< shared_ptr<AnalogSegment> >& Analog::analog_segments() const
+{
+	return segments_;
+}
+
+vector< shared_ptr<Segment> > Analog::segments() const
 {
-	_snapshots.push_front(snapshot);
+	return vector< shared_ptr<Segment> >(
+		segments_.begin(), segments_.end());
 }
 
-deque< shared_ptr<AnalogSnapshot> >& Analog::get_snapshots()
+int Analog::get_segment_count() const
 {
-	return _snapshots;
+	return segments_.size();
 }
 
 void Analog::clear()
 {
-	_snapshots.clear();
+	segments_.clear();
+
+	samples_cleared();
 }
 
-uint64_t Analog::get_max_sample_count() const
+uint64_t Analog::max_sample_count() const
 {
 	uint64_t l = 0;
-	for (const boost::shared_ptr<AnalogSnapshot> s : _snapshots) {
+	for (const shared_ptr<AnalogSegment> s : segments_) {
 		assert(s);
 		l = max(l, s->get_sample_count());
 	}
 	return l;
 }
 
+void Analog::notify_samples_added(QObject* segment, uint64_t start_sample,
+	uint64_t end_sample)
+{
+	samples_added(segment, start_sample, end_sample);
+}
+
+void Analog::notify_min_max_changed(float min, float max)
+{
+	min_max_changed(min, max);
+}
+
 } // namespace data
 } // namespace pv