Updated CMake to allow building on Linux, tackled some GCC warnings

Also added an application icon.
Open-Agriculture · Nov 19, 2023 · 73ef491 · 73ef491
1 parent 55f5213
commit 73ef491
Show file tree

Hide file tree

Showing 35 changed files with 75 additions and 44 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,6 +7,8 @@ project(
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 
+set(JUCE_WEB_BROWSER OFF)
+
 find_package(JUCE MODULE)
 find_package(CAN_Stack MODULE)
 find_package(Threads REQUIRED)
@@ -16,13 +18,22 @@ find_package(Threads REQUIRED)
 
 juce_add_gui_app(
   AgISOVirtualTerminal
-  # ICON_BIG ...                      # ICON_* arguments specify a path to an
+  ICON_BIG smallLogo.png
   # image file to use as an icon ICON_SMALL ...
   COMPANY_NAME
   "Open-Agriculture"
   PRODUCT_NAME
+  NEEDS_CURL FALSE
+  NEEDS_WEB_BROWSER FALSE
+  DESCRIPTION "An ISO11783-6 Server"
   "AgISOVirtualTerminal")
 
+set_target_properties(AgISOVirtualTerminal PROPERTIES CXX_STANDARD 17)
+
+target_compile_definitions(AgISOVirtualTerminal PRIVATE
+    JUCE_USE_CURL=0
+    JUCE_WEB_BROWSER=0)
+
 juce_generate_juce_header(AgISOVirtualTerminal)
 
 target_sources(
@@ -64,5 +75,4 @@ target_link_libraries(
   AgISOVirtualTerminal
   PRIVATE juce::juce_gui_extra juce::juce_audio_basics juce::juce_audio_utils isobus::Isobus isobus::HardwareIntegration
           isobus::Utility
-  PUBLIC juce::juce_recommended_config_flags juce::juce_recommended_lto_flags
-         juce::juce_recommended_warning_flags)
+  PUBLIC juce::juce_recommended_config_flags juce::juce_recommended_lto_flags)
diff --git a/README.md b/README.md
@@ -13,7 +13,6 @@ This section will be updated as progress is made on the project.
 Supported features:
 
 - All basic ISO11783 stuff, such as address claiming, TP, ETP, diagnostic protocol, etc.
-- Exactly 1 VT client
 - Object pool deserializer (most objects up to version 6 with some exceptions)
 - Data masks
 - Alarm masks
@@ -36,12 +35,13 @@ Supported features:
 - Input lists (partial - drawing the selector needs work)
 - Most relevant VT server CAN messages
 - Logging
+- Multiple simultaneous VT clients
+- Selecting different working sets
 
 Unimplemented features (for now)
 
 - Arbitrary audio control functionality
-- Selecting different working sets
-- Window masks
+- Window masks (tolerated in the object pool though)
 - Aux N/O
 - Most macro functionality
 - Animations
@@ -57,6 +57,21 @@ Unimplemented features (for now)
 
 This project is compiled with CMake and your favorite C++17 compiler.
 
+CMake 3.22 or higher is required.
+
+### Dependencies
+
+Linux:
+```
+sudo apt install git cmake pkg-config libfreetype-dev libfreetype6 libfreetype6-dev libasound2-dev libcurl4-openssl-dev libgtk-3-dev libwebkit2gtk-4.0-dev webkit2gtk-4.0
+```
+
+Windows:
+
+On Windows, you will need to install Visual Studio to get the MSVC compiler and CMake. The easiest way to do that would be to install [Visual Studio Community](https://visualstudio.microsoft.com/vs/community/) and select the "Desktop development with C++" workload.
+
+### Building
+
 Make sure you select your desired CAN driver as supported by AgIso Stack by defining the `CAN_DRIVER` variable.
 
 Example:

diff --git a/include/AlarmMaskComponent.hpp b/include/AlarmMaskComponent.hpp
@@ -28,7 +28,7 @@ class AlarmMaskComponent : public isobus::AlarmMask
 	std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> parentWorkingSet;
 	std::vector<std::shared_ptr<Component>> childComponents;
 
-	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(AlarmMaskComponent);
+	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(AlarmMaskComponent)
 };
 
 #endif // ALARM_MASK_COMPONENT_HPP
diff --git a/include/ButtonComponent.hpp b/include/ButtonComponent.hpp
@@ -28,7 +28,7 @@ class ButtonComponent : public isobus::Button
 	std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> parentWorkingSet;
 	std::vector<std::shared_ptr<Component>> childComponents;
 
-	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(ButtonComponent);
+	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(ButtonComponent)
 };
 
 #endif // BUTTON_COMPONENT_HPP
diff --git a/include/ColourMapComponent.hpp b/include/ColourMapComponent.hpp
@@ -25,7 +25,7 @@ class ColourMapComponent : public isobus::ColourMap
 private:
 	std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> parentWorkingSet;
 
