ModelAPI_ExecState aState = theFeature->data()->execState();
switch(aState) {
case ModelAPI_StateDone:
- case ModelAPI_StateNothing:
+ case ModelAPI_StateNothing: {
anIcon = QIcon(anIconString);
+ }
+ break;
case ModelAPI_StateMustBeUpdated: {
anIcon = ModuleBase_Tools::lighter(anIconString);
}
SLOT(onContextMenuCommand(const QString&, bool)));
myViewerProxy = new XGUI_ViewerProxy(this);
- connect(myViewerProxy, SIGNAL(selectionChanged()), this, SLOT(updateCommandsOnViewSelection()));
+ connect(myViewerProxy, SIGNAL(selectionChanged()),
+ myActionsMgr, SLOT(updateOnViewSelection()));
myModuleConnector = new XGUI_ModuleConnector(this);
connect(myOperationMgr, SIGNAL(operationStarted(ModuleBase_Operation*)),
- SLOT(onOperationStarted()));
- connect(myOperationMgr, SIGNAL(operationResumed(ModuleBase_Operation*)), SLOT(onOperationStarted()));
+ SLOT(onOperationStarted(ModuleBase_Operation*)));
+ connect(myOperationMgr, SIGNAL(operationResumed(ModuleBase_Operation*)),
+ SLOT(onOperationResumed(ModuleBase_Operation*)));
connect(myOperationMgr, SIGNAL(operationStopped(ModuleBase_Operation*)),
SLOT(onOperationStopped(ModuleBase_Operation*)));
+ connect(myOperationMgr, SIGNAL(operationCommitted(ModuleBase_Operation*)),
+ SLOT(onOperationCommitted(ModuleBase_Operation*)));
+ connect(myOperationMgr, SIGNAL(operationAborted(ModuleBase_Operation*)),
+ SLOT(onOperationAborted(ModuleBase_Operation*)));
connect(myMainWindow, SIGNAL(exitKeySequence()), SLOT(onExit()));
- // TODO(sbh): It seems that application works properly without update on operationStarted
- connect(myOperationMgr, SIGNAL(operationStarted(ModuleBase_Operation*)),
- myActionsMgr, SLOT(update()));
- connect(myOperationMgr, SIGNAL(operationStopped(ModuleBase_Operation*)),
- myActionsMgr, SLOT(update()));
connect(this, SIGNAL(errorOccurred(const QString&)), myErrorDlg, SLOT(addError(const QString&)));
}
aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_CREATED));
aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_DELETED));
- aLoop->registerListener(this, Events_Loop::eventByName("LongOperation"));
+ aLoop->registerListener(this, Events_LongOp::eventID());
aLoop->registerListener(this, Events_Loop::eventByName(EVENT_PLUGIN_LOADED));
- aLoop->registerListener(this, Events_Loop::eventByName("CurrentDocumentChanged"));
+ aLoop->registerListener(this, Events_Loop::eventByName(EVENT_DOCUMENT_CHANGED));
aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_TOSHOW));
aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_TOHIDE));
aLoop->registerListener(this, Events_Loop::eventByName(EVENT_SELFILTER_LOADED));
}
onNew();
+
+ emit applicationStarted();
}
//******************************************************
addFeature(aFeatureMsg);
}
}
-
// Process creation of Part
else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_CREATED)) {
std::shared_ptr<ModelAPI_ObjectUpdatedMessage> aUpdMsg =
else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_PLUGIN_LOADED)) {
myUpdatePrefs = true;
}
-
// Redisplay feature
else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY)) {
std::shared_ptr<ModelAPI_ObjectUpdatedMessage> aUpdMsg =
std::dynamic_pointer_cast<ModelAPI_ObjectUpdatedMessage>(theMessage);
onFeatureRedisplayMsg(aUpdMsg);
}
-
//Update property panel on corresponding message. If there is no current operation (no
//property panel), or received message has different feature to the current - do nothing.
else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_UPDATED)) {
std::shared_ptr<ModelAPI_ObjectUpdatedMessage> anUpdateMsg =
std::dynamic_pointer_cast<ModelAPI_ObjectUpdatedMessage>(theMessage);
onFeatureUpdatedMsg(anUpdateMsg);
- }
-
- else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_DELETED)) {
+ } else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_DELETED)) {
std::shared_ptr<ModelAPI_ObjectDeletedMessage> aDelMsg =
std::dynamic_pointer_cast<ModelAPI_ObjectDeletedMessage>(theMessage);
onObjectDeletedMsg(aDelMsg);
- }
-
- else if (theMessage->eventID() == Events_LongOp::eventID()) {
- if (Events_LongOp::isPerformed())
+ } else if (theMessage->eventID() == Events_LongOp::eventID()) {
+ if (Events_LongOp::isPerformed()) {
QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
- else
+ } else {
QApplication::restoreOverrideCursor();
- }
-
- else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_TOSHOW)) {
+ }
+ } else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_TOSHOW)) {
std::shared_ptr<ModelAPI_ObjectUpdatedMessage> anUpdateMsg =
std::dynamic_pointer_cast<ModelAPI_ObjectUpdatedMessage>(theMessage);
const std::set<ObjectPtr>& aObjList = anUpdateMsg->objects();
for (aIt = aObjList.cbegin(); aIt != aObjList.cend(); ++aIt)
aList.append(*aIt);
showObjects(aList, true);
- }
-
- else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_TOHIDE)) {
+ } else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_TOHIDE)) {
std::shared_ptr<ModelAPI_ObjectUpdatedMessage> anUpdateMsg =
std::dynamic_pointer_cast<ModelAPI_ObjectUpdatedMessage>(theMessage);
const std::set<ObjectPtr>& aObjList = anUpdateMsg->objects();
aList.append(*aIt);
showObjects(aList, false);
}
-
//An operation passed by message. Start it, process and commit.
else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OPERATION_LAUNCHED)) {
std::shared_ptr<Config_PointerMessage> aPartSetMsg =
updateCommandStatus();
}
}
- }
- else if (theMessage->eventID() == Events_Loop::loop()->eventByName("CurrentDocumentChanged")) {
+ } else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_DOCUMENT_CHANGED)) {
myActionsMgr->update();
// Find and Activate active part
if (myPartActivating)
std::shared_ptr<Config_SelectionFilterMessage> aMsg =
std::dynamic_pointer_cast<Config_SelectionFilterMessage>(theMessage);
if (aMsg) {
- if (aMsg->attributeId().empty()) { // feature validator
- moduleConnector()->selectionFilters()->assignFilter(aMsg->selectionFilterId(), aMsg->featureId(), aMsg->attributeId());
- } else { // attribute validator
- moduleConnector()->selectionFilters()->assignFilter(aMsg->selectionFilterId(), aMsg->featureId(), aMsg->attributeId());
+ ModuleBase_FilterFactory* aFactory = moduleConnector()->selectionFilters();
+ if (!aMsg->attributeId().empty()) {
+ aFactory->assignFilter(aMsg->selectionFilterId(), aMsg->featureId(), aMsg->attributeId(),
+ aMsg->parameters());
}
}
}
myDisplayer->erase(aObj, false);
else {
if (myDisplayer->isVisible(aObj)) {
- myDisplayer->display(aObj, false); // In order to update presentation
+ displayObject(aObj); // In order to update presentation
if (myOperationMgr->hasOperation()) {
ModuleBase_Operation* aOperation = myOperationMgr->currentOperation();
- if (aOperation->hasObject(aObj) && myDisplayer->isActive(aObj))
+ if (!aOperation->isEditOperation() &&
+ aOperation->hasObject(aObj) && myDisplayer->isActive(aObj))
myDisplayer->deactivate(aObj);
}
} else {
ModuleBase_Operation* aOperation = myOperationMgr->currentOperation();
// Display only current operation results if operation has preview
if (aOperation->hasObject(aObj)/* && aOperation->hasPreview()*/) {
- myDisplayer->display(aObj, false);
+ displayObject(aObj);
// Deactivate object of current operation from selection
if (myDisplayer->isActive(aObj))
myDisplayer->deactivate(aObj);
} else if (myOperationMgr->hasOperation()) {
ModuleBase_Operation* aOperation = myOperationMgr->currentOperation();
if (aOperation->hasObject(*aIt)) { // Display only current operation results
- myDisplayer->display(*aIt, false);
+ displayObject(*aIt);
isDisplayed = true;
}
}
}
//******************************************************
-void XGUI_Workshop::onOperationStarted()
+void XGUI_Workshop::onOperationStarted(ModuleBase_Operation* theOperation)
{
- ModuleBase_Operation* aOperation = myOperationMgr->currentOperation();
- if (this->isSalomeMode())
- aOperation->setNestedFeatures(mySalomeConnector->nestedActions(aOperation->id()));
- else
- aOperation->setNestedFeatures(myActionsMgr->nestedCommands(aOperation->id()));
-
- if (aOperation->getDescription()->hasXmlRepresentation()) { //!< No need for property panel
- connectWithOperation(aOperation);
-
- showPropertyPanel();
- QString aXmlRepr = aOperation->getDescription()->xmlRepresentation();
- ModuleBase_WidgetFactory aFactory = ModuleBase_WidgetFactory(aXmlRepr.toStdString(),
- myModuleConnector);
-
- myPropertyPanel->cleanContent();
- aFactory.createWidget(myPropertyPanel->contentWidget());
- ModuleBase_Tools::zeroMargins(myPropertyPanel->contentWidget());
-
- QList<ModuleBase_ModelWidget*> aWidgets = aFactory.getModelWidgets();
- foreach (ModuleBase_ModelWidget* aWidget, aWidgets) {
- aWidget->setFeature(aOperation->feature());
- aWidget->enableFocusProcessing();
- QObject::connect(aWidget, SIGNAL(valuesChanged()), this, SLOT(onWidgetValuesChanged()));
- // Init default values
- if (!aOperation->isEditOperation() && !aWidget->isComputedDefault()) {
- aWidget->storeValue();
- }
- }
+ setNestedFeatures(theOperation);
- myPropertyPanel->setModelWidgets(aWidgets);
- aOperation->setPropertyPanel(myPropertyPanel);
- // Do not activate widgets by default if the current operation is editing operation
- // Because we don't know which widget is going to be edited.
- if ((!aOperation->isEditOperation())) {
- aOperation->activateByPreselection();
- }
- // Set final definitions if they are necessary
- myModule->propertyPanelDefined(aOperation);
+ if (theOperation->getDescription()->hasXmlRepresentation()) { //!< No need for property panel
+ connectWithOperation(theOperation);
+ setPropertyPanel(theOperation);
+ }
+ updateCommandStatus();
- // Widget activation (from the previous method) may commit the current operation
- // if pre-selection is enougth for it. So we shouldn't update prop panel's title
- if(myOperationMgr->isCurrentOperation(aOperation)) {
- myPropertyPanel->setWindowTitle(aOperation->getDescription()->description());
- }
+ myModule->operationStarted(theOperation);
+}
+
+//******************************************************
+void XGUI_Workshop::onOperationResumed(ModuleBase_Operation* theOperation)
+{
+ setNestedFeatures(theOperation);
+
+ if (theOperation->getDescription()->hasXmlRepresentation()) { //!< No need for property panel
+ connectWithOperation(theOperation);
+ setPropertyPanel(theOperation);
}
updateCommandStatus();
+
+ myModule->operationResumed(theOperation);
}
+
//******************************************************
void XGUI_Workshop::onOperationStopped(ModuleBase_Operation* theOperation)
{
+ ModuleBase_ISelection* aSel = mySelector->selection();
+ QObjectPtrList aObj = aSel->selectedPresentations();
//!< No need for property panel
updateCommandStatus();
hidePropertyPanel();
myPropertyPanel->cleanContent();
- // Activate objects created by current operation
- FeaturePtr aFeature = theOperation->feature();
- myDisplayer->activate(aFeature);
- const std::list<ResultPtr>& aResults = aFeature->results();
- std::list<ResultPtr>::const_iterator aIt;
- for (aIt = aResults.cbegin(); aIt != aResults.cend(); ++aIt) {
- myDisplayer->activate(*aIt);
+ // Activate objects created by current operation
+ // in order to clean selection modes
+ QIntList aModes;
+ myDisplayer->activateObjects(aModes);
+ myModule->operationStopped(theOperation);
+}
+
+
+void XGUI_Workshop::onOperationCommitted(ModuleBase_Operation* theOperation)
+{
+ myModule->operationCommitted(theOperation);
+}
+
+void XGUI_Workshop::onOperationAborted(ModuleBase_Operation* theOperation)
+{
+ myModule->operationAborted(theOperation);
+}
+
+void XGUI_Workshop::setNestedFeatures(ModuleBase_Operation* theOperation)
+{
+ if (this->isSalomeMode())
+ theOperation->setNestedFeatures(mySalomeConnector->nestedActions(theOperation->id()));
+ else
+ theOperation->setNestedFeatures(myActionsMgr->nestedCommands(theOperation->id()));
+}
+
+void XGUI_Workshop::setPropertyPanel(ModuleBase_Operation* theOperation)
+{
+ showPropertyPanel();
+ QString aXmlRepr = theOperation->getDescription()->xmlRepresentation();
+ ModuleBase_WidgetFactory aFactory = ModuleBase_WidgetFactory(aXmlRepr.toStdString(),
+ myModuleConnector);
+
+ myPropertyPanel->cleanContent();
+ aFactory.createWidget(myPropertyPanel->contentWidget());
+ ModuleBase_Tools::zeroMargins(myPropertyPanel->contentWidget());
+
+ QList<ModuleBase_ModelWidget*> aWidgets = aFactory.getModelWidgets();
+ foreach (ModuleBase_ModelWidget* aWidget, aWidgets) {
+ aWidget->setFeature(theOperation->feature());
+ aWidget->enableFocusProcessing();
+ QObject::connect(aWidget, SIGNAL(valuesChanged()), this, SLOT(onWidgetValuesChanged()));
+ // Init default values
+ if (!theOperation->isEditOperation() && aWidget->isValueDefault() && !aWidget->isComputedDefault()) {
+ aWidget->storeValue();
+ }
}
+
+ myPropertyPanel->setModelWidgets(aWidgets);
+ theOperation->setPropertyPanel(myPropertyPanel);
+
+ myModule->propertyPanelDefined(theOperation);
+
+ myPropertyPanel->setWindowTitle(theOperation->getDescription()->description());
}
bool XGUI_Workshop::event(QEvent * theEvent)
}
}
myActionsMgr->update();
-}
-
-//******************************************************
-QList<QAction*> XGUI_Workshop::getModuleCommands() const
-{
- QList<QAction*> aCommands;
- if (isSalomeMode()) { // update commands in SALOME mode
- aCommands = salomeConnector()->commandList();
- } else {
- AppElements_MainMenu* aMenuBar = myMainWindow->menuObject();
- foreach(AppElements_Command* aCmd, aMenuBar->features())
- {
- aCommands.append(aCmd);
- }
- }
- return aCommands;
+ emit commandStatusUpdated();
}
//******************************************************
connect(myPropertyPanel, SIGNAL(noMoreWidgets()), myModule, SLOT(onNoMoreWidgets()));
aDesktop->addDockWidget(Qt::LeftDockWidgetArea, myPropertyPanel);
- hidePropertyPanel(); //<! Invisible by default
+ hidePropertyPanel(); ///<! Invisible by default
hideObjectBrowser();
aDesktop->tabifyDockWidget(aObjDock, myPropertyPanel);
myPropertyPanel->installEventFilter(myOperationMgr);
connect(aCancelBtn, SIGNAL(clicked()), myOperationMgr, SLOT(onAbortOperation()));
connect(myPropertyPanel, SIGNAL(keyReleased(QKeyEvent*)), myOperationMgr,
SLOT(onKeyReleased(QKeyEvent*)));
- connect(myOperationMgr, SIGNAL(operationValidated(bool)), myPropertyPanel,
+ connect(myOperationMgr, SIGNAL(applyEnableChanged(bool)), myPropertyPanel,
SLOT(setAcceptEnabled(bool)));
}
void XGUI_Workshop::showPropertyPanel()
{
QAction* aViewAct = myPropertyPanel->toggleViewAction();
- //<! Restore ability to close panel from the window's menu
+ ///<! Restore ability to close panel from the window's menu
aViewAct->setEnabled(true);
myPropertyPanel->show();
myPropertyPanel->raise();
void XGUI_Workshop::hidePropertyPanel()
{
QAction* aViewAct = myPropertyPanel->toggleViewAction();
- //<! Do not allow to show empty property panel
+ ///<! Do not allow to show empty property panel
aViewAct->setEnabled(false);
myPropertyPanel->hide();
}
FeaturePtr aFeature = anOperation->feature();
ModuleBase_ModelWidget* aSenderWidget = dynamic_cast<ModuleBase_ModelWidget*>(sender());
- //if (aCustom)
- // aCustom->storeValue(aFeature);
const QList<ModuleBase_ModelWidget*>& aWidgets = myPropertyPanel->modelWidgets();
QList<ModuleBase_ModelWidget*>::const_iterator anIt = aWidgets.begin(), aLast = aWidgets.end();
for (; anIt != aLast; anIt++) {
ModuleBase_ModelWidget* aCustom = *anIt;
- if (aCustom && (/*!aCustom->isInitialized(aFeature) ||*/aCustom == aSenderWidget)) {
- //aCustom->storeValue(aFeature);
+ if (aCustom && (aCustom == aSenderWidget)) {
aCustom->storeValue();
}
}
myObjectBrowser->activatePart(theFeature);
myPartActivating = false;
}
+ updateCommandStatus();
}
//**************************************************************
foreach (ObjectPtr aObj, theList)
{
if (isVisible) {
- myDisplayer->display(aObj, false);
+ displayObject(aObj);
} else {
myDisplayer->erase(aObj, false);
}
}
-//**************************************************************
-void XGUI_Workshop::updateCommandsOnViewSelection()
-{
- XGUI_Selection* aSelection = mySelector->selection();
- if (aSelection->getSelected().size() == 0)
- return;
-
- // Restrict validators to manage only nested (child) features
- // of the current feature i.e. if current feature is Sketch -
- // Sketch Features & Constraints can be validated.
- QStringList aNestedIds;
- if(myOperationMgr->hasOperation()) {
- FeaturePtr aFeature = myOperationMgr->currentOperation()->feature();
- if(aFeature) {
- aNestedIds << myActionsMgr->nestedCommands(QString::fromStdString(aFeature->getKind()));
- }
- }
- SessionPtr aMgr = ModelAPI_Session::get();
- ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
- QList<QAction*> aActions = getModuleCommands();
- foreach(QAction* aAction, aActions) {
- QString aId = aAction->data().toString();
- if(!aNestedIds.contains(aId))
- continue;
- std::list<ModelAPI_Validator*> aValidators;
- std::list<std::list<std::string> > anArguments;
- aFactory->validators(aId.toStdString(), aValidators, anArguments);
- std::list<ModelAPI_Validator*>::iterator aValidator = aValidators.begin();
- for (; aValidator != aValidators.end(); aValidator++) {
- if (*aValidator) {
- const ModuleBase_SelectionValidator* aSelValidator =
- dynamic_cast<const ModuleBase_SelectionValidator*>(*aValidator);
- if (aSelValidator) {
- aAction->setEnabled(aSelValidator->isValid(aSelection));
- }
- }
- }
- }
-}
-
//**************************************************************
void XGUI_Workshop::registerValidators() const
{
void XGUI_Workshop::displayGroupResults(DocumentPtr theDoc, std::string theGroup)
{
for (int i = 0; i < theDoc->size(theGroup); i++)
- myDisplayer->display(theDoc->object(theGroup, i), false);
+ displayObject(theDoc->object(theGroup, i));
}
//**************************************************************
//**************************************************************
void XGUI_Workshop::closeDocument()
{
+ ModuleBase_Operation* anOperation = operationMgr()->currentOperation();
+ while (anOperation) {
+ anOperation->abort();
+ anOperation = operationMgr()->currentOperation();
+ }
myDisplayer->closeLocalContexts();
myDisplayer->eraseAll();
objectBrowser()->clearContent();
aMgr->closeAll();
objectBrowser()->clearContent();
}
+
+//**************************************************************
+void XGUI_Workshop::displayObject(ObjectPtr theObj)
+{
+ ResultBodyPtr aBody = std::dynamic_pointer_cast<ModelAPI_ResultBody>(theObj);
+ if (aBody.get() != NULL) {
+ int aNb = myDisplayer->objectsCount();
+ myDisplayer->display(theObj, false);
+ if (aNb == 0)
+ viewer()->fitAll();
+ } else
+ myDisplayer->display(theObj, false);
+}