X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fanalog.cpp;h=02cb83e40c7e474729c7c6d82035f673138f6d36;hp=9e43e866ff72d14477b0777abfb79c07ba56ccd3;hb=HEAD;hpb=1b1ec774978b65209ce2b454cbf81da499b797d2

diff --git a/pv/data/analog.cpp b/pv/data/analog.cpp
index 9e43e866..da9736b5 100644
--- a/pv/data/analog.cpp
+++ b/pv/data/analog.cpp
@@ -14,33 +14,97 @@
  * 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 &meta,
-	uint64_t samplerate) :
-	SignalData(samplerate)
+Analog::Analog() :
+	SignalData(),
+	samplerate_(1)  // Default is 1 Hz to prevent division-by-zero errors
+{
+}
+
+void Analog::push_segment(shared_ptr<AnalogSegment> &segment)
+{
+	segments_.push_back(segment);
+
+	if ((samplerate_ == 1) && (segment->samplerate() > 1))
+		samplerate_ = segment->samplerate();
+
+	connect(segment.get(), SIGNAL(completed()), this, SLOT(on_segment_completed()));
+}
+
+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());
+}
+
+uint32_t Analog::get_segment_count() const
+{
+	return (uint32_t)segments_.size();
+}
+
+void Analog::clear()
+{
+	if (!segments_.empty()) {
+		segments_.clear();
+
+		samples_cleared();
+	}
+}
+
+void Analog::set_samplerate(double value)
+{
+	samplerate_ = value;
+}
+
+double Analog::get_samplerate() const
+{
+	return samplerate_;
+}
+
+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::notify_samples_added(shared_ptr<Segment> segment, uint64_t start_sample,
+	uint64_t end_sample)
 {
+	samples_added(segment, start_sample, end_sample);
 }
 
-void Analog::push_snapshot(shared_ptr<AnalogSnapshot> &snapshot)
+void Analog::notify_min_max_changed(float min, float max)
 {
-	_snapshots.push_front(snapshot);
+	min_max_changed(min, max);
 }
 
-deque< shared_ptr<AnalogSnapshot> >& Analog::get_snapshots()
+void Analog::on_segment_completed()
 {
-	return _snapshots;
+	segment_completed();
 }
 
 } // namespace data