From: rnv <rnv@opencascade.com>
Date: Sat, 9 Jun 2012 08:30:26 +0000 (+0000)
Subject: Avoid redisplaying of the shape after Apply action.
X-Git-Tag: V6_6_0a1~117
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2c2a70a69a6dfef064d9eb6268ba71ebd478ceae;p=modules%2Fgeom.git

Avoid redisplaying of the shape after Apply action.
---

diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx
index c34c6bb04..5d51da8fb 100644
--- a/src/GroupGUI/GroupGUI_GroupDlg.cxx
+++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx
@@ -297,6 +297,7 @@ void GroupGUI_GroupDlg::ClickOnOk()
   setIsApplyAndClose(true);
   if (ClickOnApply())
     ClickOnCancel();
+  setIsApplyAndClose(false);
 }
 
 //=================================================================================
@@ -305,9 +306,15 @@ void GroupGUI_GroupDlg::ClickOnOk()
 //=================================================================================
 bool GroupGUI_GroupDlg::ClickOnApply()
 {
-  if (!onAccept(myMode == CreateGroup, true))
+  if(!isApplyAndClose())
+    setIsDisableBrowsing( true );
+    
+  if (!onAccept(myMode == CreateGroup, true,isApplyAndClose()))
     return false;
 
+  if(!isApplyAndClose())
+    setIsDisableBrowsing( false );
+
   if (myMode == CreateGroup)
   {
     initName();
@@ -827,7 +834,9 @@ void GroupGUI_GroupDlg::setShapeType(const TopAbs_ShapeEnum theType)
 //=================================================================================
 void GroupGUI_GroupDlg::activateSelection()
 {
-  erasePreview(false);
+  bool isApply = ((QPushButton*)sender() == buttonApply());
+  if(!isApply)
+    erasePreview(false);
 
   // local selection
   if (!myMainObj->_is_nil() &&
@@ -853,70 +862,71 @@ void GroupGUI_GroupDlg::activateSelection()
         }
       }
     }
+    if(!isApply) {
+      int prevDisplayMode = aDisplayer->SetDisplayMode(0);
+
+      SUIT_ViewWindow* aViewWindow = 0;
+      SUIT_Study* activeStudy = SUIT_Session::session()->activeApplication()->activeStudy();
+      if (activeStudy)
+        aViewWindow = SUIT_Session::session()->activeApplication()->desktop()->activeWindow();
+      if (aViewWindow == 0) return;
+
+      SUIT_ViewManager* aViewManager = aViewWindow->getViewManager();
+      if (aViewManager->getType() != OCCViewer_Viewer::Type() &&
+          aViewManager->getType() != SVTK_Viewer::Type())
+        return;
 
-    int prevDisplayMode = aDisplayer->SetDisplayMode(0);
-
-    SUIT_ViewWindow* aViewWindow = 0;
-    SUIT_Study* activeStudy = SUIT_Session::session()->activeApplication()->activeStudy();
-    if (activeStudy)
-      aViewWindow = SUIT_Session::session()->activeApplication()->desktop()->activeWindow();
-    if (aViewWindow == 0) return;
-
-    SUIT_ViewManager* aViewManager = aViewWindow->getViewManager();
-    if (aViewManager->getType() != OCCViewer_Viewer::Type() &&
-        aViewManager->getType() != SVTK_Viewer::Type())
-      return;
-
-    SUIT_ViewModel* aViewModel = aViewManager->getViewModel();
-    SALOME_View* aView = dynamic_cast<SALOME_View*>(aViewModel);
-    if (aView == 0) return;
+      SUIT_ViewModel* aViewModel = aViewManager->getViewModel();
+      SALOME_View* aView = dynamic_cast<SALOME_View*>(aViewModel);
+      if (aView == 0) return;
 
-    TopoDS_Shape aMainShape = GEOM_Client::get_client().GetShape(GeometryGUI::GetGeomGen(), myMainObj);
-    TopoDS_Shape aRestrictionShape;
+      TopoDS_Shape aMainShape = GEOM_Client::get_client().GetShape(GeometryGUI::GetGeomGen(), myMainObj);
+      TopoDS_Shape aRestrictionShape;
 
-    if (subSelectionWay() == ALL_SUBSHAPES) {
-      aRestrictionShape = aMainShape;
+      if (subSelectionWay() == ALL_SUBSHAPES) {
+        aRestrictionShape = aMainShape;
 
-      TopTools_IndexedMapOfShape aSubShapesMap;
-      TopExp::MapShapes(aMainShape, aSubShapesMap);
-      CORBA::String_var aMainEntry = myMainObj->GetStudyEntry();
-      QString anEntryBase = aMainEntry.in();
-
-      TopExp_Explorer anExp (aRestrictionShape, getShapeType());
-      for (; anExp.More(); anExp.Next()) {
-        TopoDS_Shape aSubShape = anExp.Current();
-        int index = aSubShapesMap.FindIndex(aSubShape);
-        QString anEntry = anEntryBase + QString("_%1").arg(index);
-
-        SALOME_Prs* aPrs = aDisplayer->buildSubshapePresentation(aSubShape, anEntry, aView);
-        if (aPrs) {
-          displayPreview(aPrs, true, false); // append, do not update
-          // TODO: map or delete Prs
+        TopTools_IndexedMapOfShape aSubShapesMap;
+        TopExp::MapShapes(aMainShape, aSubShapesMap);
+        CORBA::String_var aMainEntry = myMainObj->GetStudyEntry();
+        QString anEntryBase = aMainEntry.in();
+
+        TopExp_Explorer anExp (aRestrictionShape, getShapeType());
+        for (; anExp.More(); anExp.Next()) {
+          TopoDS_Shape aSubShape = anExp.Current();
+          int index = aSubShapesMap.FindIndex(aSubShape);
+          QString anEntry = anEntryBase + QString("_%1").arg(index);
+
+          SALOME_Prs* aPrs = aDisplayer->buildSubshapePresentation(aSubShape, anEntry, aView);
+          if (aPrs) {
+            displayPreview(aPrs, true, false); // append, do not update
+            // TODO: map or delete Prs
+          }
         }
       }
-    }
-    else if (!myInPlaceObj->_is_nil()) {
-      TopTools_IndexedMapOfShape aSubShapesMap;
-      TopExp::MapShapes(aMainShape, aSubShapesMap);
-      CORBA::String_var aMainEntry = myMainObj->GetStudyEntry();
-      QString anEntryBase = aMainEntry.in();
+      else if (!myInPlaceObj->_is_nil()) {
+        TopTools_IndexedMapOfShape aSubShapesMap;
+        TopExp::MapShapes(aMainShape, aSubShapesMap);
+        CORBA::String_var aMainEntry = myMainObj->GetStudyEntry();
+        QString anEntryBase = aMainEntry.in();
 
-      TColStd_DataMapIteratorOfDataMapOfIntegerInteger aM2IPit (myMain2InPlaceIndices);
-      for (; aM2IPit.More(); aM2IPit.Next()) {
-        int index = aM2IPit.Key();
-        TopoDS_Shape aSubShape = aSubShapesMap.FindKey(index);
-        QString anEntry = anEntryBase + QString("_%1").arg(index);
+        TColStd_DataMapIteratorOfDataMapOfIntegerInteger aM2IPit (myMain2InPlaceIndices);
+        for (; aM2IPit.More(); aM2IPit.Next()) {
+          int index = aM2IPit.Key();
+          TopoDS_Shape aSubShape = aSubShapesMap.FindKey(index);
+          QString anEntry = anEntryBase + QString("_%1").arg(index);
 
-        SALOME_Prs* aPrs = aDisplayer->buildSubshapePresentation(aSubShape, anEntry, aView);
-        if (aPrs) {
-          displayPreview(aPrs, true, false); // append, do not update
+          SALOME_Prs* aPrs = aDisplayer->buildSubshapePresentation(aSubShape, anEntry, aView);
+          if (aPrs) {
+            displayPreview(aPrs, true, false); // append, do not update
+          }
         }
       }
-    }
-    else ;
+      else ;
 
-    aDisplayer->UpdateViewer();
-    aDisplayer->SetDisplayMode(prevDisplayMode);
+      aDisplayer->UpdateViewer();
+      aDisplayer->SetDisplayMode(prevDisplayMode);
+    }
   }
 
   globalSelection(GEOM_ALLSHAPES);