Add dynamic render area and key sizes

Open-Agriculture · Dec 10, 2023 · 55a546a · 55a546a
1 parent 246d58b
commit 55a546a
Show file tree

Hide file tree

Showing 12 changed files with 166 additions and 25 deletions.
diff --git a/include/AlarmMaskComponent.hpp b/include/AlarmMaskComponent.hpp
@@ -18,7 +18,7 @@ class AlarmMaskComponent : public isobus::AlarmMask
   , public Component
 {
 public:
-	AlarmMaskComponent(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> workingSet, isobus::AlarmMask sourceObject);
+	AlarmMaskComponent(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> workingSet, isobus::AlarmMask sourceObject, int dataMaskSize);
 
 	void on_content_changed(bool initial = false);
 

diff --git a/include/DataMaskComponent.hpp b/include/DataMaskComponent.hpp
@@ -18,7 +18,7 @@ class DataMaskComponent : public isobus::DataMask
   , public Component
 {
 public:
-	DataMaskComponent(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> workingSet, isobus::DataMask sourceObject);
+	DataMaskComponent(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> workingSet, isobus::DataMask sourceObject, int dataMaskSize);
 
 	void on_content_changed(bool initial = false);
 

diff --git a/include/JuceManagedWorkingSetCache.hpp b/include/JuceManagedWorkingSetCache.hpp
@@ -17,6 +17,12 @@ class JuceManagedWorkingSetCache
 public:
 	static std::shared_ptr<Component> create_component(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> workingSet, std::shared_ptr<isobus::VTObject> sourceObject);
 
+	static void set_data_alarm_mask_size(int size);
+
+	static void set_soft_key_width(int size);
+
+	static void set_soft_key_height(int size);
+
 private:
 	class ComponentCacheClass
 	{
@@ -28,6 +34,9 @@ class JuceManagedWorkingSetCache
 		//std::map<std::uint16_t, std::shared_ptr<Component>> componentLookup;
 	};
 	static std::vector<ComponentCacheClass> workingSetComponentCache;
+	static int dataAndAlarmMaskSize;
+	static int keyWidth;
+	static int keyHeight;
 };
 
 #endif // JUCE_MANAGED_WORKING_SET_HPP
diff --git a/include/KeyComponent.hpp b/include/KeyComponent.hpp
@@ -18,7 +18,7 @@ class KeyComponent : public isobus::Key
   , public Component
 {
 public:
-	KeyComponent(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> workingSet, isobus::Key sourceObject);
+	KeyComponent(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> workingSet, isobus::Key sourceObject, int keyWidth, int keyHeight);
 
 	void paint(Graphics &g) override;
 

diff --git a/include/ServerMainComponent.hpp b/include/ServerMainComponent.hpp
@@ -96,7 +96,8 @@ class ServerMainComponent : public juce::Component
 		NoCommand = 0, /// 0 Is an invalid command ID
 		About,
 		ConfigureLanguageCommand,
-		ConfigureReportedVersion
+		ConfigureReportedVersion,
+		ConfigureReportedHardware
 	};
 
 	class LanguageCommandConfigClosed
@@ -132,6 +133,10 @@ class ServerMainComponent : public juce::Component
 	AudioDeviceManager mAudioDeviceManager;
 	std::unique_ptr<AlertWindow> popupMenu;
 	std::uint8_t numberOfPoolsToRender = 0;
+	std::uint8_t numberPhysicalSoftKeys = 6;
+	std::uint8_t numberVirtualSoftKeys = 64;
+	std::uint8_t softKeyDesignatorWidth = 60;
+	std::uint8_t softKeyDesignatorHeight = 60;
 	VTVersion versionToReport = VTVersion::Version5;
 	bool needToRepaint = false;
 

diff --git a/src/AlarmMaskComponent.cpp b/src/AlarmMaskComponent.cpp
@@ -6,12 +6,12 @@
 #include "AlarmMaskComponent.hpp"
 #include "JuceManagedWorkingSetCache.hpp"
 
-AlarmMaskComponent::AlarmMaskComponent(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> workingSet, isobus::AlarmMask sourceObject) :
+AlarmMaskComponent::AlarmMaskComponent(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> workingSet, isobus::AlarmMask sourceObject, int dataMaskSize) :
   isobus::AlarmMask(sourceObject),
   parentWorkingSet(workingSet)
 {
 	setOpaque(true);
-	setBounds(0, 0, 480, 480);
+	setBounds(0, 0, dataMaskSize, dataMaskSize);
 	on_content_changed(true);
 }
 

diff --git a/src/DataMaskComponent.cpp b/src/DataMaskComponent.cpp
@@ -6,12 +6,12 @@
 #include "DataMaskComponent.hpp"
 #include "JuceManagedWorkingSetCache.hpp"
 
-DataMaskComponent::DataMaskComponent(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> workingSet, isobus::DataMask sourceObject) :
+DataMaskComponent::DataMaskComponent(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> workingSet, isobus::DataMask sourceObject, int dataMaskSize) :
   isobus::DataMask(sourceObject),
   parentWorkingSet(workingSet)
 {
 	setOpaque(true);
-	setBounds(0, 0, 480, 480);
+	setBounds(0, 0, dataMaskSize, dataMaskSize);
 	on_content_changed(true);
 }
 

diff --git a/src/DataMaskRenderAreaComponent.cpp b/src/DataMaskRenderAreaComponent.cpp
@@ -46,7 +46,7 @@ void DataMaskRenderAreaComponent::paint(Graphics &g)
 
 	if (nullptr != parentWorkingSet)
 	{
-		g.drawRect(0, 0, 480, 480, 1);
+		g.drawRect(0, 0, getWidth(), getHeight(), 1);
 	}
 	else
 	{

diff --git a/src/JuceManagedWorkingSetCache.cpp b/src/JuceManagedWorkingSetCache.cpp
@@ -38,6 +38,9 @@
 #include "WorkingSetComponent.hpp"
 
 std::vector<JuceManagedWorkingSetCache::ComponentCacheClass> JuceManagedWorkingSetCache::workingSetComponentCache;
+int JuceManagedWorkingSetCache::dataAndAlarmMaskSize = 480;
+int JuceManagedWorkingSetCache::keyWidth = 60;
+int JuceManagedWorkingSetCache::keyHeight = 60;
 
 std::shared_ptr<Component> JuceManagedWorkingSetCache::create_component(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> workingSet, std::shared_ptr<isobus::VTObject> sourceObject)
 {
@@ -64,13 +67,13 @@ std::shared_ptr<Component> JuceManagedWorkingSetCache::create_component(std::sha
 		{
 			case isobus::VirtualTerminalObjectType::AlarmMask:
 			{
-				retVal = std::make_shared<AlarmMaskComponent>(workingSet, *std::static_pointer_cast<isobus::AlarmMask>(sourceObject));
+				retVal = std::make_shared<AlarmMaskComponent>(workingSet, *std::static_pointer_cast<isobus::AlarmMask>(sourceObject), dataAndAlarmMaskSize);
 			}
 			break;
 
 			case isobus::VirtualTerminalObjectType::DataMask:
 			{
-				retVal = std::make_shared<DataMaskComponent>(workingSet, *std::static_pointer_cast<isobus::DataMask>(sourceObject));
+				retVal = std::make_shared<DataMaskComponent>(workingSet, *std::static_pointer_cast<isobus::DataMask>(sourceObject), dataAndAlarmMaskSize);
 			}
 			break;
 
@@ -93,7 +96,7 @@ std::shared_ptr<Component> JuceManagedWorkingSetCache::create_component(std::sha
 
 			case isobus::VirtualTerminalObjectType::Key:
 			{
-				retVal = std::make_shared<KeyComponent>(workingSet, *std::static_pointer_cast<isobus::Key>(sourceObject));
+				retVal = std::make_shared<KeyComponent>(workingSet, *std::static_pointer_cast<isobus::Key>(sourceObject), keyWidth, keyHeight);
 			}
 			break;
 
@@ -218,3 +221,18 @@ std::shared_ptr<Component> JuceManagedWorkingSetCache::create_component(std::sha
 	}
 	return retVal;
 }
+
+void JuceManagedWorkingSetCache::set_data_alarm_mask_size(int size)
+{
+	dataAndAlarmMaskSize = size;
+}
+
+void JuceManagedWorkingSetCache::set_soft_key_width(int size)
+{
+	keyWidth = size;
+}
+
+void JuceManagedWorkingSetCache::set_soft_key_height(int size)
+{
+	keyHeight = size;
+}
diff --git a/src/KeyComponent.cpp b/src/KeyComponent.cpp
@@ -7,11 +7,11 @@
 
 #include "JuceManagedWorkingSetCache.hpp"
 
-KeyComponent::KeyComponent(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> workingSet, isobus::Key sourceObject) :
+KeyComponent::KeyComponent(std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> workingSet, isobus::Key sourceObject, int keyWidth, int keyHeight) :
   isobus::Key(sourceObject),
   parentWorkingSet(workingSet)
 {
-	setSize(60, 60);
+	setSize(keyWidth, keyHeight);
 	setOpaque(true);
 
 	for (std::uint16_t i = 0; i < this->get_number_children(); i++)
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,7 +46,7 @@ void DataMaskRenderAreaComponent::paint(Graphics &g) @@
     	if (nullptr != parentWorkingSet)
     	{
-    		g.drawRect(0, 0, 480, 480, 1);
+    		g.drawRect(0, 0, getWidth(), getHeight(), 1);
     	}
     	else
     	{
@@ Expand Down @@