X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fdecodetrace.h;h=f71894d0cff9968158ce74c8a57328abbd7bd033;hb=7f8517f63ab9ff98938ceee486bb94c0aa80b74b;hp=4b3bc3dec21ca6322cb4de879ebb01ffab020e75;hpb=e9213170687cf4afd14e20acdc690ff9381d94ae;p=pulseview.git

diff --git a/pv/view/decodetrace.h b/pv/view/decodetrace.h
index 4b3bc3d..f71894d 100644
--- a/pv/view/decodetrace.h
+++ b/pv/view/decodetrace.h
@@ -61,7 +61,7 @@ class DecodeTrace : public Trace
 	Q_OBJECT
 
 private:
-	struct ProbeSelector
+	struct ChannelSelector
 	{
 		const QComboBox *_combo;
 		const std::shared_ptr<pv::data::decode::Decoder> _decoder;
@@ -123,8 +123,7 @@ public:
 
 private:
 	void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
-		QColor text_colour, int text_height, int left, int right,
-		double samples_per_pixel, double pixels_offset, int y,
+		QColor text_colour, int text_height, int left, int right, int y,
 		size_t base_colour) const;
 
 	void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
@@ -139,27 +138,40 @@ private:
 		int left, int right);
 
 	void draw_unresolved_period(QPainter &p, int h, int left,
-		int right, double samples_per_pixel, double pixels_offset);
+		int right) const;
+
+	double get_pixels_offset() const;
+
+	double get_samples_per_pixel() const;
+
+	/**
+	 * Determines the start and end sample for a given pixel range.
+	 * @param x_start the X coordinate of the start sample in the view
+	 * @param x_end the X coordinate of the end sample in the view
+	 * @return Returns a pair containing the start sample and the end
+	 * 	sample that correspond to the start and end coordinates.
+	 */
+	std::pair<uint64_t, uint64_t> get_sample_range(int x_start, int x_end) const;
 
 	void create_decoder_form(int index,
 		std::shared_ptr<pv::data::decode::Decoder> &dec,
 		QWidget *parent, QFormLayout *form);
 
-	QComboBox* create_probe_selector(QWidget *parent,
+	QComboBox* create_channel_selector(QWidget *parent,
 		const std::shared_ptr<pv::data::decode::Decoder> &dec,
 		const srd_channel *const pdch);
 
-	void commit_decoder_probes(
+	void commit_decoder_channels(
 		std::shared_ptr<data::decode::Decoder> &dec);
 
-	void commit_probes();
+	void commit_channels();
 
 private Q_SLOTS:
 	void on_new_decode_data();
 
 	void on_delete();
 
-	void on_probe_selected(int);
+	void on_channel_selected(int);
 
 	void on_stack_decoder(srd_decoder *decoder);
 
@@ -176,10 +188,11 @@ private:
 	std::list< std::shared_ptr<pv::prop::binding::DecoderOptions> >
 		_bindings;
 
-	std::list<ProbeSelector> _probe_selectors;
+	std::list<ChannelSelector> _channel_selectors;
 	std::vector<pv::widgets::DecoderGroupBox*> _decoder_forms;
 
 	std::vector<QString> _cur_row_headings;
+	int _text_height, _row_height;
 
 	QSignalMapper _delete_mapper, _show_hide_mapper;
 };