Implement text bubble methods in StageModel

Author: adazem009

src/stagemodel.cpp

@@ -52,10 +52,29 @@ void StageModel::onGraphicsEffectsCleared()
 
 void StageModel::onBubbleTypeChanged(libscratchcpp::Target::BubbleType type)
 {
+    if (type == libscratchcpp::Target::BubbleType::Say) {
+        if (m_bubbleType == TextBubbleShape::Type::Say)
+            return;
+
+        m_bubbleType = TextBubbleShape::Type::Say;
+    } else {
+        if (m_bubbleType == TextBubbleShape::Type::Think)
+            return;
+
+        m_bubbleType = TextBubbleShape::Type::Think;
+    }
+
+    emit bubbleTypeChanged();
 }
 
 void StageModel::onBubbleTextChanged(const std::string &text)
 {
+    QString newText = QString::fromStdString(text);
+
+    if (m_bubbleText != newText) {
+        m_bubbleText = newText;
+        emit bubbleTextChanged();
+    }
 }
 
 void StageModel::loadCostume()
@@ -86,3 +105,13 @@ void StageModel::setRenderedTarget(IRenderedTarget *newRenderedTarget)
 
     emit renderedTargetChanged();
 }
+
+const TextBubbleShape::Type &StageModel::bubbleType() const
+{
+    return m_bubbleType;
+}
+
+const QString &StageModel::bubbleText() const
+{
+    return m_bubbleText;
+}

src/stagemodel.h

@@ -5,6 +5,8 @@
 #include <QObject>
 #include <scratchcpp/istagehandler.h>
 
+#include "textbubbleshape.h"
+
 Q_MOC_INCLUDE("renderedtarget.h");
 
 namespace scratchcpprender
@@ -18,6 +20,8 @@ class StageModel
 {
         Q_OBJECT
         Q_PROPERTY(IRenderedTarget *renderedTarget READ renderedTarget WRITE setRenderedTarget NOTIFY renderedTargetChanged)
+        Q_PROPERTY(TextBubbleShape::Type bubbleType READ bubbleType NOTIFY bubbleTypeChanged)
+        Q_PROPERTY(QString bubbleText READ bubbleText NOTIFY bubbleTextChanged)
 
     public:
         explicit StageModel(QObject *parent = nullptr);
@@ -43,12 +47,20 @@ class StageModel
         IRenderedTarget *renderedTarget() const;
         void setRenderedTarget(IRenderedTarget *newRenderedTarget);
 
+        const TextBubbleShape::Type &bubbleType() const;
+
+        const QString &bubbleText() const;
+
     signals:
         void renderedTargetChanged();
+        void bubbleTypeChanged();
+        void bubbleTextChanged();
 
     private:
         libscratchcpp::Stage *m_stage = nullptr;
         IRenderedTarget *m_renderedTarget = nullptr;
+        TextBubbleShape::Type m_bubbleType = TextBubbleShape::Type::Say;
+        QString m_bubbleText;
 };
 
 } // namespace scratchcpprender

test/target_models/stagemodel_test.cpp

@@ -64,6 +64,48 @@ TEST(StageModelTest, OnGraphicsEffectsCleared)
     model.onGraphicsEffectsCleared();
 }
 
+TEST(StageModelTest, OnBubbleTypeChanged)
+{
+    StageModel model;
+    QSignalSpy spy(&model, &StageModel::bubbleTypeChanged);
+    ASSERT_EQ(model.bubbleType(), TextBubbleShape::Type::Say);
+
+    model.onBubbleTypeChanged(Target::BubbleType::Think);
+    ASSERT_EQ(model.bubbleType(), TextBubbleShape::Type::Think);
+    ASSERT_EQ(spy.count(), 1);
+
+    model.onBubbleTypeChanged(Target::BubbleType::Think);
+    ASSERT_EQ(model.bubbleType(), TextBubbleShape::Type::Think);
+    ASSERT_EQ(spy.count(), 1);
+
+    model.onBubbleTypeChanged(Target::BubbleType::Say);
+    ASSERT_EQ(model.bubbleType(), TextBubbleShape::Type::Say);
+    ASSERT_EQ(spy.count(), 2);
+
+    model.onBubbleTypeChanged(Target::BubbleType::Say);
+    ASSERT_EQ(model.bubbleType(), TextBubbleShape::Type::Say);
+    ASSERT_EQ(spy.count(), 2);
+}
+
+TEST(StageModelTest, OnBubbleTextChanged)
+{
+    StageModel model;
+    QSignalSpy spy(&model, &StageModel::bubbleTextChanged);
+    ASSERT_TRUE(model.bubbleText().isEmpty());
+
+    model.onBubbleTextChanged("Hello!");
+    ASSERT_EQ(model.bubbleText(), "Hello!");
+    ASSERT_EQ(spy.count(), 1);
+
+    model.onBubbleTextChanged("Hello!");
+    ASSERT_EQ(model.bubbleText(), "Hello!");
+    ASSERT_EQ(spy.count(), 1);
+
+    model.onBubbleTextChanged("test");
+    ASSERT_EQ(model.bubbleText(), "test");
+    ASSERT_EQ(spy.count(), 2);
+}
+
 TEST(StageModelTest, RenderedTarget)
 {
     StageModel model;