X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Flogicsegment.hpp;h=c7971726fe667a192a295c578f8ce07dcb64f5a8;hp=9d07d203e3b6d64b88e15898b5771b1bfef82e33;hb=9d22929c3588b994771e8db8f3be5b013fd35040;hpb=7a01bd3654ed046216308fa64edfd79be7cd525f

diff --git a/pv/data/logicsegment.hpp b/pv/data/logicsegment.hpp
index 9d07d203..c7971726 100644
--- a/pv/data/logicsegment.hpp
+++ b/pv/data/logicsegment.hpp
@@ -14,18 +14,23 @@
  * 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 <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_DATA_LOGICSNAPSHOT_HPP
-#define PULSEVIEW_PV_DATA_LOGICSNAPSHOT_HPP
+#ifndef PULSEVIEW_PV_DATA_LOGICSEGMENT_HPP
+#define PULSEVIEW_PV_DATA_LOGICSEGMENT_HPP
 
 #include "segment.hpp"
 
 #include <utility>
 #include <vector>
 
+#include <QObject>
+
+using std::pair;
+using std::shared_ptr;
+using std::vector;
+
 namespace sigrok {
 	class Logic;
 }
@@ -41,8 +46,18 @@ struct LongPulses;
 namespace pv {
 namespace data {
 
-class LogicSegment : public Segment
+class Logic;
+
+typedef struct {
+	uint64_t sample_index, chunk_num, chunk_offs;
+	uint8_t* chunk;
+	uint8_t* value;
+} SegmentLogicDataIterator;
+
+class LogicSegment : public QObject, public Segment
 {
+	Q_OBJECT
+
 private:
 	struct MipMapLevel
 	{
@@ -59,18 +74,22 @@ private:
 	static const uint64_t MipMapDataUnit;
 
 public:
-	typedef std::pair<int64_t, bool> EdgePair;
+	typedef pair<int64_t, bool> EdgePair;
 
 public:
-	LogicSegment(std::shared_ptr<sigrok::Logic> logic,
-		uint64_t samplerate, uint64_t expected_num_samples = 0);
+	LogicSegment(pv::data::Logic& owner, shared_ptr<sigrok::Logic> data, uint64_t samplerate);
+	LogicSegment(pv::data::Logic& owner, 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(uint8_t *const data,
-		int64_t start_sample, int64_t end_sample) 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;
@@ -80,7 +99,7 @@ private:
 
 	void append_payload_to_mipmap();
 
-	uint64_t get_sample(uint64_t index) const;
+	uint64_t get_unpacked_sample(uint64_t index) const;
 
 public:
 	/**
@@ -92,8 +111,8 @@ public:
 	 * @param[in] min_length The minimum number of samples that
 	 * 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);
 
@@ -103,6 +122,8 @@ private:
 	static uint64_t pow2_ceil(uint64_t x, unsigned int power);
 
 private:
+	Logic& owner_;
+
 	struct MipMapLevel mip_map_[ScaleStepCount];
 	uint64_t last_append_sample_;
 
@@ -116,4 +137,4 @@ private:
 } // namespace data
 } // namespace pv
 
-#endif // PULSEVIEW_PV_DATA_LOGICSNAPSHOT_HPP
+#endif // PULSEVIEW_PV_DATA_LOGICSEGMENT_HPP