X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Flogicsegment.hpp;h=88576118d06eb180b281d0d8ee9a9b2f1def1e2c;hp=7becfc3e70c1fc47abacc7dcd124e6c09f0f11a7;hb=72486b789078f024e4f3404f81118c03b03e2b70;hpb=85a702806a15852f3684645dffdc38cb30274481 diff --git a/pv/data/logicsegment.hpp b/pv/data/logicsegment.hpp index 7becfc3e..88576118 100644 --- a/pv/data/logicsegment.hpp +++ b/pv/data/logicsegment.hpp @@ -54,27 +54,26 @@ 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 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 pair EdgePair; +private: + struct MipMapLevel + { + uint64_t length; + uint64_t data_length; + void *data; + }; public: LogicSegment(pv::data::Logic& owner, uint32_t segment_id,