// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
//#include "XGUI_Constants.h"
-#include "XGUI_Tools.h"
#include "XGUI_Workshop.h"
-#include "XGUI_SelectionMgr.h"
-#include "XGUI_Selection.h"
-#include "XGUI_ObjectsBrowser.h"
-#include "XGUI_Displayer.h"
-#include "XGUI_OperationMgr.h"
-#include "XGUI_SalomeConnector.h"
+
#include "XGUI_ActionsMgr.h"
-#include "XGUI_ErrorDialog.h"
#include "XGUI_ColorDialog.h"
-#include "XGUI_ViewerProxy.h"
-#include "XGUI_PropertyPanel.h"
#include "XGUI_ContextMenuMgr.h"
+#include "XGUI_Displayer.h"
+#include "XGUI_ErrorDialog.h"
+#include "XGUI_ErrorMgr.h"
#include "XGUI_ModuleConnector.h"
+#include "XGUI_ObjectsBrowser.h"
+#include "XGUI_OperationMgr.h"
+#include "XGUI_PropertyPanel.h"
+#include "XGUI_SalomeConnector.h"
+#include "XGUI_Selection.h"
+#include "XGUI_SelectionMgr.h"
+#include "XGUI_Tools.h"
+#include "XGUI_ViewerProxy.h"
#include "XGUI_WorkshopListener.h"
-
-#include <XGUI_QtEvents.h>
-#include <XGUI_HistoryMenu.h>
#include <XGUI_CustomPrs.h>
+#include <XGUI_HistoryMenu.h>
+#include <XGUI_QtEvents.h>
-#include <AppElements_Workbench.h>
-#include <AppElements_Viewer.h>
+#include <AppElements_Button.h>
#include <AppElements_Command.h>
#include <AppElements_MainMenu.h>
#include <AppElements_MainWindow.h>
#include <AppElements_MenuGroupPanel.h>
-#include <AppElements_Button.h>
-
-#include <ModuleBase_IModule.h>
-#include <ModuleBase_Preferences.h>
+#include <AppElements_Viewer.h>
+#include <AppElements_Workbench.h>
+#include <ModelAPI_AttributeDocRef.h>
+#include <ModelAPI_AttributeIntArray.h>
+#include <ModelAPI_Data.h>
#include <ModelAPI_Events.h>
-#include <ModelAPI_Session.h>
#include <ModelAPI_Feature.h>
-#include <ModelAPI_Data.h>
-#include <ModelAPI_AttributeDocRef.h>
#include <ModelAPI_Object.h>
-#include <ModelAPI_Validator.h>
-#include <ModelAPI_ResultGroup.h>
-#include <ModelAPI_ResultConstruction.h>
#include <ModelAPI_ResultBody.h>
-#include <ModelAPI_AttributeIntArray.h>
+#include <ModelAPI_ResultConstruction.h>
+#include <ModelAPI_ResultGroup.h>
#include <ModelAPI_ResultParameter.h>
+#include <ModelAPI_Session.h>
+#include <ModelAPI_Validator.h>
+#include <ModelAPI_ResultCompSolid.h>
+#include <ModelAPI_Tools.h>
//#include <PartSetPlugin_Part.h>
#include <Events_Error.h>
#include <Events_LongOp.h>
+#include <ModuleBase_FilterFactory.h>
+#include <ModuleBase_IModule.h>
+#include <ModuleBase_IViewer.h>
#include <ModuleBase_Operation.h>
#include <ModuleBase_OperationDescription.h>
-#include <ModuleBase_SelectionValidator.h>
-#include <ModuleBase_WidgetFactory.h>
-#include <ModuleBase_Tools.h>
-#include <ModuleBase_IViewer.h>
-#include <ModuleBase_FilterFactory.h>
#include <ModuleBase_PageBase.h>
+#include <ModuleBase_Preferences.h>
+#include <ModuleBase_SelectionValidator.h>
#include <ModuleBase_Tools.h>
+#include <ModuleBase_WidgetFactory.h>
+#include <ModuleBase_OperationFeature.h>
+#include <ModuleBase_OperationAction.h>
#include <Config_Common.h>
#include <Config_FeatureMessage.h>
-#include <Config_PointerMessage.h>
#include <Config_ModuleReader.h>
+#include <Config_PointerMessage.h>
#include <Config_PropManager.h>
#include <Config_SelectionFilterMessage.h>
#include <QAction>
#include <QDesktopWidget>
+#include <iterator>
+
#ifdef _DEBUG
#include <QDebug>
#include <iostream>
myOperationMgr = new XGUI_OperationMgr(this, 0);
myActionsMgr = new XGUI_ActionsMgr(this);
myErrorDlg = new XGUI_ErrorDialog(QApplication::desktop());
+ myErrorMgr = new XGUI_ErrorMgr(this);
myContextMenuMgr = new XGUI_ContextMenuMgr(this);
connect(myContextMenuMgr, SIGNAL(actionTriggered(const QString&, bool)), this,
SLOT(onContextMenuCommand(const QString&, bool)));
SLOT(onOperationCommitted(ModuleBase_Operation*)));
connect(myOperationMgr, SIGNAL(operationAborted(ModuleBase_Operation*)),
SLOT(onOperationAborted(ModuleBase_Operation*)));
+ connect(myOperationMgr, SIGNAL(validationStateChanged(bool)),
+ myErrorMgr, SLOT(onValidationStateChanged()));
+
if (myMainWindow)
connect(myMainWindow, SIGNAL(exitKeySequence()), SLOT(onExit()));
connect(this, SIGNAL(errorOccurred(const QString&)), myErrorDlg, SLOT(addError(const QString&)));
myActionsMgr->update();
+ // activate visualized objects in the viewer
+ XGUI_Displayer* aDisplayer = displayer();
+ QObjectPtrList aDisplayed = aDisplayer->displayedObjects();
+ QIntList aModes;
+ module()->activeSelectionModes(aModes);
+ aDisplayer->activateObjects(aModes, aDisplayed);
}
void XGUI_Workshop::deactivateModule()
{
myModule->deactivateSelectionFilters();
+ // remove internal displayer filter
+ displayer()->deactivateSelectionFilters();
+
disconnect(myDisplayer, SIGNAL(objectDisplayed(ObjectPtr, AISObjectPtr)),
myModule, SLOT(onObjectDisplayed(ObjectPtr, AISObjectPtr)));
disconnect(myDisplayer, SIGNAL(beforeObjectErase(ObjectPtr, AISObjectPtr)),
myModule, SLOT(onBeforeObjectErase(ObjectPtr, AISObjectPtr)));
+
+ XGUI_Displayer* aDisplayer = displayer();
+ QObjectPtrList aDisplayed = aDisplayer->displayedObjects();
+ aDisplayer->deactivateObjects(aDisplayed, true);
}
//******************************************************
tr("Undo last command"),
QIcon(":pictures/undo.png"),
QKeySequence::Undo, false, "MEN_DESK_EDIT");
+ QString aToolBarTitle = tr( "INF_DESK_TOOLBAR_STANDARD" );
+ salomeConnector()->addActionInToolbar( aAction,aToolBarTitle );
+
connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onUndo()));
addHistoryMenu(aAction, SIGNAL(updateUndoHistory(const QList<ActionInfo>&)), SLOT(onUndo(int)));
aAction = salomeConnector()->addDesktopCommand("REDO_CMD", tr("Redo"), tr("Redo last command"),
QIcon(":pictures/redo.png"), QKeySequence::Redo,
false, "MEN_DESK_EDIT");
+ salomeConnector()->addActionInToolbar( aAction, aToolBarTitle );
+
connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onRedo()));
addHistoryMenu(aAction, SIGNAL(updateRedoHistory(const QList<ActionInfo>&)), SLOT(onRedo(int)));
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");
void XGUI_Workshop::deactivateActiveObject(const ObjectPtr& theObject, const bool theUpdateViewer)
{
if (!myModule->canActivateSelection(theObject)) {
- if (myDisplayer->isActive(theObject))
- myDisplayer->deactivate(theObject, theUpdateViewer);
+ if (myDisplayer->isActive(theObject)) {
+ QObjectPtrList anObjects;
+ anObjects.append(theObject);
+ myDisplayer->deactivateObjects(anObjects, theUpdateViewer);
+ }
}
}
//******************************************************
void XGUI_Workshop::onOperationStarted(ModuleBase_Operation* theOperation)
{
- setNestedFeatures(theOperation);
+ setGrantedFeatures(theOperation);
- if (theOperation->getDescription()->hasXmlRepresentation()) { //!< No need for property panel
- connectWithOperation(theOperation);
- setPropertyPanel(theOperation);
+ ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
+ (theOperation);
+ if (!aFOperation)
+ return;
+
+ if (aFOperation->getDescription()->hasXmlRepresentation()) { //!< No need for property panel
+ setPropertyPanel(aFOperation);
+ // filling the operation values by the current selection
+ // if the operation can be commited after the controls filling, the method perform should
+ // be stopped. Otherwise unnecessary presentations can be shown(e.g. operation prs in sketch)
+ if (!aFOperation->isEditOperation()) {
+ aFOperation->activateByPreselection();
+ if (operationMgr()->currentOperation() != aFOperation)
+ return;
+ }
}
updateCommandStatus();
- myModule->onOperationStarted(theOperation);
+ myModule->onOperationStarted(aFOperation);
// the objects of the current operation should be deactivated
QObjectPtrList anObjects;
- FeaturePtr aFeature = theOperation->feature();
+ FeaturePtr aFeature = aFOperation->feature();
anObjects.append(aFeature);
std::list<ResultPtr> aResults = aFeature->results();
std::list<ResultPtr>::const_iterator aIt;
//******************************************************
void XGUI_Workshop::onOperationResumed(ModuleBase_Operation* theOperation)
{
- setNestedFeatures(theOperation);
+ setGrantedFeatures(theOperation);
if (theOperation->getDescription()->hasXmlRepresentation()) { //!< No need for property panel
- // connectWithOperation(theOperation); already connected
setPropertyPanel(theOperation);
}
updateCommandStatus();
//******************************************************
void XGUI_Workshop::onOperationStopped(ModuleBase_Operation* theOperation)
{
+ updateCommandStatus();
+
+ ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
+ (theOperation);
+ if (!aFOperation)
+ return;
+
ModuleBase_ISelection* aSel = mySelector->selection();
QObjectPtrList aObj = aSel->selectedPresentations();
//!< No need for property panel
- updateCommandStatus();
hidePropertyPanel();
myPropertyPanel->cleanContent();
- myModule->onOperationStopped(theOperation);
+ myModule->onOperationStopped(aFOperation);
// the deactivated objects of the current operation should be activated back.
// They were deactivated on operation start or an object redisplay
QObjectPtrList anObjects;
- FeaturePtr aFeature = theOperation->feature();
+ FeaturePtr aFeature = aFOperation->feature();
if (myDisplayer->isVisible(aFeature) && !myDisplayer->isActive(aFeature))
anObjects.append(aFeature);
std::list<ResultPtr> aResults = aFeature->results();
myModule->onOperationAborted(theOperation);
}
-void XGUI_Workshop::setNestedFeatures(ModuleBase_Operation* theOperation)
+void XGUI_Workshop::setGrantedFeatures(ModuleBase_Operation* theOperation)
{
- if (this->isSalomeMode())
- theOperation->setNestedFeatures(mySalomeConnector->nestedActions(theOperation->id()));
- else
- theOperation->setNestedFeatures(myActionsMgr->nestedCommands(theOperation->id()));
+ ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
+ if (!aFOperation)
+ return;
+
+ QStringList aGrantedIds;
+ if (isSalomeMode())
+ aGrantedIds = mySalomeConnector->nestedActions(theOperation->id());
+ else
+ aGrantedIds = myActionsMgr->nestedCommands(theOperation->id());
+
+ aFOperation->setGrantedOperationIds(aGrantedIds);
}
void XGUI_Workshop::setPropertyPanel(ModuleBase_Operation* theOperation)
{
+ ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
+ if (!aFOperation)
+ return;
+
showPropertyPanel();
- QString aXmlRepr = theOperation->getDescription()->xmlRepresentation();
+ QString aXmlRepr = aFOperation->getDescription()->xmlRepresentation();
ModuleBase_WidgetFactory aFactory = ModuleBase_WidgetFactory(aXmlRepr.toStdString(),
myModuleConnector);
QList<ModuleBase_ModelWidget*> aWidgets = aFactory.getModelWidgets();
foreach (ModuleBase_ModelWidget* aWidget, aWidgets) {
- bool isStoreValue = !theOperation->isEditOperation() &&
+ bool isStoreValue = !aFOperation->isEditOperation() &&
!aWidget->getDefaultValue().empty() &&
!aWidget->isComputedDefault();
- aWidget->setFeature(theOperation->feature(), isStoreValue);
+ aWidget->setFeature(aFOperation->feature(), isStoreValue);
aWidget->enableFocusProcessing();
}
myPropertyPanel->setModelWidgets(aWidgets);
- theOperation->setPropertyPanel(myPropertyPanel);
+ aFOperation->setPropertyPanel(myPropertyPanel);
myModule->propertyPanelDefined(theOperation);
myPropertyPanel->setWindowTitle(theOperation->getDescription()->description());
-}
-/*
- * Makes a signal/slot connections between Property Panel
- * and given operation. The given operation becomes a
- * current operation and previous operation if exists
- */
-void XGUI_Workshop::connectWithOperation(ModuleBase_Operation* theOperation)
-{
- QAction* aCommand = 0;
- if (isSalomeMode()) {
- aCommand = salomeConnector()->command(theOperation->getDescription()->operationId());
- } else {
- AppElements_MainMenu* aMenu = myMainWindow->menuObject();
- FeaturePtr aFeature = theOperation->feature();
- if(aFeature)
- aCommand = aMenu->feature(QString::fromStdString(aFeature->getKind()));
- }
- //Abort operation on uncheck the command
- if (aCommand) {
- connect(aCommand, SIGNAL(triggered(bool)), theOperation, SLOT(setRunning(bool)));
- }
+ myErrorMgr->setPropertyPanel(myPropertyPanel);
}
/*
QApplication::restoreOverrideCursor();
}
-bool XGUI_Workshop::isActiveOperationAborted()
+bool XGUI_Workshop::abortAllOperations()
{
return myOperationMgr->abortAllOperations();
}
//******************************************************
void XGUI_Workshop::onOpen()
{
- if(!isActiveOperationAborted())
+ if(!abortAllOperations())
return;
//save current file before close if modified
SessionPtr aSession = ModelAPI_Session::get();
//******************************************************
bool XGUI_Workshop::onSave()
{
- if(!isActiveOperationAborted())
+ if(!abortAllOperations())
return false;
if (myCurrentDir.isEmpty()) {
return onSaveAs();
//******************************************************
bool XGUI_Workshop::onSaveAs()
{
- if(!isActiveOperationAborted())
+ if(!abortAllOperations())
return false;
QFileDialog dialog(mainWindow());
dialog.setWindowTitle(tr("Select directory to save files..."));
{
objectBrowser()->treeView()->setCurrentIndex(QModelIndex());
SessionPtr aMgr = ModelAPI_Session::get();
- if (aMgr->isOperation())
+ if (aMgr->isOperation()) {
+ /// this is important for nested operrations
+ /// when sketch opeation is active, this condition is false and
+ /// the sketch operation is not aborted
operationMgr()->onAbortOperation();
+ }
for (int i = 0; i < theTimes; ++i) {
aMgr->undo();
}
+
+ operationMgr()->updateApplyOfOperations();
updateCommandStatus();
}
objectBrowser()->treeView()->setCurrentIndex(QModelIndex());
SessionPtr aMgr = ModelAPI_Session::get();
- if (aMgr->isOperation())
+ if (aMgr->isOperation()) {
+ /// this is important for nested operrations
+ /// when sketch opeation is active, this condition is false and
+ /// the sketch operation is not aborted
operationMgr()->onAbortOperation();
+ }
for (int i = 0; i < theTimes; ++i) {
aMgr->redo();
}
+ operationMgr()->updateApplyOfOperations();
updateCommandStatus();
// unblock the viewer update functionality and make update on purpose
myMainWindow->menuObject()->updateFromResources();
}
}
+ displayer()->redisplayObjects();
}
}
aObjDock->setStyleSheet(
"::title { position: relative; padding-left: 5px; text-align: left center }");
myObjectBrowser = new XGUI_ObjectsBrowser(aObjDock);
+#ifdef ModuleDataModel
myObjectBrowser->setDataModel(myModule->dataModel());
+#endif
myModule->customizeObjectBrowser(myObjectBrowser);
aObjDock->setWidget(myObjectBrowser);
myOperationMgr, SLOT(onKeyReleased(QKeyEvent*)));
connect(myOperationMgr, SIGNAL(validationStateChanged(bool)),
aOkAct, SLOT(setEnabled(bool)));
- QAction* aAcceptAllAct = myActionsMgr->operationStateAction(XGUI_ActionsMgr::AcceptAll);
- connect(myOperationMgr, SIGNAL(nestedStateChanged(bool)),
- aAcceptAllAct, SLOT(setEnabled(bool)));
-
}
//******************************************************
myObjectBrowser->parentWidget()->hide();
}
-//******************************************************
-//void XGUI_Workshop::onFeatureTriggered()
-//{
-// QAction* aCmd = dynamic_cast<QAction*>(sender());
-// if (aCmd) {
-// QString aId = salomeConnector()->commandId(aCmd);
-// if (!aId.isNull())
-// myModule->launchOperation(aId);
-// }
-//}
-
//******************************************************
void XGUI_Workshop::salomeViewerSelectionChanged()
{
QObjectPtrList aObjects = mySelector->selection()->selectedObjects();
if (theId == "DELETE_CMD")
deleteObjects();
- if (theId == "MOVE_CMD")
+ else if (theId == "MOVE_CMD")
moveObjects();
else if (theId == "COLOR_CMD")
changeColor(aObjects);
setDisplayMode(aObjects, XGUI_Displayer::Wireframe);
else if (theId == "HIDEALL_CMD") {
QObjectPtrList aList = myDisplayer->displayedObjects();
- foreach (ObjectPtr aObj, aList)
- aObj->setDisplayed(false);
+ foreach (ObjectPtr aObj, aList) {
+ if (module()->canEraseObject(aObj))
+ aObj->setDisplayed(false);
+ }
Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
}
}
return;
}
- if (!isActiveOperationAborted())
+ if (!abortAllOperations())
return;
QObjectPtrList anObjects = mySelector->selection()->selectedObjects();
+ // It is necessary to clear selection in order to avoid selection changed event during
+ // deleteion 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(myMainWindow, anObjects))
+ return;
+
bool hasResult = false;
bool hasFeature = false;
bool hasParameter = false;
- ModuleBase_Tools::checkObjects(anObjects, hasResult, hasFeature, hasParameter);
+ bool hasSubFeature = false;
+ ModuleBase_Tools::checkObjects(anObjects, hasResult, hasFeature, hasParameter, hasSubFeature);
if (!(hasFeature || hasParameter))
return;
aObjectNames << QString::fromStdString(aObj->data()->name());
}
aDescription = aDescription.arg(aObjectNames.join(", "));
+ ModuleBase_OperationAction* anOpAction = new ModuleBase_OperationAction(aDescription, module());
- SessionPtr aMgr = ModelAPI_Session::get();
- aMgr->startOperation(aDescription.toStdString());
- // 2. close the documents of the removed parts if the result part is in a list of selected objects
- // this is performed in the RemoveFeature of Part object.
- /*foreach (ObjectPtr aObj, anObjects)
- {
- ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(aObj);
- if (aPart) {
- DocumentPtr aDoc = aObj->document();
- if (aDoc == aMgr->activeDocument()) {
- aDoc->close();
- }
- }
- }*/
+ operationMgr()->startOperation(anOpAction);
// 3. delete objects
QMainWindow* aDesktop = isSalomeMode() ? salomeConnector()->desktop() : myMainWindow;
std::set<FeaturePtr> anIgnoredFeatures;
if (deleteFeatures(anObjects, anIgnoredFeatures, aDesktop, true)) {
- myDisplayer->updateViewer();
- aMgr->finishOperation();
- updateCommandStatus();
+ operationMgr()->commitOperation();
}
else {
- aMgr->abortOperation();
+ operationMgr()->abortOperation(operationMgr()->currentOperation());
}
}
//**************************************************************
void XGUI_Workshop::moveObjects()
{
- if (!isActiveOperationAborted())
+ if (!abortAllOperations())
return;
SessionPtr aMgr = ModelAPI_Session::get();
- QString aDescription = contextMenuMgr()->action("MOVE_CMD")->text();
+ QString anActionId = "MOVE_CMD";
+ QString aDescription = contextMenuMgr()->action(anActionId)->text();
aMgr->startOperation(aDescription.toStdString());
QObjectPtrList anObjects = mySelector->selection()->selectedObjects();
DocumentPtr anActiveDocument = aMgr->activeDocument();
FeaturePtr aCurrentFeature = anActiveDocument->currentFeature(true);
- foreach (ObjectPtr aObj, anObjects) {
- FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObj);
+ foreach (ObjectPtr aObject, anObjects) {
+ if (!myModule->canApplyAction(aObject, anActionId))
+ continue;
+
+ FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObject);
if (aFeature.get()) {
anActiveDocument->moveFeature(aFeature, aCurrentFeature);
aCurrentFeature = anActiveDocument->currentFeature(true);
aMgr->finishOperation();
}
-//**************************************************************
-std::set<FeaturePtr> refFeatures(const ObjectPtr& theObject, bool checkAllDocuments = true)
-{
- std::set<FeaturePtr> aRefFeatures;
- FeaturePtr aFeature = ModelAPI_Feature::feature(theObject);
- if (!aFeature.get())
- return aRefFeatures;
-
- DocumentPtr aFeatureDoc = aFeature->document();
- // 1. find references in the current document
- aFeatureDoc->refsToFeature(aFeature, aRefFeatures, false);
-
- // 2. find references in all documents if the document of the feature is
- // "PartSet". Features of this document can be used in all other documents
- if (checkAllDocuments) {
- SessionPtr aMgr = ModelAPI_Session::get();
- DocumentPtr aModuleDoc = aMgr->moduleDocument();
- if (aFeatureDoc == aModuleDoc) {
- // the feature and results of the feature should be found in references
- std::list<ObjectPtr> aDeletedObjects;
- aDeletedObjects.push_back(aFeature);
- typedef std::list<std::shared_ptr<ModelAPI_Result> > ResultsList;
- const ResultsList& aResults = aFeature->results();
- ResultsList::const_iterator aRIter = aResults.begin();
- for (; aRIter != aResults.cend(); aRIter++) {
- ResultPtr aRes = *aRIter;
- if (aRes.get())
- aDeletedObjects.push_back(aRes);
- }
- // get all opened documents; found features in the documents;
- // get a list of objects where a feature refers;
- // search in these objects the deleted objects.
- std::list<DocumentPtr> anOpenedDocs = aMgr->allOpenedDocuments();
- std::list<DocumentPtr>::const_iterator anIt = anOpenedDocs.begin(),
- aLast = anOpenedDocs.end();
- std::list<std::pair<std::string, std::list<ObjectPtr> > > aRefs;
- for (; anIt != aLast; anIt++) {
- DocumentPtr aDocument = *anIt;
- if (aDocument == aFeatureDoc)
- continue; // this document has been already processed in 1.1
-
- int aFeaturesCount = aDocument->size(ModelAPI_Feature::group());
- for (int aId = 0; aId < aFeaturesCount; aId++) {
- ObjectPtr anObject = aDocument->object(ModelAPI_Feature::group(), aId);
- FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(anObject);
- if (!aFeature.get())
- continue;
-
- aRefs.clear();
- aFeature->data()->referencesToObjects(aRefs);
- std::list<std::pair<std::string, std::list<ObjectPtr> > >::iterator aRef = aRefs.begin();
- bool aHasReferenceToObjetc = false;
- for(; aRef != aRefs.end() && !aHasReferenceToObjetc; aRef++) {
- std::list<ObjectPtr>::iterator aRefObj = aRef->second.begin();
- for(; aRefObj != aRef->second.end() && !aHasReferenceToObjetc; aRefObj++) {
- std::list<ObjectPtr>::const_iterator aObjIt = aDeletedObjects.begin();
- for(; aObjIt != aDeletedObjects.end() && !aHasReferenceToObjetc; aObjIt++) {
- aHasReferenceToObjetc = *aObjIt == *aRefObj;
- }
- }
- }
- if (aHasReferenceToObjetc)
- aRefFeatures.insert(aFeature);
- }
- }
- }
- }
- return aRefFeatures;
-}
-
//**************************************************************
bool XGUI_Workshop::deleteFeatures(const QObjectPtrList& theList,
const std::set<FeaturePtr>& theIgnoredFeatures,
#endif
// 1. find all referenced features
- std::set<FeaturePtr> aRefFeatures;
+ std::set<FeaturePtr> aDirectRefFeatures, aIndirectRefFeatures;
foreach (ObjectPtr aDeletedObj, theList) {
- std::set<FeaturePtr> aFeatures = refFeatures(aDeletedObj);
- aRefFeatures.insert(aFeatures.begin(), aFeatures.end());
+ XGUI_Tools::refsToFeatureInAllDocuments(aDeletedObj, aDeletedObj, aDirectRefFeatures, aIndirectRefFeatures);
+ std::set<FeaturePtr> aDifference;
+ std::set_difference(aIndirectRefFeatures.begin(), aIndirectRefFeatures.end(),
+ aDirectRefFeatures.begin(), aDirectRefFeatures.end(),
+ std::inserter(aDifference, aDifference.begin()));
+ aIndirectRefFeatures = aDifference;
}
// 2. warn about the references remove, break the delete operation if the user chose it
- if (theAskAboutDeleteReferences && !aRefFeatures.empty()) {
- QStringList aRefNames;
- std::set<FeaturePtr>::const_iterator anIt = aRefFeatures.begin(),
- aLast = aRefFeatures.end();
- for (; anIt != aLast; anIt++) {
- aRefNames.append((*anIt)->name().c_str());
- }
- QString aNames = aRefNames.join(", ");
+ if (theAskAboutDeleteReferences && !aDirectRefFeatures.empty()) {
+ QStringList aDirectRefNames;
+ foreach(const FeaturePtr& aFeature, aDirectRefFeatures)
+ aDirectRefNames.append(aFeature->name().c_str());
+ QString aDirectNames = aDirectRefNames.join(", ");
+
+ QStringList aIndirectRefNames;
+ foreach(const FeaturePtr& aFeature, aIndirectRefFeatures)
+ aIndirectRefNames.append(aFeature->name().c_str());
+ QString aIndirectNames = aIndirectRefNames.join(", ");
QMessageBox::StandardButton aRes = QMessageBox::warning(
theParent, tr("Delete features"),
QString(tr("Selected features are used in the following features: %1.\
-These features will be deleted also. Would you like to continue?")).arg(aNames),
+ These features will be deleted.\n%2Would you like to continue?")).arg(aDirectNames)
+ .arg(aIndirectNames.isEmpty() ? QString() : QString("Also these features will be deleted: %1.\n").arg(aIndirectNames)),
QMessageBox::No | QMessageBox::Yes, QMessageBox::No);
if (aRes != QMessageBox::Yes)
return false;
}
// 3. remove referenced features
- std::set<FeaturePtr>::const_iterator anIt = aRefFeatures.begin(),
- aLast = aRefFeatures.end();
+ std::set<FeaturePtr> aFeaturesToDelete = aDirectRefFeatures;
+ aFeaturesToDelete.insert(aIndirectRefFeatures.begin(), aIndirectRefFeatures.end());
+ std::set<FeaturePtr>::const_iterator anIt = aFeaturesToDelete.begin(),
+ aLast = aFeaturesToDelete.end();
#ifdef DEBUG_DELETE
QStringList anInfo;
#endif
anInfo.clear();
#endif
- QString anId = QString::fromStdString("DELETE_CMD");
+ QString anActionId = "DELETE_CMD";
+ QString anId = QString::fromStdString(anActionId.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
+ /*// TODO: to learn the workshop to delegate the Part object deletion to the PartSet module
// part features are removed in the PartSet module. This condition should be moved there
if (aFeature->getKind() == "Part")
continue;
-
+ */
DocumentPtr aDoc = aObj->document();
if (theIgnoredFeatures.find(aFeature) == theIgnoredFeatures.end()) {
#ifdef DEBUG_DELETE
bool XGUI_Workshop::canMoveFeature()
{
+ QString anActionId = "MOVE_CMD";
+
QObjectPtrList aObjects = mySelector->selection()->selectedObjects();
+ QObjectPtrList aValidatedObjects;
foreach (ObjectPtr aObject, aObjects) {
+ if (myModule->canApplyAction(aObject, anActionId))
+ aValidatedObjects.append(aObject);
+ }
+ if (aValidatedObjects.size() != aObjects.size())
+ aObjects = aValidatedObjects;
+
+ bool aCanMove = !aObjects.empty();
+
+ QObjectPtrList::const_iterator anIt = aObjects.begin(), aLast = aObjects.end();
+ for (; anIt != aLast && aCanMove; anIt++) {
+ ObjectPtr aObject = *anIt;
// 1. Get features placed between selected and current in the document
std::list<FeaturePtr> aFeaturesBetween = toCurrentFeatures(aObject);
// if aFeaturesBetween is empty it means wrong order or aObject is the current feature
if (aFeaturesBetween.empty())
- return false;
- std::set<FeaturePtr> aPlacedFeatures(aFeaturesBetween.begin(), aFeaturesBetween.end());
- // 2. Get all reference features to the selected object in the document
- std::set<FeaturePtr> aRefFeatures = refFeatures(aObject, false);
- if (aRefFeatures.empty())
- continue;
- // 3. Find any placed features in all reference features
- std::set<FeaturePtr> aIntersectionFeatures;
- std::set_intersection(aRefFeatures.begin(), aRefFeatures.end(),
- aPlacedFeatures.begin(), aPlacedFeatures.end(),
- std::inserter(aIntersectionFeatures, aIntersectionFeatures.begin()));
- // 4. Return false if any reference feature is placed before curent feature
- if (!aIntersectionFeatures.empty())
- return false;
+ aCanMove = false;
+ else {
+ std::set<FeaturePtr> aPlacedFeatures(aFeaturesBetween.begin(), aFeaturesBetween.end());
+ // 2. Get all reference features to the selected object in the document
+ std::set<FeaturePtr> aRefFeatures;
+ XGUI_Tools::refsToFeatureInFeatureDocument(aObject, aRefFeatures);
+
+ if (aRefFeatures.empty())
+ continue;
+ else {
+ // 3. Find any placed features in all reference features
+ std::set<FeaturePtr> aIntersectionFeatures;
+ std::set_intersection(aRefFeatures.begin(), aRefFeatures.end(),
+ aPlacedFeatures.begin(), aPlacedFeatures.end(),
+ std::inserter(aIntersectionFeatures, aIntersectionFeatures.begin()));
+ // 4. Return false if any reference feature is placed before curent feature
+ if (!aIntersectionFeatures.empty())
+ aCanMove = false;
+ }
+ }
}
- return true;
+ return aCanMove;
+}
+
+//**************************************************************
+bool XGUI_Workshop::canBeShaded(const ObjectPtr& theObject) const
+{
+ bool aCanBeShaded = myDisplayer->canBeShaded(theObject);
+ if (!aCanBeShaded) {
+ ResultCompSolidPtr aCompsolidResult =
+ std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(theObject);
+ if (aCompsolidResult.get() != NULL) { // change colors for all sub-solids
+ for(int i = 0; i < aCompsolidResult->numberOfSubs() && !aCanBeShaded; i++)
+ aCanBeShaded = myDisplayer->canBeShaded(aCompsolidResult->subResult(i));
+ }
+ }
+ return aCanBeShaded;
}
//**************************************************************
std::vector<int> aColor;
foreach(ObjectPtr anObject, theObjects) {
ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(anObject);
- if (aResult.get())
+ if (aResult.get()) {
XGUI_CustomPrs::getResultColor(aResult, aColor);
+ }
else {
// TODO: remove the obtaining a color from the AIS object
// this does not happen never because:
}
// 4. set the value to all results
+ std::vector<int> aColorResult = aDlg->getColor();
foreach(ObjectPtr anObj, theObjects) {
ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(anObj);
if (aResult.get() != NULL) {
- std::vector<int> aColorResult = aDlg->getColor();
+ ResultCompSolidPtr aCompsolidResult = std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(aResult);
+ if (aCompsolidResult.get() != NULL) { // change colors for all sub-solids
+ for(int i = 0; i < aCompsolidResult->numberOfSubs(); i++)
+ setColor(aCompsolidResult->subResult(i), aColorResult);
+ }
setColor(aResult, aColorResult);
}
}
{
// Hide all displayed objects
QObjectPtrList aList = myDisplayer->displayedObjects();
- foreach (ObjectPtr aObj, aList)
- aObj->setDisplayed(false);
+ foreach (ObjectPtr aObj, aList) {
+ if (module()->canEraseObject(aObj))
+ aObj->setDisplayed(false);
+ }
// Show only objects from the list
foreach (ObjectPtr aObj, theList) {
{
foreach(ObjectPtr aObj, theList) {
myDisplayer->setDisplayMode(aObj, (XGUI_Displayer::DisplayMode)theMode, false);
+
+ ResultCompSolidPtr aCompsolidResult = std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(aObj);
+ if (aCompsolidResult.get() != NULL) { // change colors for all sub-solids
+ for(int i = 0; i < aCompsolidResult->numberOfSubs(); i++) {
+ myDisplayer->setDisplayMode(aCompsolidResult->subResult(i),
+ (XGUI_Displayer::DisplayMode)theMode, false);
+ }
+ }
}
if (theList.size() > 0)
myDisplayer->updateViewer();
myDisplayer->eraseAll();
objectBrowser()->clearContent();
+ module()->closeDocument();
+
SessionPtr aMgr = ModelAPI_Session::get();
aMgr->closeAll();
}
std::list<std::string>::const_iterator it = theList.cbegin();
for (; it != theList.cend(); it++) {
QString anId = QString::fromStdString(*it);
- bool isEditing = anId.endsWith(ModuleBase_Operation::EditSuffix());
+ bool isEditing = anId.endsWith(ModuleBase_OperationFeature::EditSuffix());
if (isEditing) {
- anId.chop(ModuleBase_Operation::EditSuffix().size());
+ anId.chop(ModuleBase_OperationFeature::EditSuffix().size());
}
ActionInfo anInfo;
QAction* aContextMenuAct = myContextMenuMgr->actionByName(anId);
