From: asl <asl@opencascade.com>
Date: Fri, 20 Dec 2013 09:52:39 +0000 (+0000)
Subject: bug #270: restore of included groups in calc.case
X-Git-Tag: BR_hydro_v_0_6~8
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=13699bfe68e78d61c7174247d7219c3383b5d5c1;p=modules%2Fhydro.git

bug #270: restore of included groups in calc.case
---

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
index f8143232..9ebcae43 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
@@ -145,6 +145,7 @@ void HYDROGUI_CalculationOp::startOperation()
         aPolylineName = aPolylineObj->GetName();
         aPanel->setBoundary( aPolylineName );
       }
+
       aSeq = myEditedObject->GetGeometryObjects();
       getNamesAndEntries( aSeq, aList, anEntryList );
       aPanel->includeGeomObjects( aList );
@@ -173,8 +174,8 @@ void HYDROGUI_CalculationOp::getNamesAndEntries( const HYDROData_SequenceOfObjec
   for ( ; anIter.More(); anIter.Next() )
   {
     Handle(HYDROData_Entity) anEntity = anIter.Value();
-    if ( !HYDROData_Tool::IsGeometryObject( anEntity ) )
-      continue;
+    //if ( !HYDROData_Tool::IsGeometryObject( anEntity ) )
+    //  continue;
 
     theNames.append( anEntity->GetName() );
     theEntries.append( HYDROGUI_DataObject::dataObjectEntry( anEntity ) );
@@ -777,7 +778,11 @@ void HYDROGUI_CalculationOp::closePreview()
 void HYDROGUI_CalculationOp::setAvailableGroups()
 {
   HYDROGUI_CalculationDlg* aPanel = 
-    ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+      ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+
+  HYDROData_SequenceOfObjects aSeq = myEditedObject->GetGeometryGroups();
+  QStringList aList, anEntryList;
+  getNamesAndEntries( aSeq, aList, anEntryList );
 
   QStringList aGroupsNames;
 
@@ -792,8 +797,13 @@ void HYDROGUI_CalculationOp::setAvailableGroups()
       aGroupsNames.append( aGroup->GetName() );
     }
   }
-  myEditedObject->RemoveGeometryGroups();
+  if( myEditedObject->IsMustBeUpdated() )
+    myEditedObject->RemoveGeometryGroups();
+
   aPanel->setAvailableGroups( aGroupsNames );
+  aPanel->includeGroups( aList );
+
+  bool isUpdated = myEditedObject->IsMustBeUpdated();
 }
 
 void HYDROGUI_CalculationOp::onAddGroups()