Stream browser: properly handle per-channel ADC modes

Author: azonenberg

lib

@@ -563,7 +563,8 @@ bool Dialog::renderEditableProperty(
 	float fontSize = ImGui::GetFontSize();
 	if(width >= 0)
 	{
-		if(width == 0) width = 6*fontSize;
+		if(width == 0)
+			width = 8*fontSize;
 		ImGui::SetNextItemWidth(width);
 	}
 	if constexpr (std::is_same_v<T, int64_t>)

src/ngscopeclient/Dialog.cpp

@@ -174,8 +174,10 @@ void InstrumentThread(InstrumentThreadArgs args)
 								scopestate->m_strOffset[i][j] = unit.PrettyPrint(offset);
 								scopestate->m_strRange[i][j] = unit.PrettyPrint(range);
 							}
+
 							// Get probe name
 							scopestate->m_probeName[i] = scope->GetProbeName(i);
+
 							// Populate bandwidth limit values
 							auto limit = scope->GetChannelBandwidthLimit(i);
 							scopestate->m_bandwidthLimits[i].clear();
@@ -194,6 +196,8 @@ void InstrumentThread(InstrumentThreadArgs args)
 									scopestate->m_channelBandwidthLimit[i] = j;
 							}
 
+							scopestate->m_adcMode[i] = scope->GetADCMode(i);
+
 							// Populate coupling values
 							auto coupling = scope->GetChannelCoupling(i);
 							scopestate->m_couplings[i].clear();

src/ngscopeclient/InstrumentThread.cpp

@@ -77,6 +77,8 @@ class OscilloscopeState
 		m_committedAttenuation = std::make_unique<float[]>(n);
 		m_strAttenuation = std::make_unique<std::string[]>(n);
 
+		m_adcMode = std::make_unique<int[]>(n);
+
 		Unit volts(Unit::UNIT_VOLTS);
 
 		for(size_t i=0; i<n; i++)
@@ -88,6 +90,7 @@ class OscilloscopeState
 			m_channelBandwidthLimit[i] = 0;
 			m_channelCoupling[i] = 0;
 			m_channelBandwidthLimit[i] = 0;
+			m_adcMode[i] = 0;
 
 			// Offset and range ar per stream
 			OscilloscopeChannel* chan = dynamic_cast<OscilloscopeChannel*>(scope->GetChannel(i));
@@ -150,6 +153,8 @@ class OscilloscopeState
 
 	std::unique_ptr<float[]> m_committedAttenuation;
 	std::unique_ptr<std::string[]> m_strAttenuation;
+
+	std::unique_ptr<int[]> m_adcMode;
 };
 
 #endif

src/ngscopeclient/OscilloscopeState.h

@@ -1751,7 +1751,7 @@ void StreamBrowserDialog::renderChannelNode(
 						m_parent->ShowChannelProperties(scopechan);
 					}
 					renderChannelProperties(scope,scopechan,channelIndex,scopeState);
-				EndBlock();
+					EndBlock();
 				}
 			}
 			size_t streamCount = channel->GetStreamCount();
@@ -1778,15 +1778,25 @@ void StreamBrowserDialog::renderChannelNode(
    @param channelIndex the index of the channel
    @param scopeState the OscilloscopeState
  */
-void StreamBrowserDialog::renderChannelProperties(std::shared_ptr<Oscilloscope> scope, OscilloscopeChannel* scopechan, size_t channelIndex, shared_ptr<OscilloscopeState> scopeState)
+void StreamBrowserDialog::renderChannelProperties(
+	shared_ptr<Oscilloscope> scope,
+	OscilloscopeChannel* scopechan,
+	size_t channelIndex,
+	shared_ptr<OscilloscopeState> scopeState)
 {
 	float fontSize = ImGui::GetFontSize();
-	float width = 6*fontSize;
+	float width = 8*fontSize;
 
 	Unit counts(Unit::UNIT_COUNTS);
-	if(renderEditableProperty(width,"Attenuation",scopeState->m_strAttenuation[channelIndex],scopeState->m_committedAttenuation[channelIndex],counts,
-	"Attenuation setting for the probe (for example, 10 for a 10:1 probe)"))
-	{	// Update offset
+	if(renderEditableProperty(
+		width,
+		"Attenuation",
+		scopeState->m_strAttenuation[channelIndex],
+		scopeState->m_committedAttenuation[channelIndex],
+		counts,
+		"Attenuation setting for the probe (for example, 10 for a 10:1 probe)"))
+	{
+		// Update offset
 		scopechan->SetAttenuation(scopeState->m_committedAttenuation[channelIndex]);
 		scopeState->m_needsUpdate[channelIndex] = true;
 	}
@@ -1823,7 +1833,8 @@ void StreamBrowserDialog::renderChannelProperties(std::shared_ptr<Oscilloscope>
 			0,
 			false))
 		{
-			scopechan->SetBandwidthLimit(scopeState->m_bandwidthLimits[channelIndex][scopeState->m_channelBandwidthLimit[channelIndex]]);
+			scopechan->SetBandwidthLimit(
+				scopeState->m_bandwidthLimits[channelIndex][scopeState->m_channelBandwidthLimit[channelIndex]]);
 			scopeState->m_needsUpdate[channelIndex] = true;
 		}
 		HelpMarker("Hardware bandwidth limiter setting");
@@ -1843,6 +1854,38 @@ void StreamBrowserDialog::renderChannelProperties(std::shared_ptr<Oscilloscope>
 			);
 	}
 
+	//Per channel ADC mode switch
+	if(scope->IsADCModeConfigurable() && scope->IsADCModePerChannel())
+	{
+		auto config = GetTimebaseInfoFor(scope);
+		bool nomodes = config->m_adcmodeNames.size() <= 1;
+		if(nomodes)
+			ImGui::BeginDisabled();
+		ImGui::SetNextItemWidth(width);
+
+		if(renderCombo(
+			"ADC mode",
+			false,
+			ImGui::GetStyleColorVec4(ImGuiCol_FrameBg),
+			scopeState->m_adcMode[channelIndex],
+			config->m_adcmodeNames,
+			false,
+			0,
+			false))
+		{
+			scope->SetADCMode(channelIndex, scopeState->m_adcMode[channelIndex]);
+		}
+		if(nomodes)
+			ImGui::EndDisabled();
+
+		HelpMarker(
+			"Operating mode for the analog-to-digital converter.\n\n"
+			"Some instruments allow the ADC to operate in several modes, typically trading bit depth "
+			"against sample rate. Available modes may vary depending on the current sample rate and "
+			"which channels are in use."
+			);
+	}
+
 }
 
 /**