From: jfa <jfa@opencascade.com>
Date: Thu, 21 Jan 2021 08:57:05 +0000 (+0300)
Subject: Update SHAPERSTUDY objects in the viewers after SHAPER objects modification
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Focc%2F19960;p=modules%2Fshaper.git

Update SHAPERSTUDY objects in the viewers after SHAPER objects modification
---

diff --git a/src/SHAPERGUI/SHAPERGUI.cpp b/src/SHAPERGUI/SHAPERGUI.cpp
index 5e981a042..99fd7b3b8 100644
--- a/src/SHAPERGUI/SHAPERGUI.cpp
+++ b/src/SHAPERGUI/SHAPERGUI.cpp
@@ -493,47 +493,6 @@ bool SHAPERGUI::deactivateModule(SUIT_Study* theStudy)
 
   publishToStudy();
 
-  // update SHAPERSTUDY objects in OCC and VTK viewers
-  QString aShaperStudyComp = "SHAPERSTUDY";
-  LightApp_Displayer* aDisplayer = LightApp_Displayer::FindDisplayer(aShaperStudyComp, false);
-  if ( aDisplayer ) {
-    LightApp_Study* aStudy = dynamic_cast<LightApp_Study*>(theStudy);
-    DataObjectList aComps;
-    bool isFound = false;
-    aStudy->root()->children( aComps );
-    DataObjectList::const_iterator aCompsIt = aComps.begin();
-    for ( ; aCompsIt != aComps.end() && !isFound; aCompsIt++ ) {
-      LightApp_DataObject* aComp = dynamic_cast<LightApp_DataObject*>( *aCompsIt );
-      if ( aComp && aComp->componentDataType() == aShaperStudyComp ) {
-        isFound = true;
-        DataObjectList anObjs;
-        aComp->children(anObjs, true);
-
-        QList<SUIT_ViewManager*> aViewMgrs;
-        getApp()->viewManagers( "OCCViewer", aViewMgrs );
-        getApp()->viewManagers( "VTKViewer", aViewMgrs );
-        QListIterator<SUIT_ViewManager*> itViewMgrs( aViewMgrs );
-        while ( itViewMgrs.hasNext()) {
-          SUIT_ViewModel* aVM = itViewMgrs.next()->getViewModel();
-          if ( aVM ) {
-            SALOME_View* aView = dynamic_cast<SALOME_View*>(aVM);
-            if ( aView ) {
-              DataObjectList::const_iterator itObjs = anObjs.begin();
-              for ( ; itObjs != anObjs.end(); itObjs++ ) {
-                LightApp_DataObject* anObj = dynamic_cast<LightApp_DataObject*>( *itObjs );
-                QString anEntry = anObj->entry();
-                if ( aDisplayer->IsDisplayed( anEntry, aView ) ) {
-                  aDisplayer->Erase( anEntry, false, false, aView );
-                  aDisplayer->Display( anEntry, false, aView );
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-
   return LightApp_Module::deactivateModule(theStudy);
 }
 
@@ -1321,6 +1280,12 @@ void SHAPERGUI::resetToolbars()
 
 void SHAPERGUI::publishToStudy()
 {
-  if (isActiveModule() && ModelAPI_Session::get()->hasModuleDocument())
+  if (isActiveModule() && ModelAPI_Session::get()->hasModuleDocument()) {
     myWorkshop->module()->launchOperation("PublishToStudy", false);
+
+    // update SHAPERSTUDY objects in OCC and VTK viewers
+    QStringList aVMList;
+    aVMList << "OCCViewer" << "VTKViewer";
+    getApp()->updatePresentations("SHAPERSTUDY", aVMList);
+  }
 }