X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Flogicsignal.hpp;h=45e815bae79e0d4e3fc8a68916be14a39183a9cd;hp=4a52d379060523569e42628e94aa99d2aea6ee20;hb=2795de2e7fdaeb6e9f672e0dc73dea328f35e585;hpb=7daebd054e65a244dce36933cbf173b8d7532a09 diff --git a/pv/views/trace/logicsignal.hpp b/pv/views/trace/logicsignal.hpp index 4a52d379..45e815ba 100644 --- a/pv/views/trace/logicsignal.hpp +++ b/pv/views/trace/logicsignal.hpp @@ -59,14 +59,14 @@ class LogicSignal : public Signal public: static const float Oversampling; - static const QColor EdgeColour; - static const QColor HighColour; - static const QColor LowColour; - static const QColor SamplingPointColour; + static const QColor EdgeColor; + static const QColor HighColor; + static const QColor LowColor; + static const QColor SamplingPointColor; - static const QColor SignalColours[10]; + static const QColor SignalColors[10]; - static QColor TriggerMarkerBackgroundColour; + static QColor TriggerMarkerBackgroundColor; static const int TriggerMarkerPadding; static const char* TriggerMarkerIcons[8]; @@ -147,6 +147,7 @@ private: QSpinBox *signal_height_sb_; const sigrok::TriggerMatchType *trigger_match_; + const vector trigger_types_; QToolBar *trigger_bar_; QAction *trigger_none_; QAction *trigger_rising_;