X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.hpp;h=3e0a347142fb91b69b72301c4adeaa60e109e07b;hb=cf124e472f9b5be7f85ecf708fe5290d6a6d1c9e;hp=a23f284825d17534b6edcf11df3a2e302610d661;hpb=2496bf451ebd50b9ab67a1af9b979761c0fbad49;p=pulseview.git

diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index a23f284..3e0a347 100644
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -18,11 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_VIEW_H
-#define PULSEVIEW_PV_VIEW_VIEW_H
+#ifndef PULSEVIEW_PV_VIEW_VIEW_HPP
+#define PULSEVIEW_PV_VIEW_VIEW_HPP
 
 #include <stdint.h>
 
+#include <list>
 #include <memory>
 #include <set>
 #include <unordered_map>
@@ -35,8 +36,13 @@
 #include <pv/data/signaldata.hpp>
 
 #include "cursorpair.hpp"
+#include "flag.hpp"
 #include "rowitemowner.hpp"
 
+namespace sigrok {
+class ChannelGroup;
+}
+
 namespace pv {
 
 class Session;
@@ -46,6 +52,7 @@ namespace view {
 class CursorHeader;
 class Header;
 class Ruler;
+class Trace;
 class Viewport;
 
 class View : public QAbstractScrollArea, public RowItemOwner {
@@ -53,8 +60,8 @@ class View : public QAbstractScrollArea, public RowItemOwner {
 
 private:
 	enum StickyEvents {
-		SelectableItemHExtentsChanged = 1,
-		SelectableItemVExtentsChanged = 2
+		RowItemHExtentsChanged = 1,
+		RowItemVExtentsChanged = 2
 	};
 
 private:
@@ -65,11 +72,6 @@ private:
 
 	static const int ScaleUnits[3];
 
-public:
-	static const QColor CursorAreaColour;
-
-	static const QSizeF LabelPadding;
-
 public:
 	explicit View(Session &session, QWidget *parent = 0);
 
@@ -105,8 +107,17 @@ public:
 	 * seconds.
 	 */
 	double offset() const;
+
+	/**
+	 * Returns the vertical scroll offset.
+	 */
 	int owner_visual_v_offset() const;
 
+	/**
+	 * Sets the visual v-offset.
+	 */
+	void set_v_offset(int offset);
+
 	/**
 	 * Returns the SI prefix to apply to the graticule time markings.
 	 */
@@ -159,12 +170,22 @@ public:
 	/**
 	 * Returns a reference to the pair of cursors.
 	 */
-	CursorPair& cursors();
+	std::shared_ptr<CursorPair> cursors() const;
 
 	/**
-	 * Returns a reference to the pair of cursors.
+	 * Adds a new flag at a specified time.
 	 */
-	const CursorPair& cursors() const;
+	void add_flag(double time);
+
+	/**
+	 * Removes a flag from the list.
+	 */
+	void remove_flag(std::shared_ptr<Flag> flag);
+
+	/**
+	 * Gets the list of flags.
+	 */
+	std::vector< std::shared_ptr<Flag> > flags() const;
 
 	const QPoint& hover_point() const;
 
@@ -175,8 +196,6 @@ public:
 Q_SIGNALS:
 	void hover_point_changed();
 
-	void signals_moved();
-
 	void selection_changed();
 
 	void scale_offset_changed();
@@ -205,30 +224,29 @@ private:
 	/**
 	 * Satisifies RowItem functionality.
 	 * @param p the QPainter to paint into.
-	 * @param right the x-coordinate of the right edge of the header
-	 * 	area.
+	 * @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, int right, bool hover);
+	void paint_label(QPainter &p, const QRect &rect, bool hover);
 
 	/**
 	 * Computes the outline rectangle of a label.
-	 * @param right the x-coordinate of the right edge of the header
-	 * 	area.
+	 * @param rect the rectangle of the header area.
 	 * @return Returns the rectangle of the signal label.
 	 */
-	QRectF label_rect(int right);
+	QRectF label_rect(const QRectF &rect);
 
-	static bool add_channels_to_owner(
+	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);
+
+	static std::vector< std::shared_ptr<Trace> >
+		extract_new_traces_for_channels(
 		const std::vector< std::shared_ptr<sigrok::Channel> > &channels,
-		RowItemOwner *owner, int &offset,
-		std::unordered_map<std::shared_ptr<sigrok::Channel>,
+		const std::unordered_map<std::shared_ptr<sigrok::Channel>,
 			std::shared_ptr<Signal> > &signal_map,
-		std::function<bool (std::shared_ptr<RowItem>)> filter_func =
-			std::function<bool (std::shared_ptr<RowItem>)>());
-
-	static void apply_offset(
-		std::shared_ptr<RowItem> row_item, int &offset);
+		std::set< std::shared_ptr<Trace> > &add_list);
 
 private:
 	bool eventFilter(QObject *object, QEvent *event);
@@ -238,22 +256,19 @@ private:
 	void resizeEvent(QResizeEvent *e);
 
 public:
-	void appearance_changed(bool label, bool content);
+	void row_item_appearance_changed(bool label, bool content);
+	void time_item_appearance_changed(bool label, bool content);
 
 	void extents_changed(bool horz, bool vert);
 
 private Q_SLOTS:
 
 	void h_scroll_value_changed(int value);
-	void v_scroll_value_changed(int value);
+	void v_scroll_value_changed();
 
 	void signals_changed();
 	void data_updated();
 
-	void marker_time_changed();
-
-	void on_signals_moved();
-
 	void process_sticky_events();
 
 	void on_hover_point_changed();
@@ -263,7 +278,6 @@ private:
 
 	Viewport *viewport_;
 	Ruler *ruler_;
-	CursorHeader *cursorheader_;
 	Header *header_;
 
 	/// The view time scale in seconds per pixel.
@@ -272,14 +286,16 @@ private:
 	/// The view time offset in seconds.
 	double offset_;
 
-	int v_offset_;
 	bool updating_scroll_;
 
 	double tick_period_;
 	unsigned int tick_prefix_;
 
 	bool show_cursors_;
-	CursorPair cursors_;
+	std::shared_ptr<CursorPair> cursors_;
+
+	std::list< std::shared_ptr<Flag> > flags_;
+	char next_flag_text_;
 
 	QPoint hover_point_;
 
@@ -290,4 +306,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_VIEW_H
+#endif // PULSEVIEW_PV_VIEW_VIEW_HPP