StreamBrowserDialog rework

src/ngscopeclient/CMakeLists.txt

@@ -73,7 +73,6 @@ add_executable(ngscopeclient
 	FilterGraphWorkspace.cpp
 	FilterPropertiesDialog.cpp
 	FontManager.cpp
-	FunctionGeneratorDialog.cpp
 	GuiLogSink.cpp
 	HistoryDialog.cpp
 	HistoryManager.cpp
@@ -89,7 +88,6 @@ add_executable(ngscopeclient
 	MeasurementsDialog.cpp
 	MemoryLeakerDialog.cpp
 	MetricsDialog.cpp
-	MultimeterDialog.cpp
 	NFDFileBrowser.cpp
 	NotesDialog.cpp
 	PacketManager.cpp

src/ngscopeclient/ChannelPropertiesDialog.cpp

@@ -2,7 +2,7 @@
 *                                                                                                                      *
 * ngscopeclient                                                                                                        *
 *                                                                                                                      *
-* Copyright (c) 2012-2025 Andrew D. Zonenberg and contributors                                                         *
+* Copyright (c) 2012-2026 Andrew D. Zonenberg and contributors                                                         *
 * All rights reserved.                                                                                                 *
 *                                                                                                                      *
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
@@ -43,9 +43,20 @@ using namespace std;
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Construction / destruction
 
-ChannelPropertiesDialog::ChannelPropertiesDialog(InstrumentChannel* chan,  MainWindow* parent, bool graphEditorMode)
+ChannelPropertiesDialog::ChannelPropertiesDialog(InstrumentChannel* chan, MainWindow* parent, bool graphEditorMode)
 	: BaseChannelPropertiesDialog(chan, parent, graphEditorMode)
 {
+	// Get oscilloscope state, for that we need to make a shared_ptr out of the base pointer returned by chan->GetInstrument()
+	m_session = &m_parent->GetSession();
+	auto instrument = chan->GetInstrument();
+	if(instrument)
+	{
+		std::shared_ptr<Instrument> scopeSharedPointer = instrument->shared_from_this();
+		shared_ptr<Oscilloscope> sharedScope = dynamic_pointer_cast<Oscilloscope>(scopeSharedPointer);
+		if(sharedScope)
+			m_state = m_session->GetOscilloscopeState(sharedScope);
+	}
+
 	auto ochan = dynamic_cast<OscilloscopeChannel*>(chan);
 	if(!ochan)
 		LogFatal("ChannelPropertiesDialog expects an OscilloscopeChannel\n");
@@ -307,12 +318,12 @@ bool ChannelPropertiesDialog::DoRender()
 
 	//Input settings only make sense if we have an attached scope
 	auto nstreams = m_channel->GetStreamCount();
+	auto index = m_channel->GetIndex();
 	if(scope)
 	{
 		if(ImGui::CollapsingHeader("Input", defaultOpenFlags))
 		{
 			//Type of probe connected
-			auto index = m_channel->GetIndex();
 			string ptype = m_probe;
 			if(ptype == "")
 				ptype = "(not detected)";
@@ -340,6 +351,9 @@ bool ChannelPropertiesDialog::DoRender()
 						//refresh in case scope driver changed the value
 						m_committedThreshold = scope->GetDigitalThreshold(index);
 						m_threshold = yunit.PrettyPrint(m_committedThreshold);
+
+						// Tell intrument thread that the scope state has to be updated
+						if(m_state) m_state->m_needsUpdate[index] = true;
 					}
 					HelpMarker("Switching threshold for the digital input buffer");
 				}
@@ -354,6 +368,9 @@ bool ChannelPropertiesDialog::DoRender()
 						//refresh in case scope driver changed the value
 						m_committedHysteresis = scope->GetDigitalHysteresis(index);
 						m_hysteresis = yunit.PrettyPrint(m_committedHysteresis);
+
+						// Tell intrument thread that the scope state has to be updated
+						if(m_state) m_state->m_needsUpdate[index] = true;
 					}
 					HelpMarker("Hysteresis for the digital input buffer");
 				}
@@ -398,6 +415,9 @@ bool ChannelPropertiesDialog::DoRender()
 						m_committedRange[i] = ochan->GetVoltageRange(i);
 						m_range[i] = unit.PrettyPrint(m_committedRange[i]);
 					}
