Renamed pv::data::Decoder to DecoderStack

[pulseview.git] / pv / view / logicsignal.h

diff --git a/pv/view/logicsignal.h b/pv/view/logicsignal.h
index 8b977ae285b5dd3098637db533a6e78abd25b0e2..92d4cb0f704777589cb1681f4bde61b9518fcd50 100644 (file)
--- a/pv/view/logicsignal.h
+++ b/pv/view/logicsignal.h
@@ -18,13 +18,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_LOGICSIGNAL_H
-#define PULSEVIEW_PV_LOGICSIGNAL_H
+#ifndef PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
+#define PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
 
 #include "signal.h"
 
 #include <boost/shared_ptr.hpp>
 
+class QToolBar;
+
 namespace pv {
 
 namespace data {
@@ -47,7 +49,7 @@ private:
        static const QColor SignalColours[10];
 
 public:
-       LogicSignal(pv::SigSession &session, const sr_probe *const probe,
+       LogicSignal(pv::SigSession &session, sr_probe *const probe,
                boost::shared_ptr<pv::data::Logic> data);
 
        virtual ~LogicSignal();
@@ -77,6 +79,13 @@ private:
                bool level, double samples_per_pixel, double pixels_offset,
                float x_offset, float y_offset);
 
+       void init_trigger_actions(QWidget *parent);
+
+       void populate_popup_form(QWidget *parent, QFormLayout *form);
+       
+       void add_trigger_action(const char *trig_types, char type,
+               QAction *action);
+
        void update_trigger_actions();
 
        void set_trigger(char type);
@@ -92,6 +101,7 @@ private slots:
 private:
        boost::shared_ptr<pv::data::Logic> _data;
 
+       QToolBar *_trigger_bar;
        QAction *_trigger_none;
        QAction *_trigger_rising;
        QAction *_trigger_high;
@@ -103,4 +113,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_LOGICSIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_H