#include <ModuleBase_Tools.h>
#include <ModuleBase_WidgetFactory.h>
#include <ModuleBase_OperationFeature.h>
+#include <ModuleBase_OperationAction.h>
#include <Config_Common.h>
#include <Config_FeatureMessage.h>
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)));
ModuleBase_IWorkshop* aWorkshop = moduleConnector();
myOperationMgr->setWorkshop(aWorkshop);
+ myErrorMgr = new XGUI_ErrorMgr(this, aWorkshop);
myEventsListener = new XGUI_WorkshopListener(aWorkshop);
connect(myOperationMgr, SIGNAL(operationStarted(ModuleBase_Operation*)),
SLOT(onOperationCommitted(ModuleBase_Operation*)));
connect(myOperationMgr, SIGNAL(operationAborted(ModuleBase_Operation*)),
SLOT(onOperationAborted(ModuleBase_Operation*)));
- connect(myOperationMgr, SIGNAL(validationStateChanged(bool)),
- myErrorMgr, SLOT(onValidationStateChanged()));
+ //connect(myOperationMgr, SIGNAL(validationStateChanged(bool)),
+ // myErrorMgr, SLOT(onValidationStateChanged()));
if (myMainWindow)
connect(myMainWindow, SIGNAL(exitKeySequence()), SLOT(onExit()));
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::onAcceptActionClicked()
+{
+ QAction* anAction = dynamic_cast<QAction*>(sender());
+ XGUI_OperationMgr* anOperationMgr = operationMgr();
+ if (anOperationMgr) {
+ ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
+ (anOperationMgr->currentOperation());
+ if (aFOperation) {
+ 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)
{
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);
+ }
+ }
+}
+
+//******************************************************
+bool XGUI_Workshop::isFeatureOfNested(const FeaturePtr& theFeature)
+{
+ bool aHasNested = false;
+ std::string aFeatureKind = theFeature->getKind();
+ if (isSalomeMode()) {
+ XGUI_SalomeConnector* aSalomeConnector = salomeConnector();
+ if (aSalomeConnector->isFeatureOfNested(actionsMgr()->action(aFeatureKind.c_str())))
+ aHasNested = true;
+ } else {
+ AppElements_MainMenu* aMenuBar = mainWindow()->menuObject();
+ AppElements_Command* aCommand = aMenuBar->feature(aFeatureKind.c_str());
+ if (aCommand && aCommand->button()->additionalButtonWidget())
+ aHasNested = true;
}
+ return aHasNested;
}
//******************************************************
void XGUI_Workshop::onOperationStarted(ModuleBase_Operation* theOperation)
{
- setNestedFeatures(theOperation);
+ setGrantedFeatures(theOperation);
ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
(theOperation);
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
+ // if the operation can be committed 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();
//******************************************************
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)
ModuleBase_ISelection* aSel = mySelector->selection();
QObjectPtrList aObj = aSel->selectedPresentations();
//!< No need for property panel
- updateCommandStatus();
hidePropertyPanel();
myPropertyPanel->cleanContent();
// They were deactivated on operation start or an object redisplay
QObjectPtrList anObjects;
FeaturePtr aFeature = aFOperation->feature();
- if (myDisplayer->isVisible(aFeature) && !myDisplayer->isActive(aFeature))
- anObjects.append(aFeature);
- std::list<ResultPtr> aResults = aFeature->results();
- std::list<ResultPtr>::const_iterator aIt;
- for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) {
- ResultPtr anObject = *aIt;
- if (myDisplayer->isVisible(anObject) && !myDisplayer->isActive(anObject)) {
- anObjects.append(anObject);
+ if (aFeature.get()) { // feature may be not created (plugin load fail)
+ if (myDisplayer->isVisible(aFeature) && !myDisplayer->isActive(aFeature))
+ anObjects.append(aFeature);
+ std::list<ResultPtr> aResults = aFeature->results();
+ std::list<ResultPtr>::const_iterator aIt;
+ for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) {
+ ResultPtr anObject = *aIt;
+ if (myDisplayer->isVisible(anObject) && !myDisplayer->isActive(anObject)) {
+ anObjects.append(anObject);
+ }
}
}
QIntList aModes;
myModule->onOperationAborted(theOperation);
}
-void XGUI_Workshop::setNestedFeatures(ModuleBase_Operation* theOperation)
+void XGUI_Workshop::setGrantedFeatures(ModuleBase_Operation* theOperation)
{
ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
if (!aFOperation)
return;
+ QStringList aGrantedIds;
if (isSalomeMode())
- aFOperation->setGrantedOperationIds(mySalomeConnector->nestedActions(theOperation->id()));
+ aGrantedIds = mySalomeConnector->nestedActions(theOperation->id());
else
- aFOperation->setGrantedOperationIds(myActionsMgr->nestedCommands(theOperation->id()));
+ aGrantedIds = myActionsMgr->nestedCommands(theOperation->id());
+
+ aFOperation->setGrantedOperationIds(aGrantedIds);
}
void XGUI_Workshop::setPropertyPanel(ModuleBase_Operation* 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();
aSession->closeAll();
aSession->load(myCurrentDir.toLatin1().constData());
myObjectBrowser->rebuildDataTree();
- //displayAllResults();
updateCommandStatus();
QApplication::restoreOverrideCursor();
}
//******************************************************
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..."));
myMainWindow->menuObject()->updateFromResources();
}
}
+ displayer()->redisplayObjects();
}
}
myPropertyPanel->installEventFilter(myOperationMgr);
QAction* aOkAct = myActionsMgr->operationStateAction(XGUI_ActionsMgr::Accept);
- connect(aOkAct, SIGNAL(triggered()), myOperationMgr, SLOT(onCommitOperation()));
+ connect(aOkAct, SIGNAL(triggered()), this, SLOT(onAcceptActionClicked()));
+
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)),
- aOkAct, SLOT(setEnabled(bool)));
+ //connect(myOperationMgr, SIGNAL(validationStateChanged(bool)),
+ // this, SLOT(onValidationStateChanged(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();
- operationMgr()->updateApplyOfOperations();
- updateCommandStatus();
+ operationMgr()->commitOperation();
}
else {
- aMgr->abortOperation();
+ operationMgr()->abortOperation(operationMgr()->currentOperation());
}
}
//**************************************************************
void XGUI_Workshop::moveObjects()
{
- if (!isActiveOperationAborted())
+ if (!abortAllOperations())
return;
SessionPtr aMgr = ModelAPI_Session::get();
QObjectPtrList aObjects = mySelector->selection()->selectedObjects();
QObjectPtrList aValidatedObjects;
foreach (ObjectPtr aObject, aObjects) {
- if (myModule->canApplyAction(aObject, anActionId))
- aValidatedObjects.append(aObject);
+ if (!myModule->canApplyAction(aObject, anActionId))
+ continue;
+ // To be moved feature should be in active document
+ if (aObject->document() != ModelAPI_Session::get()->activeDocument())
+ continue;
+ aValidatedObjects.append(aObject);
}
if (aValidatedObjects.size() != aObjects.size())
aObjects = aValidatedObjects;
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
+ // 4. Return false if any reference feature is placed before current feature
if (!aIntersectionFeatures.empty())
aCanMove = false;
}
{
// 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) {
ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
}
-//**************************************************************
-/*void XGUI_Workshop::displayAllResults()
-{
- SessionPtr aMgr = ModelAPI_Session::get();
- DocumentPtr aRootDoc = aMgr->moduleDocument();
- displayDocumentResults(aRootDoc);
- for (int i = 0; i < aRootDoc->size(ModelAPI_ResultPart::group()); i++) {
- ObjectPtr aObject = aRootDoc->object(ModelAPI_ResultPart::group(), i);
- ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(aObject);
- displayDocumentResults(aPart->partDoc());
- }
- myDisplayer->updateViewer();
-}*/
-
//**************************************************************
void XGUI_Workshop::displayDocumentResults(DocumentPtr theDoc)
{
