Update dspxmodel

Author: CrSjimo

src/libs/application/dspxmodel/src/AnchorNode.cpp

@@ -1,7 +1,6 @@
 #include "AnchorNode.h"
 #include "AnchorNode_p.h"
 
-#include <QJSEngine>
 #include <QVariant>
 
 #include <opendspx/anchornode.h>
@@ -12,36 +11,6 @@
 
 namespace dspx {
 
-    void AnchorNodePrivate::setInterpUnchecked(AnchorNode::InterpolationMode interp_) {
-        Q_Q(AnchorNode);
-        q->model()->strategy()->setEntityProperty(q->handle(), ModelStrategy::P_Type, QVariant::fromValue(interp_));
-    }
-
-    void AnchorNodePrivate::setInterp(AnchorNode::InterpolationMode interp_) {
-        Q_Q(AnchorNode);
-        if ((interp_ != AnchorNode::None && interp_ != AnchorNode::Linear && interp_ != AnchorNode::Hermite)) {
-            if (auto engine = qjsEngine(q))
-                engine->throwError(QJSValue::RangeError, QStringLiteral("Interpolation mode must be one of None, Linear, or Hermite"));
-            return;
-        }
-        setInterpUnchecked(interp_);
-    }
-
-    void AnchorNodePrivate::setXUnchecked(int x_) {
-        Q_Q(AnchorNode);
-        q->model()->strategy()->setEntityProperty(q->handle(), ModelStrategy::P_Position, x_);
-    }
-
-    void AnchorNodePrivate::setX(int x_) {
-        Q_Q(AnchorNode);
-        if (x_ < 0) {
-            if (auto engine = qjsEngine(q))
-                engine->throwError(QJSValue::RangeError, QStringLiteral("Position must be greater or equal to 0"));
-            return;
-        }
-        setXUnchecked(x_);
-    }
-
     void AnchorNodePrivate::setAnchorNodeSequence(AnchorNode *item, AnchorNodeSequence *anchorNodeSequence) {
         auto d = item->d_func();
         if (d->anchorNodeSequence != anchorNodeSequence) {
@@ -70,7 +39,7 @@ namespace dspx {
     void AnchorNode::setInterp(InterpolationMode interp) {
         Q_D(AnchorNode);
         Q_ASSERT(interp == None || interp == Linear || interp == Hermite);
-        d->setInterpUnchecked(interp);
+        model()->strategy()->setEntityProperty(handle(), ModelStrategy::P_Type, QVariant::fromValue(interp));
     }
 
     int AnchorNode::x() const {
@@ -81,7 +50,7 @@ namespace dspx {
     void AnchorNode::setX(int x) {
         Q_D(AnchorNode);
         Q_ASSERT(x >= 0);
-        d->setXUnchecked(x);
+        model()->strategy()->setEntityProperty(handle(), ModelStrategy::P_Position, x);
     }
 
     int AnchorNode::y() const {

src/libs/application/dspxmodel/src/AnchorNode.h

@@ -22,8 +22,8 @@ namespace dspx {
         QML_ELEMENT
         QML_UNCREATABLE("")
         Q_DECLARE_PRIVATE(AnchorNode)
-        Q_PRIVATE_PROPERTY(d_func(), InterpolationMode interp MEMBER interp WRITE setInterp NOTIFY interpChanged)
-        Q_PRIVATE_PROPERTY(d_func(), int x MEMBER x WRITE setX NOTIFY xChanged)
+        Q_PROPERTY(InterpolationMode interp READ interp WRITE setInterp NOTIFY interpChanged)
+        Q_PROPERTY(int x READ x WRITE setX NOTIFY xChanged)
         Q_PROPERTY(int y READ y WRITE setY NOTIFY yChanged)
         Q_PROPERTY(AnchorNodeSequence *anchorNodeSequence READ anchorNodeSequence NOTIFY anchorNodeSequenceChanged)
 

src/libs/application/dspxmodel/src/AnchorNode_p.h

@@ -14,10 +14,7 @@ namespace dspx {
         int y;
         AnchorNodeSequence *anchorNodeSequence{};
 
-        void setInterpUnchecked(AnchorNode::InterpolationMode interp_);
-        void setInterp(AnchorNode::InterpolationMode interp_);
-        void setXUnchecked(int x_);
-        void setX(int x_);
+
 
         static void setAnchorNodeSequence(AnchorNode *item, AnchorNodeSequence *anchorNodeSequence);
     };

src/libs/application/dspxmodel/src/ClipTime.cpp

@@ -1,6 +1,4 @@
 #include "ClipTime.h"
-
-#include <QJSEngine>
 #include <QVariant>
 
 #include <opendspx/cliptime.h>
@@ -21,59 +19,9 @@ namespace dspx {
         int length;
         int clipStart;
         int clipLen;
-
-        void setLengthUnchecked(int length_);
-        void setLength(int length_);
-        void setClipStartUnchecked(int clipStart_);
-        void setClipStart(int clipStart_);
-        void setClipLenUnchecked(int clipLen_);
-        void setClipLen(int clipLen_);
     };
 
-    void ClipTimePrivate::setLengthUnchecked(int length_) {
-        Q_Q(ClipTime);
-        pModel->strategy->setEntityProperty(handle, ModelStrategy::P_Length, length_);
-    }
-
-    void ClipTimePrivate::setLength(int length_) {
-        Q_Q(ClipTime);
-        if (length_ < 0) {
-            if (auto engine = qjsEngine(q))
-                engine->throwError(QJSValue::RangeError, QStringLiteral("Length must be greater than or equal to 0"));
-            return;
-        }
-        setLengthUnchecked(length_);
-    }
-
-    void ClipTimePrivate::setClipStartUnchecked(int clipStart_) {
-        Q_Q(ClipTime);
-        pModel->strategy->setEntityProperty(handle, ModelStrategy::P_ClipStart, clipStart_);
-    }
 
-    void ClipTimePrivate::setClipStart(int clipStart_) {
-        Q_Q(ClipTime);
-        if (clipStart_ < 0) {
-            if (auto engine = qjsEngine(q))
-                engine->throwError(QJSValue::RangeError, QStringLiteral("ClipStart must be greater than or equal to 0"));
-            return;
-        }
-        setClipStartUnchecked(clipStart_);
-    }
-
-    void ClipTimePrivate::setClipLenUnchecked(int clipLen_) {
-        Q_Q(ClipTime);
-        pModel->strategy->setEntityProperty(handle, ModelStrategy::P_ClipLength, clipLen_);
-    }
-
-    void ClipTimePrivate::setClipLen(int clipLen_) {
-        Q_Q(ClipTime);
-        if (clipLen_ < 0) {
-            if (auto engine = qjsEngine(q))
-                engine->throwError(QJSValue::RangeError, QStringLiteral("ClipLen must be greater than or equal to 0"));
-            return;
-        }
-        setClipLenUnchecked(clipLen_);
-    }
 
     ClipTime::ClipTime(Handle handle, Model *model) : QObject(model), d_ptr(new ClipTimePrivate) {
         Q_D(ClipTime);
@@ -106,7 +54,7 @@ namespace dspx {
     void ClipTime::setLength(int length) {
         Q_D(ClipTime);
         Q_ASSERT(length >= 0);
-        d->setLengthUnchecked(length);
+        d->pModel->strategy->setEntityProperty(d->handle, ModelStrategy::P_Length, length);
     }
 
     int ClipTime::clipStart() const {
@@ -117,7 +65,7 @@ namespace dspx {
     void ClipTime::setClipStart(int clipStart) {
         Q_D(ClipTime);
         Q_ASSERT(clipStart >= 0);
-        d->setClipStartUnchecked(clipStart);
+        d->pModel->strategy->setEntityProperty(d->handle, ModelStrategy::P_ClipStart, clipStart);
     }
 
     int ClipTime::clipLen() const {
@@ -128,7 +76,7 @@ namespace dspx {
     void ClipTime::setClipLen(int clipLen) {
         Q_D(ClipTime);
         Q_ASSERT(clipLen >= 0);
-        d->setClipLenUnchecked(clipLen);
+        d->pModel->strategy->setEntityProperty(d->handle, ModelStrategy::P_ClipLength, clipLen);
     }
 
     QDspx::ClipTime ClipTime::toQDspx() const {

src/libs/application/dspxmodel/src/ClipTime.h

@@ -24,9 +24,9 @@ namespace dspx {
         QML_UNCREATABLE("")
         Q_DECLARE_PRIVATE(ClipTime)
         Q_PROPERTY(int start READ start WRITE setStart NOTIFY startChanged)
-        Q_PRIVATE_PROPERTY(d_func(), int length MEMBER length WRITE setLength NOTIFY lengthChanged)
-        Q_PRIVATE_PROPERTY(d_func(), int clipStart MEMBER clipStart WRITE setClipStart NOTIFY clipStartChanged)
-        Q_PRIVATE_PROPERTY(d_func(), int clipLen MEMBER clipLen WRITE setClipLen NOTIFY clipLenChanged)
+        Q_PROPERTY(int length READ length WRITE setLength NOTIFY lengthChanged)
+        Q_PROPERTY(int clipStart READ clipStart WRITE setClipStart NOTIFY clipStartChanged)
+        Q_PROPERTY(int clipLen READ clipLen WRITE setClipLen NOTIFY clipLenChanged)
 
     public:
         ~ClipTime() override;

src/libs/application/dspxmodel/src/Control.cpp

@@ -1,6 +1,4 @@
 #include "Control.h"
-
-#include <QJSEngine>
 #include <QVariant>
 
 #include <dspxmodel/ModelStrategy.h>
@@ -19,42 +17,10 @@ namespace dspx {
         double pan;
         bool mute;
 
-        void setGainUnchecked(double gain_);
-        void setGain(double gain_);
 
-        void setPanUnchecked(double pan_);
-        void setPan(double pan_);
     };
 
-    void ControlPrivate::setGainUnchecked(double gain_) {
-        Q_Q(Control);
-        pModel->strategy->setEntityProperty(handle, ModelStrategy::P_ControlGain, gain_);
-    }
-
-    void ControlPrivate::setGain(double gain_) {
-        Q_Q(Control);
-        if ((gain_ < 0)) {
-            if (auto engine = qjsEngine(q))
-                engine->throwError(QJSValue::RangeError, QStringLiteral("Gain must be greater or equal to 0"));
-            return;
-        }
-        setGainUnchecked(gain_);
-    }
 
-    void ControlPrivate::setPanUnchecked(double pan_) {
-        Q_Q(Control);
-        pModel->strategy->setEntityProperty(handle, ModelStrategy::P_ControlPan, pan_);
-    }
-
-    void ControlPrivate::setPan(double pan_) {
-        Q_Q(Control);
-        if ((pan_ < -1 || pan_ > 1)) {
-            if (auto engine = qjsEngine(q))
-                engine->throwError(QJSValue::RangeError, QStringLiteral("Pan must be in range [-1.0, 1.0]"));
-            return;
-        }
-        setPanUnchecked(pan_);
-    }
 
     Control::Control(Handle handle, Model *model) : QObject(model), d_ptr(new ControlPrivate) {
         Q_D(Control);
@@ -76,7 +42,7 @@ namespace dspx {
     void Control::setGain(double gain) {
         Q_D(Control);
         Q_ASSERT(gain >= 0.0);
-        d->setGainUnchecked(gain);
+        d->pModel->strategy->setEntityProperty(d->handle, ModelStrategy::P_ControlGain, gain);
     }
 
     double Control::pan() const {
@@ -87,7 +53,7 @@ namespace dspx {
     void Control::setPan(double pan) {
         Q_D(Control);
         Q_ASSERT(pan >= -1.0 && pan <= 1.0);
-        d->setPanUnchecked(pan);
+        d->pModel->strategy->setEntityProperty(d->handle, ModelStrategy::P_ControlPan, pan);
     }
 
     bool Control::mute() const {

src/libs/application/dspxmodel/src/Control.h

@@ -19,8 +19,8 @@ namespace dspx {
         QML_ELEMENT
         QML_UNCREATABLE("")
         Q_DECLARE_PRIVATE(Control)
-        Q_PRIVATE_PROPERTY(d_func(), double gain MEMBER gain WRITE setGain NOTIFY gainChanged)
-        Q_PRIVATE_PROPERTY(d_func(), double pan MEMBER pan WRITE setPan NOTIFY panChanged)
+        Q_PROPERTY(double gain READ gain WRITE setGain NOTIFY gainChanged)
+        Q_PROPERTY(double pan READ pan WRITE setPan NOTIFY panChanged)
         Q_PROPERTY(bool mute READ mute WRITE setMute NOTIFY muteChanged)
 
     public:

src/libs/application/dspxmodel/src/Global.cpp

@@ -1,6 +1,4 @@
 #include "Global.h"
-
-#include <QJSEngine>
 #include <QVariant>
 
 #include <opendspx/global.h>
@@ -19,28 +17,14 @@ namespace dspx {
         Handle handle;
 
         int centShift() const;
-        void setCentShiftUnchecked(int centShift);
-        void setCentShift(int centShift);
+
     };
 
     int GlobalPrivate::centShift() const {
         return pModel->centShift;
     }
 
-    void GlobalPrivate::setCentShiftUnchecked(int centShift) {
-        Q_Q(Global);
-        pModel->strategy->setEntityProperty(handle, ModelStrategy::P_CentShift, centShift);
-    }
 
-    void GlobalPrivate::setCentShift(int centShift) {
-        Q_Q(Global);
-        if ((centShift < -50 || centShift > 50)) {
-            if (auto engine = qjsEngine(q))
-                engine->throwError(QJSValue::RangeError, QStringLiteral("Cent shift must be in range [-50, 50]"));
-            return;
-        }
-        setCentShiftUnchecked(centShift);
-    }
 
     Global::Global(Model *model) : QObject(model), d_ptr(new GlobalPrivate) {
         Q_D(Global);
@@ -73,7 +57,7 @@ namespace dspx {
     void Global::setCentShift(int centShift) {
         Q_D(Global);
         Q_ASSERT(centShift >= -50 && centShift <= 50);
-        d->setCentShiftUnchecked(centShift);
+        d->pModel->strategy->setEntityProperty(d->handle, ModelStrategy::P_CentShift, centShift);
     }
     QString Global::editorId() const {
         Q_D(const Global);

src/libs/application/dspxmodel/src/Global.h

@@ -26,7 +26,7 @@ namespace dspx {
         Q_DECLARE_PRIVATE(Global)
         Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
         Q_PROPERTY(QString author READ author WRITE setAuthor NOTIFY authorChanged)
-        Q_PRIVATE_PROPERTY(d_func(), int centShift READ centShift WRITE setCentShift NOTIFY centShiftChanged)
+        Q_PROPERTY(int centShift READ centShift WRITE setCentShift NOTIFY centShiftChanged)
         Q_PROPERTY(QString editorId READ editorId WRITE setEditorId NOTIFY editorIdChanged)
         Q_PROPERTY(QString editorName READ editorName WRITE setEditorName NOTIFY editorNameChanged)
 

src/libs/application/dspxmodel/src/Label.cpp

@@ -1,7 +1,5 @@
 #include "Label.h"
 #include "Label_p.h"
-
-#include <QJSEngine>
 #include <QVariant>
 
 #include <opendspx/label.h>
@@ -12,20 +10,7 @@
 
 namespace dspx {
 
-    void LabelPrivate::setPosUnchecked(int pos_) {
-        Q_Q(Label);
-        q->model()->strategy()->setEntityProperty(q->handle(), ModelStrategy::P_Position, pos_);
-    }
 
-    void LabelPrivate::setPos(int pos_) {
-        Q_Q(Label);
-        if (pos_ < -0) {
-            if (auto engine = qjsEngine(q))
-                engine->throwError(QJSValue::RangeError, QStringLiteral("Pos must be greater or equal to 0"));
-            return;
-        }
-        setPosUnchecked(pos_);
-    }
 
     void LabelPrivate::setLabelSequence(Label *item, LabelSequence *labelSequence) {
         auto d = item->d_func();
@@ -53,7 +38,7 @@ namespace dspx {
     void Label::setPos(int pos) {
         Q_D(Label);
         Q_ASSERT(pos >= 0);
-        d->setPosUnchecked(pos);
+        model()->strategy()->setEntityProperty(handle(), ModelStrategy::P_Position, pos);
     }
 
     QString Label::text() const {