feat(parameters): add defaults and remove qt keywords

CMakeLists.txt

@@ -54,6 +54,7 @@ set(GUI_SOURCES
 # qt
 find_package(Qt6 REQUIRED COMPONENTS Core Widgets SvgWidgets OpenGLWidgets)
 qt_standard_project_setup()
+ADD_DEFINITIONS(-DQT_NO_KEYWORDS)
 
 # glm
 find_package(glm REQUIRED)

src/Engine/Network/NetworkManager.h

@@ -42,7 +42,7 @@ private:
     enzo::nt::OpId maxOpId_=0;
     // operator selected for displaying in the viewport
     std::optional<OpId> displayOp_=std::nullopt;
-signals:
+Q_SIGNALS:
     void updateDisplay(enzo::geo::Geometry& geometry);
 
 };

src/Engine/Parameter/Parameter.cpp

@@ -5,6 +5,7 @@
 enzo::prm::Parameter::Parameter(Template prmTemplate)
 : template_{prmTemplate}
 {
+    floatValue_ = prmTemplate.getDefault();
     std::cout << "created new parameter: " << prmTemplate.getName() << "\n";
 }
 

src/Engine/Parameter/Template.cpp

@@ -1,8 +1,8 @@
 #include "Engine/Parameter/Template.h"
 #include "Engine/Parameter/Type.h"
 
-enzo::prm::Template::Template(enzo::prm::Type type, const char* name)
+enzo::prm::Template::Template(enzo::prm::Type type, const char* name, bt::floatT theDefault)
-: type_{type}, name_{name}
+: type_{type}, name_{name}, default_{theDefault}
 {
     
 }
@@ -18,6 +18,11 @@ bool enzo::prm::Template::isValid() const
 
 }
 
