#include <ModuleBase_WidgetFactory.h>
#include <ModuleBase_OperationFeature.h>
#include <ModuleBase_OperationAction.h>
+#include <ModuleBase_PagedContainer.h>
+#include <ModuleBase_WidgetValidated.h>
#include <Config_Common.h>
#include <Config_FeatureMessage.h>
#include <dlfcn.h>
#endif
+
+QString XGUI_Workshop::MOVE_TO_END_COMMAND = QObject::tr("Move to the end");
+
//#define DEBUG_DELETE
+//#define DEBUG_FEATURE_NAME
XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector)
: QObject(),
myDisplayer = new XGUI_Displayer(this);
mySelector = new XGUI_SelectionMgr(this);
- //connect(mySelector, SIGNAL(selectionChanged()), this, SLOT(updateModuleCommands()));
+ connect(mySelector, SIGNAL(selectionChanged()), this, SLOT(updateCommandStatus()));
myOperationMgr = new XGUI_OperationMgr(this, 0);
myActionsMgr = new XGUI_ActionsMgr(this);
SLOT(onOperationCommitted(ModuleBase_Operation*)));
connect(myOperationMgr, SIGNAL(operationAborted(ModuleBase_Operation*)),
SLOT(onOperationAborted(ModuleBase_Operation*)));
- //connect(myOperationMgr, SIGNAL(validationStateChanged(bool)),
- // myErrorMgr, SLOT(onValidationStateChanged()));
#ifndef HAVE_SALOME
connect(myMainWindow, SIGNAL(exitKeySequence()), SLOT(onExit()));
+ onTrihedronVisibilityChanged(true);
#endif
connect(this, SIGNAL(errorOccurred(const QString&)), myErrorDlg, SLOT(addError(const QString&)));
onNew();
+ myViewerProxy->connectViewProxy();
+ connect(myViewerProxy, SIGNAL(trihedronVisibilityChanged(bool)),
+ SLOT(onTrihedronVisibilityChanged(bool)));
+
emit applicationStarted();
}
connect(myDisplayer, SIGNAL(beforeObjectErase(ObjectPtr, AISObjectPtr)),
myModule, SLOT(onBeforeObjectErase(ObjectPtr, AISObjectPtr)));
- myActionsMgr->update();
+ updateCommandStatus();
// activate visualized objects in the viewer
XGUI_Displayer* aDisplayer = displayer();
QIntList aModes;
module()->activeSelectionModes(aModes);
aDisplayer->activateObjects(aModes, aDisplayed);
+ myOperationMgr->activate();
}
void XGUI_Workshop::deactivateModule()
XGUI_Displayer* aDisplayer = displayer();
QObjectPtrList aDisplayed = aDisplayer->displayedObjects();
aDisplayer->deactivateObjects(aDisplayed, true);
+
+ myOperationMgr->deactivate();
}
//******************************************************
addHistoryMenu(aAction, SIGNAL(updateRedoHistory(const QList<ActionInfo>&)), SLOT(onRedo(int)));
salomeConnector()->addDesktopMenuSeparator("MEN_DESK_EDIT");
- aAction = salomeConnector()->addDesktopCommand("REBUILD_CMD", tr("Rebuild"), tr("Rebuild data objects"),
- QIcon(":pictures/rebuild.png"), QKeySequence(),
- false, "MEN_DESK_EDIT");
- salomeConnector()->addActionInToolbar( aAction, aToolBarTitle );
+ //aAction = salomeConnector()->addDesktopCommand("REBUILD_CMD", tr("Rebuild"), tr("Rebuild data objects"),
+ // QIcon(":pictures/rebuild.png"), QKeySequence(),
+ // false, "MEN_DESK_EDIT");
+ //salomeConnector()->addActionInToolbar( aAction, aToolBarTitle );
- connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onRebuild()));
- salomeConnector()->addDesktopMenuSeparator("MEN_DESK_EDIT");
+ //connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onRebuild()));
+ //salomeConnector()->addDesktopMenuSeparator("MEN_DESK_EDIT");
aAction = salomeConnector()->addDesktopCommand("SAVEAS_CMD", tr("Export NewGeom..."), tr("Export the current document into a NewGeom file"),
QIcon(), QKeySequence(),
aCommand->connectTo(this, SLOT(onSave()));
//aCommand->disable();
+ aCommand = aGroup->addFeature("SAVEAS_CMD", tr("Save as..."), tr("Save the document into a file"),
+ QIcon(":pictures/save.png"), QKeySequence());
+ aCommand->connectTo(this, SLOT(onSaveAs()));
+
QString aUndoId = "UNDO_CMD";
aCommand = aGroup->addFeature(aUndoId, tr("Undo"), tr("Undo last command"),
QIcon(":pictures/undo.png"), QKeySequence::Undo);
SIGNAL(updateRedoHistory(const QList<ActionInfo>&)),
SLOT(onRedo(int)));
- aCommand = aGroup->addFeature("REBUILD_CMD", tr("Rebuild"), tr("Rebuild data objects"),
- QIcon(":pictures/rebuild.png"), QKeySequence());
- aCommand->connectTo(this, SLOT(onRebuild()));
+ //aCommand = aGroup->addFeature("REBUILD_CMD", tr("Rebuild"), tr("Rebuild data objects"),
+ // QIcon(":pictures/rebuild.png"), QKeySequence());
+ //aCommand->connectTo(this, SLOT(onRebuild()));
- aCommand = aGroup->addFeature("SAVEAS_CMD", tr("Save as..."), tr("Save the document into a file"),
- QIcon(":pictures/save.png"), QKeySequence());
- aCommand->connectTo(this, SLOT(onSaveAs()));
//aCommand->disable();
aCommand = aGroup->addFeature("OPEN_CMD", tr("Open..."), tr("Open a new document"),
ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
(anOperationMgr->currentOperation());
if (aFOperation) {
- if (errorMgr()->canProcessClick(anAction, aFOperation->feature()))
- myOperationMgr->onCommitOperation();
+ //if (errorMgr()->canProcessClick(anAction, aFOperation->feature()))
+ myOperationMgr->onCommitOperation();
}
}
}
-//******************************************************
-/*void XGUI_Workshop::onValidationStateChanged(bool theEnabled)
-{
- XGUI_OperationMgr* anOperationMgr = operationMgr();
- if (anOperationMgr) {
- ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
- (anOperationMgr->currentOperation());
- if (aFOperation) {
- QAction* anAction = myActionsMgr->operationStateAction(XGUI_ActionsMgr::Accept);
- myErrorMgr->updateActionState(anAction, aFOperation->feature(), theEnabled);
- }
- }
-}*/
-
-
//******************************************************
void XGUI_Workshop::deactivateActiveObject(const ObjectPtr& theObject, const bool theUpdateViewer)
{
}
updateCommandStatus();
- myModule->onOperationStarted(aFOperation);
+ connectToPropertyPanel(true);
+ myModule->operationStarted(aFOperation);
// the objects of the current operation should be deactivated
QObjectPtrList anObjects;
if (theOperation->getDescription()->hasXmlRepresentation()) { //!< No need for property panel
setPropertyPanel(theOperation);
+ connectToPropertyPanel(true);
}
updateCommandStatus();
- myModule->onOperationResumed(theOperation);
+ myModule->operationResumed(theOperation);
}
hidePropertyPanel();
myPropertyPanel->cleanContent();
- myModule->onOperationStopped(aFOperation);
+ connectToPropertyPanel(false);
+ myModule->operationStopped(aFOperation);
// the deactivated objects of the current operation should be activated back.
// They were deactivated on operation start or an object redisplay
void XGUI_Workshop::onOperationCommitted(ModuleBase_Operation* theOperation)
{
- myModule->onOperationCommitted(theOperation);
+ myModule->operationCommitted(theOperation);
}
void XGUI_Workshop::onOperationAborted(ModuleBase_Operation* theOperation)
{
- myModule->onOperationAborted(theOperation);
+ myModule->operationAborted(theOperation);
}
void XGUI_Workshop::setGrantedFeatures(ModuleBase_Operation* theOperation)
return;
showPropertyPanel();
- QString aXmlRepr = aFOperation->getDescription()->xmlRepresentation();
- ModuleBase_WidgetFactory aFactory(aXmlRepr.toStdString(), myModuleConnector);
-
myPropertyPanel->cleanContent();
- aFactory.createWidget(myPropertyPanel->contentWidget());
- QList<ModuleBase_ModelWidget*> aWidgets = aFactory.getModelWidgets();
+ QList<ModuleBase_ModelWidget*> aWidgets;
+ if (!module()->createWidgets(theOperation, aWidgets)) {
+ QString aXmlRepr = aFOperation->getDescription()->xmlRepresentation();
+ ModuleBase_WidgetFactory aFactory(aXmlRepr.toStdString(), myModuleConnector);
+ aFactory.createWidget(myPropertyPanel->contentWidget());
+ aWidgets = aFactory.getModelWidgets();
+ }
// check compatibility of feature and widgets
FeaturePtr aFeature = aFOperation->feature();
myModule->propertyPanelDefined(theOperation);
+#ifndef DEBUG_FEATURE_NAME
myPropertyPanel->setWindowTitle(theOperation->getDescription()->description());
+#else
+ std::string aFeatureName = aFeature->name();
+ myPropertyPanel->setWindowTitle(QString("%1: %2").arg(theOperation->getDescription()->description())
+ .arg(aFeatureName.c_str()));
+#endif
myErrorMgr->setPropertyPanel(myPropertyPanel);
}
+void XGUI_Workshop::connectToPropertyPanel(const bool isToConnect)
+{
+ XGUI_PropertyPanel* aPropertyPanel = propertyPanel();
+ if (aPropertyPanel) {
+ const QList<ModuleBase_ModelWidget*>& aWidgets = aPropertyPanel->modelWidgets();
+ foreach (ModuleBase_ModelWidget* aWidget, aWidgets) {
+ myModule->connectToPropertyPanel(aWidget, isToConnect);
+ if (isToConnect) {
+ connect(aWidget, SIGNAL(valueStateChanged(int)), this, SLOT(onWidgetStateChanged(int)));
+ connect(aWidget, SIGNAL(valuesChanged()), this, SLOT(onValuesChanged()));
+ }
+ else {
+ disconnect(aWidget, SIGNAL(valueStateChanged(int)), this, SLOT(onWidgetStateChanged(int)));
+ disconnect(aWidget, SIGNAL(valuesChanged()), this, SLOT(onValuesChanged()));
+ }
+ }
+ }
+}
+
/*
* Saves document with given name.
*/
}
#endif
+//******************************************************
+void XGUI_Workshop::onTrihedronVisibilityChanged(bool theState)
+{
+ XGUI_Displayer* aDisplayer = displayer();
+ if (aDisplayer)
+ aDisplayer->displayTrihedron(theState);
+}
+
//******************************************************
bool XGUI_Workshop::onSave()
{
{
objectBrowser()->treeView()->setCurrentIndex(QModelIndex());
SessionPtr aMgr = ModelAPI_Session::get();
+ std::list<std::string> aUndoList = aMgr->undoList();
if (aMgr->isOperation()) {
/// this is important for nested operations
/// when sketch operation is active, this condition is false and
/// the sketch operation is not aborted
operationMgr()->onAbortOperation();
}
- for (int i = 0; i < theTimes; ++i) {
+ std::list<std::string>::const_iterator aIt = aUndoList.cbegin();
+ for (int i = 0; (i < theTimes) && (aIt != aUndoList.cend()); ++i, ++aIt) {
aMgr->undo();
+ if (QString((*aIt).c_str()) == MOVE_TO_END_COMMAND)
+ myObjectBrowser->rebuildDataTree();
}
operationMgr()->updateApplyOfOperations();
objectBrowser()->treeView()->setCurrentIndex(QModelIndex());
SessionPtr aMgr = ModelAPI_Session::get();
+ std::list<std::string> aRedoList = aMgr->redoList();
if (aMgr->isOperation()) {
/// this is important for nested operations
/// when sketch operation is active, this condition is false and
/// the sketch operation is not aborted
operationMgr()->onAbortOperation();
}
- for (int i = 0; i < theTimes; ++i) {
+ std::list<std::string>::const_iterator aIt = aRedoList.cbegin();
+ for (int i = 0; (i < theTimes) && (aIt != aRedoList.cend()); ++i, ++aIt) {
aMgr->redo();
+ if (QString((*aIt).c_str()) == MOVE_TO_END_COMMAND)
+ myObjectBrowser->rebuildDataTree();
}
operationMgr()->updateApplyOfOperations();
updateCommandStatus();
}
//******************************************************
-void XGUI_Workshop::onRebuild()
+//void XGUI_Workshop::onRebuild()
+//{
+// SessionPtr aMgr = ModelAPI_Session::get();
+// bool aWasOperation = aMgr->isOperation(); // keep this value
+// if (!aWasOperation) {
+// aMgr->startOperation("Rebuild");
+// }
+// static const Events_ID aRebuildEvent = Events_Loop::loop()->eventByName("Rebuild");
+// Events_Loop::loop()->send(std::shared_ptr<Events_Message>(
+// new Events_Message(aRebuildEvent, this)));
+// if (!aWasOperation) {
+// aMgr->finishOperation();
+// }
+// updateCommandStatus();
+//}
+
+//******************************************************
+void XGUI_Workshop::onWidgetStateChanged(int thePreviousState)
+{
+ ModuleBase_ModelWidget* anActiveWidget = 0;
+ ModuleBase_Operation* anOperation = myOperationMgr->currentOperation();
+ if (anOperation) {
+ ModuleBase_IPropertyPanel* aPanel = anOperation->propertyPanel();
+ if (aPanel)
+ anActiveWidget = aPanel->activeWidget();
+ }
+ if (anActiveWidget)
+ operationMgr()->onValidateOperation();
+
+ myModule->widgetStateChanged(thePreviousState);
+}
+
+//******************************************************
+void XGUI_Workshop::onValuesChanged()
{
- SessionPtr aMgr = ModelAPI_Session::get();
- bool aWasOperation = aMgr->isOperation(); // keep this value
- if (!aWasOperation) {
- aMgr->startOperation("Rebuild");
+ ModuleBase_ModelWidget* aSenderWidget = (ModuleBase_ModelWidget*)(sender());
+ if (!aSenderWidget || aSenderWidget->canSetValue())
+ return;
+
+ ModuleBase_ModelWidget* anActiveWidget = 0;
+ ModuleBase_Operation* anOperation = myOperationMgr->currentOperation();
+ if (anOperation) {
+ ModuleBase_IPropertyPanel* aPanel = anOperation->propertyPanel();
+ if (aPanel)
+ anActiveWidget = aPanel->activeWidget();
}
- static const Events_ID aRebuildEvent = Events_Loop::loop()->eventByName("Rebuild");
- Events_Loop::loop()->send(std::shared_ptr<Events_Message>(
- new Events_Message(aRebuildEvent, this)));
- if (!aWasOperation) {
- aMgr->finishOperation();
+ if (anActiveWidget) {
+ ModuleBase_WidgetValidated* aWidgetValidated = dynamic_cast<ModuleBase_WidgetValidated*>
+ (anActiveWidget);
+ aWidgetValidated->clearValidatedCash();
}
- updateCommandStatus();
}
-//******************************************************
ModuleBase_IModule* XGUI_Workshop::loadModule(const QString& theModule)
{
QString libName = QString::fromStdString(library(theModule.toStdString()));
aCmd->setEnabled(false);
}
}
- myActionsMgr->update();
+ myActionsMgr->updateCommandsStatus();
emit commandStatusUpdated();
}
QAction* aCancelAct = myActionsMgr->operationStateAction(XGUI_ActionsMgr::Abort);
connect(aCancelAct, SIGNAL(triggered()), myOperationMgr, SLOT(onAbortOperation()));
- connect(myPropertyPanel, SIGNAL(noMoreWidgets()), myModule, SLOT(onNoMoreWidgets()));
- connect(myPropertyPanel, SIGNAL(keyReleased(QKeyEvent*)),
- myOperationMgr, SLOT(onKeyReleased(QKeyEvent*)));
- //connect(myOperationMgr, SIGNAL(validationStateChanged(bool)),
- // this, SLOT(onValidationStateChanged(bool)));
+ connect(myPropertyPanel, SIGNAL(keyReleased(QObject*, QKeyEvent*)),
+ myOperationMgr, SLOT(onKeyReleased(QObject*, QKeyEvent*)));
+
+ connect(myPropertyPanel, SIGNAL(enterClicked(QObject*)),
+ myOperationMgr, SLOT(onProcessEnter(QObject*)));
}
//******************************************************
// in order to operation manager could process key events of the panel.
// otherwise they are ignored. It happens only if the same(activateWindow) is
// not happened by property panel activation(e.g. resume operation of Sketch)
- myPropertyPanel->activateWindow();
- myPropertyPanel->setFocus();
+ ModuleBase_Tools::activateWindow(myPropertyPanel, "XGUI_Workshop::showPropertyPanel()");
+ ModuleBase_Tools::setFocus(myPropertyPanel, "XGUI_Workshop::showPropertyPanel()");
}
//******************************************************
// are processed by this console. For example Undo actions.
// It is possible that this code is to be moved to NewGeom package
QMainWindow* aDesktop = desktop();
- aDesktop->activateWindow();
- aDesktop->setFocus();
+ ModuleBase_Tools::activateWindow(aDesktop, "XGUI_Workshop::hidePropertyPanel()");
+ ModuleBase_Tools::setFocus(aDesktop, "XGUI_Workshop::showPropertyPanel()");
}
//******************************************************
void XGUI_Workshop::showObjectBrowser()
{
- myObjectBrowser->parentWidget()->show();
+ if (!isSalomeMode())
+ myObjectBrowser->parentWidget()->show();
}
//******************************************************
void XGUI_Workshop::hideObjectBrowser()
{
- myObjectBrowser->parentWidget()->hide();
+ if (!isSalomeMode())
+ myObjectBrowser->parentWidget()->hide();
}
//******************************************************
QObjectPtrList aObjects = mySelector->selection()->selectedObjects();
if (theId == "DELETE_CMD")
deleteObjects();
+ else if (theId == "CLEAN_HISTORY_CMD")
+ cleanHistory();
else if (theId == "MOVE_CMD")
moveObjects();
else if (theId == "COLOR_CMD")
changeColor(aObjects);
- else if (theId == "SHOW_CMD")
+ else if (theId == "SHOW_CMD") {
showObjects(aObjects, true);
+ mySelector->updateSelectionBy(ModuleBase_ISelection::Browser);
+ }
else if (theId == "HIDE_CMD")
showObjects(aObjects, false);
- else if (theId == "SHOW_ONLY_CMD")
+ else if (theId == "SHOW_ONLY_CMD") {
showOnlyObjects(aObjects);
+ mySelector->updateSelectionBy(ModuleBase_ISelection::Browser);
+ }
else if (theId == "SHADING_CMD")
setDisplayMode(aObjects, XGUI_Displayer::Shading);
else if (theId == "WIREFRAME_CMD")
QObjectPtrList anObjects = mySelector->selection()->selectedObjects();
if (!abortAllOperations())
return;
- // It is necessary to clear selection in order to avoid selection changed event during
- // deletion and negative consequences connected with processing of already deleted items
- mySelector->clearSelection();
// check whether the object can be deleted. There should not be parts which are not loaded
if (!XGUI_Tools::canRemoveOrRename(desktop(), anObjects))
return;
// 1. start operation
QString aDescription = contextMenuMgr()->action("DELETE_CMD")->text();
- aDescription += tr(" %1");
- QStringList aObjectNames;
- foreach (ObjectPtr aObj, anObjects) {
- if (!aObj->data()->isValid())
- continue;
- aObjectNames << QString::fromStdString(aObj->data()->name());
- }
- aDescription = aDescription.arg(aObjectNames.join(", "));
+ aDescription += " " + aDescription.arg(XGUI_Tools::unionOfObjectNames(anObjects, ", "));
ModuleBase_OperationAction* anOpAction = new ModuleBase_OperationAction(aDescription, module());
-
operationMgr()->startOperation(anOpAction);
+
// 3. delete objects
std::set<FeaturePtr> anIgnoredFeatures;
- if (deleteFeatures(anObjects, anIgnoredFeatures, desktop(), true)) {
- operationMgr()->commitOperation();
+ std::set<FeaturePtr> aDirectRefFeatures, aIndirectRefFeatures;
+ findReferences(anObjects, aDirectRefFeatures, aIndirectRefFeatures);
+
+ bool doDeleteReferences = true;
+ if (isDeleteFeatureWithReferences(anObjects, aDirectRefFeatures, aIndirectRefFeatures,
+ desktop(), doDeleteReferences)) {
+ // It is necessary to clear selection in order to avoid selection changed event during
+ // deletion and negative consequences connected with processing of already deleted items
+ mySelector->clearSelection();
+ if (deleteFeaturesInternal(anObjects, aDirectRefFeatures, aIndirectRefFeatures,
+ anIgnoredFeatures, doDeleteReferences))
+ operationMgr()->commitOperation();
+ else
+ operationMgr()->abortOperation(operationMgr()->currentOperation());
+ }
+}
+
+//**************************************************************
+void XGUI_Workshop::cleanHistory()
+{
+ if (!abortAllOperations())
+ return;
+
+ QObjectPtrList anObjects = mySelector->selection()->selectedObjects();
+ QObjectPtrList aFeatures;
+ foreach (ObjectPtr anObject, anObjects) {
+ FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(anObject);
+ // for parameter result, use the corresponded reature to be removed
+ if (!aFeature.get() && anObject->groupName() == ModelAPI_ResultParameter::group()) {
+ aFeature = ModelAPI_Feature::feature(anObject);
+ }
+ aFeatures.append(aFeature);
}
- else {
- operationMgr()->abortOperation(operationMgr()->currentOperation());
+
+ // 1. find all referenced features
+ QList<ObjectPtr> anUnusedObjects;
+ std::set<FeaturePtr> aDirectRefFeatures;
+ //foreach (ObjectPtr anObject, anObjects) {
+ foreach (ObjectPtr anObject, aFeatures) {
+ FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(anObject);
+ // for parameter result, use the corresponded reature to be removed
+ //if (!aFeature.get() && anObject->groupName() == ModelAPI_ResultParameter::group()) {
+ // aFeature = ModelAPI_Feature::feature(anObject);
+ //}
+ if (aFeature.get()) {
+ std::set<FeaturePtr> alreadyProcessed;
+ aDirectRefFeatures.clear();
+ XGUI_Tools::refsDirectToFeatureInAllDocuments(aFeature, aFeature, aFeatures,
+ aDirectRefFeatures, alreadyProcessed);
+ if (aDirectRefFeatures.empty() && !anUnusedObjects.contains(aFeature))
+ anUnusedObjects.append(aFeature);
+ }
+ }
+
+ // 2. warn about the references remove, break the delete operation if the user chose it
+ if (!anUnusedObjects.empty()) {
+ QStringList aNames;
+ foreach (const ObjectPtr& anObject, anUnusedObjects) {
+ FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(anObject);
+ aNames.append(aFeature->name().c_str());
+ }
+ QString anUnusedNames = aNames.join(", ");
+
+ QString anActionId = "CLEAN_HISTORY_CMD";
+ QString aDescription = contextMenuMgr()->action(anActionId)->text();
+
+ QMessageBox aMessageBox(desktop());
+ aMessageBox.setWindowTitle(aDescription);
+ aMessageBox.setIcon(QMessageBox::Warning);
+ aMessageBox.setStandardButtons(QMessageBox::No | QMessageBox::Yes);
+ aMessageBox.setDefaultButton(QMessageBox::No);
+
+ QString aText = QString(tr("Unused features are the following: %1.\nThese features will be deleted.\nWould you like to continue?")
+ .arg(anUnusedNames));
+ aMessageBox.setText(aText);
+ if (aMessageBox.exec() == QMessageBox::No)
+ return;
+
+ // 1. start operation
+ aDescription += "by deleting of " + aDescription.arg(XGUI_Tools::unionOfObjectNames(anObjects, ", "));
+ ModuleBase_OperationAction* anOpAction = new ModuleBase_OperationAction(aDescription, module());
+ operationMgr()->startOperation(anOpAction);
+
+ std::set<FeaturePtr> anIgnoredFeatures;
+ if (removeFeatures(anUnusedObjects, anIgnoredFeatures, anActionId)) {
+ operationMgr()->commitOperation();
+ }
+ else {
+ operationMgr()->abortOperation(operationMgr()->currentOperation());
+ }
}
}
}
//**************************************************************
-bool XGUI_Workshop::deleteFeatures(const QObjectPtrList& theList,
- const std::set<FeaturePtr>& theIgnoredFeatures,
- QWidget* theParent,
- const bool theAskAboutDeleteReferences)
+void XGUI_Workshop::findReferences(const QObjectPtrList& theList,
+ std::set<FeaturePtr>& aDirectRefFeatures,
+ std::set<FeaturePtr>& aIndirectRefFeatures)
{
-#ifdef DEBUG_DELETE
- QStringList aDInfo;
- QObjectPtrList::const_iterator aDIt = theList.begin(), aDLast = theList.end();
- for (; aDIt != aDLast; ++aDIt) {
- aDInfo.append(ModuleBase_Tools::objectInfo((*aDIt)));
- }
- QString anInfoStr = aDInfo.join(", ");
- qDebug(QString("deleteFeatures: %1, %2").arg(theList.size()).arg(anInfoStr).toStdString().c_str());
-#endif
-
- // 1. find all referenced features
- std::set<FeaturePtr> aDirectRefFeatures, aIndirectRefFeatures;
foreach (ObjectPtr aDeletedObj, theList) {
std::set<FeaturePtr> alreadyProcessed;
- XGUI_Tools::refsToFeatureInAllDocuments(
- aDeletedObj, aDeletedObj, aDirectRefFeatures, aIndirectRefFeatures, alreadyProcessed);
+ XGUI_Tools::refsToFeatureInAllDocuments(aDeletedObj, aDeletedObj, theList, aDirectRefFeatures,
+ aIndirectRefFeatures, alreadyProcessed);
std::set<FeaturePtr> aDifference;
std::set_difference(aIndirectRefFeatures.begin(), aIndirectRefFeatures.end(),
aDirectRefFeatures.begin(), aDirectRefFeatures.end(),
std::inserter(aDifference, aDifference.begin()));
aIndirectRefFeatures = aDifference;
}
+}
- bool doDeleteReferences = true;
+bool XGUI_Workshop::isDeleteFeatureWithReferences(const QObjectPtrList& theList,
+ const std::set<FeaturePtr>& aDirectRefFeatures,
+ const std::set<FeaturePtr>& aIndirectRefFeatures,
+ QWidget* theParent,
+ bool& doDeleteReferences)
+{
+ doDeleteReferences = true;
- // 2. warn about the references remove, break the delete operation if the user chose it
- if (theAskAboutDeleteReferences && !aDirectRefFeatures.empty()) {
+ if (!aDirectRefFeatures.empty()) {
QStringList aDirectRefNames;
foreach (const FeaturePtr& aFeature, aDirectRefFeatures)
aDirectRefNames.append(aFeature->name().c_str());
doDeleteReferences = false;
}
}
+ return true;
+}
+
+bool XGUI_Workshop::deleteFeatures(const QObjectPtrList& theFeatures,
+ const std::set<FeaturePtr>& theIgnoredFeatures)
+{
+ std::set<FeaturePtr> aDirectRefFeatures, aIndirectRefFeatures;
+ findReferences(theFeatures, aDirectRefFeatures, aIndirectRefFeatures);
+ return deleteFeaturesInternal(theFeatures, aDirectRefFeatures, aIndirectRefFeatures,
+ theIgnoredFeatures);
+}
- // 3. remove referenced features
+bool XGUI_Workshop::deleteFeaturesInternal(const QObjectPtrList& theList,
+ const std::set<FeaturePtr>& aDirectRefFeatures,
+ const std::set<FeaturePtr>& aIndirectRefFeatures,
+ const std::set<FeaturePtr>& theIgnoredFeatures,
+ const bool doDeleteReferences)
+{
if (doDeleteReferences) {
std::set<FeaturePtr> aFeaturesToDelete = aDirectRefFeatures;
aFeaturesToDelete.insert(aIndirectRefFeatures.begin(), aIndirectRefFeatures.end());
}
QString anActionId = "DELETE_CMD";
- QString anId = QString::fromStdString(anActionId.toStdString().c_str());
+ return removeFeatures(theList, theIgnoredFeatures, anActionId);
+}
+
+//**************************************************************
+bool XGUI_Workshop::removeFeatures(const QObjectPtrList& theList,
+ const std::set<FeaturePtr>& theIgnoredFeatures,
+ const QString& theActionId)
+{
+ bool isDone = false;
+
+ QString anId = QString::fromStdString(theActionId.toStdString().c_str());
QStringList anObjectGroups = contextMenuMgr()->actionObjectGroups(anId);
// 4. remove the parameter features
foreach (ObjectPtr aObj, theList) {
if (!anObjectGroups.contains(aGroupName.c_str()))
continue;
- if (!myModule->canApplyAction(aObj, anActionId))
- continue;
-
FeaturePtr aFeature = ModelAPI_Feature::feature(aObj);
if (aFeature) {
/*// TODO: to learn the workshop to delegate the Part object deletion to the PartSet module
qDebug(QString("remove feature :%1").arg(anInfoStr).toStdString().c_str());
#endif
aDoc->removeFeature(aFeature);
+ isDone = true;
}
}
}