ngscopeclient · Feb 17, 2020
Showing with 8 additions and 1 deletion.

+1 −0 scopehal/OscilloscopeChannel.cpp

+6 −0 scopehal/OscilloscopeChannel.h

+0 −1 scopehal/Unit.cpp

+1 −0 scopeprotocols/FFTDecoder.cpp
diff --git a/scopehal/OscilloscopeChannel.cpp b/scopehal/OscilloscopeChannel.cpp
@@ -63,6 +63,7 @@ OscilloscopeChannel::OscilloscopeChannel(
 	, m_index(index)
 	, m_physical(physical)
 	, m_refcount(0)
+	, m_xAxisUnit(Unit::UNIT_PS)
 	, m_yAxisUnit(Unit::UNIT_VOLTS)
 {
 }

diff --git a/scopehal/OscilloscopeChannel.h b/scopehal/OscilloscopeChannel.h
@@ -141,6 +141,9 @@ class OscilloscopeChannel
 	virtual double GetOffset();
 	virtual void SetOffset(double offset);
 
+	virtual Unit GetXAxisUnits()
+	{ return m_xAxisUnit; }
+
 	virtual Unit GetYAxisUnits()
 	{ return m_yAxisUnit; }
 
@@ -172,6 +175,9 @@ class OscilloscopeChannel
 	///Number of references (channel is disabled when last ref is released)
 	size_t m_refcount;
 
+	///Unit of measurement for our horizontal axis
+	Unit m_xAxisUnit;
+
 	///Unit of measurement for our vertical axis
 	Unit m_yAxisUnit;
 };

diff --git a/scopehal/Unit.cpp b/scopehal/Unit.cpp
@@ -93,7 +93,6 @@ string Unit::PrettyPrint(double value)
 			}
 			else if(fabs(value) >= 1e3)
 			{
-				LogDebug("value = %.4f ps\n", value);
 				value_rescaled = value / 1e3;
 				scale = "n";
 			}

diff --git a/scopeprotocols/FFTDecoder.cpp b/scopeprotocols/FFTDecoder.cpp
@@ -47,6 +47,7 @@ FFTCapture::~FFTCapture()
 FFTDecoder::FFTDecoder(string color)
 	: ProtocolDecoder(OscilloscopeChannel::CHANNEL_TYPE_ANALOG, color, CAT_MATH)
 {
+	m_xAxisUnit = Unit(Unit::UNIT_HZ);
 	m_yAxisUnit = Unit(Unit::UNIT_DB);
 
 	//Set up channels