+const enzo::bt::floatT enzo::prm::Template::getDefault() const
+{
+    return default_;
+}
+
 const char* enzo::prm::Template::getName() const
 {
     return name_;

src/Engine/Parameter/Template.h

@@ -1,5 +1,6 @@
 #pragma once
 #include "Engine/Parameter/Type.h"
+#include "Engine/Types.h"
 
 namespace enzo::prm
 {
@@ -7,12 +8,19 @@ namespace enzo::prm
 class Template
 {
 public:
-    Template(enzo::prm::Type type, const char* name);
+    Template(
+        enzo::prm::Type type,
+        const char* name,
+        // TODO: change default to class that can store multiple types
+        bt::floatT theDefault
+    );
     Template();
     const char* getName() const;
+    const bt::floatT getDefault() const;
     bool isValid() const;
 private:
     enzo::prm::Type type_;
+    bt::floatT default_;
     // TODO: make a class that holds token and name
     const char* name_;
 

src/Gui/Network/TabMenu.h

@@ -59,7 +59,7 @@ protected:
     void focusOutEvent(QFocusEvent *event) override;
     bool event(QEvent *event) override;
     // void resizeEvent(QResizeEvent *event) override;
-protected slots:
+protected Q_SLOTS:
     void nodeClicked();
 };
 

src/Gui/Parameters/AbstractFormParm.cpp

@@ -16,7 +16,6 @@ enzo::ui::AbstractFormParm::AbstractFormParm(std::weak_ptr<prm::Parameter> param
         label->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
 
         auto slider = new AbstractSliderParm();
-        connect(slider, &AbstractSliderParm::valueChanged, this, &AbstractFormParm::changeValue); 
         slider->setValue(sharedParameter->evalFloat());
 
         mainLayout_ = new QHBoxLayout();
@@ -28,6 +27,8 @@ enzo::ui::AbstractFormParm::AbstractFormParm(std::weak_ptr<prm::Parameter> param
         setProperty("class", "Parameter");
         setStyleSheet(".Parameter { background-color: none;}");
         setLayout(mainLayout_);
+
+        connect(slider, &AbstractSliderParm::valueChanged, this, &AbstractFormParm::changeValue); 
     }
 
 }

src/Gui/Parameters/AbstractFormParm.h

@@ -2,6 +2,7 @@
 #include <QWidget>
 #include <QHBoxLayout>
 #include <memory>
+#include <qtmetamacros.h>
 
 namespace enzo::ui
 {
@@ -9,13 +10,13 @@ namespace enzo::ui
 class AbstractFormParm
 : public QWidget
 {
+    Q_OBJECT
 public:
     AbstractFormParm(std::weak_ptr<prm::Parameter> parameter);
 
-protected slots:
+protected Q_SLOTS:
     void changeValue(bt::floatT value);
 
-
 private:
     QHBoxLayout* mainLayout_;
     std::weak_ptr<prm::Parameter> parameter_;

src/Gui/Parameters/AbstractSliderParm.h

@@ -15,7 +15,7 @@ public:
     AbstractSliderParm(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
     void setValue(bt::floatT value);
 
-signals:
+Q_SIGNALS:
     void valueChanged(bt::floatT value); 
 
 private:

src/Gui/ParametersPanel/ParametersPanel.h

@@ -8,7 +8,7 @@ class ParametersPanel
 {
 public:
     ParametersPanel(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
-public slots:
+public Q_SLOTS:
     void selectionChanged();
 private:
     QVBoxLayout* mainLayout_;

src/Gui/Viewport/Viewport.h

@@ -23,6 +23,6 @@ private:
     QPointF leftStartPos_;
     bool rightMouseDown_=false;
     QPointF rightStartPos_;
-public slots:
+public Q_SLOTS:
     void geometryChanged(enzo::geo::Geometry& geometry);
 };

src/Gui/Viewport/ViewportGLWidget.h

@@ -25,6 +25,6 @@ protected:
     void resizeGL(int w, int h) override;
     void paintGL() override;
 
-public slots:
+public Q_SLOTS:
     void geometryChanged(enzo::geo::Geometry& geometry);
 };

src/OpDefs/GopHouse.cpp

@@ -48,7 +48,7 @@ void GOP_house::cookOp(enzo::op::Context context)
         for(int i=0; i<PAttrHandle.getAllValues().size(); ++i)
         {
             enzo::bt::Vector3 vector = PAttrHandle.getValue(i);
-            vector.x()+=2.5;
+            vector*=context.evalFloatParm("size");
             PAttrHandle.setValue(i, vector);
         }
         // ----
@@ -69,18 +69,10 @@ void GOP_house::cookOp(enzo::op::Context context)
         setOutputGeometry(0, geo);
     }
 
-    // if(outputRequested(1))
-    // {
-    //     // create new geometry
-    //     const geo::Geometry& geo1 = getInputGeoView(0);
-    //     geo::Geometry geo2;
-
-    //     setOutputGeometry(1, geo2);
-    // }
 }
 
 enzo::prm::Template GOP_house::parameterList[] =
 {
-    enzo::prm::Template(enzo::prm::Type::FLOAT, "Size"),
+    enzo::prm::Template(enzo::prm::Type::FLOAT, "size", 1),
     enzo::prm::Terminator
 };

src/OpDefs/GopTransform.cpp

@@ -43,9 +43,9 @@ void GopTransform::cookOp(enzo::op::Context context)
 
 enzo::prm::Template GopTransform::parameterList[] = 
 {
-    enzo::prm::Template(enzo::prm::Type::FLOAT, "translateX"),
+    enzo::prm::Template(enzo::prm::Type::FLOAT, "translateX", 0),
-    enzo::prm::Template(enzo::prm::Type::FLOAT, "translateY"),
+    enzo::prm::Template(enzo::prm::Type::FLOAT, "translateY", 0),
-    enzo::prm::Template(enzo::prm::Type::FLOAT, "translateZ"),
+    enzo::prm::Template(enzo::prm::Type::FLOAT, "translateZ", 0),
     enzo::prm::Terminator
 };