X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.hpp;h=05d9d60193a00c2b7120f4a8dca1b4719c9d63a4;hb=aca9aa834c742ba70f49d1ac3eb2d1e02e759416;hp=90a9b877cb04b164d5bedd8d19f1c244fd1cc848;hpb=4b0af0b67fe57e0880bcb8aa13b4fa807f3aaac0;p=pulseview.git

diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index 90a9b87..05d9d60 100644
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -14,15 +14,13 @@
  * 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_VIEW_HPP
-#define PULSEVIEW_PV_VIEW_VIEW_HPP
-
-#include <stdint.h>
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
 
+#include <cstdint>
 #include <list>
 #include <memory>
 #include <set>
@@ -35,10 +33,18 @@
 
 #include <pv/data/signaldata.hpp>
 #include <pv/util.hpp>
+#include <pv/views/viewbase.hpp>
 
 #include "cursorpair.hpp"
 #include "flag.hpp"
-#include "rowitemowner.hpp"
+#include "tracetreeitemowner.hpp"
+
+using std::list;
+using std::unordered_map;
+using std::unordered_set;
+using std::set;
+using std::shared_ptr;
+using std::vector;
 
 namespace sigrok {
 class ChannelGroup;
@@ -48,21 +54,37 @@ 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 CustomAbstractScrollArea : public QAbstractScrollArea
+{
+	Q_OBJECT
 
-class View : public QAbstractScrollArea, public RowItemOwner {
+public:
+	CustomAbstractScrollArea(QWidget *parent = nullptr);
+	void setViewportMargins(int left, int top, int right, int bottom);
+	bool viewportEvent(QEvent *event);
+};
+
+class View : public ViewBase, public TraceTreeItemOwner
+{
 	Q_OBJECT
 
 private:
 	enum StickyEvents {
-		RowItemHExtentsChanged = 1,
-		RowItemVExtentsChanged = 2
+		TraceTreeItemHExtentsChanged = 1,
+		TraceTreeItemVExtentsChanged = 2
 	};
 
 private:
@@ -75,29 +97,50 @@ private:
 	static const int ScaleUnits[3];
 
 public:
-	explicit View(Session &session, QWidget *parent = 0);
+	explicit View(Session &session, bool is_main_view=false, QWidget *parent = nullptr);
 
 	Session& session();
 	const Session& session() const;
 
+	/**
+	 * Returns the signals contained in this view.
+	 */
+	unordered_set< shared_ptr<Signal> > signals() const;
+
+	virtual void clear_signals();
+
+	virtual void add_signal(const shared_ptr<Signal> signal);
+
+#ifdef ENABLE_DECODE
+	virtual void clear_decode_signals();
+
+	virtual void add_decode_signal(shared_ptr<data::SignalBase> signalbase);
+
+	virtual void remove_decode_signal(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.
 	 */
-	std::vector< std::shared_ptr<TimeItem> > time_items() const;
+	vector< shared_ptr<TimeItem> > time_items() const;
 
 	/**
 	 * Returns the view time scale in seconds per pixel.
@@ -133,7 +176,7 @@ public:
 	/**
 	 * Returns period of the graticule time markings.
 	 */
-	double tick_period() const;
+	const pv::util::Timestamp& tick_period() const;
 
 	/**
 	 * Returns the unit of time currently used.
@@ -159,16 +202,20 @@ public:
 	 */
 	void set_scale_offset(double scale, const pv::util::Timestamp& offset);
 
-	std::set< std::shared_ptr<pv::data::SignalData> >
-		get_visible_data() const;
+	set< shared_ptr<pv::data::SignalData> > get_visible_data() const;
+
+	pair<pv::util::Timestamp, pv::util::Timestamp> get_time_extents() const;
 
-	std::pair<pv::util::Timestamp, pv::util::Timestamp> get_time_extents() const;
+	/**
+	 * Enables or disables coloured trace backgrounds. If they're not
+	 * coloured then they will use alternating colors.
+	 */
+	void enable_coloured_bg(bool state);
 
 	/**
-	 * Enables or disables sticky scrolling, i.e. the view always shows
-	 * the most recent samples when capturing data.
+	 * Enable or disable showing sampling points.
 	 */
-	void enable_sticky_scrolling(bool state);
+	void enable_show_sampling_points(bool state);
 
 	/**
 	 * Returns true if cursors are displayed. false otherwise.
@@ -188,7 +235,7 @@ public:
 	/**
 	 * Returns a reference to the pair of cursors.
 	 */
-	std::shared_ptr<CursorPair> cursors() const;
+	shared_ptr<CursorPair> cursors() const;
 
 	/**
 	 * Adds a new flag at a specified time.
@@ -198,18 +245,16 @@ public:
 	/**
 	 * Removes a flag from the list.
 	 */
-	void remove_flag(std::shared_ptr<Flag> flag);
+	void remove_flag(shared_ptr<Flag> flag);
 
 	/**
 	 * Gets the list of flags.
 	 */
-	std::vector< std::shared_ptr<Flag> > flags() const;
+	vector< shared_ptr<Flag> > flags() const;
 
 	const QPoint& hover_point() const;
 
-	void update_viewport();
-
-	void restack_all_row_items();
+	void restack_all_trace_tree_items();
 
 Q_SIGNALS:
 	void hover_point_changed();
@@ -238,6 +283,9 @@ Q_SIGNALS:
 	/// Emitted when the time_unit changed.
 	void time_unit_changed();
 
+public Q_SLOTS:
+	void trigger_event(util::Timestamp location);
+
 private:
 	void get_scroll_layout(double &length, pv::util::Timestamp &offset) const;
 
@@ -257,42 +305,29 @@ private:
 
 	void update_scroll();
 
-	void update_layout();
+	void reset_scroll();
 
-	/**
-	 * Satisifies RowItem functionality.
-	 * @param p the QPainter to paint into.
-	 * @param rect the rectangle of the header area.
-	 * @param hover true if the label is being hovered over by the mouse.
-	 */
-	void paint_label(QPainter &p, const QRect &rect, bool hover);
+	void set_scroll_default();
 
-	/**
-	 * Computes the outline rectangle of a label.
-	 * @param rect the rectangle of the header area.
-	 * @return Returns the rectangle of the signal label.
-	 */
-	QRectF label_rect(const QRectF &rect);
+	void update_layout();
 
-	RowItemOwner* find_prevalent_trace_group(
-		const std::shared_ptr<sigrok::ChannelGroup> &group,
-		const std::unordered_map<std::shared_ptr<sigrok::Channel>,
-			std::shared_ptr<Signal> > &signal_map);
+	TraceTreeItemOwner* find_prevalent_trace_group(
+		const shared_ptr<sigrok::ChannelGroup> &group,
+		const unordered_map<shared_ptr<data::SignalBase>,
+			shared_ptr<Signal> > &signal_map);
 
-	static std::vector< std::shared_ptr<Trace> >
+	static vector< 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>,
-			std::shared_ptr<Signal> > &signal_map,
-		std::set< std::shared_ptr<Trace> > &add_list);
+		const vector< shared_ptr<sigrok::Channel> > &channels,
+		const unordered_map<shared_ptr<data::SignalBase>,
+			shared_ptr<Signal> > &signal_map,
+		set< shared_ptr<Trace> > &add_list);
 
 	void determine_time_unit();
 
 	bool eventFilter(QObject *object, QEvent *event);
 
-	bool viewportEvent(QEvent *e);
-
-	void resizeEvent(QResizeEvent *e);
+	void resizeEvent(QResizeEvent *event);
 
 public:
 	void row_item_appearance_changed(bool label, bool content);
@@ -343,7 +378,7 @@ private Q_SLOTS:
 	 * Sets the 'tick_period_' member and emits the 'tick_period_changed'
 	 * signal if needed.
 	 */
-	void set_tick_period(double tick_period);
+	void set_tick_period(const pv::util::Timestamp& tick_period);
 
 	/**
 	 * Sets the 'time_unit' member and emits the 'time_unit_changed'
@@ -352,12 +387,18 @@ private Q_SLOTS:
 	void set_time_unit(pv::util::TimeUnit time_unit);
 
 private:
-	Session &session_;
-
 	Viewport *viewport_;
 	Ruler *ruler_;
 	Header *header_;
 
+	unordered_set< shared_ptr<Signal> > signals_;
+
+#ifdef ENABLE_DECODE
+	vector< shared_ptr<DecodeTrace> > decode_traces_;
+#endif
+
+	CustomAbstractScrollArea scrollarea_;
+
 	/// The view time scale in seconds per pixel.
 	double scale_;
 
@@ -366,27 +407,39 @@ private:
 
 	bool updating_scroll_;
 	bool sticky_scrolling_;
+	bool coloured_bg_;
 	bool always_zoom_to_fit_;
 	QTimer delayed_view_updater_;
 
-	double tick_period_;
+	pv::util::Timestamp tick_period_;
 	pv::util::SIPrefix tick_prefix_;
 	unsigned int tick_precision_;
 	util::TimeUnit time_unit_;
 
 	bool show_cursors_;
-	std::shared_ptr<CursorPair> cursors_;
+	shared_ptr<CursorPair> cursors_;
 
-	std::list< std::shared_ptr<Flag> > flags_;
+	list< shared_ptr<Flag> > flags_;
 	char next_flag_text_;
 
+	vector< shared_ptr<TriggerMarker> > trigger_markers_;
+
 	QPoint hover_point_;
 
 	unsigned int sticky_events_;
 	QTimer lazy_event_handler_;
+
+	// This is true when the defaults couldn't be set due to insufficient info
+	bool scroll_needs_defaults_;
+
+	// A nonzero value indicates the v offset to restore. See View::resizeEvent()
+	int saved_v_offset_;
+
+	bool size_finalized_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_VIEW_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP