projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update cursor action's state whenever the cursor state changes
[pulseview.git]
/
pv
/
views
/
trace
/
trace.hpp
diff --git
a/pv/views/trace/trace.hpp
b/pv/views/trace/trace.hpp
index 777ea5001198a3cb355540006a43bfbc2f222e82..410d82cd14e8c9121e9a758024dee4c5d540204f 100644
(file)
--- a/
pv/views/trace/trace.hpp
+++ b/
pv/views/trace/trace.hpp
@@
-70,9
+70,11
@@
public:
* Note: Consider these locations when updating the list:
* *
* @ref View::set_segment_display_mode
* Note: Consider these locations when updating the list:
* *
* @ref View::set_segment_display_mode
+ * @ref View::on_segment_changed
* @ref AnalogSignal::get_analog_segment_to_paint
* @ref AnalogSignal::get_logic_segment_to_paint
* @ref LogicSignal::get_logic_segment_to_paint
* @ref AnalogSignal::get_analog_segment_to_paint
* @ref AnalogSignal::get_logic_segment_to_paint
* @ref LogicSignal::get_logic_segment_to_paint
+ * @ref StandardBar
*/
enum SegmentDisplayMode {
ShowLastSegmentOnly = 1,
*/
enum SegmentDisplayMode {
ShowLastSegmentOnly = 1,
@@
-86,8
+88,8
@@
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);
@@
-98,16
+100,6
@@
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.
*/
/**
* Configures the segment display mode to use.
*/
@@
-152,7
+144,7
@@
protected:
*/
void paint_axis(QPainter &p, ViewItemPaintParams &pp, int y);
*/
void paint_axis(QPainter &p, ViewItemPaintParams &pp, int y);
- void add_colo
u
r_option(QWidget *parent, QFormLayout *form);
+ void add_color_option(QWidget *parent, QFormLayout *form);
void create_popup_form();
void create_popup_form();
@@
-161,14
+153,14
@@
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_;
protected:
shared_ptr<data::SignalBase> base_;