InstrumentThread / OscilloscopeState: Fixed misspelling of "threshold"; don't try to query analog properties on non-analog channels (e.g. external trigger input)

Author: azonenberg

src/ngscopeclient/InstrumentThread.cpp

@@ -145,14 +145,15 @@ void InstrumentThread(InstrumentThreadArgs args)
 						scopestate->m_channelInverted[i] = scope->IsInverted(i);
 
 						bool isDigital = (scopechan->GetType(0) == Stream::STREAM_TYPE_DIGITAL);
+						bool isAnalog = (scopechan->GetType(0) == Stream::STREAM_TYPE_ANALOG);
 						if(isDigital)
 						{
 							Unit unit = scopechan->GetYAxisUnits(0);
-							scopestate->m_channelDigitalTrehshold[i] = scope->GetDigitalThreshold(i);
-							scopestate->m_committedDigitalThreshold[i] = scopestate->m_channelDigitalTrehshold[i];
-							scopestate->m_strDigitalThreshold[i] = unit.PrettyPrint(scopestate->m_channelDigitalTrehshold[i]);
+							scopestate->m_channelDigitalThreshold[i] = scope->GetDigitalThreshold(i);
+							scopestate->m_committedDigitalThreshold[i] = scopestate->m_channelDigitalThreshold[i];
+							scopestate->m_strDigitalThreshold[i] = unit.PrettyPrint(scopestate->m_channelDigitalThreshold[i]);
 						}
-						else
+						else if(isAnalog)
 						{
 							scopestate->m_channelAttenuation[i] = scope->GetChannelAttenuation(i);
 							scopestate->m_channelBandwidthLimit[i] = scope->GetChannelBandwidthLimit(i);
@@ -193,7 +194,6 @@ void InstrumentThread(InstrumentThreadArgs args)
 									scopestate->m_channelBandwidthLimit[i] = j;
 							}
 
-
 							// Populate coupling values
 							auto coupling = scope->GetChannelCoupling(i);
 							scopestate->m_couplings[i].clear();

src/ngscopeclient/OscilloscopeState.h

@@ -49,8 +49,8 @@ class OscilloscopeState
 		m_channelInverted = std::make_unique<bool[] >(n);
 		m_channelOffset = std::make_unique<std::vector<float>[] >(n);
 		m_channelRange = std::make_unique<std::vector<float>[] >(n);
-		
-		m_channelDigitalTrehshold = std::make_unique<std::atomic<float>[] >(n);
+
+		m_channelDigitalThreshold = std::make_unique<std::atomic<float>[] >(n);
 		m_channelAttenuation = std::make_unique<std::atomic<float>[] >(n);
 
 		m_needsUpdate = std::make_unique<std::atomic<bool>[] >(n);
@@ -83,7 +83,7 @@ class OscilloscopeState
 		{
 			m_channelInverted[i] = false;
 
-			m_channelDigitalTrehshold[i] = 0;
+			m_channelDigitalThreshold[i] = 0;
 			m_channelAttenuation[i] = 0;
 			m_channelBandwidthLimit[i] = 0;
 			m_channelCoupling[i] = 0;
@@ -121,7 +121,7 @@ class OscilloscopeState
 	std::unique_ptr<bool[]> m_channelInverted;
 	std::unique_ptr<std::vector<float>[]> m_channelOffset;
 	std::unique_ptr<std::vector<float>[]> m_channelRange;
-	std::unique_ptr<std::atomic<float>[]> m_channelDigitalTrehshold;
+	std::unique_ptr<std::atomic<float>[]> m_channelDigitalThreshold;
 	std::unique_ptr<std::atomic<float>[]> m_channelAttenuation;
 
 	std::unique_ptr<std::atomic<bool>[]> m_needsUpdate;