X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=pv%2Fview%2Fdecodetrace.hpp;h=6d703ec5fe66906ebe69aebed1c575464a447436;hb=6644424f1ea61ee7e1f048bfac09acd4a094feab;hp=fb14ae0ec8d46e24b0d5eecb8c7a3a0a743af2be;hpb=aee9dcf34d3bb5bf53803d3e132ae69475e434b7;p=pulseview.git
diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index fb14ae0e..6d703ec5 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,6 +30,7 @@
#include
#include
+#include
#include
struct srd_channel;
@@ -44,6 +44,7 @@ class Session;
namespace data {
class DecoderStack;
+class SignalBase;
namespace decode {
class Annotation;
@@ -56,7 +57,8 @@ namespace widgets {
class DecoderGroupBox;
}
-namespace view {
+namespace views {
+namespace TraceView {
class DecodeTrace : public Trace
{
@@ -84,14 +86,15 @@ private:
static const QColor OutlineColours[16];
public:
- DecodeTrace(pv::Session &session,
- std::shared_ptr decoder_stack,
+ DecodeTrace(pv::Session &session, std::shared_ptr signalbase,
int index);
bool enabled() const;
const std::shared_ptr& decoder() const;
+ std::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.
@@ -131,18 +134,17 @@ private:
size_t base_colour, int row_title_width);
void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
- int text_height, const ViewItemPaintParams &pp, int y,
+ int h, const ViewItemPaintParams &pp, int y,
size_t base_colour, int row_title_width) const;
- void draw_annotation_block(std::vector a,
+ void draw_annotation_block(std::vector annotations,
QPainter &p, int h, int y, size_t base_colour) const;
void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
- QColor fill, QColor outline, int h, double x, int y) const;
+ int h, double x, int y) const;
void draw_range(const pv::data::decode::Annotation &a, QPainter &p,
- QColor fill, QColor outline, int h, double start,
- double end, int y, const ViewItemPaintParams &pp,
+ int h, double start, double end, int y, const ViewItemPaintParams &pp,
int row_title_width) const;
void draw_error(QPainter &p, const QString &message,
@@ -197,8 +199,8 @@ private Q_SLOTS:
private:
pv::Session &session_;
- std::shared_ptr decoder_stack_;
+ std::vector visible_rows_;
uint64_t decode_start_, decode_end_;
std::list< std::shared_ptr >
@@ -207,14 +209,16 @@ private:
std::list channel_selectors_;
std::vector decoder_forms_;
- std::vector visible_rows_;
std::map row_title_widths_;
int row_height_, max_visible_rows_;
+ int min_useful_label_width_;
+
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