+
+					// Tell intrument thread that the scope state has to be updated
+					if(m_state) m_state->m_needsUpdate[index] = true;
 				}
 				if(m_probe != "")
 					ImGui::EndDisabled();
@@ -408,7 +428,12 @@ bool ChannelPropertiesDialog::DoRender()
 				{
 					ImGui::SetNextItemWidth(width);
 					if(Combo("Coupling", m_couplingNames, m_coupling))
+					{
 						ochan->SetCoupling(m_couplings[m_coupling]);
+
+						// Tell intrument thread that the scope state has to be updated
+						if(m_state) m_state->m_needsUpdate[index] = true;
+					}
 					HelpMarker("Coupling configuration for the input");
 				}
 
@@ -417,7 +442,12 @@ bool ChannelPropertiesDialog::DoRender()
 				{
 					ImGui::SetNextItemWidth(width);
 					if(Combo("Bandwidth", m_bwlNames, m_bwl))
+					{
 						ochan->SetBandwidthLimit(m_bwlValues[m_bwl]);
+
+						// Tell intrument thread that the scope state has to be updated
+						if(m_state) m_state->m_needsUpdate[index] = true;
+					}
 					HelpMarker("Hardware bandwidth limiter setting");
 				}
 			}
@@ -465,8 +495,13 @@ bool ChannelPropertiesDialog::DoRender()
 			if(scope->CanInvert(index))
 			{
 				if(ImGui::Checkbox("Invert", &m_inverted))
+				{
 					ochan->Invert(m_inverted);
 
+					// Tell intrument thread that the scope state has to be updated
+					if(m_state) m_state->m_needsUpdate[index] = true;
+				}
+
 				HelpMarker(
 					"When checked, input value is multiplied by -1.\n\n"
 					"For a differential probe, this is equivalent to swapping the positive and negative inputs."
@@ -558,8 +593,13 @@ bool ChannelPropertiesDialog::DoRender()
 				}
 				ImGui::SetNextItemWidth(width);
 				if(UnitInputWithExplicitApply("Offset", m_offset[i], m_committedOffset[i], unit))
+				{
 					ochan->SetOffset(m_committedOffset[i], i);
 
+					// Tell intrument thread that the scope state has to be updated
+					if(m_state) m_state->m_needsUpdate[index] = true;
+				}
+
 				//Same for range
 				auto range = ochan->GetVoltageRange(i);
 				auto srange = unit.PrettyPrint(m_committedRange[i]);
@@ -570,8 +610,13 @@ bool ChannelPropertiesDialog::DoRender()
 				}
 				ImGui::SetNextItemWidth(width);
 				if(UnitInputWithExplicitApply("Range", m_range[i], m_committedRange[i], unit))
+				{
 					ochan->SetVoltageRange(m_committedRange[i], i);
 
+					// Tell intrument thread that the scope state has to be updated
+					if(m_state) m_state->m_needsUpdate[index] = true;
+				}
+
 				ImGui::PopID();
 			}
 		}

src/ngscopeclient/ChannelPropertiesDialog.h

@@ -2,7 +2,7 @@
 *                                                                                                                      *
 * ngscopeclient                                                                                                        *
 *                                                                                                                      *
-* Copyright (c) 2012-2025 Andrew D. Zonenberg                                                                          *
+* Copyright (c) 2012-2026 Andrew D. Zonenberg                                                                          *
 * All rights reserved.                                                                                                 *
 *                                                                                                                      *
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
@@ -49,6 +49,9 @@ class ChannelPropertiesDialog : public BaseChannelPropertiesDialog
 
 	void RefreshInputSettings(Oscilloscope* scope, size_t nchan);
 
+	///@brief Current channel stats, live updated
+	std::shared_ptr<OscilloscopeState> m_state;
+
 	std::string m_displayName;
 	std::string m_committedDisplayName;