X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.hpp;h=cd4f0e232f9fd5131f40306ad2dedbb94ff99fad;hp=9bd91ba93a54eb6994f5569337921aa7580f472c;hb=e9c8e87cf09ad9761bea1193b25d01a87f8e0dd6;hpb=bf0edd2b0cbb5f4bd5d69b0f00bcea7d037e2287

diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index 9bd91ba9..cd4f0e23 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,7 +43,8 @@ namespace data {
 class Logic;
 }
 
-namespace view {
+namespace views {
+namespace TraceView {
 
 class LogicSignal : public Signal
 {
@@ -56,6 +56,7 @@ private:
 	static const QColor EdgeColour;
 	static const QColor HighColour;
 	static const QColor LowColour;
+	static const QColor SamplingPointColour;
 
 	static const QColor SignalColours[10];
 
@@ -66,8 +67,7 @@ private:
 public:
 	LogicSignal(pv::Session &session,
 		std::shared_ptr<devices::Device> device,
-		std::shared_ptr<data::SignalBase> channel,
-		std::shared_ptr<pv::data::Logic> data);
+		std::shared_ptr<data::SignalBase> base);
 
 	virtual ~LogicSignal() = default;
 
@@ -75,8 +75,6 @@ public:
 
 	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.
@@ -134,7 +132,6 @@ 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_;
@@ -149,7 +146,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