Add MonitorModel class

Author: adazem009

src/CMakeLists.txt

@@ -18,6 +18,8 @@ qt_add_qml_module(scratchcpp-render
 	stagemodel.h
 	spritemodel.cpp
 	spritemodel.h
+	monitormodel.cpp
+	monitormodel.h
 	irenderedtarget.h
         renderedtarget.cpp
         renderedtarget.h

src/monitormodel.cpp

@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+#include <scratchcpp/monitor.h>
+#include <scratchcpp/sprite.h>
+
+#include "monitormodel.h"
+
+using namespace scratchcpprender;
+
+MonitorModel::MonitorModel(QObject *parent) :
+    QObject(parent)
+{
+}
+
+QString MonitorModel::name() const
+{
+    if (m_monitor) {
+        if (libscratchcpp::Sprite *sprite = m_monitor->sprite())
+            return QString::fromStdString(sprite->name() + ": " + m_monitor->name());
+        else
+            return QString::fromStdString(m_monitor->name());
+    } else
+        return "";
+}
+
+bool MonitorModel::visible() const
+{
+    if (m_monitor)
+        return m_monitor->visible();
+    else
+        return false;
+}
+
+void MonitorModel::init(libscratchcpp::Monitor *monitor)
+{
+    m_monitor = monitor;
+}
+
+void MonitorModel::onVisibleChanged(bool visible)
+{
+    emit visibleChanged();
+}
+
+libscratchcpp::Monitor *MonitorModel::monitor() const
+{
+    return m_monitor;
+}
+
+int MonitorModel::x() const
+{
+    if (m_monitor)
+        return m_monitor->x();
+    else
+        return 0;
+}
+
+int MonitorModel::y() const
+{
+    if (m_monitor)
+        return m_monitor->y();
+    else
+        return 0;
+}
+
+unsigned int MonitorModel::width() const
+{
+    if (m_monitor)
+        return m_monitor->width();
+    else
+        return 0;
+}
+
+void MonitorModel::setWidth(unsigned int newWidth)
+{
+    if (m_monitor) {
+        m_monitor->setWidth(newWidth);
+        emit widthChanged();
+    }
+}
+
+unsigned int MonitorModel::height() const
+{
+    if (m_monitor)
+        return m_monitor->height();
+    else
+        return 0;
+}
+
+void MonitorModel::setHeight(unsigned int newHeight)
+{
+    if (m_monitor) {
+        m_monitor->setHeight(newHeight);
+        emit heightChanged();
+    }
+}

src/monitormodel.h

@@ -0,0 +1,74 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+#pragma once
+
+#include <QObject>
+#include <QQmlEngine>
+#include <scratchcpp/imonitorhandler.h>
+
+namespace scratchcpprender
+{
+
+class MonitorModel
+    : public QObject
+    , public libscratchcpp::IMonitorHandler
+{
+        Q_OBJECT
+        QML_ELEMENT
+        Q_PROPERTY(QString name READ name NOTIFY nameChanged)
+        Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)
+        Q_PROPERTY(Type type READ type NOTIFY typeChanged)
+        Q_PROPERTY(int x READ x NOTIFY xChanged)
+        Q_PROPERTY(int y READ y NOTIFY yChanged)
+        Q_PROPERTY(unsigned int width READ width WRITE setWidth NOTIFY widthChanged)
+        Q_PROPERTY(unsigned int height READ height WRITE setHeight NOTIFY heightChanged)
+
+    public:
+        enum class Type
+        {
+            Invalid,
+            Value,
+            List
+        };
+
+        Q_ENUM(Type)
+
+        MonitorModel(QObject *parent = nullptr);
+
+        void init(libscratchcpp::Monitor *monitor) override final;
+
+        virtual void onValueChanged(const libscratchcpp::VirtualMachine *vm) override { }
+        void onVisibleChanged(bool visible) override final;
+
+        libscratchcpp::Monitor *monitor() const;
+
+        QString name() const;
+
+        bool visible() const;
+
+        virtual Type type() const { return Type::Invalid; }
+
+        int x() const;
+
+        int y() const;
+
+        unsigned int width() const;
+        void setWidth(unsigned int newWidth);
+
+        unsigned int height() const;
+        void setHeight(unsigned int newHeight);
+
+    signals:
+        void visibleChanged();
+        void typeChanged();
+        void xChanged();
+        void yChanged();
+        void widthChanged();
+        void heightChanged();
+        void nameChanged();
+
+    private:
+        libscratchcpp::Monitor *m_monitor = nullptr;
+};
+
+} // namespace scratchcpprender

test/CMakeLists.txt

@@ -28,3 +28,4 @@ add_subdirectory(projectscene)
 add_subdirectory(keyeventhandler)
 add_subdirectory(mouseeventhandler)
 add_subdirectory(scenemousearea)
+add_subdirectory(monitor_models)

