Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix SketcherSetEqual.test_length_equality
[modules/shaper.git]
/
src
/
NewGeom
/
NewGeom_Module.cpp
diff --git
a/src/NewGeom/NewGeom_Module.cpp
b/src/NewGeom/NewGeom_Module.cpp
index dae10ab346092acb362abc9a5945eea7d404e451..75f33a64f9a32f8bb840b259b24d1f4e52427f3b 100644
(file)
--- a/
src/NewGeom/NewGeom_Module.cpp
+++ b/
src/NewGeom/NewGeom_Module.cpp
@@
-125,7
+125,6
@@
void NewGeom_Module::initialize(CAM_Application* theApp)
if (anApp)
{
connect(anApp, SIGNAL(preferenceResetToDefaults()), this, SLOT(onDefaultPreferences()));
if (anApp)
{
connect(anApp, SIGNAL(preferenceResetToDefaults()), this, SLOT(onDefaultPreferences()));
- connect(anApp, SIGNAL(abortAllOperations( bool& )), this, SLOT(onAbortAllOperations( bool& )));
}
}
}
}
@@
-174,9
+173,6
@@
bool NewGeom_Module::activateModule(SUIT_Study* theStudy)
myWorkshop->objectBrowser()->rebuildDataTree();
myWorkshop->updateCommandStatus();
myIsOpened = false;
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();
}
else
myWorkshop->updateCommandStatus();
@@
-195,8
+191,11
@@
bool NewGeom_Module::activateModule(SUIT_Study* theStudy)
aResMgr->setValue("Study", "store_positions", false);
// Synchronize displayed objects
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();
XGUI_Displayer* aDisp = myWorkshop->displayer();
QObjectPtrList aObjList = aDisp->displayedObjects();
@@
-276,6
+275,7
@@
void NewGeom_Module::onViewManagerAdded(SUIT_ViewManager* theMgr)
if (!mySelector) {
mySelector = createSelector(theMgr);
myWorkshop->module()->activateSelectionFilters();
if (!mySelector) {
mySelector = createSelector(theMgr);
myWorkshop->module()->activateSelectionFilters();
+ myWorkshop->synchronizeViewer();
}
}
}
}
@@
-407,14
+407,14
@@
QAction* NewGeom_Module::addFeature(const QString& theWBName, const QString& the
return aAction;
}
return aAction;
}
-bool NewGeom_Module::is
NestedFeature
(const QAction* theAction)
+bool NewGeom_Module::is
FeatureOfNested
(const QAction* theAction)
{
return dynamic_cast<const NewGeom_NestedButton*>(theAction);
}
{
return dynamic_cast<const NewGeom_NestedButton*>(theAction);
}
-QAction* NewGeom_Module::add
NestedFeature
(const QString& theWBName,
- const ActionInfo& theInfo,
- const QList<QAction*>& theNestedActions)
+QAction* NewGeom_Module::add
FeatureOfNested
(const QString& theWBName,
+
const ActionInfo& theInfo,
+
const QList<QAction*>& theNestedActions)
{
int aMenu = createMenu(theWBName, -1, -1, 50);
int aTool = createTool(theWBName, theWBName);
{
int aMenu = createMenu(theWBName, -1, -1, 50);
int aTool = createTool(theWBName, theWBName);
@@
-626,7
+626,7
@@
void NewGeom_Module::inspectSalomeModules()
}
}
}
}
-
void NewGeom_Module::onAbortAllOperations( bool& isNextOperationAllowed
)
+
bool NewGeom_Module::abortAllOperations(
)
{
{
-
isNextOperationAllowed =
workshop()->operationMgr()->abortAllOperations();
+
return
workshop()->operationMgr()->abortAllOperations();
}
}