Merge pull request #905 from FashionFreedom/issue-147-improve-group-tool

feat: Issue 147 improve group tool
FashionFreedom · Mar 25, 2023 · 0916742 · 0916742
2 parents 5c96c7e + 6852a11
commit 0916742
Show file tree

Hide file tree

Showing 71 changed files with 6,748 additions and 634 deletions.
diff --git a/src/app/seamly2d/core/vtooloptionspropertybrowser.cpp b/src/app/seamly2d/core/vtooloptionspropertybrowser.cpp
@@ -744,7 +744,7 @@ QMap<QString, quint32> VToolOptionsPropertyBrowser::getObjectList(Tool *tool, GO
     quint32 toolId = tool->getId();
     QHash<quint32, QSharedPointer<VGObject>> objects;
 
-    QVector<VToolRecord> history = qApp->getCurrentDocument()->getLocalHistory();
+    QVector<VToolRecord> history = qApp->getCurrentDocument()->getBlockHistory();
     for (qint32 i = 0; i < history.size(); ++i)
     {
         const VToolRecord record = history.at(i);
@@ -758,7 +758,7 @@ QMap<QString, quint32> VToolOptionsPropertyBrowser::getObjectList(Tool *tool, GO
                 case 47:    //Tool::MirrorByAxis
                 case 48:    //Tool::Move
                 {
-                    QVector<quint32> list = qApp->getCurrentDocument()->getOpItems(recId);
+                    QVector<quint32> list = qApp->getCurrentDocument()->getOpItems(recId, QStringLiteral("destination"));
                     for (qint32 j = 0; j < list.size(); ++j)
                     {
                         quint32 id = list.at(j);

diff --git a/src/app/seamly2d/dialogs/dialoghistory.cpp b/src/app/seamly2d/dialogs/dialoghistory.cpp
diff --git a/src/app/seamly2d/dialogs/dialogs.h b/src/app/seamly2d/dialogs/dialogs.h
@@ -58,7 +58,7 @@
 #include "dialognewpattern.h"
 #include "dialogaboutapp.h"
 #include "dialogpreferences.h"
-#include "dialogs/vwidgetgroups.h"
+#include "dialogs/groups_widget.h"
 #include "dialogs/pieces_widget.h"
 #include "dialogs/calculator_dialog.h"
 #include "dialogs/decimalchart_dialog.h"

diff --git a/src/app/seamly2d/dialogs/dialogs.pri b/src/app/seamly2d/dialogs/dialogs.pri
@@ -12,11 +12,11 @@ HEADERS += \
     $$PWD/dialoglayoutprogress.h \
     $$PWD/dialogvariables.h \
     $$PWD/export_layout_dialog.h \
+    $$PWD/groups_widget.h \
     $$PWD/history_dialog.h \
     $$PWD/pieces_widget.h \
     $$PWD/shortcuts_dialog.h \
     $$PWD/show_info_dialog.h \
-    $$PWD/vwidgetgroups.h \
     $$PWD/dialogpreferences.h \
     $$PWD/configpages/preferencesconfigurationpage.h \
     $$PWD/configpages/preferencespatternpage.h \
@@ -35,11 +35,11 @@ SOURCES += \
     $$PWD/dialoglayoutprogress.cpp \
     $$PWD/dialogvariables.cpp \
     $$PWD/export_layout_dialog.cpp \
+    $$PWD/groups_widget.cpp \
     $$PWD/history_dialog.cpp \
     $$PWD/pieces_widget.cpp \
     $$PWD/shortcuts_dialog.cpp \
     $$PWD/show_info_dialog.cpp \
-    $$PWD/vwidgetgroups.cpp \
     $$PWD/dialogpreferences.cpp \
     $$PWD/configpages/preferencesconfigurationpage.cpp \
     $$PWD/configpages/preferencespatternpage.cpp \
@@ -58,11 +58,11 @@ FORMS += \
     $$PWD/dialoglayoutprogress.ui \
     $$PWD/dialogvariables.ui \
     $$PWD/export_layout_dialog.ui \
+    $$PWD/groups_widget.ui \
     $$PWD/history_dialog.ui \
     $$PWD/pieces_widget.ui \
     $$PWD/shortcuts_dialog.ui \
     $$PWD/show_info_dialog.ui \
-    $$PWD/vwidgetgroups.ui \
     $$PWD/dialogpreferences.ui \
     $$PWD/configpages/preferencesconfigurationpage.ui \
     $$PWD/configpages/preferencespatternpage.ui \