X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fdata%2Flogicsegment.hpp;h=3c012a45c3257bcf4c20be27256b3a243ba0cf2b;hb=d3feec232211b3acec6a323ca3b8008ed8b2faa0;hp=6f19c1cb28e3bb58f65ef712e6112541ae78762b;hpb=a38268f064687eff3e5395da6bb7f39e55dcd60f;p=pulseview.git
diff --git a/pv/data/logicsegment.hpp b/pv/data/logicsegment.hpp
index 6f19c1c..3c012a4 100644
--- a/pv/data/logicsegment.hpp
+++ b/pv/data/logicsegment.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_LOGICSEGMENT_HPP
@@ -26,6 +25,12 @@
#include
#include
+#include
+
+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,28 +74,31 @@ private:
static const uint64_t MipMapDataUnit;
public:
- typedef std::pair EdgePair;
+ typedef pair EdgePair;
public:
- LogicSegment(std::shared_ptr logic,
- uint64_t samplerate, uint64_t expected_num_samples = 0);
+ LogicSegment(pv::data::Logic& owner, unsigned int unit_size, uint64_t samplerate);
virtual ~LogicSegment();
- void append_payload(std::shared_ptr logic);
+ void append_payload(shared_ptr 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;
void pack_sample(uint8_t *ptr, uint64_t value);
-
+
void reallocate_mipmap_level(MipMapLevel &m);
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 +110,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 &edges,
+ */
+ void get_subsampled_edges(vector &edges,
uint64_t start, uint64_t end,
float min_length, int sig_index);
@@ -103,6 +121,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_;