X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fdata%2Fanalogsegment.hpp;h=846837ce75f47c2df2afedeaae64f9159d3bd53b;hb=9d307c60d7fc2dee27bca6eaadd1e68bf7ab0cbf;hp=46c6b6754655d4067e5b5e8c6fd5e1124cfd24ae;hpb=520362f8c4082820193f09e43b27a8c7df2ef011;p=pulseview.git
diff --git a/pv/data/analogsegment.hpp b/pv/data/analogsegment.hpp
index 46c6b675..846837ce 100644
--- a/pv/data/analogsegment.hpp
+++ b/pv/data/analogsegment.hpp
@@ -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 .
*/
#ifndef PULSEVIEW_PV_DATA_ANALOGSEGMENT_HPP
@@ -26,6 +25,11 @@
#include
#include
+#include
+
+using std::enable_shared_from_this;
+using std::pair;
+
namespace AnalogSegmentTest {
struct Basic;
}
@@ -33,8 +37,12 @@ struct Basic;
namespace pv {
namespace data {
-class AnalogSegment : public Segment
+class Analog;
+
+class AnalogSegment : public Segment, public enable_shared_from_this
{
+ Q_OBJECT
+
public:
struct EnvelopeSample
{
@@ -66,15 +74,18 @@ private:
static const uint64_t EnvelopeDataUnit;
public:
- AnalogSegment(uint64_t samplerate, uint64_t expected_num_samples = 0);
+ AnalogSegment(Analog& owner, uint32_t segment_id, uint64_t samplerate);
virtual ~AnalogSegment();
void append_interleaved_samples(const float *data,
size_t sample_count, size_t stride);
- const float* get_samples(int64_t start_sample,
- int64_t end_sample) const;
+ void get_samples(int64_t start_sample, int64_t end_sample, float* dest) const;
+
+ const pair get_min_max() const;
+
+ float* get_iterator_value_ptr(SegmentDataIterator* it);
void get_envelope_section(EnvelopeSection &s,
uint64_t start, uint64_t end, float min_length) const;
@@ -85,8 +96,12 @@ private:
void append_payload_to_envelope_levels();
private:
+ Analog& owner_;
+
struct Envelope envelope_levels_[ScaleStepCount];
+ float min_value_, max_value_;
+
friend struct AnalogSegmentTest::Basic;
};