propvis scripting: add vector prop support + refactor

ScriptObjects/ScriptSettings.cc

@@ -15,21 +15,33 @@
 
 ScriptSettings::ScriptSettings(QWidget *widget)
 {
-    if (widget == nullptr)
-        return;
-    connect(widget, &QWidget::destroyed,
-            this,   &QObject::deleteLater);
+    if (widget) {
+        connect(widget, &QWidget::destroyed,
+                this,   &QObject::deleteLater);
+    }
 }
 
 QScriptValue createSettingsScriptObject(QScriptContext *ctx, QWidget *widget)
 {
     QScriptEngine *engine = ctx->engine();
-    auto bw = dynamic_cast<BooleanWidget*>(widget);
-    if (bw) {return engine->newQObject(new ScriptSettingsBoolean(bw)); }
-    auto dw = dynamic_cast<DoubleWidget*>(widget);
-    if (dw) {return engine->newQObject(new ScriptSettingsDouble(dw)); }
-    auto dv = dynamic_cast<VectorWidget*>(widget);
-    if (dv) {return engine->newQObject(new ScriptSettingsVector(dv)); }
-    // not implemented:
-    return QScriptValue::SpecialValue::NullValue;
+    ScriptSettings *obj = nullptr;
+    if (auto w = dynamic_cast<BooleanWidget*>(widget)) {
+        obj = new ScriptSettingsBoolean(w);
+    }
+    else if (auto w = dynamic_cast<DoubleWidget*>(widget)) {
+        obj = new ScriptSettingsDouble(w);
+    }
+    else if (auto w = dynamic_cast<VectorWidget*>(widget)) {
+        obj = new ScriptSettingsVector(w);
+    }
+
+    if (!obj) { // no ScriptSettings class implemented for this widget
+        return QScriptValue::SpecialValue::NullValue;
+    }
+    return engine->newQObject(obj,
+                              QScriptEngine::QtOwnership,
+                              QScriptEngine::ExcludeSuperClassMethods
+                              | QScriptEngine::ExcludeSuperClassProperties
+                              | QScriptEngine::ExcludeChildObjects
+                              );
 }

ScriptObjects/ScriptSettingsVector.cc

 #include "ScriptSettingsVector.hh"
+#include "ACG/Utils/ColorConversion.hh"
 
 ScriptSettingsVector::ScriptSettingsVector()
     : ScriptSettings(nullptr),
@@ -20,3 +21,79 @@ ScriptSettingsVector::ScriptSettingsVector(
 
 ScriptSettingsVector::~ScriptSettingsVector()
 {}
+
+
+ScriptSettingsVector::Type ScriptSettingsVector::type() const
+{
+    if (widget_->vectors_edges_rb->isChecked()) {
+        return Type::Edges;
+    }
+    if (widget_->vectors_strokes_rb->isChecked()) {
+        return Type::Strokes;
+    }
+    if (widget_->vectors_length_color_rb->isChecked()) {
+        return Type::LengthColor;
+    }
+    if (widget_->vectors_colors_rb->isChecked()) {
+        return Type::Rgb;
+    }
+    throw std::logic_error("No radiobutton selected?!");
+}
+
+void ScriptSettingsVector::setType(ScriptSettingsVector::Type type)
+{
+    switch(type)
+    {
+    case Type::Edges:
+        widget_->vectors_edges_rb->setChecked(true);
+        break;
+    case Type::Strokes:
+        widget_->vectors_strokes_rb->setChecked(true);
+        break;
+    case Type::LengthColor:
+        widget_->vectors_length_color_rb->setChecked(true);
+        break;
+    case Type::Rgb:
+        widget_->vectors_colors_rb->setChecked(true);
+        break;
+    }
+}
+
+bool ScriptSettingsVector::normalize() const
+{
+    return widget_->normalize->isChecked();
+}
+void ScriptSettingsVector::setNormalize(bool normalize)
+{
+    widget_->normalize->setChecked(normalize);
+}
+
+bool ScriptSettingsVector::doScale() const
+{
+    return widget_->scale ->isChecked();
+}
+
+void ScriptSettingsVector::setDoScale(bool doScale)
+{
+    widget_->scale ->setChecked(doScale);
+}
+
+double ScriptSettingsVector::scaleFactor() const
+{
+    return  widget_->scaleBox->value();
+}
+
+void ScriptSettingsVector::setScaleFactor(double scaleFactor)
+{
+    widget_->scaleBox->setValue(scaleFactor);
+}
+
+Vector4 ScriptSettingsVector::lineColor() const
+{
+    return ACG::to_Vec4d(widget_->lineColor->color());
+}
+
+void ScriptSettingsVector::setLineColor(Vector4 lineColor)
+{
+    widget_->lineColor->setColor(ACG::to_QColor(lineColor));
+}

ScriptObjects/ScriptSettingsVector.hh

@@ -12,16 +12,34 @@ class ScriptSettingsVector : public ScriptSettings
 {
     Q_OBJECT
 
-    //Q_PROPERTY(Vector4 colorTrue  READ colorTrue  WRITE setColorTrue )
+    Q_PROPERTY(Type    type         READ type         WRITE setType)
+    Q_PROPERTY(bool    normalize    READ normalize    WRITE setNormalize)
+    Q_PROPERTY(bool    doScale      READ doScale      WRITE setDoScale)
+    Q_PROPERTY(double  scaleFactor  READ scaleFactor  WRITE setScaleFactor)
+    Q_PROPERTY(Vector4 lineColor    READ lineColor    WRITE setLineColor)
 
 public:
+    enum class Type {Strokes, Rgb, Edges, LengthColor};
+    Q_ENUM(Type)
+
     explicit ScriptSettingsVector();
     explicit ScriptSettingsVector(VectorWidget *widget);
     explicit ScriptSettingsVector(const ScriptSettingsVector &other);
     virtual ~ScriptSettingsVector();
-signals:
+
+    Type type() const;
+    bool normalize() const;
+    bool doScale() const;
+    double scaleFactor() const;
+    Vector4 lineColor() const;
 
 public slots:
+    void setType(Type type);
+    void setNormalize(bool normalize);
+    void setDoScale(bool doScale);
+    void setScaleFactor(double scaleFactor);
+    void setLineColor(Vector4 lineColor);
+
 private:
     VectorWidget *widget_;
 };