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

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