Views: Cleanup LevelCelView a bit

diasurgical · Feb 3, 2024 · 109c8a3 · 109c8a3
1 parent 6138786
commit 109c8a3
Show file tree

Hide file tree

Showing 7 changed files with 212 additions and 156 deletions.
diff --git a/source/undostack/framecmds.cpp b/source/undostack/framecmds.cpp
@@ -40,10 +40,9 @@ void ReplaceFrameCommand::redo()
     emit this->replaced(frameIndexToReplace, imgToReplace);
 }
 
-AddFrameCommand::AddFrameCommand(int index, QImage &img, IMAGE_FILE_MODE mode)
+AddFrameCommand::AddFrameCommand(int index, QImage &img)
     : m_index(index)
     , m_image(std::move(img))
-    , m_mode(mode)
 {
 }
 
@@ -54,5 +53,5 @@ void AddFrameCommand::undo()
 
 void AddFrameCommand::redo()
 {
-    emit this->added(m_index, m_image, m_mode);
+    emit this->added(m_index, m_image);
 }
diff --git a/source/undostack/framecmds.h b/source/undostack/framecmds.h
@@ -48,18 +48,17 @@ class AddFrameCommand : public QObject, public Command {
     Q_OBJECT
 
 public:
-    explicit AddFrameCommand(int index, QImage &image, IMAGE_FILE_MODE mode);
+    explicit AddFrameCommand(int index, QImage &image);
     ~AddFrameCommand() = default;
 
     void undo() override;
     void redo() override;
 
 signals:
     void undoAdded(int index);
-    void added(int index, const QImage &image, IMAGE_FILE_MODE mode);
+    void added(int index, const QImage &image);
 
 private:
     QImage m_image;
     int m_index = 0;
-    IMAGE_FILE_MODE m_mode;
 };
diff --git a/source/undostack/undomacro.cpp b/source/undostack/undomacro.cpp
@@ -9,11 +9,23 @@ UserData::UserData(QString labelText, QString cancelButtonText, std::pair<int, i
 {
 }
 
+UserData::UserData(QString labelText, QString cancelButtonText)
+    : m_labelText(std::move(labelText))
+    , m_cancelButtonText(std::move(cancelButtonText))
+    , m_minMax({ 0, 0 })
+{
+}
+
 UndoMacroFactory::UndoMacroFactory(UserData &&userData)
     : m_userData(std::make_unique<UserData>(userData.labelText(), userData.cancelButtonText(), std::make_pair(userData.min(), userData.max())))
 {
 }
 
+void UndoMacroFactory::setUserData(const UserData &&userData)
+{
+    m_userData = std::make_unique<UserData>(userData.labelText(), userData.cancelButtonText(), std::make_pair(userData.min(), userData.max()));
+}
+
 void UndoMacroFactory::add(std::unique_ptr<Command> cmd)
 {
     m_commands.push_back(std::move(cmd));

diff --git a/source/undostack/undomacro.h b/source/undostack/undomacro.h
@@ -14,6 +14,7 @@ class UserData {
 
 public:
     UserData(QString labelText, QString cancelButtonText, std::pair<int, int> &&minMax);
+    UserData(QString labelText, QString cancelButtonText);
     ~UserData() = default;
 
     [[nodiscard]] int min() const
@@ -49,8 +50,11 @@ class UndoMacroFactory {
 
 public:
     UndoMacroFactory(UserData &&userData);
+    UndoMacroFactory() = default;
     ~UndoMacroFactory() = default;
 
+    void setUserData(const UserData &&userData);
+
     void add(std::unique_ptr<Command> cmd);
     [[nodiscard]] std::vector<std::unique_ptr<Command>> &cmds()
     {

diff --git a/source/views/celview.cpp b/source/views/celview.cpp
@@ -221,7 +221,7 @@ void CelView::sendAddFrameCmd(IMAGE_FILE_MODE mode, int index, const QString &im
     };
 
     auto connectCommand = [&](QImage &img) -> std::unique_ptr<AddFrameCommand> {
-        auto command = std::make_unique<AddFrameCommand>(index, img, mode);
+        auto command = std::make_unique<AddFrameCommand>(index, img);
 
         // Connect signals which will be called upon redo/undo operations of the undostack
         QObject::connect(command.get(), &AddFrameCommand::added, this, &CelView::insertFrames);