merged dev900b in to dev

Author: XRay3D

external_dependencies/ChaiScript

@@ -0,0 +1 @@
+Subproject commit 6939982a0df8114bc426a1b8745f2b811b464fc3

external_dependencies/Clipper2

@@ -0,0 +1 @@
+Subproject commit d3fbd4a1d642d0446bdc7739b471159539e3f465

external_dependencies/compile-time-regular-expressions

@@ -0,0 +1 @@
+Subproject commit 903f8ccbfbfad46ade9f851ef138397336f05d43

external_dependencies/pfr_non_boost

@@ -0,0 +1 @@
+Subproject commit 26623019cc6a2aba2b26489bf9c860cc7a7699f4

plugins/CMakeLists.txt

@@ -18,11 +18,34 @@ else()
     set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${STATIC_LIBS_DIR})
 endif()
 
+set(Enable OFF)
+
 # plugins shape
+set(Enable_Circle       OFF) #[["Enable_Circle"]]
+set(Enable_Circlearc    OFF) #[["Enable_Circlearc"]]
+set(Enable_Polyline     OFF) #[["Enable_Polyline"]]
+set(Enable_Rectangle    OFF) #[["Enable_Rectangle"]]
+set(Enable_Text         OFF) #[["Enable_Text"]]
 add_subdirectory(shape)
 
 # plugins file
+set(Enable_Gerber       ON)  #[["Enable_Gerber"]]
+set(Enable_Dxf          OFF) #[["Enable_Dxf"]]
+set(Enable_Excellon     OFF) #[["Enable_Excellon"]]
 add_subdirectory(file)
 
 # plugins gcode
+set(Enable_Drill        OFF) #[["Enable_Drill"]]
+set(Enable_Hatching     OFF) #[["Enable_Hatching"]]
+set(Enable_Pocketoffset OFF) #[["Enable_Pocketoffset"]]
+set(Enable_Pocketraster OFF) #[["Enable_Pocketraster"]]
+set(Enable_Profile      OFF) #[["Enable_Profile"]]
+set(Enable_Thermal      OFF) #[["Enable_Thermal"]]
+set(Enable_Voroni       OFF) #[["Enable_Voroni"]]
 add_subdirectory(gcode)
+
+
+
+
+
+

plugins/file/CMakeLists.txt

@@ -62,13 +62,28 @@ else()
     qt5_add_translation(${QM_FILES} ${TS_FILES})
 endif()
 
-
+if(Enable_Gerber)
 add_subdirectory(gerber)
+endif()
+
+if(Enable_Dxf)
 add_subdirectory(dxf)
+endif()
+
+if(Enable_Excellon)
 add_subdirectory(excellon)
+endif()
+
+# if(Enable_TopoR)
 #add_subdirectory(TopoR)
+# endif()
 
+# if(Enable_File)
 #add_subdirectory(file)
+# endif()
+
+# if(Enable_Hpgl)
 #add_subdirectory(hpgl)
+# endif()
 
 

plugins/file/gerber/gbr_aperture.cpp

@@ -15,6 +15,8 @@
 
 #include <QDebug>
 #include <QLineF>
+#include <QtQml/QJSEngine>
+#include <QtQml/QJSValue>
 
 namespace Gerber {
 
@@ -394,6 +396,10 @@ void ApMacro::draw() {
     try {
         //        for (int i = 0; i < modifiers_.size(); ++i) {
         //            QString var(modifiers_[i]);
+
+        QJSEngine js;
+        for(auto&& [name, value]: macroCoefficients)
+            js.globalObject().setProperty(name, value);
         for(QString& var: modifiers_) {
             if(var.at(0) == '0') // Skip Comment
                 continue;
@@ -403,12 +409,20 @@ void ApMacro::draw() {
             if(var.contains('=')) {
                 QList<QString> stringList = var.split('=');
                 stringList.last().replace(QChar('x'), '*', Qt::CaseInsensitive);
-                macroCoefficients[stringList.first()] = MathParser(&macroCoefficients).parse(stringList.last());
+
+                auto val = js.evaluate(stringList.last());
+                if(val.errorType()) qWarning() << val.toString();
+                js.globalObject().setProperty(stringList.first(), val.toNumber());
                 continue;
             } else {
                 for(auto&& var2: var.split(',')) {
                     var2.replace(QChar('x'), '*', Qt::CaseInsensitive);
-                    mod.push_back(var2.contains('$') ? MathParser(&macroCoefficients).parse(var2) : var2.toDouble());
+                    if(var2.contains('$')) {
+                        auto val = js.evaluate(var2);
+                        if(val.errorType()) qWarning() << val.toString();
+                        mod.push_back(val.toNumber());
+                    } else
+                        mod.push_back(var2.toDouble());
                 }
             }
 

plugins/file/gerber/gbr_aperture.h

@@ -10,8 +10,13 @@
  *******************************************************************************/
 #pragma once
 #include "gbr_types.h"
+<<<<<<< HEAD
 #define MT 3
 #include "mathparser.h"
+=======
+// #define MT 1
+// #include "mathparser.h"
+>>>>>>> refs/heads/dev900b
 
 #include <QtMath>
 #include <numbers>
@@ -183,6 +188,7 @@ class ApPolygon final : public AbstractAperture {
 /////////////////////////////////////////////////////
 /// \brief The GAMacro class
 ///
+using VarMap = std::map<QString, double>;
 class ApMacro final : public AbstractAperture {
 public:
     ApMacro(const QString& macro, const QList<QString>& modifiers, const VarMap& coefficients, const File* file);

plugins/gcode/CMakeLists.txt

@@ -67,15 +67,37 @@ else()
     qt5_add_translation(${QM_FILES} ${TS_FILES})
 endif()
 
+
+if(Enable_Pocketoffset)
 add_subdirectory(pocketoffset)
+endif()
+
+if(Enable_Profile)
 add_subdirectory(profile)
+endif()
+
+if(Enable_Drill)
 add_subdirectory(drill)
+endif()
 
+if(Enable_Hatching)
 add_subdirectory(hatching)
+endif()
+
+if(Enable_Pocketraster)
 add_subdirectory(pocketraster)
+endif()
+
+if(Enable_Voroni)
 add_subdirectory(voroni)
+endif()
 
+if(Enable_Thermal)
 add_subdirectory(thermal)
+endif()
 
+if(Enable_Thread)
 # add_subdirectory(thread)
+endif()
+
 

plugins/shape/CMakeLists.txt

@@ -50,9 +50,23 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
     Qt${QT_VERSION_MAJOR}::Widgets
 )
 
+if(Enable_Circle)
 add_subdirectory(circle)
+endif()
+
+if(Enable_Circlearc)
 add_subdirectory(circlearc)
+endif()
+
+if(Enable_Polyline)
 add_subdirectory(polyline)
+endif()
+
+if(Enable_Rectangle)
 add_subdirectory(rectangle)
+endif()
+
+if(Enable_Text)
 add_subdirectory(text)
+endif()
 

static_libs/common/CMakeLists.txt

@@ -21,7 +21,7 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 
-find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui Widgets REQUIRED)
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui Widgets Qml REQUIRED)
 
 file(GLOB HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
 file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
@@ -39,6 +39,7 @@ target_link_libraries(common PRIVATE
     gi
     graphicsview
     Qt${QT_VERSION_MAJOR}::Core
+    Qt${QT_VERSION_MAJOR}::Qml
     Qt${QT_VERSION_MAJOR}::Gui
     Qt${QT_VERSION_MAJOR}::Widgets
 )