Add blockSection property to Monitor

Author: adazem009

include/scratchcpp/monitor.h

@@ -12,6 +12,7 @@ namespace libscratchcpp
 class IMonitorHandler;
 class Block;
 class Script;
+class IBlockSection;
 class Sprite;
 class Value;
 class Rect;
@@ -44,6 +45,8 @@ class LIBSCRATCHCPP_EXPORT Monitor : public Entity
         std::shared_ptr<Script> script() const;
         void setScript(std::shared_ptr<Script> script);
 
+        std::shared_ptr<IBlockSection> blockSection() const;
+
         Sprite *sprite() const;
         void setSprite(Sprite *sprite);
 

src/engine/internal/engine.cpp

@@ -138,6 +138,8 @@ void Engine::resolveIds()
         if (container)
             block->setCompileFunction(container->resolveBlockCompileFunc(block->opcode()));
 
+        monitor->impl->blockSection = blockSection(monitor->opcode());
+
         const auto &fields = block->fields();
         Target *target;
 
@@ -1436,6 +1438,8 @@ void Engine::addVarOrListMonitor(std::shared_ptr<Monitor> monitor, Target *targe
     if (!target->isStage())
         monitor->setSprite(dynamic_cast<Sprite *>(target));
 
+    monitor->impl->blockSection = blockSection(monitor->opcode());
+
     // Auto-position the monitor
     Rect rect = Monitor::getInitialPosition(m_monitors, monitor->width(), monitor->height());
     monitor->setX(rect.left());

src/scratch/monitor.cpp

@@ -62,6 +62,15 @@ void Monitor::setScript(std::shared_ptr<Script> script)
     impl->script = script;
 }
 
+/*
+ * Returns the block section of this monitor.
+ * \note This will return nullptr by default. Add the monitor to a project to set this property.
+ */
+std::shared_ptr<IBlockSection> Monitor::blockSection() const
+{
+    return impl->blockSection;
+}
+
 /*! Convenience method which calls block()->target(). */
 Sprite *Monitor::sprite() const
 {

src/scratch/monitor_p.h

@@ -19,6 +19,7 @@ struct MonitorPrivate
         IMonitorHandler *iface = nullptr;
         Monitor::Mode mode = Monitor::Mode::Default;
         std::shared_ptr<Script> script;
+        std::shared_ptr<IBlockSection> blockSection;
         std::shared_ptr<Block> block; // Compiler needs shared_ptr
         unsigned int width = 0;
         unsigned int height = 0;

test/engine/engine_test.cpp

@@ -138,6 +138,10 @@ TEST(EngineTest, CompileAndExecuteMonitors)
     ASSERT_EQ(script2->target(), sprite.get());
     ASSERT_EQ(script2->topBlock(), m2->block());
 
+    ASSERT_EQ(m1->blockSection(), section);
+    ASSERT_EQ(m2->blockSection(), section);
+    ASSERT_FALSE(m3->blockSection());
+
     // Execute the monitor blocks
     MonitorHandlerMock iface1, iface2, iface3;
     EXPECT_CALL(iface1, init);