Improved handling of working set timeouts

Fixed timed out working sets never being removed from the active working set list and render subcomponents.
Open-Agriculture · Nov 29, 2023 · 6cf4ee8 · 6cf4ee8
1 parent d156713
commit 6cf4ee8
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 0 deletions.
diff --git a/include/DataMaskRenderAreaComponent.hpp b/include/DataMaskRenderAreaComponent.hpp
@@ -23,6 +23,8 @@ class DataMaskRenderAreaComponent : public Component
 
 	void on_change_active_mask(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> workingSet);
 
+	void on_working_set_disconnect(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> workingSet);
+
 	void paint(Graphics &g) override;
 
 	// Used to calculate button press events

diff --git a/include/ServerMainComponent.hpp b/include/ServerMainComponent.hpp
@@ -115,6 +115,7 @@ class ServerMainComponent : public juce::Component
 	void repaint_data_and_soft_key_mask();
 	void check_load_settings();
 	void save_settings();
+	void remove_working_set(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> workingSetToRemove);
 
 	const std::string ISO_DATA_PATH = "iso_data";
 

diff --git a/include/SoftKeyMaskRenderAreaComponent.hpp b/include/SoftKeyMaskRenderAreaComponent.hpp
@@ -23,6 +23,8 @@ class SoftKeyMaskRenderAreaComponent : public Component
 
 	void on_change_active_mask(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> workingSet);
 
+	void on_working_set_disconnect(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> workingSet);
+
 	void paint(Graphics &g) override;
 
 	// Used to calculate button press events

diff --git a/src/DataMaskRenderAreaComponent.cpp b/src/DataMaskRenderAreaComponent.cpp
@@ -30,6 +30,16 @@ void DataMaskRenderAreaComponent::on_change_active_mask(std::shared_ptr<isobus::
 	needToRepaintActiveArea = false;
 }
 
+void DataMaskRenderAreaComponent::on_working_set_disconnect(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> workingSet)
+{
+	if ((nullptr != workingSet) && (parentWorkingSet == workingSet))
+	{
+		childComponents.clear();
+		parentWorkingSet.reset();
+		repaint();
+	}
+}
+
 void DataMaskRenderAreaComponent::paint(Graphics &g)
 {
 	g.fillAll(getLookAndFeel().findColour(juce::ResizableWindow::backgroundColourId));

diff --git a/src/ServerMainComponent.cpp b/src/ServerMainComponent.cpp
@@ -384,6 +384,37 @@ void ServerMainComponent::timerCallback()
 		         (isobus::SystemTiming::time_expired_ms(ws->get_working_set_maintenance_message_timestamp_ms(), 3000)))
 		{
 			workingSetSelector.remove_working_set(ws);
+			dataMaskRenderer.on_working_set_disconnect(ws);
+			softKeyMaskRenderer.on_working_set_disconnect(ws);
+
+			if (managedWorkingSetList.empty())
+			{
+				activeWorkingSetMasterAddress = isobus::NULL_CAN_ADDRESS;
+				activeWorkingSetDataMaskObjectID = isobus::NULL_OBJECT_ID;
+			}
+			else if (ws->get_control_function()->get_address() == activeWorkingSetMasterAddress)
+			{
+				bool newWorkingSetFound = false;
+
+				for (auto &nextWorkingSet : managedWorkingSetList)
+				{
+					if (nextWorkingSet->get_control_function()->get_address() != activeWorkingSetMasterAddress)
+					{
+						activeWorkingSetMasterAddress = nextWorkingSet->get_control_function()->get_address();
+						activeWorkingSetDataMaskObjectID = std::static_pointer_cast<isobus::WorkingSet>(nextWorkingSet->get_working_set_object())->get_active_mask();
+						newWorkingSetFound = true;
+						break;
+					}
+				}
+
+				if (!newWorkingSetFound)
+				{
+					activeWorkingSetMasterAddress = isobus::NULL_CAN_ADDRESS;
+					activeWorkingSetDataMaskObjectID = isobus::NULL_OBJECT_ID;
+				}
+			}
+			remove_working_set(ws);
+			break;
 		}
 		else if (isobus::VirtualTerminalServerManagedWorkingSet::ObjectPoolProcessingThreadState::Joined == ws->get_object_pool_processing_state())
 		{
@@ -879,3 +910,15 @@ void ServerMainComponent::save_settings()
 		}
 	}
 }
+
+void ServerMainComponent::remove_working_set(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> workingSetToRemove)
+{
+	for (auto it = managedWorkingSetList.begin(); it != managedWorkingSetList.end(); it++)
+	{
+		if (workingSetToRemove == *it)
+		{
+			managedWorkingSetList.erase(it);
+			break;
+		}
+	}
+}
diff --git a/src/SoftkeyMaskRenderArea.cpp b/src/SoftkeyMaskRenderArea.cpp
@@ -51,6 +51,16 @@ void SoftKeyMaskRenderAreaComponent::on_change_active_mask(std::shared_ptr<isobu
 	repaint();
 }
 
+void SoftKeyMaskRenderAreaComponent::on_working_set_disconnect(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> workingSet)
+{
+	if ((nullptr != workingSet) && (workingSet == parentWorkingSet))
+	{
+		parentWorkingSet = nullptr;
+		childComponents.clear();
+		repaint();
+	}
+}
+
 void SoftKeyMaskRenderAreaComponent::paint(Graphics &g)
 {
 	g.fillAll(getLookAndFeel().findColour(juce::ResizableWindow::backgroundColourId));