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 9899260a8cfc503f342802020a17e6db56d11a8e..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];
 


@@ -120,6 +120,8 @@ private:
                bool level, double samples_per_pixel, double pixels_offset,
                float x_offset, float y_offset);
 
                bool level, double samples_per_pixel, double pixels_offset,
                float x_offset, float y_offset);
 

+       shared_ptr<pv::data::LogicSegment> get_logic_segment_to_paint() const;
+

        void init_trigger_actions(QWidget *parent);
 
        const vector<int32_t> get_trigger_types() const;
        void init_trigger_actions(QWidget *parent);
 
        const vector<int32_t> get_trigger_types() const;


@@ -145,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_;