Fix #979 by querying trigger types only once and storing them

[pulseview.git] / pv / views / trace / logicsignal.hpp

diff --git a/pv/views/trace/logicsignal.hpp b/pv/views/trace/logicsignal.hpp
index 4a52d379060523569e42628e94aa99d2aea6ee20..45e815bae79e0d4e3fc8a68916be14a39183a9cd 100644 (file)
--- 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;
 
 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];
 
        static const int TriggerMarkerPadding;
        static const char* TriggerMarkerIcons[8];
 


@@ -147,6 +147,7 @@ private:
        QSpinBox *signal_height_sb_;
 
        const sigrok::TriggerMatchType *trigger_match_;
        QSpinBox *signal_height_sb_;
 
        const sigrok::TriggerMatchType *trigger_match_;

+       const vector<int32_t> trigger_types_;

        QToolBar *trigger_bar_;
        QAction *trigger_none_;
        QAction *trigger_rising_;
        QToolBar *trigger_bar_;
        QAction *trigger_none_;
        QAction *trigger_rising_;