X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fsignal.hpp;h=82d3b51fc4a5209610ca43dbd88069da6b258131;hp=714b44f6d9d27fcfc4881dc9e4850138f575b0a4;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=214470fc17e73bbf4664f4c1678a7dd30c905bf2

diff --git a/pv/view/signal.hpp b/pv/view/signal.hpp
index 714b44f..82d3b51 100644
--- a/pv/view/signal.hpp
+++ b/pv/view/signal.hpp
@@ -14,12 +14,11 @@
  * 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 <http://www.gnu.org/licenses/>.
  */
 
-#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 <memory>
 
@@ -28,53 +27,57 @@
 
 #include <stdint.h>
 
+#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<sigrok::Channel> channel);
+	Signal(pv::Session &session, shared_ptr<data::SignalBase> channel);
 
 public:
 	/**
 	 * Sets the name of the signal.
 	 */
-	void set_name(QString name);
+	virtual void set_name(QString name);
 
-	virtual std::shared_ptr<pv::data::SignalData> data() const = 0;
+	virtual shared_ptr<pv::data::SignalData> data() const = 0;
 
 	/**
 	 * Returns true if the trace is visible and enabled.
 	 */
 	bool enabled() const;
 
-	void enable(bool enable = true);
+	shared_ptr<data::SignalBase> base() const;
+
+	virtual void save_settings(QSettings &settings) const;
 
-	std::shared_ptr<sigrok::Channel> channel() const;
+	virtual void restore_settings(QSettings &settings);
 
 	/**
 	 * Returns a list of row items owned by this object.
 	 */
 	const item_list& child_items() const;
 
+	void paint_back(QPainter &p, const ViewItemPaintParams &pp);
+
 	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
 	QMenu* create_context_menu(QWidget *parent);
@@ -97,20 +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<sigrok::Channel> channel_;
 
+	const shared_ptr<SignalScaleHandle> 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