Add a way to change monitor values

Author: adazem009

include/scratchcpp/monitor.h

@@ -56,6 +56,9 @@ class LIBSCRATCHCPP_EXPORT Monitor : public Entity
 
         void updateValue(const VirtualMachine *vm);
 
+        void setValueChangeFunction(MonitorChangeFunc f);
+        void changeValue(const Value &newValue);
+
         unsigned int width() const;
         void setWidth(unsigned int width);
 

src/scratch/monitor.cpp

@@ -108,6 +108,32 @@ void Monitor::updateValue(const VirtualMachine *vm)
         impl->iface->onValueChanged(vm);
 }
 
+/*!
+ * Sets the function which is called to change the monitor's value.
+ * \see changeValue()
+ */
+void Monitor::setValueChangeFunction(MonitorChangeFunc f)
+{
+    impl->changeFunc = f;
+}
+
+/*!
+ * Calls the monitor's value update function. For example a variable
+ * monitor's function sets the value of the monitored variable.
+ * \note This doesn't work with list monitors.
+ */
+void Monitor::changeValue(const Value &newValue)
+{
+    if (impl->changeFunc)
+        impl->changeFunc(impl->block.get(), newValue);
+
+    if (impl->iface) {
+        impl->changeValueVM.reset();
+        impl->changeValueVM.addReturnValue(newValue);
+        impl->iface->onValueChanged(&impl->changeValueVM);
+    }
+}
+
 /*! Returns the monitor's width. */
 unsigned int Monitor::width() const
 {

src/scratch/monitor_p.h

@@ -3,7 +3,7 @@
 #pragma once
 
 #include <scratchcpp/monitor.h>
-#include <scratchcpp/script.h>
+#include <scratchcpp/virtualmachine.h>
 
 namespace libscratchcpp
 {
@@ -22,6 +22,8 @@ struct MonitorPrivate
         std::shared_ptr<Script> script;
         std::shared_ptr<IBlockSection> blockSection;
         std::shared_ptr<Block> block; // Compiler needs shared_ptr
+        MonitorChangeFunc changeFunc;
+        VirtualMachine changeValueVM;
         unsigned int width = 0;
         unsigned int height = 0;
         int x = 0;

test/scratch_classes/monitor_test.cpp

@@ -3,6 +3,7 @@
 #include <scratchcpp/sprite.h>
 #include <scratchcpp/rect.h>
 #include <scratchcpp/virtualmachine.h>
+#include <scratchcpp/script.h>
 #include <scratch/monitor_p.h>
 #include <monitorhandlermock.h>
 #include <randomgeneratormock.h>
@@ -12,6 +13,8 @@
 using namespace libscratchcpp;
 
 using ::testing::Return;
+using ::testing::SaveArg;
+using ::testing::_;
 
 static const int PADDING = 5;
 static const int SCREEN_WIDTH = 400;
@@ -110,6 +113,32 @@ TEST(MonitorTest, UpdateValue)
     monitor.updateValue(&vm2);
 }
 
+TEST(MonitorTest, ChangeValue)
+{
+    Monitor monitor("", "test_block");
+    monitor.changeValue(6.2);
+
+    MonitorHandlerMock handler;
+    EXPECT_CALL(handler, init);
+    monitor.setInterface(&handler);
+
+    const VirtualMachine *vm = nullptr;
+    EXPECT_CALL(handler, onValueChanged(_)).WillOnce(SaveArg<0>(&vm));
+    monitor.changeValue(0.25);
+    ASSERT_TRUE(vm);
+    ASSERT_EQ(vm->registerCount(), 1);
+    ASSERT_EQ(vm->getInput(0, 1)->toDouble(), 0.25);
+
+    monitor.setValueChangeFunction([](Block *block, const Value &newValue) { std::cout << block->opcode() + " " + newValue.toString() << std::endl; });
+    EXPECT_CALL(handler, onValueChanged(_)).WillOnce(SaveArg<0>(&vm));
+    testing::internal::CaptureStdout();
+    monitor.changeValue("test");
+    ASSERT_TRUE(vm);
+    ASSERT_EQ(vm->registerCount(), 1);
+    ASSERT_EQ(vm->getInput(0, 1)->toString(), "test");
+    ASSERT_EQ(testing::internal::GetCapturedStdout(), "test_block test\n");
+}
+
 TEST(MonitorTest, Width)
 {
     Monitor monitor("", "");