Update monitor value change handlers

Author: adazem009

src/listmonitormodel.cpp

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
-#include <scratchcpp/virtualmachine.h>
+#include <scratchcpp/value.h>
 
 #include "listmonitormodel.h"
 #include "listmonitorlistmodel.h"
@@ -18,13 +18,10 @@ ListMonitorModel::ListMonitorModel(libscratchcpp::IExtension *extension, QObject
     m_listModel = new ListMonitorListModel(this);
 }
 
-void ListMonitorModel::onValueChanged(const libscratchcpp::VirtualMachine *vm)
+void ListMonitorModel::onValueChanged(const libscratchcpp::Value &value)
 {
-    if (vm->registerCount() == 1) {
-        long index = vm->getInput(0, 1)->toLong();
-        libscratchcpp::List *list = vm->lists()[index];
-        m_listModel->setList(list, m_minIndex, m_maxIndex);
-    }
+    libscratchcpp::List *list = (libscratchcpp::List *)value.toPointer();
+    m_listModel->setList(list, m_minIndex, m_maxIndex);
 }
 
 MonitorModel::Type ListMonitorModel::type() const

src/listmonitormodel.h

@@ -25,7 +25,7 @@ class ListMonitorModel : public MonitorModel
         ListMonitorModel(QObject *parent = nullptr);
         ListMonitorModel(libscratchcpp::IExtension *extension, QObject *parent = nullptr);
 
-        void onValueChanged(const libscratchcpp::VirtualMachine *vm) override;
+        void onValueChanged(const libscratchcpp::Value &value) override;
 
         Type type() const override;
 

src/monitormodel.h

@@ -47,7 +47,7 @@ class MonitorModel
 
         void init(libscratchcpp::Monitor *monitor) override final;
 
-        virtual void onValueChanged(const libscratchcpp::VirtualMachine *vm) override { }
+        virtual void onValueChanged(const libscratchcpp::Value &value) override { }
         void onVisibleChanged(bool visible) override final;
         void onXChanged(int x) override final;
         void onYChanged(int y) override final;

src/valuemonitormodel.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
-#include <scratchcpp/virtualmachine.h>
 #include <scratchcpp/monitor.h>
+#include <scratchcpp/value.h>
 
 #include "valuemonitormodel.h"
 
@@ -21,12 +21,10 @@ ValueMonitorModel::ValueMonitorModel(IExtension *extension, QObject *parent) :
 {
 }
 
-void ValueMonitorModel::onValueChanged(const VirtualMachine *vm)
+void ValueMonitorModel::onValueChanged(const libscratchcpp::Value &value)
 {
-    if (vm->registerCount() == 1) {
-        m_value = QString::fromStdString(vm->getInput(0, 1)->toString());
-        emit valueChanged();
-    }
+    m_value = QString::fromStdString(value.toString());
+    emit valueChanged();
 }
 
 MonitorModel::Type ValueMonitorModel::type() const

src/valuemonitormodel.h

@@ -30,7 +30,7 @@ class ValueMonitorModel : public MonitorModel
         ValueMonitorModel(QObject *parent = nullptr);
         ValueMonitorModel(libscratchcpp::IExtension *extension, QObject *parent = nullptr);
 
-        void onValueChanged(const libscratchcpp::VirtualMachine *vm) override;
+        void onValueChanged(const libscratchcpp::Value &value) override;
 
         Type type() const override;
 

test/monitor_models/listmonitormodel_test.cpp

@@ -1,5 +1,4 @@
 #include <QtTest/QSignalSpy>
-#include <scratchcpp/virtualmachine.h>
 #include <scratchcpp/list.h>
 #include <listmonitormodel.h>
 #include <listmonitorlistmodel.h>
@@ -29,7 +28,6 @@ TEST(ListMonitorModelTest, OnValueChanged)
     ListMonitorModel model;
     ListMonitorListModel *listModel = model.listModel();
     QSignalSpy dataChangedSpy(listModel, &ListMonitorListModel::dataChanged);
-    VirtualMachine vm;
 
     List list1("", "");
     list1.append(1);
@@ -46,38 +44,26 @@ TEST(ListMonitorModelTest, OnValueChanged)
     list3.append(2);
     list3.append(3);
 
-    List *lists[] = { &list1, &list2, &list3 };
-    vm.setLists(lists);
-
-    vm.addReturnValue(1);
-    model.onValueChanged(&vm);
+    model.onValueChanged(&list2);
     ASSERT_EQ(listModel->rowCount(QModelIndex()), 4);
 
-    vm.reset();
-    vm.addReturnValue(2);
-    model.onValueChanged(&vm);
+    model.onValueChanged(&list3);
     ASSERT_EQ(listModel->rowCount(QModelIndex()), 3);
 
-    vm.reset();
-    vm.addReturnValue(2);
     model.setMinIndex(0);
     model.setMaxIndex(3);
-    model.onValueChanged(&vm);
+    model.onValueChanged(&list3);
     ASSERT_EQ(listModel->rowCount(QModelIndex()), 3);
     ASSERT_EQ(dataChangedSpy.count(), 4);
 
     dataChangedSpy.clear();
-    vm.reset();
-    vm.addReturnValue(2);
     model.setMinIndex(1);
     model.setMaxIndex(2);
-    model.onValueChanged(&vm);
+    model.onValueChanged(&list3);
     ASSERT_EQ(listModel->rowCount(QModelIndex()), 3);
     ASSERT_EQ(dataChangedSpy.count(), 2);
 
-    vm.reset();
-    vm.addReturnValue(0);
-    model.onValueChanged(&vm);
+    model.onValueChanged(&list1);
     ASSERT_EQ(listModel->rowCount(QModelIndex()), 2);
 }
 

test/monitor_models/valuemonitormodel_test.cpp

@@ -1,6 +1,5 @@
 #include <QtTest/QSignalSpy>
 #include <scratchcpp/monitor.h>
-#include <scratchcpp/virtualmachine.h>
 #include <scratchcpp/block.h>
 #include <scratchcpp/comment.h>
 #include <valuemonitormodel.h>
@@ -29,16 +28,12 @@ TEST(ValueMonitorModelTest, OnValueChanged)
 {
     ValueMonitorModel model;
     QSignalSpy spy(&model, &ValueMonitorModel::valueChanged);
-    VirtualMachine vm;
 
-    vm.addReturnValue(5.4);
-    model.onValueChanged(&vm);
+    model.onValueChanged(5.4);
     ASSERT_EQ(model.value(), "5.4");
     ASSERT_EQ(spy.count(), 1);
 
-    vm.reset();
-    vm.addReturnValue("test");
-    model.onValueChanged(&vm);
+    model.onValueChanged("test");
     ASSERT_EQ(model.value(), "test");
     ASSERT_EQ(spy.count(), 2);
 }