Sankore-834

src/domain/UBAbstractUndoCommand.h

@@ -32,7 +32,8 @@ class UBAbstractUndoCommand : public QUndoCommand
             undotype_GRAPHICITEMTRANSFORM  = 2,
             undotype_GRAPHICITEM           = 3,
             undotype_GRAPHICTEXTITEM       = 4,
-            undotype_PAGESIZE              = 5
+            undotype_PAGESIZE              = 5,
+            undotype_GRAPHICSGROUPITEM     = 6
         };
 
         virtual UndoType getType() { return undotype_UNKNOWN; }

src/domain/UBGraphicsItemGroupUndoCommand.cpp

+#include "UBGraphicsItemGroupUndoCommand.h"
+
+#include "UBGraphicsGroupContainerItem.h"
+#include "UBGraphicsScene.h"
+#include "core/memcheck.h"
+
+
+UBGraphicsItemGroupUndoCommand::UBGraphicsItemGroupUndoCommand(UBGraphicsScene *pScene, UBGraphicsGroupContainerItem *pGroupCreated) :
+    mScene (pScene), mGroup(pGroupCreated), mFirstRedo(true)
+
+{
+    if (pGroupCreated->childItems().count()) {
+        foreach (QGraphicsItem *item, pGroupCreated->childItems()) {
+            mItems << item;
+        }
+    }
+}
+
+UBGraphicsItemGroupUndoCommand::~UBGraphicsItemGroupUndoCommand()
+{
+}
+
+void UBGraphicsItemGroupUndoCommand::undo()
+{
+    mGroup->destroy();
+    foreach(QGraphicsItem *item, mItems) {
+        item->setSelected(true);
+    }
+}
+
+void UBGraphicsItemGroupUndoCommand::redo()
+{
+    if (mFirstRedo) {
+        //Work around. TODO determine why does Qt call the redo function on pushing to undo
+        mFirstRedo = false;
+        return;
+    }
+
+    foreach (QGraphicsItem *item, mItems) {
+        if (item->type() == UBGraphicsGroupContainerItem::Type) {
+            QList<QGraphicsItem*> childItems = item->childItems();
+            UBGraphicsGroupContainerItem *currentGroup = dynamic_cast<UBGraphicsGroupContainerItem*>(item);
+            if (currentGroup) {
+                currentGroup->destroy();
+            }
+            foreach (QGraphicsItem *chItem, childItems) {
+                mGroup->addToGroup(chItem);
+            }
+        } else {
+            mGroup->addToGroup(item);
+        }
+    }
+
+    mScene->addItem(mGroup);
+    mGroup->setVisible(true);
+    mGroup->setFocus();
+    mGroup->setSelected(true);
+}

src/domain/UBGraphicsItemGroupUndoCommand.h

+#ifndef UBGRAPHICSITEMGROUPUNDOCOMMAND_H
+#define UBGRAPHICSITEMGROUPUNDOCOMMAND_H
+
+#include <QList>
+#include "UBAbstractUndoCommand.h"
+
+class UBGraphicsScene;
+class UBGraphicsGroupContainerItem;
+
+class UBGraphicsItemGroupUndoCommand : public UBAbstractUndoCommand
+{
+public:
+    UBGraphicsItemGroupUndoCommand(UBGraphicsScene *pScene, UBGraphicsGroupContainerItem *pGroupCreated);
+    virtual ~UBGraphicsItemGroupUndoCommand();
+
+    virtual UndoType getType() { return undotype_GRAPHICSGROUPITEM; }
+
+protected:
+    virtual void undo();
+    virtual void redo();
+
+private:
+    UBGraphicsScene *mScene;
+    UBGraphicsGroupContainerItem *mGroup;
+    QList<QGraphicsItem*> mItems;
+
+    bool mFirstRedo;
+};
+
+#endif // UBGRAPHICSITEMGROUPUNDOCOMMAND_H

src/domain/UBGraphicsItemTransformUndoCommand.h

@@ -32,7 +32,7 @@ class UBGraphicsItemTransformUndoCommand : public UBAbstractUndoCommand
                                                 const QSizeF& prevSize = QSizeF());
         virtual ~UBGraphicsItemTransformUndoCommand();
 
-        virtual UndoType getType() { return undotype_GRAPHICITEMTRANSFORM; };
+        virtual UndoType getType() { return undotype_GRAPHICITEMTRANSFORM; }
 
     protected:
         virtual void undo();

