#include <ModelAPI_ResultConstruction.h>
#include <ModelAPI_ResultBody.h>
#include <ModelAPI_AttributeIntArray.h>
+#include <ModelAPI_ResultParameter.h>
//#include <PartSetPlugin_Part.h>
#include <ModuleBase_WidgetFactory.h>
#include <ModuleBase_Tools.h>
#include <ModuleBase_IViewer.h>
-#include<ModuleBase_FilterFactory.h>
+#include <ModuleBase_FilterFactory.h>
#include <ModuleBase_PageBase.h>
+#include <ModuleBase_Tools.h>
#include <Config_Common.h>
#include <Config_FeatureMessage.h>
//#define DEBUG_FEATURE_CREATED
//#define DEBUG_FEATURE_REDISPLAY
-QString objectInfo(ObjectPtr theObj)
-{
- ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(theObj);
- FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(theObj);
- QString aFeatureStr = "feature";
- if(aRes.get()) {
- aFeatureStr.append("(Result)");
- aFeature = ModelAPI_Feature::feature(aRes);
- }
- if (aFeature.get()) {
- aFeatureStr.append(QString(": %1").arg(aFeature->getKind().c_str()).toStdString().c_str());
- if (aFeature->data().get() && aFeature->data()->isValid())
- aFeatureStr.append(QString("(name=%1)").arg(aFeature->data()->name().c_str()).toStdString().c_str());
- }
- return aFeatureStr;
-}
-
-
QMap<QString, QString> XGUI_Workshop::myIcons;
myObjectBrowser(0),
myDisplayer(0),
myUpdatePrefs(false),
- myPartActivating(false)
+ myPartActivating(false),
+ myIsLoadingData(false)
{
myMainWindow = mySalomeConnector ? 0 : new AppElements_MainWindow();
#ifdef DEBUG_FEATURE_REDISPLAY
QStringList anInfo;
for (aIt = aObjects.begin(); aIt != aObjects.end(); ++aIt) {
- anInfo.append(objectInfo((*aIt)));
+ anInfo.append(ModuleBase_Tools::objectInfo((*aIt)));
}
QString anInfoStr = anInfo.join(", ");
qDebug(QString("onFeatureRedisplayMsg: %1, %2").arg(aObjects.size()).arg(anInfoStr).toStdString().c_str());
// Redisplay the visible object or the object of the current operation
bool isVisibleObject = myDisplayer->isVisible(aObj);
#ifdef DEBUG_FEATURE_REDISPLAY
- //QString anObjInfo = objectInfo((aObj));
+ //QString anObjInfo = ModuleBase_Tools::objectInfo((aObj));
//qDebug(QString("visible=%1 : display= %2").arg(isVisibleObject).arg(anObjInfo).toStdString().c_str());
#endif
if (isVisibleObject) { // redisplay visible object
- displayObject(aObj); // In order to update presentation
+ //displayObject(aObj); // In order to update presentation
+ // in order to avoid the check whether the object can be redisplayed, the exact method
+ // of redisplay is called. This modification is made in order to have the line is updated
+ // by creation of a horizontal constraint on the line by preselection
+ myDisplayer->redisplay(aObj, false);
if (myOperationMgr->hasOperation()) {
ModuleBase_Operation* aOperation = myOperationMgr->currentOperation();
if (!aOperation->isEditOperation() &&
ModuleBase_Operation* aOperation = myOperationMgr->currentOperation();
if (aOperation && aOperation->hasObject(aObj)) {
ModuleBase_Operation* aOperation = myOperationMgr->currentOperation();
+ #ifdef DEBUG_FEATURE_REDISPLAY
+ QString anObjInfo = ModuleBase_Tools::objectInfo((aObj));
+ qDebug(QString(" display object = %1").arg(anObjInfo).toStdString().c_str());
+ #endif
if (displayObject(aObj)) {
// Deactivate object of current operation from selection
if (myDisplayer->isActive(aObj))
#ifdef DEBUG_FEATURE_CREATED
QStringList anInfo;
for (aIt = aObjects.begin(); aIt != aObjects.end(); ++aIt) {
- anInfo.append(objectInfo((*aIt)));
+ anInfo.append(ModuleBase_Tools::objectInfo((*aIt)));
}
QString anInfoStr = anInfo.join(", ");
qDebug(QString("onFeatureCreatedMsg: %1, %2").arg(aObjects.size()).arg(anInfoStr).toStdString().c_str());
// Activate objects created by current operation
// in order to clean selection modes
- QIntList aModes;
- myDisplayer->activateObjects(aModes);
+ // the deactivation should be pefromed in the same place, where the mode is activated,
+ // e.g. activation in the current widget activation, deactivation - in the widget's deactivation
+ //QIntList aModes;
+ //myDisplayer->activateObjects(aModes);
myModule->operationStopped(theOperation);
+
+ if (myOperationMgr->operationsCount() == 0) {
+ // Activate selection mode for all objects
+ QIntList aModes;
+ myDisplayer->activateObjects(aModes);
+ }
}
QStringList aNestedFeatures =
QString::fromStdString(theMessage->nestedFeatures()).split(" ", QString::SkipEmptyParts);
QString aDocKind = QString::fromStdString(theMessage->documentKind());
+ QList<QAction*> aNestedActList;
+ bool isColumnButton = !aNestedFeatures.isEmpty();
+ if (isColumnButton) {
+ QString aNestedActions = QString::fromStdString(theMessage->actionsWhenNested());
+ if (aNestedActions.contains("accept")) {
+ QAction* anAction = myActionsMgr->operationStateAction(XGUI_ActionsMgr::AcceptAll, NULL);
+ connect(anAction, SIGNAL(triggered()), myOperationMgr, SLOT(commitAllOperations()));
+ aNestedActList << anAction;
+ }
+ if (aNestedActions.contains("abort")) {
+ QAction* anAction = myActionsMgr->operationStateAction(XGUI_ActionsMgr::AbortAll, NULL);
+ connect(anAction, SIGNAL(triggered()), myOperationMgr, SLOT(abortAllOperations()));
+ aNestedActList << anAction;
+ }
+ }
+
if (isSalomeMode()) {
- QAction* aAction = salomeConnector()->addFeature(aWchName, aFeatureInfo);
+ QAction* aAction;
+ if (isColumnButton) {
+ aAction = salomeConnector()->addNestedFeature(aWchName, aFeatureInfo, aNestedActList);
+ } else {
+ aAction = salomeConnector()->addFeature(aWchName, aFeatureInfo);
+ }
salomeConnector()->setNestedActions(aFeatureInfo.id, aNestedFeatures);
salomeConnector()->setDocumentKind(aFeatureInfo.id, aDocKind);
// Enrich created button with accept/abort buttons if necessary
AppElements_Button* aButton = aCommand->button();
if (aButton->isColumnButton()) {
- QString aNestedActions = QString::fromStdString(theMessage->actionsWhenNested());
- QList<QAction*> anActList;
- if (aNestedActions.contains("accept")) {
- QAction* anAction = myActionsMgr->operationStateAction(XGUI_ActionsMgr::AcceptAll, aButton);
- connect(anAction, SIGNAL(triggered()), myOperationMgr, SLOT(commitAllOperations()));
- anActList << anAction;
- }
- if (aNestedActions.contains("abort")) {
- QAction* anAction = myActionsMgr->operationStateAction(XGUI_ActionsMgr::AbortAll, aButton);
- connect(anAction, SIGNAL(triggered()), myOperationMgr, SLOT(abortAllOperations()));
- anActList << anAction;
- }
- aButton->setAdditionalButtons(anActList);
+ aButton->setAdditionalButtons(aNestedActList);
}
myActionsMgr->addCommand(aCommand);
myModule->actionCreated(aCommand);
return;
}
QApplication::setOverrideCursor(Qt::WaitCursor);
+ myIsLoadingData = true;
aSession->load(myCurrentDir.toLatin1().constData());
myObjectBrowser->rebuildDataTree();
displayAllResults();
updateCommandStatus();
+ myIsLoadingData = false;
QApplication::restoreOverrideCursor();
}
//******************************************************
void XGUI_Workshop::onRedo(int theTimes)
{
+ // the viewer update should be blocked in order to avoid the features blinking. For the created
+ // feature a results are created, the flush of the created signal caused the viewer redisplay for
+ // each created result. After a redisplay signal is flushed. So, the viewer update is blocked until
+ // redo of all possible objects happens
+ bool isUpdateEnabled = myDisplayer->enableUpdateViewer(false);
+
objectBrowser()->treeView()->setCurrentIndex(QModelIndex());
SessionPtr aMgr = ModelAPI_Session::get();
if (aMgr->isOperation())
aMgr->redo();
}
updateCommandStatus();
+
+ // unblock the viewer update functionality and make update on purpose
+ myDisplayer->enableUpdateViewer(isUpdateEnabled);
+ myDisplayer->updateViewer();
}
//******************************************************
myDisplayer->eraseAll();
else if (theId == "EDIT_CMD") {
FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObjects.first());
- if (aFeature)
+ if (aFeature == NULL) {
+ ResultParameterPtr aParam =
+ std::dynamic_pointer_cast<ModelAPI_ResultParameter>(aObjects.first());
+ if (aParam.get() != NULL) {
+ aFeature = ModelAPI_Feature::feature(aParam);
+ }
+ }
+ if (aFeature.get() != NULL)
myModule->editFeature(aFeature);
}
}
{
ModuleBase_IModule* aModule = module();
// 1. allow the module to delete objects, do nothing if it has succeed
- if (aModule->deleteObjects())
+ if (aModule->deleteObjects()) {
+ updateCommandStatus();
return;
+ }
if (!isActiveOperationAborted())
return;
QObjectPtrList anObjects = mySelector->selection()->selectedObjects();
+ bool hasResult = false;
+ bool hasFeature = false;
+ bool hasParameter = false;
+ XGUI_Tools::checkObjects(anObjects, hasResult, hasFeature, hasParameter);
+ if (!(hasFeature || hasParameter))
+ return;
+
// 1. start operation
QString aDescription = contextMenuMgr()->action("DELETE_CMD")->text();
aDescription += tr(" %1");
myDisplayer->display(theObj, false);
if (aNb == 0)
viewer()->fitAll();
- } else
+ } else if (!(myIsLoadingData || myPartActivating))
myDisplayer->display(theObj, false);
return true;
if (isEditing) {
anId.chop(ModuleBase_Operation::EditSuffix().size());
}
- ActionInfo anInfo = myActionsMgr->actionInfoById(anId);
+ ActionInfo anInfo;
+ QAction* aContextMenuAct = myContextMenuMgr->actionByName(anId);
+ if (aContextMenuAct) {
+ anInfo.initFrom(aContextMenuAct);
+ } else {
+ anInfo = myActionsMgr->actionInfoById(anId);
+ }
if (isEditing) {
anInfo.text = anInfo.text.prepend("Modify ");
}