Change icons for chamfer

[modules/shaper.git] / src / SHAPERGUI / SHAPERGUI.cpp

diff --git a/src/SHAPERGUI/SHAPERGUI.cpp b/src/SHAPERGUI/SHAPERGUI.cpp
index 7fa6366d63ec3d30417f37c0ea57871b2740add7..5b69d3593ffb8e02830a296173cbdf0abf0185bb 100644 (file)
--- a/src/SHAPERGUI/SHAPERGUI.cpp
+++ b/src/SHAPERGUI/SHAPERGUI.cpp
@@ -40,6 +40,8 @@
 #include <ModuleBase_ActionInfo.h>
 #include <ModuleBase_IModule.h>
 
+#include <ModelAPI_Tools.h>
+
 #include <LightApp_Application.h>
 #include <LightApp_SelectionMgr.h>
 #include <LightApp_OCCSelector.h>
@@ -141,7 +143,9 @@ SHAPERGUI::SHAPERGUI()
   myProxyViewer = new SHAPERGUI_SalomeViewer(this);
 
   ModuleBase_Preferences::setResourceMgr(application()->resourceMgr());
-  ModuleBase_Preferences::loadCustomProps();
+
+  // It will be called in XGUI_Workshop::startApplication
+  // ModuleBase_Preferences::loadCustomProps();
 }
 
 //******************************************************
@@ -281,7 +285,7 @@ bool SHAPERGUI::activateModule(SUIT_Study* theStudy)
       ViewManagerList OCCViewManagers;
       application()->viewManagers(OCCViewer_Viewer::Type(), OCCViewManagers);
       if (OCCViewManagers.size() > 0) {
-        mySelector = createSelector(OCCViewManagers.first());
+        onViewManagerAdded(OCCViewManagers.first());
       }
     }
     // it should be performed after the selector creation in order to have AISContext
@@ -445,8 +449,16 @@ void SHAPERGUI::onViewManagerRemoved(SUIT_ViewManager* theMgr)
       if (mySelector->viewer() == aViewer) {
         XGUI_Displayer* aDisp = myWorkshop->displayer();
         QObjectPtrList aObjects = aDisp->displayedObjects();
-        foreach(ObjectPtr aObj, aObjects)
+        ResultPtr aRes;
+        foreach(ObjectPtr aObj, aObjects) {
           aObj->setDisplayed(false);
+          aRes = std::dynamic_pointer_cast<ModelAPI_Result>(aObj);
+          if (aRes.get()) {
+            while (aRes = ModelAPI_Tools::bodyOwner(aRes)) {
+              aRes->setDisplayed(false);
+            }
+          }
+        }
         Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
         myProxyViewer->setSelector(0);
         delete mySelector;
@@ -790,37 +802,37 @@ void SHAPERGUI::createPreferences()
 
   int colorScaleGroup = pref->addItem(tr("Color scale"), viewTab);
   pref->setItemProperty("columns", 4, colorScaleGroup);
-  int aItem = pref->addItem(tr("X position"), colorScaleGroup,
+  int aItem = aMgr.addPreference(tr("X position"), colorScaleGroup,
     SUIT_PreferenceMgr::Double, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_x_position");
   pref->setItemProperty("min", 0, aItem);
   pref->setItemProperty("max", 1, aItem);
 
-  aItem = pref->addItem(tr("Y position"), colorScaleGroup,
+  aItem = aMgr.addPreference(tr("Y position"), colorScaleGroup,
     SUIT_PreferenceMgr::Double, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_y_position");
   pref->setItemProperty("min", 0, aItem);
   pref->setItemProperty("max", 1, aItem);
 
-  aItem = pref->addItem(tr("Width"), colorScaleGroup,
+  aItem = aMgr.addPreference(tr("Width"), colorScaleGroup,
     SUIT_PreferenceMgr::Double, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_width");
   pref->setItemProperty("min", 0, aItem);
   pref->setItemProperty("max", 1, aItem);
 
-  aItem = pref->addItem(tr("Height"), colorScaleGroup,
+  aItem = aMgr.addPreference(tr("Height"), colorScaleGroup,
     SUIT_PreferenceMgr::Double, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_height");
   pref->setItemProperty("min", 0, aItem);
   pref->setItemProperty("max", 1, aItem);
 
-  aItem = pref->addItem(tr("Intervals number"), colorScaleGroup,
+  aItem = aMgr.addPreference(tr("Intervals number"), colorScaleGroup,
     SUIT_PreferenceMgr::Integer, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_nb_intervals");
   pref->setItemProperty("min", 0, aItem);
   pref->setItemProperty("max", 100, aItem);
 
-  aItem = pref->addItem(tr("Text height"), colorScaleGroup,
+  aItem = aMgr.addPreference(tr("Text height"), colorScaleGroup,
     SUIT_PreferenceMgr::Integer, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_text_height");
   pref->setItemProperty("min", 0, aItem);
   pref->setItemProperty("max", 100, aItem);
 
-  aItem = pref->addItem(tr("Text color"), colorScaleGroup,
+  aItem = aMgr.addPreference(tr("Text color"), colorScaleGroup,
     SUIT_PreferenceMgr::Color, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_text_color");
 
   pref->retrieve();