X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fdata%2Fanalog.cpp;h=02cb83e40c7e474729c7c6d82035f673138f6d36;hb=9d307c60d7fc2dee27bca6eaadd1e68bf7ab0cbf;hp=c95fffaf247518454b065ef9775cb5dcab8a2447;hpb=f3d66e52ed6b454ea7a0662d5e6367e230116a2b;p=pulseview.git
diff --git a/pv/data/analog.cpp b/pv/data/analog.cpp
index c95fffaf..02cb83e4 100644
--- a/pv/data/analog.cpp
+++ b/pv/data/analog.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 .
*/
#include
@@ -32,13 +31,14 @@ namespace pv {
namespace data {
Analog::Analog() :
- SignalData()
+ SignalData(),
+ samplerate_(1) // Default is 1 Hz to prevent division-by-zero errors
{
}
void Analog::push_segment(shared_ptr &segment)
{
- segments_.push_front(segment);
+ segments_.push_back(segment);
}
const deque< shared_ptr >& Analog::analog_segments() const
@@ -52,20 +52,48 @@ vector< shared_ptr > Analog::segments() const
segments_.begin(), segments_.end());
}
+uint32_t Analog::get_segment_count() const
+{
+ return (uint32_t)segments_.size();
+}
+
void Analog::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 s : segments_) {
+ for (const shared_ptr& s : segments_) {
assert(s);
l = max(l, s->get_sample_count());
}
return l;
}
+void Analog::notify_samples_added(shared_ptr 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