Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'csgroup_IS2'
[modules/shaper.git]
/
src
/
XGUI
/
XGUI_FacesPanel.cpp
diff --git
a/src/XGUI/XGUI_FacesPanel.cpp
b/src/XGUI/XGUI_FacesPanel.cpp
index 71617d829f61d055423549eca3ef456910f1e03a..e3a649bc65470ad39d872ad2dff353ac463baa34 100644
(file)
--- a/
src/XGUI/XGUI_FacesPanel.cpp
+++ b/
src/XGUI/XGUI_FacesPanel.cpp
@@
-44,6
+44,10
@@
#include <ModelAPI_Events.h>
#include <ModelAPI_AttributeSelectionList.h>
#include <ModelAPI_Events.h>
#include <ModelAPI_AttributeSelectionList.h>
+#include <ModuleBase_Operation.h>
+#include <ModuleBase_OperationFeature.h>
+#include <XGUI_OperationMgr.h>
+
#include <QAction>
#include <QCheckBox>
#include <QFocusEvent>
#include <QAction>
#include <QCheckBox>
#include <QFocusEvent>
@@
-207,8
+211,10
@@
void XGUI_FacesPanel::setActivePanel(const bool theIsActive)
// the selection is cleared by activating selection control
myWorkshop->selector()->clearSelection();
}
// the selection is cleared by activating selection control
myWorkshop->selector()->clearSelection();
}
- else
+ else
{
emit deactivated();
emit deactivated();
+ myUndoList.clear();
+ }
}
//********************************************************************
}
//********************************************************************
@@
-413,6
+419,8
@@
void XGUI_FacesPanel::processSelection()
myItems.insert(myLastItemIndex, aPrs);
myListView->addItem(aItemName, myLastItemIndex);
myItems.insert(myLastItemIndex, aPrs);
myListView->addItem(aItemName, myLastItemIndex);
+ // add in undo list
+ myUndoList.push_back(myLastItemIndex);
myLastItemIndex++;
isModified = true;
}
myLastItemIndex++;
isModified = true;
}
@@
-462,7
+470,7
@@
void XGUI_FacesPanel::processSelection()
bool XGUI_FacesPanel::processDelete()
{
//appendFirstSelectionInHistory();
bool XGUI_FacesPanel::processDelete()
{
//appendFirstSelectionInHistory();
- QModelIndexList anIndices = myListView->getControl()->selectionModel()->selectedIndexes();
+
//
QModelIndexList anIndices = myListView->getControl()->selectionModel()->selectedIndexes();
std::set<int> aSelectedIds;
myListView->getSelectedIndices(aSelectedIds);
std::set<int> aSelectedIds;
myListView->getSelectedIndices(aSelectedIds);
@@
-604,6
+612,18
@@
void XGUI_FacesPanel::onClosed()
reset(true);
}
reset(true);
}
+//********************************************************************
+
+void XGUI_FacesPanel::processUndo()
+{
+ if(!myUndoList.size())
+ return;
+
+ myListView->selectIndices({myUndoList.back()});
+ processDelete();
+ myUndoList.pop_back();
+}
+
//********************************************************************
void XGUI_FacesPanel::flushRedisplay() const
{
//********************************************************************
void XGUI_FacesPanel::flushRedisplay() const
{