myWorkshop->startApplication();
LightApp_Application* anApp = dynamic_cast<LightApp_Application*>(theApp);
if (anApp)
+ {
connect(anApp, SIGNAL(preferenceResetToDefaults()), this, SLOT(onDefaultPreferences()));
+ }
}
//******************************************************
myWorkshop->objectBrowser()->rebuildDataTree();
myWorkshop->updateCommandStatus();
myIsOpened = false;
- // the display all results is not necessary anymore, it was commented in XGUI_Workshop,
- // so it should be commented here
- //QTimer::singleShot(1000, myWorkshop, SLOT(displayAllResults()));
}
else
myWorkshop->updateCommandStatus();
aResMgr->setValue("Study", "store_positions", false);
// Synchronize displayed objects
- if (mySelector && mySelector->viewer()) {
- Handle(AIS_InteractiveContext) aContext = mySelector->viewer()->getAISContext();
+ Handle(AIS_InteractiveContext) aContext;
+ if (mySelector && mySelector->viewer())
+ aContext = mySelector->viewer()->getAISContext();
+
+ if (!aContext.IsNull()) {
XGUI_Displayer* aDisp = myWorkshop->displayer();
QObjectPtrList aObjList = aDisp->displayedObjects();
{
if (!mySelector) {
mySelector = createSelector(theMgr);
+ myWorkshop->module()->activateSelectionFilters();
+ myWorkshop->synchronizeViewer();
}
}
LightApp_Preferences* pref = preferences();
if (pref)
pref->retrieve();
+
+ myWorkshop->displayer()->redisplayObjects();
}
//******************************************************
return aAction;
}
-bool NewGeom_Module::isNestedFeature(const QAction* theAction)
+bool NewGeom_Module::isFeatureOfNested(const QAction* theAction)
{
return dynamic_cast<const NewGeom_NestedButton*>(theAction);
}
-QAction* NewGeom_Module::addNestedFeature(const QString& theWBName,
- const ActionInfo& theInfo,
- const QList<QAction*>& theNestedActions)
+QAction* NewGeom_Module::addFeatureOfNested(const QString& theWBName,
+ const ActionInfo& theInfo,
+ const QList<QAction*>& theNestedActions)
{
int aMenu = createMenu(theWBName, -1, -1, 50);
int aTool = createTool(theWBName, theWBName);
}
aProp->setValue(aValue);
- // redisplay objects visualized in the viewer
- static Events_ID EVENT_DISP = Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY);
- static const ModelAPI_EventCreator* aECreator = ModelAPI_EventCreator::get();
- QObjectPtrList aDisplayed = myWorkshop->displayer()->displayedObjects();
- QObjectPtrList::const_iterator anIt = aDisplayed.begin(), aLast = aDisplayed.end();
- for (; anIt != aLast; anIt++) {
- aECreator->sendUpdated(*anIt, EVENT_DISP);
- }
- Events_Loop::loop()->flush(EVENT_DISP);
-
+ myWorkshop->displayer()->redisplayObjects();
}
void NewGeom_Module::inspectSalomeModules()
Config_ModuleReader::addDependencyModule(eachModule.toStdString());
}
}
+
+bool NewGeom_Module::abortAllOperations()
+{
+ return workshop()->operationMgr()->abortAllOperations();
+}