test/monitor_models/CMakeLists.txt

@@ -0,0 +1,15 @@
+add_executable(
+  monitormodel_test
+  monitormodel_test.cpp
+)
+
+target_link_libraries(
+  monitormodel_test
+  GTest::gtest_main
+  scratchcpp-render
+  ${QT_LIBS}
+  Qt6::Test
+)
+
+add_test(monitormodel_test)
+gtest_discover_tests(monitormodel_test)

test/monitor_models/monitormodel_test.cpp

@@ -0,0 +1,136 @@
+#include <QtTest/QSignalSpy>
+#include <scratchcpp/monitor.h>
+#include <scratchcpp/sprite.h>
+#include <monitormodel.h>
+
+#include "../common.h"
+
+using namespace scratchcpprender;
+using namespace libscratchcpp;
+
+TEST(MonitorModelTest, Constructors)
+{
+    MonitorModel model1;
+    MonitorModel model2(&model1);
+    ASSERT_EQ(model2.parent(), &model1);
+}
+
+TEST(MonitorModelTest, Init)
+{
+    MonitorModel model;
+    ASSERT_EQ(model.monitor(), nullptr);
+
+    Monitor monitor("", "");
+    model.init(&monitor);
+    ASSERT_EQ(model.monitor(), &monitor);
+}
+
+TEST(MonitorModelTest, OnVisibleChanged)
+{
+    MonitorModel model;
+    QSignalSpy spy(&model, &MonitorModel::visibleChanged);
+
+    model.onVisibleChanged(false);
+    ASSERT_EQ(spy.count(), 1);
+
+    model.onVisibleChanged(true);
+    ASSERT_EQ(spy.count(), 2);
+}
+
+TEST(MonitorModelTest, Name)
+{
+    MonitorModel model;
+    Monitor monitor("", "");
+    // TODO: Use monitor.setName()
+    const_cast<std::string *>(&monitor.name())->assign("days since 2000");
+    model.init(&monitor);
+    ASSERT_EQ(model.name().toStdString(), monitor.name());
+
+    Sprite sprite;
+    sprite.setName("Sprite2");
+    monitor.setSprite(&sprite);
+    // TODO: Use monitor.setName()
+    const_cast<std::string *>(&monitor.name())->assign("x position");
+    ASSERT_EQ(model.name().toStdString(), sprite.name() + ": " + monitor.name());
+}
+
+TEST(MonitorModelTest, Visible)
+{
+    MonitorModel model;
+    Monitor monitor("", "");
+    monitor.setVisible(true);
+    model.init(&monitor);
+    ASSERT_TRUE(model.visible());
+
+    monitor.setVisible(false);
+    ASSERT_FALSE(model.visible());
+
+    monitor.setVisible(false);
+    ASSERT_FALSE(model.visible());
+}
+
+TEST(MonitorModelTest, Type)
+{
+    MonitorModel model;
+    ASSERT_EQ(model.type(), MonitorModel::Type::Invalid);
+}
+
+TEST(MonitorModelTest, X)
+{
+    MonitorModel model;
+    Monitor monitor("", "");
+    monitor.setX(65);
+    model.init(&monitor);
+    ASSERT_EQ(model.x(), 65);
+
+    monitor.setX(-2);
+    ASSERT_EQ(model.x(), -2);
+}
+
+TEST(MonitorModelTest, Y)
+{
+    MonitorModel model;
+    Monitor monitor("", "");
+    monitor.setY(15);
+    model.init(&monitor);
+    ASSERT_EQ(model.y(), 15);
+
+    monitor.setY(-8);
+    ASSERT_EQ(model.y(), -8);
+}
+
+TEST(MonitorModelTest, Width)
+{
+    MonitorModel model;
+    Monitor monitor("", "");
+    QSignalSpy spy(&model, &MonitorModel::widthChanged);
+    monitor.setWidth(20);
+    model.init(&monitor);
+    ASSERT_EQ(model.width(), 20);
+
+    monitor.setWidth(150);
+    ASSERT_EQ(model.width(), 150);
+
+    model.setWidth(87);
+    ASSERT_EQ(model.width(), 87);
+    ASSERT_EQ(monitor.width(), 87);
+    ASSERT_EQ(spy.count(), 1);
+}
+
+TEST(MonitorModelTest, Height)
+{
+    MonitorModel model;
+    Monitor monitor("", "");
+    QSignalSpy spy(&model, &MonitorModel::heightChanged);
+    monitor.setHeight(20);
+    model.init(&monitor);
+    ASSERT_EQ(model.height(), 20);
+
+    monitor.setHeight(150);
+    ASSERT_EQ(model.height(), 150);
+
+    model.setHeight(87);
+    ASSERT_EQ(model.height(), 87);
+    ASSERT_EQ(monitor.height(), 87);
+    ASSERT_EQ(spy.count(), 1);
+}