-	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(ColourMapComponent);
+	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(ColourMapComponent)
 };
 
 #endif // COLOR_MAP_COMPONENT_HPP
diff --git a/include/ContainerComponent.hpp b/include/ContainerComponent.hpp
@@ -26,7 +26,7 @@ class ContainerComponent : public isobus::Container
 	std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> parentWorkingSet;
 	std::vector<std::shared_ptr<Component>> childComponents;
 
-	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(ContainerComponent);
+	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(ContainerComponent)
 };
 
 #endif // CONTAINER_COMPONENT_HPP
diff --git a/include/DataMaskComponent.hpp b/include/DataMaskComponent.hpp
@@ -28,7 +28,7 @@ class DataMaskComponent : public isobus::DataMask
 	std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> parentWorkingSet;
 	std::vector<std::shared_ptr<Component>> childComponents;
 
-	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(DataMaskComponent);
+	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(DataMaskComponent)
 };
 
 #endif // DATA_MASK_COMPONENT_HPP
diff --git a/include/DataMaskRenderAreaComponent.hpp b/include/DataMaskRenderAreaComponent.hpp
@@ -65,7 +65,7 @@ class DataMaskRenderAreaComponent : public Component
 	InputNumberListener inputNumberListener;
 	bool needToRepaintActiveArea = false;
 
-	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(DataMaskRenderAreaComponent);
+	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(DataMaskRenderAreaComponent)
 };
 
 #endif // DATA_MASK_RENDER_AREA_COMPONENT_HPP
diff --git a/include/InputListComponent.hpp b/include/InputListComponent.hpp
@@ -29,7 +29,7 @@ class InputListComponent : public isobus::InputList
 	std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> parentWorkingSet;
 	std::shared_ptr<Component> childComponent;
 
-	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(InputListComponent);
+	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(InputListComponent)
 };
 
 #endif // INPUT_LIST_COMPONENT_HPP
diff --git a/include/InputNumberComponent.hpp b/include/InputNumberComponent.hpp
@@ -27,7 +27,7 @@ class InputNumberComponent : public isobus::InputNumber
 private:
 	std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> parentWorkingSet;
 
-	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(InputNumberComponent);
+	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(InputNumberComponent)
 };
 
 #endif // INPUT_NUMBER_COMPONENT_HPP
diff --git a/include/KeyComponent.hpp b/include/KeyComponent.hpp
@@ -26,7 +26,7 @@ class KeyComponent : public isobus::Key
 	std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> parentWorkingSet;
 	std::vector<std::shared_ptr<Component>> childComponents;
 
-	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(KeyComponent);
+	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(KeyComponent)
 };
 
 #endif // KEY_COMPONENT_HPP
diff --git a/include/LoggerComponent.hpp b/include/LoggerComponent.hpp
@@ -35,7 +35,7 @@ class LoggerComponent : public Component
 	static constexpr std::size_t MAX_NUMBER_MESSAGES = 3000;
 	std::deque<LogData> loggedMessages;
 
-	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(LoggerComponent);
+	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(LoggerComponent)
 };
 
 #endif // LOGGER_COMPONENT_HPP
diff --git a/include/ObjectPointerComponent.hpp b/include/ObjectPointerComponent.hpp
@@ -28,7 +28,7 @@ class ObjectPointerComponent : public isobus::ObjectPointer
 	std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> parentWorkingSet;
 	std::shared_ptr<Component> childComponent;
 
-	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(ObjectPointerComponent);
+	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(ObjectPointerComponent)
 };
 
 #endif // OBJECT_POINTER_COMPONENT_HPP
diff --git a/include/OutputEllipseComponent.hpp b/include/OutputEllipseComponent.hpp
@@ -25,7 +25,7 @@ class OutputEllipseComponent : public isobus::OutputEllipse
 private:
 	std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> parentWorkingSet;
 
-	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(OutputEllipseComponent);
+	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(OutputEllipseComponent)
 };
 
 #endif // OUTPUT_ELLIPSE_COMPONENT_HPP
diff --git a/include/OutputLineComponent.hpp b/include/OutputLineComponent.hpp
@@ -25,7 +25,7 @@ class OutputLineComponent : public isobus::OutputLine
 private:
 	std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> parentWorkingSet;
 
-	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(OutputLineComponent);
+	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(OutputLineComponent)
 };
 
 #endif // OUTPUT_LINE_COMPONENT_HPP
diff --git a/include/OutputLinearBarGraphComponent.hpp b/include/OutputLinearBarGraphComponent.hpp
@@ -25,7 +25,7 @@ class OutputLinearBarGraphComponent : public isobus::OutputLinearBarGraph
 private:
 	std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> parentWorkingSet;
 
