X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Flogicsegment.hpp;h=88576118d06eb180b281d0d8ee9a9b2f1def1e2c;hp=a7a38ebefa7761a7929073272d5e7dcabf1b0361;hb=72486b789078f024e4f3404f81118c03b03e2b70;hpb=7db61e770abd2d1c7eb326a09e35cd4266664c1d

diff --git a/pv/data/logicsegment.hpp b/pv/data/logicsegment.hpp
index a7a38ebe..88576118 100644
--- a/pv/data/logicsegment.hpp
+++ b/pv/data/logicsegment.hpp
@@ -27,6 +27,10 @@
 
 #include <QObject>
 
+using std::pair;
+using std::shared_ptr;
+using std::vector;
+
 namespace sigrok {
 	class Logic;
 }
@@ -50,45 +54,46 @@ typedef struct {
 	uint8_t* value;
 } SegmentLogicDataIterator;
 
-class LogicSegment : public QObject, public Segment
+class LogicSegment : public Segment
 {
 	Q_OBJECT
 
-private:
-	struct MipMapLevel
-	{
-		uint64_t length;
-		uint64_t data_length;
-		void *data;
-	};
+public:
+	typedef pair<int64_t, bool> EdgePair;
 
-private:
 	static const unsigned int ScaleStepCount = 10;
 	static const int MipMapScalePower;
 	static const int MipMapScaleFactor;
 	static const float LogMipMapScaleFactor;
 	static const uint64_t MipMapDataUnit;
 
-public:
-	typedef std::pair<int64_t, bool> EdgePair;
+private:
+	struct MipMapLevel
+	{
+		uint64_t length;
+		uint64_t data_length;
+		void *data;
+	};
 
 public:
-	LogicSegment(pv::data::Logic& owner, std::shared_ptr<sigrok::Logic> data, uint64_t samplerate);
+	LogicSegment(pv::data::Logic& owner, uint32_t segment_id,
+		unsigned int unit_size, uint64_t samplerate);
 
 	virtual ~LogicSegment();
 
-	void append_payload(std::shared_ptr<sigrok::Logic> logic);
+	void append_payload(shared_ptr<sigrok::Logic> logic);
+	void append_payload(void *data, uint64_t data_size);
 
-	const uint8_t* get_samples(int64_t start_sample, int64_t end_sample) const;
+	void get_samples(int64_t start_sample, int64_t end_sample, uint8_t* dest) const;
 
-	SegmentLogicDataIterator* begin_sample_iteration(uint64_t start) const;
-	void continue_sample_iteration(SegmentLogicDataIterator* it, uint64_t increase) const;
-	void end_sample_iteration(SegmentLogicDataIterator* it) const;
+	SegmentLogicDataIterator* begin_sample_iteration(uint64_t start);
+	void continue_sample_iteration(SegmentLogicDataIterator* it, uint64_t increase);
+	void end_sample_iteration(SegmentLogicDataIterator* it);
 
 private:
 	uint64_t unpack_sample(const uint8_t *ptr) const;
 	void pack_sample(uint8_t *ptr, uint64_t value);
-	
+
 	void reallocate_mipmap_level(MipMapLevel &m);
 
 	void append_payload_to_mipmap();
@@ -106,7 +111,7 @@ public:
 	 * can be resolved at this level of detail.
 	 * @param[in] sig_index The index of the signal.
 	 */
-	void get_subsampled_edges(std::vector<EdgePair> &edges,
+	void get_subsampled_edges(vector<EdgePair> &edges,
 		uint64_t start, uint64_t end,
 		float min_length, int sig_index);