projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RowItem: Replaced fixed signal heights with extents
[pulseview.git]
/
pv
/
view
/
decodetrace.h
diff --git
a/pv/view/decodetrace.h
b/pv/view/decodetrace.h
index e5a9c0b6ad03b4cfbb215576ad5d4d40977883ca..2bb115412f9c5eb562296596a4c7145fc124b95c 100644
(file)
--- a/
pv/view/decodetrace.h
+++ b/
pv/view/decodetrace.h
@@
-30,6
+30,7
@@
#include <QSignalMapper>
#include <pv/prop/binding/decoderoptions.h>
#include <QSignalMapper>
#include <pv/prop/binding/decoderoptions.h>
+#include <pv/data/decode/row.h>
struct srd_channel;
struct srd_decoder;
struct srd_channel;
struct srd_decoder;
@@
-89,7
+90,11
@@
public:
const std::shared_ptr<pv::data::DecoderStack>& decoder() const;
const std::shared_ptr<pv::data::DecoderStack>& decoder() const;
- void set_view(pv::view::View *view);
+ /**
+ * Computes the vertical extents of the contents of this row item.
+ * @return A pair containing the minimum and maximum y-values.
+ */
+ std::pair<int, int> v_extents() const;
/**
* Paints the background layer of the trace with a QPainter
/**
* Paints the background layer of the trace with a QPainter
@@
-140,9
+145,7
@@
private:
void draw_unresolved_period(QPainter &p, int h, int left,
int right) const;
void draw_unresolved_period(QPainter &p, int h, int left,
int right) const;
- double get_pixels_offset() const;
-
- double get_samples_per_pixel() const;
+ std::pair<double, double> get_pixels_offset_samples_per_pixel() const;
/**
* Determines the start and end sample for a given pixel range.
/**
* Determines the start and end sample for a given pixel range.
@@
-153,18
+156,12
@@
private:
*/
std::pair<uint64_t, uint64_t> get_sample_range(int x_start, int x_end) const;
*/
std::pair<uint64_t, uint64_t> get_sample_range(int x_start, int x_end) const;
- bool hover_point_is_over_trace();
-
- int get_row_at_hover_point();
-
- const QString get_annotation_at_hover_point();
+ int get_row_at_point(const QPoint &point);
-
void show_hover_annotation(
);
+
const QString get_annotation_at_point(const QPoint &point
);
void hide_hover_annotation();
void hide_hover_annotation();
- void hover_point_changed();
-
void create_decoder_form(int index,
std::shared_ptr<pv::data::decode::Decoder> &dec,
QWidget *parent, QFormLayout *form);
void create_decoder_form(int index,
std::shared_ptr<pv::data::decode::Decoder> &dec,
QWidget *parent, QFormLayout *form);
@@
-178,6
+175,9
@@
private:
void commit_channels();
void commit_channels();
+public:
+ void hover_point_changed();
+
private Q_SLOTS:
void on_new_decode_data();
private Q_SLOTS:
void on_new_decode_data();
@@
-203,7
+203,7
@@
private:
std::list<ChannelSelector> _channel_selectors;
std::vector<pv::widgets::DecoderGroupBox*> _decoder_forms;
std::list<ChannelSelector> _channel_selectors;
std::vector<pv::widgets::DecoderGroupBox*> _decoder_forms;
- std::vector<
QString> _cur_row_heading
s;
+ std::vector<
data::decode::Row> _visible_row
s;
int _text_height, _row_height;
QSignalMapper _delete_mapper, _show_hide_mapper;
int _text_height, _row_height;
QSignalMapper _delete_mapper, _show_hide_mapper;