-	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(OutputLinearBarGraphComponent);
+	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(OutputLinearBarGraphComponent)
 };
 
 #endif // OUTPUT_LINEAR_BAR_GRAPH_COMPONENT_HPP
diff --git a/include/OutputMeterComponent.hpp b/include/OutputMeterComponent.hpp
@@ -25,7 +25,7 @@ class OutputMeterComponent : public isobus::OutputMeter
 private:
 	std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> parentWorkingSet;
 
-	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(OutputMeterComponent);
+	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(OutputMeterComponent)
 };
 
 #endif // OUTPUT_METER_COMPONENT_HPP
diff --git a/include/OutputNumberComponent.hpp b/include/OutputNumberComponent.hpp
@@ -27,7 +27,7 @@ class OutputNumberComponent : public isobus::OutputNumber
 private:
 	std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> parentWorkingSet;
 
-	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(OutputNumberComponent);
+	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(OutputNumberComponent)
 };
 
 #endif // OUTPUT_NUMBER_COMPONENT_HPP
diff --git a/include/OutputPolygonComponent.hpp b/include/OutputPolygonComponent.hpp
@@ -25,7 +25,7 @@ class OutputPolygonComponent : public isobus::OutputPolygon
 private:
 	std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> parentWorkingSet;
 
-	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(OutputPolygonComponent);
+	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(OutputPolygonComponent)
 };
 
 #endif // OUTPUT_POLYGON_COMPONENT_HPP
diff --git a/include/OutputRectangleComponent.hpp b/include/OutputRectangleComponent.hpp
@@ -25,7 +25,7 @@ class OutputRectangleComponent : public isobus::OutputRectangle
 private:
 	std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> parentWorkingSet;
 
-	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(OutputRectangleComponent);
+	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(OutputRectangleComponent)
 };
 
 #endif // OUTPUT_RECTANGLE_COMPONENT_HPP
diff --git a/include/OutputStringComponent.hpp b/include/OutputStringComponent.hpp
@@ -27,7 +27,7 @@ class OutputStringComponent : public isobus::OutputString
 private:
 	std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> parentWorkingSet;
 
-	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(OutputStringComponent);
+	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(OutputStringComponent)
 };
 
 #endif // OUTPUT_STRING_COMPONENT_HPP
diff --git a/include/PictureGraphicComponent.hpp b/include/PictureGraphicComponent.hpp
@@ -28,7 +28,7 @@ class PictureGraphicComponent : public isobus::PictureGraphic
 	std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> parentWorkingSet;
 	Image reconstructedImage;
 
-	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(PictureGraphicComponent);
+	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(PictureGraphicComponent)
 };
 
 #endif // PICTURE_GRAPHIC_COMPONENT_HPP
diff --git a/include/SoftKeyMaskComponent.hpp b/include/SoftKeyMaskComponent.hpp
@@ -28,7 +28,7 @@ class SoftKeyMaskComponent : public isobus::SoftKeyMask
 	std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> parentWorkingSet;
 	std::vector<std::shared_ptr<Component>> childComponents;
 
-	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(SoftKeyMaskComponent);
+	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(SoftKeyMaskComponent)
 };
 
 #endif // SOFT_KEY_MASK_COMPONENT_HPP
diff --git a/include/SoftKeyMaskRenderAreaComponent.hpp b/include/SoftKeyMaskRenderAreaComponent.hpp
@@ -40,7 +40,7 @@ class SoftKeyMaskRenderAreaComponent : public Component
 	std::vector<std::shared_ptr<Component>> childComponents;
 	ServerMainComponent &ownerServer;
 
-	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(SoftKeyMaskRenderAreaComponent);
+	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(SoftKeyMaskRenderAreaComponent)
 };
 
 #endif // SOFT_KEY_MASK_RENDER_AREA_COMPONENT_HPP
diff --git a/include/WorkingSetComponent.hpp b/include/WorkingSetComponent.hpp
@@ -25,7 +25,7 @@ class WorkingSetComponent : public isobus::WorkingSet
 private:
 	std::shared_ptr<isobus::VirtualTerminalServerManagedWorkingSet> parentWorkingSet;
 
-	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(WorkingSetComponent);
+	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(WorkingSetComponent)
 };
 
 #endif // WORKING_SET_COMPONENT_HPP
diff --git a/include/WorkingSetSelectorComponent.hpp b/include/WorkingSetSelectorComponent.hpp
@@ -41,7 +41,7 @@ class WorkingSetSelectorComponent : public Component
 	std::vector<SELECTOR_CHILD_OBJECTS_STRUCT> children;
 	ServerMainComponent &parentServer;
 
-	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(WorkingSetSelectorComponent);
+	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(WorkingSetSelectorComponent)
 };
 
 #endif // WORKING_SET_SELECTOR_COMPONENT_HPP
