[designer] Add jml_tools module

neo-sonar · Oct 23, 2023 · 94d39c5 · 94d39c5
1 parent 83ff43e
commit 94d39c5
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 28 deletions.
diff --git a/tools/jml-designer/CMakeLists.txt b/tools/jml-designer/CMakeLists.txt
@@ -46,12 +46,8 @@ set(sources
     "Component/ValuePropertyComponent.cpp"
     "Component/ValuePropertyComponent.hpp"
 
-    "Core/Color.cpp"
-    "Core/Color.hpp"
     "Core/Justification.cpp"
     "Core/Justification.hpp"
-    "Core/ValueTree.cpp"
-    "Core/ValueTree.hpp"
     "Core/ValueTreeObject.hpp"
     "Core/ValueTreeObjectList.hpp"
 
@@ -139,7 +135,12 @@ target_include_directories(jml-designer
 target_link_libraries(jml-designer
     PRIVATE
         juce::juce_gui_extra
+        jml::jml_tools
+
     PUBLIC
+        lua::lua
+        sol2::sol2
+
         JMLDesigner_BinaryData
         juce::juce_recommended_warning_flags
 )
diff --git a/tools/jml-designer/Component/ColorPropertyComponent.cpp b/tools/jml-designer/Component/ColorPropertyComponent.cpp
@@ -1,7 +1,6 @@
 #include "ColorPropertyComponent.hpp"
 
-#include "Core/Color.hpp"
-#include "Core/ValueTree.hpp"
+#include <jml_tools/jml_tools.hpp>
 
 namespace jml::designer {
 

diff --git a/tools/jml-designer/Core/Justification.cpp b/tools/jml-designer/Core/Justification.cpp
@@ -1,6 +1,6 @@
 #include "Justification.hpp"
 
-#include "Core/ValueTree.hpp"
+#include <jml_tools/jml_tools.hpp>
 
 namespace jml::designer {
 

diff --git a/tools/jml-designer/Document/Document.cpp b/tools/jml-designer/Document/Document.cpp
@@ -1,10 +1,11 @@
 #include "Document.hpp"
 
-#include "Core/ValueTree.hpp"
 #include "Layers/GroupLayer.hpp"
 #include "Layers/ShapeLayer.hpp"
 #include "Layers/TextLayer.hpp"
 
+#include <jml_tools/jml_tools.hpp>
+
 namespace jml::designer {
 
 Document::Document(juce::ValueTree valueTree, juce::UndoManager* um)

diff --git a/tools/jml-designer/Layer/Export/ExportPanel.cpp b/tools/jml-designer/Layer/Export/ExportPanel.cpp
@@ -1,7 +1,8 @@
 #include "ExportPanel.hpp"
 
 #include "Component/PropertyPanel.hpp"
-#include "Core/ValueTree.hpp"
+
+#include <jml_tools/jml_tools.hpp>
 
 namespace jml::designer {
 

diff --git a/tools/jml-designer/Layer/Export/ExportPanel.hpp b/tools/jml-designer/Layer/Export/ExportPanel.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "Core/ValueTree.hpp"
 #include "Layer/Export/ImageExporter.hpp"
 #include "Layer/LayerSelection.hpp"
 
+#include <jml_tools/jml_tools.hpp>
 #include <juce_gui_basics/juce_gui_basics.h>
 
 namespace jml::designer {

diff --git a/tools/jml-designer/Layer/Layer.cpp b/tools/jml-designer/Layer/Layer.cpp
@@ -1,8 +1,8 @@
 #include "Layer.hpp"
 
 #include "Component/PropertyPanel.hpp"
-#include "Core/Color.hpp"
-#include "Core/ValueTree.hpp"
+
+#include <jml_tools/jml_tools.hpp>
 
 namespace jml::designer {
 

diff --git a/tools/jml-designer/Layers/TextLayer.cpp b/tools/jml-designer/Layers/TextLayer.cpp
@@ -1,9 +1,9 @@
 #include "TextLayer.hpp"
 
 #include "Component/PropertyPanel.hpp"
-#include "Core/Color.hpp"
 #include "Core/Justification.hpp"
-#include "Core/ValueTree.hpp"
+
+#include <jml_tools/jml_tools.hpp>
 
 namespace jml::designer {
 

diff --git a/tools/jml-designer/Tool/ShapeTool.cpp b/tools/jml-designer/Tool/ShapeTool.cpp
@@ -1,10 +1,10 @@
 #include "ShapeTool.hpp"
 
-#include "Core/Color.hpp"
-#include "Core/ValueTree.hpp"
 #include "Document/DocumentCanvas.hpp"
 #include "Layers/ShapeLayer.hpp"
 
+#include <jml_tools/jml_tools.hpp>
+
 namespace jml::designer {
 
 ShapeTool::ShapeTool(DocumentCanvas& c, Shape shape) noexcept : Tool{c}, _shape{shape}

diff --git a/tools/jml-designer/Core/Color.cpp → tools/jml_tools/graphics/Color.cpp b/tools/jml-designer/Core/Color.cpp → tools/jml_tools/graphics/Color.cpp
@@ -1,5 +1,3 @@
-#include "Color.hpp"
-
 auto juce::VariantConverter<juce::Colour>::fromVar(juce::var const& v) -> juce::Colour
 {
     return juce::Colour::fromString(v.toString());

diff --git a/tools/jml-designer/Core/Color.hpp → tools/jml_tools/graphics/Color.hpp b/tools/jml-designer/Core/Color.hpp → tools/jml_tools/graphics/Color.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <juce_graphics/juce_graphics.h>
-
 template<>
 struct juce::VariantConverter<juce::Colour>
 {

diff --git a/tools/jml_tools/jml_tools.cpp b/tools/jml_tools/jml_tools.cpp
@@ -2,4 +2,6 @@
 
 #include "BinaryData.hpp"
 
+#include "graphics/Color.cpp"    // NOLINT
 #include "graphics/Drawable.cpp" // NOLINT
+#include "value/ValueTree.cpp"   // NOLINT
diff --git a/tools/jml_tools/jml_tools.hpp b/tools/jml_tools/jml_tools.hpp
@@ -22,4 +22,6 @@ END_JUCE_MODULE_DECLARATION
 
 #include <lua_juce/lua_juce.hpp>
 
+#include "graphics/Color.hpp"
 #include "graphics/Drawable.hpp"
+#include "value/ValueTree.hpp"
diff --git a/tools/jml-designer/Core/ValueTree.cpp → tools/jml_tools/value/ValueTree.cpp b/tools/jml-designer/Core/ValueTree.cpp → tools/jml_tools/value/ValueTree.cpp
@@ -1,6 +1,4 @@
-#include "ValueTree.hpp"
-
-namespace jml::designer {
+namespace jml {
 
 auto loadValueTree(juce::File const& file, bool asXml) -> juce::ValueTree
 {
@@ -42,4 +40,4 @@ auto saveValueTree(juce::ValueTree const& v, juce::File const& file, bool asXml)
     return false;
 }
 
-} // namespace jml::designer
+} // namespace jml
diff --git a/tools/jml-designer/Core/ValueTree.hpp → tools/jml_tools/value/ValueTree.hpp b/tools/jml-designer/Core/ValueTree.hpp → tools/jml_tools/value/ValueTree.hpp
@@ -1,8 +1,6 @@
 #pragma once
 
-#include <juce_data_structures/juce_data_structures.h>
-
-namespace jml::designer {
+namespace jml {
 
 template<typename T>
 [[nodiscard]] auto toVar(T const& v) -> juce::var
@@ -25,4 +23,4 @@ template<typename T>
 [[nodiscard]] auto loadValueTree(juce::File const& file, bool asXml) -> juce::ValueTree;
 auto saveValueTree(juce::ValueTree const& v, juce::File const& file, bool asXml) -> bool;
 
-} // namespace jml::designer
+} // namespace jml