X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.hpp;h=e000a3cdf9b676536b451f25874833b1d776c9aa;hp=71dcc0361404648091532a767209b9d88e9170bc;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=214470fc17e73bbf4664f4c1678a7dd30c905bf2

diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index 71dcc036..e000a3cd 100644
--- a/pv/view/logicsignal.hpp
+++ b/pv/view/logicsignal.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_LOGICSIGNAL_HPP
-#define PULSEVIEW_PV_VIEW_LOGICSIGNAL_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
 
 #include <QCache>
 
@@ -44,16 +43,14 @@ namespace data {
 class Logic;
 }
 
-namespace view {
+namespace views {
+namespace TraceView {
 
 class LogicSignal : public Signal
 {
 	Q_OBJECT
 
 private:
-	static const int SignalHeight;
-	static const int SignalMargin;
-
 	static const float Oversampling;
 
 	static const QColor EdgeColour;
@@ -69,17 +66,14 @@ private:
 public:
 	LogicSignal(pv::Session &session,
 		std::shared_ptr<devices::Device> device,
-		std::shared_ptr<sigrok::Channel> channel,
-		std::shared_ptr<pv::data::Logic> data);
+		std::shared_ptr<data::SignalBase> base);
 
-	virtual ~LogicSignal();
+	virtual ~LogicSignal() = default;
 
 	std::shared_ptr<pv::data::SignalData> data() const;
 
 	std::shared_ptr<pv::data::Logic> logic_data() const;
 
-	void set_logic_data(std::shared_ptr<pv::data::Logic> data);
-
 	/**
 	 * Computes the vertical extents of the contents of this row item.
 	 * @return A pair containing the minimum and maximum y-values.
@@ -97,25 +91,18 @@ public:
 	 */
 	void scale_handle_dragged(int offset);
 
-	/**
-	 * Paints the background layer of the signal with a QPainter
-	 * @param p the QPainter to paint into.
-	 * @param pp the painting parameters object to paint with..
-	 **/
-	void paint_back(QPainter &p, const ViewItemPaintParams &pp);
-
 	/**
 	 * Paints the mid-layer of the signal with a QPainter
 	 * @param p the QPainter to paint into.
 	 * @param pp the painting parameters object to paint with..
-	 **/
+	 */
 	void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
 
 	/**
 	 * Paints the foreground layer of the signal with a QPainter
 	 * @param p the QPainter to paint into.
 	 * @param pp the painting parameters object to paint with.
-	 **/
+	 */
 	virtual void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
 
 private:
@@ -128,7 +115,7 @@ private:
 
 	const std::vector<int32_t> get_trigger_types() const;
 	QAction* action_from_trigger_type(
-		const sigrok::TriggerMatchType *match);
+		const sigrok::TriggerMatchType *type);
 	const sigrok::TriggerMatchType* trigger_type_from_action(
 		QAction *action);
 	void populate_popup_form(QWidget *parent, QFormLayout *form);
@@ -141,8 +128,9 @@ private Q_SLOTS:
 	void on_trigger();
 
 private:
+	int signal_height_;
+
 	std::shared_ptr<pv::devices::Device> device_;
-	std::shared_ptr<pv::data::Logic> data_;
 
 	const sigrok::TriggerMatchType *trigger_match_;
 	QToolBar *trigger_bar_;
@@ -157,7 +145,8 @@ private:
 	static QCache<QString, const QPixmap> pixmap_cache_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP