Session: Fix issue #67 by improving error handling

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

diff --git a/pv/views/trace/trace.hpp b/pv/views/trace/trace.hpp
index bc97736c03de58f1ccc4d9d2e09571c110c6d909..741f346957735c92aa1f62f1dc37e5cc3c85aad4 100644 (file)
--- a/pv/views/trace/trace.hpp
+++ b/pv/views/trace/trace.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_TRACE_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_TRACE_HPP
 
 #include <QColor>
 #include <QPainter>
@@ -91,9 +91,10 @@ private:
 
        static const QColor BrightGrayBGColor;
        static const QColor DarkGrayBGColor;
+       static const QColor ErrorBgColor;
 
 protected:
-       Trace(shared_ptr<data::SignalBase> channel);
+       Trace(shared_ptr<data::SignalBase> signal);
        ~Trace();
 
 public:
@@ -102,6 +103,16 @@ public:
         */
        shared_ptr<data::SignalBase> base() const;
 
+       /**
+        * Returns true if the item may be selected.
+        */
+       virtual bool is_selectable(QPoint pos) const;
+
+       /**
+        * Returns true if the item may be dragged/moved.
+        */
+       virtual bool is_draggable(QPoint pos) const;
+
        /**
         * Configures the segment display mode to use.
         */
@@ -117,7 +128,16 @@ public:
         */
        virtual void paint_label(QPainter &p, const QRect &rect, bool hover);
 
-       virtual QMenu* create_context_menu(QWidget *parent);
+       /**
+        * Paints the signal's current error message text.
+        * @param p the QPainter to paint into.
+        * @param pp The painting parameters object to paint with.
+        */
+       virtual void paint_error(QPainter &p, const ViewItemPaintParams &pp);
+
+       virtual QMenu* create_header_context_menu(QWidget *parent);
+
+       virtual QMenu* create_view_context_menu(QWidget *parent, QPoint &click_pos);
 
        pv::widgets::Popup* create_popup(QWidget *parent);
 
@@ -130,7 +150,7 @@ public:
 
        /**
         * Computes the outline rectangle of the viewport hit-box.
-        * @param rect the rectangle of the viewport area.
+        * @param pp The painting parameters object to paint with.
         * @return Returns the rectangle of the hit-box.
         * @remarks The default implementation returns an empty hit-box.
         */
@@ -172,8 +192,8 @@ protected:
 
 protected Q_SLOTS:
        virtual void on_name_changed(const QString &text);
-
        virtual void on_color_changed(const QColor &color);
+       virtual void on_error_message_changed(const QString &msg);
 
        void on_popup_closed();
 
@@ -182,6 +202,8 @@ private Q_SLOTS:
 
        void on_coloredit_changed(const QColor &color);
 
+       void on_create_marker_here() const;
+
 protected:
        shared_ptr<data::SignalBase> base_;
        QPen axis_pen_;
@@ -189,6 +211,8 @@ protected:
        SegmentDisplayMode segment_display_mode_;
        bool show_hover_marker_;
 
+       uint32_t context_menu_x_pos_;
+
        /// The ID of the currently displayed segment
        int current_segment_;
 
@@ -201,4 +225,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_TRACE_HPP