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 df50886286daa97c9a0f2c9217c74d9c65008989..75f33a64f9a32f8bb840b259b24d1f4e52427f3b 100644
(file)
--- a/
src/NewGeom/NewGeom_Module.cpp
+++ b/
src/NewGeom/NewGeom_Module.cpp
@@
-16,6
+16,7
@@
#include <ModuleBase_Operation.h>
#include <ModuleBase_Preferences.h>
#include <ModuleBase_ActionInfo.h>
#include <ModuleBase_Operation.h>
#include <ModuleBase_Preferences.h>
#include <ModuleBase_ActionInfo.h>
+#include <ModuleBase_IModule.h>
#include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h>
@@
-122,7
+123,9
@@
void NewGeom_Module::initialize(CAM_Application* theApp)
myWorkshop->startApplication();
LightApp_Application* anApp = dynamic_cast<LightApp_Application*>(theApp);
if (anApp)
myWorkshop->startApplication();
LightApp_Application* anApp = dynamic_cast<LightApp_Application*>(theApp);
if (anApp)
+ {
connect(anApp, SIGNAL(preferenceResetToDefaults()), this, SLOT(onDefaultPreferences()));
connect(anApp, SIGNAL(preferenceResetToDefaults()), this, SLOT(onDefaultPreferences()));
+ }
}
//******************************************************
}
//******************************************************
@@
-170,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();
@@
-191,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();
@@
-271,6
+274,8
@@
void NewGeom_Module::onViewManagerAdded(SUIT_ViewManager* theMgr)
{
if (!mySelector) {
mySelector = createSelector(theMgr);
{
if (!mySelector) {
mySelector = createSelector(theMgr);
+ myWorkshop->module()->activateSelectionFilters();
+ myWorkshop->synchronizeViewer();
}
}
}
}
@@
-289,6
+294,8
@@
void NewGeom_Module::onViewManagerRemoved(SUIT_ViewManager* theMgr)
myProxyViewer->setSelector(0);
delete mySelector;
mySelector = 0;
myProxyViewer->setSelector(0);
delete mySelector;
mySelector = 0;
+
+ myWorkshop->module()->clearViewer();
}
}
}
}
}
}
@@
-311,6
+318,8
@@
void NewGeom_Module::onDefaultPreferences()
LightApp_Preferences* pref = preferences();
if (pref)
pref->retrieve();
LightApp_Preferences* pref = preferences();
if (pref)
pref->retrieve();
+
+ myWorkshop->displayer()->redisplayObjects();
}
//******************************************************
}
//******************************************************
@@
-398,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);
@@
-605,6
+614,7
@@
void NewGeom_Module::preferencesChanged(const QString& theSection, const QString
}
aProp->setValue(aValue);
}
aProp->setValue(aValue);
+ myWorkshop->displayer()->redisplayObjects();
}
void NewGeom_Module::inspectSalomeModules()
}
void NewGeom_Module::inspectSalomeModules()
@@
-615,3
+625,8
@@
void NewGeom_Module::inspectSalomeModules()
Config_ModuleReader::addDependencyModule(eachModule.toStdString());
}
}
Config_ModuleReader::addDependencyModule(eachModule.toStdString());
}
}
+
+bool NewGeom_Module::abortAllOperations()
+{
+ return workshop()->operationMgr()->abortAllOperations();
+}