X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fanalog.cpp;h=da025882949ea8486638198fcb5fe124c22fa7ff;hp=ca2659b175815aa02e05711f4d22b5724bf768bd;hb=eeceee9955e7db4ac777d49d1b7a766069476b08;hpb=e45b13b536666034c9b6fe52a9321d749dae3c02 diff --git a/pv/data/analog.cpp b/pv/data/analog.cpp index ca2659b1..da025882 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 @@ -38,7 +37,7 @@ Analog::Analog() : 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 +51,46 @@ 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(); +} + +double Analog::get_samplerate() const +{ + if (segments_.empty()) + return 1.0; + + return segments_.front()->samplerate(); } 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(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