X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fanalog.cpp;h=0b5c37729ea0908c4e6a3a2b39a727088de014a9;hp=3f96dae1afe566e61d512176d4d1cf2d6fbdd08d;hb=144e72c9ec677e7df35d37d7de6e8a18bb3f2ba1;hpb=99503171d4f32570829df171521b4b9cbccb0503

diff --git a/pv/data/analog.cpp b/pv/data/analog.cpp
index 3f96dae1..0b5c3772 100644
--- a/pv/data/analog.cpp
+++ b/pv/data/analog.cpp
@@ -14,14 +14,13 @@
  * 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>
 
 #include "analog.hpp"
-#include "analogsnapshot.hpp"
+#include "analogsegment.hpp"
 
 using std::deque;
 using std::max;
@@ -32,40 +31,76 @@ namespace pv {
 namespace data {
 
 Analog::Analog() :
-	SignalData()
+	SignalData(),
+	samplerate_(1)  // Default is 1 Hz to prevent division-by-zero errors
 {
 }
 
-void Analog::push_snapshot(shared_ptr<AnalogSnapshot> &snapshot)
+void Analog::push_segment(shared_ptr<AnalogSegment> &segment)
 {
-	snapshots_.push_front(snapshot);
+	segments_.push_back(segment);
+
+	connect(segment.get(), SIGNAL(completed()), this, SLOT(on_segment_completed()));
 }
 
-const deque< shared_ptr<AnalogSnapshot> >& Analog::analog_snapshots() const
+const deque< shared_ptr<AnalogSegment> >& Analog::analog_segments() const
 {
-	return snapshots_;
+	return segments_;
 }
 
-vector< shared_ptr<Snapshot> > Analog::snapshots() const
+vector< shared_ptr<Segment> > Analog::segments() const
 {
-	return vector< shared_ptr<Snapshot> >(
-		snapshots_.begin(), snapshots_.end());
+	return vector< shared_ptr<Segment> >(
+		segments_.begin(), segments_.end());
+}
+
+uint32_t Analog::get_segment_count() const
+{
+	return (uint32_t)segments_.size();
 }
 
 void Analog::clear()
 {
-	snapshots_.clear();
+	segments_.clear();
+
+	samples_cleared();
+}
+
+void Analog::set_samplerate(double value)
+{
+	samplerate_ = value;
+}
+
+double Analog::get_samplerate() const
+{
+	return samplerate_;
 }
 
-uint64_t Analog::get_max_sample_count() const
+uint64_t Analog::max_sample_count() const
 {
 	uint64_t l = 0;
-	for (const std::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(shared_ptr<Segment> 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);
+}
+
+void Analog::on_segment_completed()
+{
+	segment_completed();
+}
+
 } // namespace data
 } // namespace pv