X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.hpp;h=2bb8da1b9b2a99a74d4d089fb0765755e19df184;hb=cafe470ed977ab3bff1a865439a261c9f0eb397d;hp=bcd4e2eb617eef83a46a5c1e98bf308751b48d8e;hpb=99af6802961b0a5ec7ec7d3ff2215c8eb6925ca3;p=pulseview.git
diff --git a/pv/view/signal.hpp b/pv/view/signal.hpp
index bcd4e2e..2bb8da1 100644
--- a/pv/view/signal.hpp
+++ b/pv/view/signal.hpp
@@ -14,62 +14,62 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
-#ifndef PULSEVIEW_PV_VIEW_SIGNAL_HPP
-#define PULSEVIEW_PV_VIEW_SIGNAL_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_SIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_SIGNAL_HPP
#include
#include
#include
-#include
+#include
#include "signalscalehandle.hpp"
#include "trace.hpp"
#include "viewitemowner.hpp"
-namespace sigrok {
- class Channel;
-}
+using std::shared_ptr;
namespace pv {
class Session;
namespace data {
+class SignalBase;
class SignalData;
}
-namespace view {
+namespace views {
+namespace TraceView {
class Signal : public Trace, public ViewItemOwner
{
Q_OBJECT
protected:
- Signal(pv::Session &session,
- std::shared_ptr channel);
+ Signal(pv::Session &session, shared_ptr channel);
public:
/**
* Sets the name of the signal.
*/
- void set_name(QString name);
+ virtual void set_name(QString name);
- virtual std::shared_ptr data() const = 0;
+ virtual shared_ptr data() const = 0;
/**
* Returns true if the trace is visible and enabled.
*/
bool enabled() const;
- void enable(bool enable = true);
+ shared_ptr base() const;
+
+ virtual void save_settings(QSettings &settings) const;
- std::shared_ptr channel() const;
+ virtual void restore_settings(QSettings &settings);
/**
* Returns a list of row items owned by this object.
@@ -100,21 +100,24 @@ public:
*/
virtual void scale_handle_released() {};
-private Q_SLOTS:
+protected Q_SLOTS:
+ virtual void on_name_changed(const QString &text);
+
void on_disable();
+ void on_enabled_changed(bool enabled);
+
protected:
pv::Session &session_;
- std::shared_ptr channel_;
- const std::shared_ptr scale_handle_;
+ const shared_ptr scale_handle_;
const item_list items_;
QComboBox *name_widget_;
- bool updating_name_widget_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_SIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_SIGNAL_HPP