#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>
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);
}
//******************************************************
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
- 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 (!theOperation->isEditOperation()) {
- theOperation->activateByPreselection();
- if (operationMgr()->currentOperation() != theOperation)
+ 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
setPropertyPanel(theOperation);
//******************************************************
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);
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..."));
for (int i = 0; i < theTimes; ++i) {
aMgr->undo();
}
+
+ operationMgr()->updateApplyOfOperations();
updateCommandStatus();
}
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();
}
}
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)));
-
}
//******************************************************
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
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();
{
// 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) {
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);
