Implement text bubble methods in SpriteModel

Author: adazem009

src/spritemodel.cpp

@@ -115,10 +115,29 @@ void SpriteModel::onGraphicsEffectsCleared()
 
 void SpriteModel::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 SpriteModel::onBubbleTextChanged(const std::string &text)
 {
+    QString newText = QString::fromStdString(text);
+
+    if (m_bubbleText != newText) {
+        m_bubbleText = newText;
+        emit bubbleTextChanged();
+    }
 }
 
 libscratchcpp::Rect SpriteModel::boundingRect() const
@@ -195,4 +214,14 @@ SpriteModel *SpriteModel::cloneRoot() const
         return m_cloneRoot;
 }
 
+const TextBubbleShape::Type &SpriteModel::bubbleType() const
+{
+    return m_bubbleType;
+}
+
+const QString &SpriteModel::bubbleText() const
+{
+    return m_bubbleText;
+}
+
 } // namespace scratchcpprender

src/spritemodel.h

@@ -7,6 +7,7 @@
 #include <scratchcpp/ispritehandler.h>
 
 #include "penstate.h"
+#include "textbubbleshape.h"
 
 Q_MOC_INCLUDE("renderedtarget.h");
 Q_MOC_INCLUDE("ipenlayer.h");
@@ -25,6 +26,8 @@ class SpriteModel
         QML_ELEMENT
         Q_PROPERTY(IRenderedTarget *renderedTarget READ renderedTarget WRITE setRenderedTarget NOTIFY renderedTargetChanged)
         Q_PROPERTY(IPenLayer *penLayer READ penLayer WRITE setPenLayer NOTIFY penLayerChanged)
+        Q_PROPERTY(TextBubbleShape::Type bubbleType READ bubbleType NOTIFY bubbleTypeChanged)
+        Q_PROPERTY(QString bubbleText READ bubbleText NOTIFY bubbleTextChanged)
 
     public:
         SpriteModel(QObject *parent = nullptr);
@@ -69,9 +72,15 @@ class SpriteModel
 
         SpriteModel *cloneRoot() const;
 
+        const TextBubbleShape::Type &bubbleType() const;
+
+        const QString &bubbleText() const;
+
     signals:
         void renderedTargetChanged();
         void penLayerChanged();
+        void bubbleTypeChanged();
+        void bubbleTextChanged();
         void cloned(SpriteModel *cloneModel);
         void cloneDeleted(SpriteModel *clone);
 
@@ -81,6 +90,8 @@ class SpriteModel
         IPenLayer *m_penLayer = nullptr;
         PenState m_penState;
         SpriteModel *m_cloneRoot = nullptr;
+        TextBubbleShape::Type m_bubbleType = TextBubbleShape::Type::Say;
+        QString m_bubbleText;
 };
 
 } // namespace scratchcpprender

test/target_models/spritemodel_test.cpp

@@ -244,6 +244,48 @@ TEST(SpriteModelTest, OnGraphicsEffectsCleared)
     model.onGraphicsEffectsCleared();
 }
 
+TEST(SpriteModelTest, OnBubbleTypeChanged)
+{
+    SpriteModel model;
+    QSignalSpy spy(&model, &SpriteModel::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(SpriteModelTest, OnBubbleTextChanged)
+{
+    SpriteModel model;
+    QSignalSpy spy(&model, &SpriteModel::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(SpriteModelTest, BoundingRect)
 {
     SpriteModel model;