X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.hpp;h=0412c697ba1db0aea118760618fb1fd99c97c04d;hb=cbf7b5db5c3c04b95daf77bc0e6dc112c15e0195;hp=a3610b74114246e7d94aae69859c7f805275cd85;hpb=9e8f0e503e0c79c3765947ba5abae0ffc76850c4;p=pulseview.git

diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index a3610b74..0412c697 100644
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_VIEW_HPP
-#define PULSEVIEW_PV_VIEW_VIEW_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
 
 #include <stdint.h>
 
@@ -34,6 +34,7 @@
 #include <QTimer>
 
 #include <pv/data/signaldata.hpp>
+#include <pv/views/viewbase.hpp>
 #include <pv/util.hpp>
 
 #include "cursorpair.hpp"
@@ -48,16 +49,29 @@ namespace pv {
 
 class Session;
 
-namespace view {
+namespace views {
+
+namespace TraceView {
 
 class CursorHeader;
+class DecodeTrace;
 class Header;
 class Ruler;
+class Signal;
 class Trace;
 class Viewport;
 class TriggerMarker;
 
-class View : public QAbstractScrollArea, public TraceTreeItemOwner {
+class CustomAbstractScrollArea : public QAbstractScrollArea {
+	Q_OBJECT
+
+public:
+	CustomAbstractScrollArea(QWidget *parent = 0);
+	void setViewportMargins(int left, int top, int right, int bottom);
+	bool viewportEvent(QEvent *event);
+};
+
+class View : public ViewBase, public TraceTreeItemOwner {
 	Q_OBJECT
 
 private:
@@ -81,20 +95,41 @@ public:
 	Session& session();
 	const Session& session() const;
 
+	/**
+	 * Returns the signals contained in this view.
+	 */
+	std::unordered_set< std::shared_ptr<Signal> > signals() const;
+
+	virtual void clear_signals();
+
+	virtual void add_signal(const std::shared_ptr<Signal> signal);
+
+#ifdef ENABLE_DECODE
+	virtual void clear_decode_signals();
+
+	virtual void add_decode_signal(std::shared_ptr<data::SignalBase> signalbase);
+
+	virtual void remove_decode_signal(std::shared_ptr<data::SignalBase> signalbase);
+#endif
+
 	/**
 	 * Returns the view of the owner.
 	 */
-	virtual pv::view::View* view();
+	virtual View* view();
 
 	/**
 	 * Returns the view of the owner.
 	 */
-	virtual const pv::view::View* view() const;
+	virtual const View* view() const;
 
 	Viewport* viewport();
 
 	const Viewport* viewport() const;
 
+	virtual void save_settings(QSettings &settings) const;
+
+	virtual void restore_settings(QSettings &settings);
+
 	/**
 	 * Gets a list of time markers.
 	 */
@@ -273,13 +308,13 @@ private:
 
 	TraceTreeItemOwner* find_prevalent_trace_group(
 		const std::shared_ptr<sigrok::ChannelGroup> &group,
-		const std::unordered_map<std::shared_ptr<sigrok::Channel>,
+		const std::unordered_map<std::shared_ptr<data::SignalBase>,
 			std::shared_ptr<Signal> > &signal_map);
 
 	static std::vector< std::shared_ptr<Trace> >
 		extract_new_traces_for_channels(
 		const std::vector< std::shared_ptr<sigrok::Channel> > &channels,
-		const std::unordered_map<std::shared_ptr<sigrok::Channel>,
+		const std::unordered_map<std::shared_ptr<data::SignalBase>,
 			std::shared_ptr<Signal> > &signal_map,
 		std::set< std::shared_ptr<Trace> > &add_list);
 
@@ -287,8 +322,6 @@ private:
 
 	bool eventFilter(QObject *object, QEvent *event);
 
-	bool viewportEvent(QEvent *event);
-
 	void resizeEvent(QResizeEvent *event);
 
 public:
@@ -349,12 +382,18 @@ private Q_SLOTS:
 	void set_time_unit(pv::util::TimeUnit time_unit);
 
 private:
-	Session &session_;
-
 	Viewport *viewport_;
 	Ruler *ruler_;
 	Header *header_;
 
+	std::unordered_set< std::shared_ptr<Signal> > signals_;
+
+#ifdef ENABLE_DECODE
+	std::vector< std::shared_ptr<DecodeTrace> > decode_traces_;
+#endif
+
+	CustomAbstractScrollArea scrollarea_;
+
 	/// The view time scale in seconds per pixel.
 	double scale_;
 
@@ -388,7 +427,8 @@ private:
 	bool scroll_needs_defaults;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_VIEW_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP