X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.hpp;h=619c7327b7ba838663340e270f5e61dbb7012234;hp=96332d97b46c8a3842ed1f8fa580ae9a59528ebf;hb=407c9ebeb13200fb7f28a33cab00e996c018f8dc;hpb=bf0edd2b0cbb5f4bd5d69b0f00bcea7d037e2287
diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index 96332d97..619c7327 100644
--- a/pv/view/decodetrace.hpp
+++ b/pv/view/decodetrace.hpp
@@ -14,12 +14,11 @@
* 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_VIEW_DECODETRACE_HPP
-#define PULSEVIEW_PV_VIEW_DECODETRACE_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
#include "trace.hpp"
@@ -31,8 +30,14 @@
#include
#include
-#include
#include
+#include
+
+using std::list;
+using std::map;
+using std::pair;
+using std::shared_ptr;
+using std::vector;
struct srd_channel;
struct srd_decoder;
@@ -45,6 +50,7 @@ class Session;
namespace data {
class DecoderStack;
+class SignalBase;
namespace decode {
class Annotation;
@@ -57,7 +63,8 @@ namespace widgets {
class DecoderGroupBox;
}
-namespace view {
+namespace views {
+namespace TraceView {
class DecodeTrace : public Trace
{
@@ -67,7 +74,8 @@ private:
struct ChannelSelector
{
const QComboBox *combo_;
- const std::shared_ptr decoder_;
+ const QComboBox *combo_initial_pin_;
+ const shared_ptr decoder_;
const srd_channel *pdch_;
};
@@ -85,40 +93,41 @@ private:
static const QColor OutlineColours[16];
public:
- DecodeTrace(pv::Session &session, std::shared_ptr signalbase,
- std::shared_ptr decoder_stack,
+ DecodeTrace(pv::Session &session, shared_ptr signalbase,
int index);
bool enabled() const;
- const std::shared_ptr& decoder() const;
+ const shared_ptr& decoder() const;
+
+ shared_ptr base() const;
/**
* Computes the vertical extents of the contents of this row item.
* @return A pair containing the minimum and maximum y-values.
*/
- std::pair v_extents() const;
+ pair v_extents() const;
/**
* Paints the background layer of the trace with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with..
*/
- void paint_back(QPainter &p, const ViewItemPaintParams &pp);
+ void paint_back(QPainter &p, ViewItemPaintParams &pp);
/**
* Paints the mid-layer of the trace with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with.
*/
- void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
+ void paint_mid(QPainter &p, ViewItemPaintParams &pp);
/**
* Paints the foreground layer of the trace with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with.
*/
- void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
+ void paint_fore(QPainter &p, ViewItemPaintParams &pp);
void populate_popup_form(QWidget *parent, QFormLayout *form);
@@ -127,7 +136,7 @@ public:
void delete_pressed();
private:
- void draw_annotations(std::vector annotations,
+ void draw_annotations(vector annotations,
QPainter &p, int h, const ViewItemPaintParams &pp, int y,
size_t base_colour, int row_title_width);
@@ -135,7 +144,7 @@ private:
int h, const ViewItemPaintParams &pp, int y,
size_t base_colour, int row_title_width) const;
- void draw_annotation_block(std::vector annotations,
+ void draw_annotation_block(vector annotations,
QPainter &p, int h, int y, size_t base_colour) const;
void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
@@ -151,7 +160,7 @@ private:
void draw_unresolved_period(QPainter &p, int h, int left,
int right) const;
- std::pair get_pixels_offset_samples_per_pixel() const;
+ pair get_pixels_offset_samples_per_pixel() const;
/**
* Determines the start and end sample for a given pixel range.
@@ -160,22 +169,25 @@ private:
* @return Returns a pair containing the start sample and the end
* sample that correspond to the start and end coordinates.
*/
- std::pair get_sample_range(int x_start, int x_end) const;
+ pair get_sample_range(int x_start, int x_end) const;
int get_row_at_point(const QPoint &point);
const QString get_annotation_at_point(const QPoint &point);
void create_decoder_form(int index,
- std::shared_ptr &dec,
+ shared_ptr &dec,
QWidget *parent, QFormLayout *form);
QComboBox* create_channel_selector(QWidget *parent,
- const std::shared_ptr &dec,
+ const shared_ptr &dec,
const srd_channel *const pdch);
- void commit_decoder_channels(
- std::shared_ptr &dec);
+ QComboBox* create_channel_selector_initial_pin(QWidget *parent,
+ const shared_ptr &dec,
+ const srd_channel *const pdch);
+
+ void commit_decoder_channels(shared_ptr &dec);
void commit_channels();
@@ -189,6 +201,8 @@ private Q_SLOTS:
void on_channel_selected(int);
+ void on_initial_pin_selected(int);
+
void on_stack_decoder(srd_decoder *decoder);
void on_delete_decoder(int index);
@@ -197,19 +211,16 @@ private Q_SLOTS:
private:
pv::Session &session_;
- std::shared_ptr signalbase_;
- std::shared_ptr decoder_stack_;
+ vector visible_rows_;
uint64_t decode_start_, decode_end_;
- std::list< std::shared_ptr >
- bindings_;
+ list< shared_ptr > bindings_;
- std::list channel_selectors_;
- std::vector decoder_forms_;
+ list channel_selectors_;
+ vector decoder_forms_;
- std::vector visible_rows_;
- std::map row_title_widths_;
+ map row_title_widths_;
int row_height_, max_visible_rows_;
int min_useful_label_width_;
@@ -217,7 +228,8 @@ private:
QSignalMapper delete_mapper_, show_hide_mapper_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_DECODETRACE_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP