projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Properly handle decoder errors
[pulseview.git]
/
pv
/
views
/
trace
/
trace.hpp
diff --git
a/pv/views/trace/trace.hpp
b/pv/views/trace/trace.hpp
index 134f11024f3a8de618dd64354280b5817b9c69fa..d6d53045e4bbf69ce68aff934a94195280a40d38 100644
(file)
--- a/
pv/views/trace/trace.hpp
+++ b/
pv/views/trace/trace.hpp
@@
-30,6
+30,7
@@
#include "tracetreeitem.hpp"
#include "tracetreeitem.hpp"
+#include <pv/globalsettings.hpp>
#include "pv/data/signalbase.hpp"
using std::shared_ptr;
#include "pv/data/signalbase.hpp"
using std::shared_ptr;
@@
-59,7
+60,7
@@
namespace trace {
* For this reason, Trace is more generic and contains properties and helpers
* that benefit any kind of time series items.
*/
* For this reason, Trace is more generic and contains properties and helpers
* that benefit any kind of time series items.
*/
-class Trace : public TraceTreeItem
+class Trace : public TraceTreeItem
, public GlobalSettingsInterface
{
Q_OBJECT
{
Q_OBJECT
@@
-88,11
+89,12
@@
private:
static const QPen AxisPen;
static const int LabelHitPadding;
static const QPen AxisPen;
static const int LabelHitPadding;
- static const QColor BrightGrayBGColo
u
r;
- static const QColor DarkGrayBGColo
u
r;
+ static const QColor BrightGrayBGColor;
+ static const QColor DarkGrayBGColor;
protected:
Trace(shared_ptr<data::SignalBase> channel);
protected:
Trace(shared_ptr<data::SignalBase> channel);
+ ~Trace();
public:
/**
public:
/**
@@
-100,21
+102,13
@@
public:
*/
shared_ptr<data::SignalBase> base() const;
*/
shared_ptr<data::SignalBase> base() const;
- /**
- * Sets the name of the signal.
- */
- virtual void set_name(QString name);
-
- /**
- * Set the colour of the signal.
- */
- virtual void set_colour(QColor colour);
-
/**
* Configures the segment display mode to use.
*/
virtual void set_segment_display_mode(SegmentDisplayMode mode);
/**
* Configures the segment display mode to use.
*/
virtual void set_segment_display_mode(SegmentDisplayMode mode);
+ virtual void on_setting_changed(const QString &key, const QVariant &value);
+
/**
* Paints the signal label.
* @param p the QPainter to paint into.
/**
* Paints the signal label.
* @param p the QPainter to paint into.
@@
-138,6
+132,8
@@
public:
int get_current_segment() const;
int get_current_segment() const;
+ virtual void hover_point_changed(const QPoint &hp);
+
protected:
/**
* Paints the background layer of the signal with a QPainter.
protected:
/**
* Paints the background layer of the signal with a QPainter.
@@
-154,7
+150,13
@@
protected:
*/
void paint_axis(QPainter &p, ViewItemPaintParams &pp, int y);
*/
void paint_axis(QPainter &p, ViewItemPaintParams &pp, int y);
- void add_colour_option(QWidget *parent, QFormLayout *form);
+ /**
+ * Draw a hover marker under the cursor position.
+ * @param p The painter to draw into.
+ */
+ void paint_hover_marker(QPainter &p);
+
+ void add_color_option(QWidget *parent, QFormLayout *form);
void create_popup_form();
void create_popup_form();
@@
-163,20
+165,21
@@
protected:
protected Q_SLOTS:
virtual void on_name_changed(const QString &text);
protected Q_SLOTS:
virtual void on_name_changed(const QString &text);
- virtual void on_colo
ur_changed(const QColor &colou
r);
+ virtual void on_colo
r_changed(const QColor &colo
r);
void on_popup_closed();
private Q_SLOTS:
void on_nameedit_changed(const QString &name);
void on_popup_closed();
private Q_SLOTS:
void on_nameedit_changed(const QString &name);
- void on_colo
uredit_changed(const QColor &colou
r);
+ void on_colo
redit_changed(const QColor &colo
r);
protected:
shared_ptr<data::SignalBase> base_;
QPen axis_pen_;
SegmentDisplayMode segment_display_mode_;
protected:
shared_ptr<data::SignalBase> base_;
QPen axis_pen_;
SegmentDisplayMode segment_display_mode_;
+ bool show_hover_marker_;
/// The ID of the currently displayed segment
int current_segment_;
/// The ID of the currently displayed segment
int current_segment_;