src/domain/UBGraphicsItemUndoCommand.cpp

@@ -24,6 +24,7 @@
 #include "board/UBBoardController.h"
 
 #include "core/memcheck.h"
+#include "domain/UBGraphicsGroupContainerItem.h"
 
 UBGraphicsItemUndoCommand::UBGraphicsItemUndoCommand(UBGraphicsScene* pScene, const QSet<QGraphicsItem*>& pRemovedItems,
         const QSet<QGraphicsItem*>& pAddedItems)
@@ -81,6 +82,14 @@ void UBGraphicsItemUndoCommand::undo()
     {
         QGraphicsItem* item = itAdded.next();
 
+        //if removing group
+        if (item->type() == UBGraphicsGroupContainerItem::Type) {
+            UBGraphicsGroupContainerItem *curGroup = qgraphicsitem_cast<UBGraphicsGroupContainerItem*>(item);
+            if (curGroup) {
+                curGroup->destroy();
+            }
+        }
+
         UBApplication::boardController->freezeW3CWidget(item, true);
         item->setSelected(false);
         mScene->removeItem(item);

src/domain/UBGraphicsItemUndoCommand.h

@@ -34,10 +34,10 @@ class UBGraphicsItemUndoCommand : public UBAbstractUndoCommand
 
         virtual ~UBGraphicsItemUndoCommand();
 
-        QSet<QGraphicsItem*> GetAddedList() { return mAddedItems; };
-        QSet<QGraphicsItem*> GetRemovedList() { return mRemovedItems; };
+        QSet<QGraphicsItem*> GetAddedList() { return mAddedItems; }
+        QSet<QGraphicsItem*> GetRemovedList() { return mRemovedItems; }
 
-        virtual UndoType getType() { return undotype_GRAPHICITEM; };
+        virtual UndoType getType() { return undotype_GRAPHICITEM; }
 
     protected:
         virtual void undo();

src/domain/UBGraphicsScene.cpp

@@ -47,6 +47,7 @@
 #include "board/UBBoardView.h"
 
 #include "UBGraphicsItemUndoCommand.h"
+#include "UBGraphicsItemGroupUndoCommand.h"
 #include "UBGraphicsTextItemUndoCommand.h"
 #include "UBGraphicsProxyWidget.h"
 #include "UBGraphicsPixmapItem.h"
@@ -1521,7 +1522,7 @@ UBGraphicsGroupContainerItem *UBGraphicsScene::createGroup(QList<QGraphicsItem *
     groupItem->setFocus();
 
     if (enableUndoRedoStack) { //should be deleted after scene own undo stack implemented
-        UBGraphicsItemUndoCommand* uc = new UBGraphicsItemUndoCommand(this, 0, groupItem);
+        UBGraphicsItemGroupUndoCommand* uc = new UBGraphicsItemGroupUndoCommand(this, groupItem);
         UBApplication::undoStack->push(uc);
     }
 

src/domain/domain.pri

@@ -20,7 +20,8 @@ HEADERS      += src/domain/UBGraphicsScene.h \
                 src/domain/UBAbstractUndoCommand.h\
                 src/domain/UBGraphicsGroupContainerItem.h \
                 src/domain/UBGraphicsGroupContainerItemDelegate.h \
-                src/domain/UBGraphicsStrokesGroup.h
+                src/domain/UBGraphicsStrokesGroup.h \
+    src/domain/UBGraphicsItemGroupUndoCommand.h
                 
 HEADERS      += src/domain/UBGraphicsItemDelegate.h \
                 src/domain/UBGraphicsTextItemDelegate.h \
@@ -51,7 +52,8 @@ SOURCES      += src/domain/UBGraphicsScene.cpp \
                 src/domain/UBAbstractUndoCommand.cpp \
                 src/domain/ubgraphicsgroupcontaineritem.cpp \
                 src/domain/ubgraphicsgroupcontaineritemdelegate.cpp \
-                src/domain/UBGraphicsStrokesGroup.cpp
+                src/domain/UBGraphicsStrokesGroup.cpp \
+    src/domain/UBGraphicsItemGroupUndoCommand.cpp
                 
 SOURCES      += src/domain/UBGraphicsItemDelegate.cpp \
                 src/domain/UBGraphicsTextItemDelegate.cpp \