From ad341c3a893c66cfd59ac66eedb1de405ed0dbbb Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Sat, 6 Dec 2014 23:40:07 +0000
Subject: [PATCH 1/1] TimeItem: Added new class - a base of TimeMarker, derived
 from SelectableItem

---
 CMakeLists.txt         |  2 ++
 pv/view/timeitem.cpp   | 31 ++++++++++++++++++++++++++
 pv/view/timeitem.hpp   | 49 ++++++++++++++++++++++++++++++++++++++++++
 pv/view/timemarker.cpp |  2 +-
 pv/view/timemarker.hpp |  5 ++---
 5 files changed, 85 insertions(+), 4 deletions(-)
 create mode 100644 pv/view/timeitem.cpp
 create mode 100644 pv/view/timeitem.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de264c5a..036946c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -179,6 +179,7 @@ set(pulseview_SOURCES
 	pv/view/ruler.cpp
 	pv/view/selectableitem.cpp
 	pv/view/signal.cpp
+	pv/view/timeitem.cpp
 	pv/view/timemarker.cpp
 	pv/view/trace.cpp
 	pv/view/tracegroup.cpp
@@ -220,6 +221,7 @@ set(pulseview_HEADERS
 	pv/view/ruler.hpp
 	pv/view/selectableitem.hpp
 	pv/view/signal.hpp
+	pv/view/timeitem.hpp
 	pv/view/timemarker.hpp
 	pv/view/trace.hpp
 	pv/view/tracegroup.hpp
diff --git a/pv/view/timeitem.cpp b/pv/view/timeitem.cpp
new file mode 100644
index 00000000..dabdd5f1
--- /dev/null
+++ b/pv/view/timeitem.cpp
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the PulseView project.
+ *
+ * Copyright (C) 2014 Joel Holdsworth <joel@airwebreathe.org.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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
+ */
+
+#include "timeitem.hpp"
+
+namespace pv {
+namespace view {
+
+TimeItem::TimeItem(View &view) :
+	view_(view) {
+}
+
+} // namespace view
+} // namespace pv
diff --git a/pv/view/timeitem.hpp b/pv/view/timeitem.hpp
new file mode 100644
index 00000000..e47f1a6b
--- /dev/null
+++ b/pv/view/timeitem.hpp
@@ -0,0 +1,49 @@
+/*
+ * This file is part of the PulseView project.
+ *
+ * Copyright (C) 2014 Joel Holdsworth <joel@airwebreathe.org.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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
+ */
+
+#ifndef PULSEVIEW_PV_VIEW_TIMEITEM_H
+#define PULSEVIEW_PV_VIEW_TIMEITEM_H
+
+#include "selectableitem.hpp"
+
+namespace pv {
+namespace view {
+
+class View;
+
+class TimeItem : public SelectableItem
+{
+	Q_OBJECT
+
+protected:
+	/**
+	 * Constructor.
+	 * @param view A reference to the view that owns this marker.
+	 */
+	TimeItem(View &view);
+
+protected:
+	View &view_;
+};
+
+} // namespace view
+} // namespace pv
+
+#endif // PULSEVIEW_PV_VIEW_TIMEITEM_H
diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index d1c16ba8..34b2699b 100644
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -43,7 +43,7 @@ const int TimeMarker::ArrowSize = 4;
 const int TimeMarker::Offset = 1;
 
 TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
-	view_(view),
+	TimeItem(view),
 	colour_(colour),
 	time_(time),
 	value_action_(NULL),
diff --git a/pv/view/timemarker.hpp b/pv/view/timemarker.hpp
index 93c7dc90..24688ebc 100644
--- a/pv/view/timemarker.hpp
+++ b/pv/view/timemarker.hpp
@@ -27,7 +27,7 @@
 #include <QRectF>
 #include <QWidgetAction>
 
-#include "selectableitem.hpp"
+#include "timeitem.hpp"
 
 class QPainter;
 class QRect;
@@ -37,7 +37,7 @@ namespace view {
 
 class View;
 
-class TimeMarker : public SelectableItem
+class TimeMarker : public TimeItem
 {
 	Q_OBJECT
 
@@ -107,7 +107,6 @@ Q_SIGNALS:
 	void time_changed();
 
 protected:
-	View &view_;
 	const QColor &colour_;
 
 	double time_;
-- 
2.30.2