X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.hpp;h=d96a85cf3b82ca3854efcc1c99ff5bdf8759c9e4;hb=75663e3ab6656ed9fc39050d8ac6752450b6a4ad;hp=dd3af0b3abc704d339859ecf4449eb23734e04da;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;p=pulseview.git diff --git a/pv/view/signal.hpp b/pv/view/signal.hpp index dd3af0b3..d96a85cf 100644 --- a/pv/view/signal.hpp +++ b/pv/view/signal.hpp @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef PULSEVIEW_PV_VIEW_SIGNAL_H -#define PULSEVIEW_PV_VIEW_SIGNAL_H +#ifndef PULSEVIEW_PV_VIEW_SIGNAL_HPP +#define PULSEVIEW_PV_VIEW_SIGNAL_HPP #include @@ -29,6 +29,7 @@ #include #include "trace.hpp" +#include "viewitemowner.hpp" namespace sigrok { class Channel; @@ -36,7 +37,7 @@ namespace sigrok { namespace pv { -class SigSession; +class Session; namespace data { class SignalData; @@ -44,12 +45,12 @@ class SignalData; namespace view { -class Signal : public Trace +class Signal : public Trace, public ViewItemOwner { Q_OBJECT protected: - Signal(pv::SigSession &session, + Signal(pv::Session &session, std::shared_ptr channel); public: @@ -69,6 +70,11 @@ public: std::shared_ptr channel() const; + /** + * Returns a list of row items owned by this object. + */ + const item_list& child_items() const; + virtual void populate_popup_form(QWidget *parent, QFormLayout *form); QMenu* create_context_menu(QWidget *parent); @@ -79,9 +85,11 @@ private Q_SLOTS: void on_disable(); protected: - pv::SigSession &session_; + pv::Session &session_; std::shared_ptr channel_; + const item_list items_; + QComboBox *name_widget_; bool updating_name_widget_; }; @@ -89,4 +97,4 @@ protected: } // namespace view } // namespace pv -#endif // PULSEVIEW_PV_VIEW_SIGNAL_H +#endif // PULSEVIEW_PV_VIEW_SIGNAL_HPP