diff --git a/smallLogo.png b/smallLogo.png
diff --git a/src/DataMaskRenderAreaComponent.cpp b/src/DataMaskRenderAreaComponent.cpp
@@ -160,8 +160,8 @@ void DataMaskRenderAreaComponent::mouseUp(const MouseEvent &event)
 							}
 							inputListModal->addButton("OK", 0);
 							auto resultCallback = [this, clickedList](int result) {
-								auto combo = inputListModal->getComboBoxComponent("Input List Combo");
-								result = combo->getSelectedItemIndex();
+								auto inputCombo = inputListModal->getComboBoxComponent("Input List Combo");
+								result = inputCombo->getSelectedItemIndex();
 
 								// Remap the visible index to the actual index
 								std::uint16_t numberOfNonNullsSeen = 0;

diff --git a/src/InputNumberComponent.cpp b/src/InputNumberComponent.cpp
@@ -93,6 +93,7 @@ Justification InputNumberComponent::convert_justification(HorizontalJustificatio
 				}
 				break;
 
+				case VerticalJustification::Reserved:
 				default:
 					break;
 			}
@@ -121,6 +122,7 @@ Justification InputNumberComponent::convert_justification(HorizontalJustificatio
 				}
 				break;
 
+				case VerticalJustification::Reserved:
 				default:
 					break;
 			}
@@ -149,6 +151,7 @@ Justification InputNumberComponent::convert_justification(HorizontalJustificatio
 				}
 				break;
 
+				case VerticalJustification::Reserved:
 				default:
 					break;
 			}

diff --git a/src/LoggerComponent.cpp b/src/LoggerComponent.cpp
@@ -21,7 +21,7 @@ void LoggerComponent::paint(Graphics &g)
 
 	int numberOfLinesFitted = getHeight() / 14;
 
-	for (std::size_t i = 0; i < loggedMessages.size() && i < numberOfLinesFitted; i++)
+	for (std::size_t i = 0; i < static_cast<int>(loggedMessages.size()) && i < numberOfLinesFitted; i++)
 	{
 		const auto &message = loggedMessages.at(i);
 

diff --git a/src/OutputMeterComponent.cpp b/src/OutputMeterComponent.cpp
@@ -59,8 +59,6 @@ void OutputMeterComponent::paint(Graphics &g)
 	}
 	auto vtColour = colourTable.get_colour(get_needle_colour());
 	Path needlePath;
-	float xCoord = 0.0f;
-	float yCoord = 0.0f;
 	float endVtAngleDeg = get_end_angle() * 2.0f;
 	float startVtAngleDeg = get_start_angle() * 2.0f;
 
@@ -86,9 +84,6 @@ void OutputMeterComponent::paint(Graphics &g)
 	float xOffset = (get_width() / 2.0f) * std::cos(needleEndAngle * 3.14159265f / 180.0f);
 	float yOffset = -(get_width() / 2.0f) * std::sin(needleEndAngle * 3.14159265f / 180.0f);
 
-	xCoord = (get_width() / 2.0f) + xOffset;
-	yCoord = (get_width() / 2.0f) + yOffset;
-
 	g.setColour(Colour::fromFloatRGBA(vtColour.r, vtColour.g, vtColour.b, 1.0f));
 	g.drawLine((get_width() / 2.0f) + xOffset, (get_width() / 2.0f) + yOffset, get_width() / 2.0f, get_height() / 2.0f, 3.0f);
 

diff --git a/src/OutputRectangleComponent.cpp b/src/OutputRectangleComponent.cpp
@@ -58,6 +58,7 @@ void OutputRectangleComponent::paint(Graphics &g)
 				}
 				break;
 
+				case isobus::FillAttributes::FillType::NoFill:
 				default:
 				{
 					// No fill

diff --git a/src/OutputStringComponent.cpp b/src/OutputStringComponent.cpp
@@ -114,6 +114,7 @@ Justification OutputStringComponent::convert_justification(HorizontalJustificati
 				}
 				break;
 
+				case VerticalJustification::Reserved:
 				default:
 					break;
 			}
@@ -142,6 +143,7 @@ Justification OutputStringComponent::convert_justification(HorizontalJustificati
 				}
 				break;
 
+				case VerticalJustification::Reserved:
 				default:
 					break;
 			}
@@ -170,6 +172,7 @@ Justification OutputStringComponent::convert_justification(HorizontalJustificati
 				}
 				break;
 
+				case VerticalJustification::Reserved:
 				default:
 					break;
 			}
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,6 +58,7 @@ void OutputRectangleComponent::paint(Graphics &g) @@
     				}
     				break;
+    				case isobus::FillAttributes::FillType::NoFill:
     				default:
     				{
     					// No fill
@@ Expand Down @@