Renamed get_samplerate to samplerate

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index f0bdd6bd4f6e3556a3777e7cabfea49d06b2acc6..6d5e4e19440a4f154abb8fceb1e0824ccbf83b8f 100644 (file)
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -133,7 +133,7 @@ void DecoderStack::begin_decode()
 
        // Get the samplerate and start time
        _start_time = data->get_start_time();
-       _samplerate = data->get_samplerate();
+       _samplerate = data->samplerate();
        if (_samplerate == 0.0)
                _samplerate = 1.0;
 

diff --git a/pv/data/signaldata.cpp b/pv/data/signaldata.cpp
index f7bfe1f00ae548061a54c88e5ab8b8a1e68724f2..04f1d3f53dec8a7fb65b9aa3fb0b3786d4630c47 100644 (file)
--- a/pv/data/signaldata.cpp
+++ b/pv/data/signaldata.cpp
@@ -29,7 +29,7 @@ SignalData::SignalData() :
 {
 }
 
-double SignalData::get_samplerate() const
+double SignalData::samplerate() const
 {
        return _samplerate;
 }

diff --git a/pv/data/signaldata.h b/pv/data/signaldata.h
index ba80ac3a579dcc976413d7610c49f43c77dd7d39..0aa3b348ff68ad3b3e715435c276c510a891359c 100644 (file)
--- a/pv/data/signaldata.h
+++ b/pv/data/signaldata.h
@@ -32,7 +32,7 @@ public:
        SignalData();
 
 public:
-       double get_samplerate() const;
+       double samplerate() const;
        void set_samplerate(double samplerate);
 
        double get_start_time() const;

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index bcd0f20020a2d326b7b1be314fe97838909acbcc..64633717fb4b8098637901813421df24f83c3d30 100644 (file)
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -96,7 +96,7 @@ void AnalogSignal::paint_mid(QPainter &p, int left, int right)
                snapshots.front();
 
        const double pixels_offset = offset / scale;
-       const double samplerate = _data->get_samplerate();
+       const double samplerate = _data->samplerate();
        const double start_time = _data->get_start_time();
        const int64_t last_sample = snapshot->get_sample_count() - 1;
        const double samples_per_pixel = samplerate * scale;

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 1d5a62684fddea143db3a8c2ee23d82793ac320c..1a629f2c182dbc0bee782ddbbb3feb6acc8726e0 100644 (file)
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -107,7 +107,7 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right)
        const double scale = _view->scale();
        assert(scale > 0);
 
-       double samplerate = _decoder_stack->get_samplerate();
+       double samplerate = _decoder_stack->samplerate();
 
        // Show sample rate as 1Hz when it is unknown
        if (samplerate == 0.0)

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 54faa601dc16f97ac4b80fba50e5d8af0f3bf992..ae4f11e29eca7195b0bd720c599a262fbfcc5784 100644 (file)
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -126,7 +126,7 @@ void LogicSignal::paint_mid(QPainter &p, int left, int right)
        const shared_ptr<pv::data::LogicSnapshot> &snapshot =
                snapshots.front();
 
-       double samplerate = _data->get_samplerate();
+       double samplerate = _data->samplerate();
 
        // Show sample rate as 1Hz when it is unknown
        if (samplerate == 0.0)

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index abf522c0dfbc39d11d43988cb08bdab0d46d4812..cf93a371c4d7fbe8dce55163f3caf699c034a645 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -177,7 +177,7 @@ void View::zoom_fit()
                const double start_time = d->get_start_time();
                left_time = min(left_time, start_time);
                right_time = max(right_time, start_time +
-                       d->get_max_sample_count() / d->get_samplerate());
+                       d->get_max_sample_count() / d->samplerate());
        }
 
        assert(left_time < right_time);
@@ -305,7 +305,7 @@ void View::get_scroll_layout(double &length, double &offset) const
        if (!sig_data)
                return;
 
-       length = _data_length / (sig_data->get_samplerate() * _scale);
+       length = _data_length / (sig_data->samplerate() * _scale);
        offset = _offset / _scale;
 }