Fix bugs

Author: CrSjimo

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

@@ -30,6 +30,11 @@ namespace dspx {
     }
 
     void AnchorNodePrivate::setInterp(AnchorNode::InterpolationMode interp_) {
+        Q_Q(AnchorNode);
+        if (auto engine = qjsEngine(q); engine && (interp_ != AnchorNode::None && interp_ != AnchorNode::Linear && interp_ != AnchorNode::Hermite)) {
+            engine->throwError(QJSValue::RangeError, QStringLiteral("Interpolation mode must be one of None, Linear, or Hermite"));
+            return;
+        }
         setInterpUnchecked(interp_);
     }
 
@@ -66,7 +71,8 @@ namespace dspx {
 
     void AnchorNode::setInterp(InterpolationMode interp) {
         Q_D(AnchorNode);
-        d->setInterp(interp);
+        Q_ASSERT(interp == None || interp == Linear || interp == Hermite);
+        d->setInterpUnchecked(interp);
     }
 
     int AnchorNode::x() const {
@@ -77,7 +83,7 @@ namespace dspx {
     void AnchorNode::setX(int x) {
         Q_D(AnchorNode);
         Q_ASSERT(x >= 0);
-        d->setX(x);
+        d->setXUnchecked(x);
     }
 
     int AnchorNode::y() const {
@@ -87,7 +93,7 @@ namespace dspx {
 
     void AnchorNode::setY(int y) {
         Q_D(AnchorNode);
-        model()->strategy()->setEntityProperty(handle(), ModelStrategy::P_Position, y);
+        model()->strategy()->setEntityProperty(handle(), ModelStrategy::P_Value, y);
     }
 
     QDspx::AnchorNode AnchorNode::toQDspx() const {

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

@@ -19,10 +19,27 @@ 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 (auto engine = qjsEngine(q); engine && (gain_ < 0)) {
+            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_);
@@ -56,7 +73,8 @@ namespace dspx {
 
     void Control::setGain(double gain) {
         Q_D(Control);
-        d->pModel->strategy->setEntityProperty(d->handle, ModelStrategy::P_ControlGain, gain);
+        Q_ASSERT(gain >= 0.0);
+        d->setGainUnchecked(gain);
     }
 
     double Control::pan() const {

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

@@ -18,7 +18,7 @@ namespace dspx {
         QML_ELEMENT
         QML_UNCREATABLE("")
         Q_DECLARE_PRIVATE(Control)
-        Q_PROPERTY(double gain READ gain WRITE setGain NOTIFY gainChanged)
+        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(bool mute READ mute WRITE setMute NOTIFY muteChanged)
 

src/libs/application/dspxmodel/src/Model.cpp

@@ -116,6 +116,18 @@ namespace dspx {
                 entityObject->handleSetEntityProperty(property, value);
             }
         });
+
+        QObject::connect(strategy, &ModelStrategy::spliceDataArrayNotified, q, [=, this](Handle entity, int index, int length, const QVariantList &values) {
+            if (auto entityObject = mapToObject(entity)) {
+                entityObject->handleSpliceDataArray(index, length, values);
+            }
+        });
+
+        QObject::connect(strategy, &ModelStrategy::rotateDataArrayNotified, q, [=, this](Handle entity, int leftIndex, int middleIndex, int rightIndex) {
+            if (auto entityObject = mapToObject(entity)) {
+                entityObject->handleRotateDataArray(leftIndex, middleIndex, rightIndex);
+            }
+        });
     }
 
     EntityObject * ModelPrivate::mapToObject(Handle handle) const {

src/libs/application/dspxmodel/src/Note.cpp

@@ -274,6 +274,20 @@ namespace dspx {
                 Q_EMIT posChanged(d->pos);
                 break;
             }
+            case ModelStrategy::P_PronunciationOriginal:
+            case ModelStrategy::P_PronunciationEdited: {
+                ModelPrivate::proxySetEntityPropertyNotify(d->pronunciation, property, value);
+                break;
+            }
+            case ModelStrategy::P_VibratoAmplitude:
+            case ModelStrategy::P_VibratoEnd:
+            case ModelStrategy::P_VibratoFrequency:
+            case ModelStrategy::P_VibratoOffset:
+            case ModelStrategy::P_VibratoPhase:
+            case ModelStrategy::P_VibratoStart: {
+                ModelPrivate::proxySetEntityPropertyNotify(d->vibrato, property, value);
+                break;
+            }
             default:
                 Q_UNREACHABLE();
         }