Added instrument state update on config flush.

Author: Frederic Borry

src/ngscopeclient/FunctionGeneratorState.h

@@ -45,6 +45,7 @@ class FunctionGeneratorState
 	FunctionGeneratorState(std::shared_ptr<FunctionGenerator> generator)
 	{
 		size_t n = generator->GetChannelCount();
+		m_channelNumner = n;
 		m_channelActive = std::make_unique<std::atomic<bool>[] >(n);
 		m_channelAmplitude = std::make_unique<std::atomic<float>[] >(n);
 		m_channelOffset= std::make_unique<std::atomic<float>[] >(n);
@@ -94,6 +95,12 @@ class FunctionGeneratorState
 		}
 	}
 
+	void FlushConfigCache()
+	{
+		for(size_t i = 0 ; i < m_channelNumner.load() ; i++)
+			m_needsUpdate[i] = true;
+	}
+
 	std::unique_ptr<std::atomic<bool>[]> m_channelActive;
 	std::unique_ptr<std::atomic<float>[]> m_channelAmplitude;
 	std::unique_ptr<std::atomic<float>[]> m_channelOffset;
@@ -107,6 +114,8 @@ class FunctionGeneratorState
 
 	std::unique_ptr<std::atomic<bool>[]> m_needsUpdate;
 
+	std::atomic<size_t> m_channelNumner;
+
 	//UI state for dialogs etc
 	std::unique_ptr<float[]> m_committedOffset;
 	std::unique_ptr<std::string[]> m_strOffset;

src/ngscopeclient/MultimeterState.h

@@ -51,6 +51,11 @@ class MultimeterState
 		m_needsRangeUpdate = true;
 	}
 
+	void FlushConfigCache()
+	{
+		m_needsRangeUpdate = true;
+	}
+
 	std::atomic<float> m_primaryMeasurement;
 	std::atomic<float> m_secondaryMeasurement;
 	std::atomic<bool> m_firstUpdateDone;

src/ngscopeclient/OscilloscopeState.h

@@ -45,6 +45,7 @@ class OscilloscopeState
 	OscilloscopeState(std::shared_ptr<Oscilloscope> scope)
 	{
 		size_t n = scope->GetChannelCount();
+		m_channelNumner = n;
 		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);
@@ -111,6 +112,12 @@ class OscilloscopeState
 		}
 	}
 
+	void FlushConfigCache()
+	{
+		for(size_t i = 0 ; i < m_channelNumner.load() ; i++)
+			m_needsUpdate[i] = true;
+	}
+
 	std::unique_ptr<bool[]> m_channelInverted;
 	std::unique_ptr<std::vector<float>[]> m_channelOffset;
 	std::unique_ptr<std::vector<float>[]> m_channelRange;
@@ -119,6 +126,8 @@ class OscilloscopeState
 
 	std::unique_ptr<std::atomic<bool>[]> m_needsUpdate;
 
+	std::atomic<size_t> m_channelNumner;
+
 	//UI state for dialogs etc
 	std::unique_ptr<std::string[]> m_probeName;
 

src/ngscopeclient/PowerSupplyState.h

@@ -45,6 +45,7 @@ class PowerSupplyState
 	PowerSupplyState(size_t n = 0)
 	{
 		m_masterEnable = false;
+		m_channelNumner = n;
 
 		m_channelVoltage = std::make_unique<std::atomic<float>[] >(n);
 		m_channelCurrent = std::make_unique<std::atomic<float>[] >(n);
@@ -82,6 +83,12 @@ class PowerSupplyState
 		m_firstUpdateDone = false;
 	}
 
+	void FlushConfigCache()
+	{
+		for(size_t i = 0 ; i < m_channelNumner.load() ; i++)
+			m_needsUpdate[i] = true;
+	}
+
 	std::unique_ptr<std::atomic<float>[]> m_channelVoltage;
 	std::unique_ptr<std::atomic<float>[]> m_channelCurrent;
 	std::unique_ptr<std::atomic<bool>[]> m_channelConstantCurrent;
@@ -104,6 +111,8 @@ class PowerSupplyState
 	std::atomic<bool> m_firstUpdateDone;
 
 	std::atomic<bool> m_masterEnable;
+
+	std::atomic<size_t> m_channelNumner;
 };
 
 #endif

src/ngscopeclient/Session.cpp

@@ -166,6 +166,24 @@ void Session::FlushConfigCache()
 	lock_guard<mutex> lock(m_scopeMutex);
 	for(auto it : m_instrumentStates)
 		it.first->FlushConfigCache();
+
+	// Also flush session states
+	for(auto it : m_psus)
+	{
+		it.second->FlushConfigCache();
+	}
+	for(auto it : m_meters)
+	{
+		it.second->FlushConfigCache();
+	}
+	for(auto it : m_oscilloscopesStates)
+	{
+		it.second->FlushConfigCache();
+	}
+	for(auto it : m_awgs)
+	{
+		it.second->FlushConfigCache();
+	}
 }
 
 /**