PAL7403. In Save(), remove shape referring data if a referred shape was deleted

src/SMESH_I/SMESH_Gen_i.cxx

@@ -975,13 +975,15 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
 	    
 	    // write reference on a shape if exists
 	    SALOMEDS::SObject_var myRef;
+            bool shapeRefFound = false;
 	    bool found = gotBranch->FindSubObject( GetRefOnShapeTag(), myRef );
 	    if ( found ) {
 	      SALOMEDS::SObject_var myShape;
 	      bool ok = myRef->ReferencedObject( myShape );
 	      if ( ok ) {
+                shapeRefFound = (! CORBA::is_nil( myShape->GetObject() ));
 		string myRefOnObject = myShape->GetID();
-		if ( myRefOnObject.length() > 0 ) {
+		if ( shapeRefFound && myRefOnObject.length() > 0 ) {
 		  aSize[ 0 ] = myRefOnObject.length() + 1;
 		  aDataset = new HDFdataset( "Ref on shape", aTopGroup, HDF_STRING, aSize, 1 );
 		  aDataset->CreateOnDisk();
@@ -990,11 +992,19 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
 		}
 	      }
 	    }
+            // maybe a shape was deleted in the study
+            if ( !shapeRefFound && !mySMESHDSMesh->ShapeToMesh().IsNull() ) {
+              TopoDS_Shape nullShape;
+              myLocMesh.ShapeToMesh( nullShape ); // remove shape referring data
+            }
 
 	    // write applied hypotheses if exist
 	    SALOMEDS::SObject_var myHypBranch;
 	    found = gotBranch->FindSubObject( GetRefOnAppliedHypothesisTag(), myHypBranch );
-	    if ( found ) {
+	    if ( found && !shapeRefFound ) { // remove applied hyps
+              myCurrentStudy->NewBuilder()->RemoveObjectWithChildren( myHypBranch );
+            }
+	    if ( found && shapeRefFound ) {
 	      aGroup = new HDFgroup( "Applied Hypotheses", aTopGroup );
 	      aGroup->CreateOnDisk();
 
@@ -1033,7 +1043,10 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
 	    // write applied algorithms if exist
 	    SALOMEDS::SObject_var myAlgoBranch;
 	    found = gotBranch->FindSubObject( GetRefOnAppliedAlgorithmsTag(), myAlgoBranch );
-	    if ( found ) {
+	    if ( found && !shapeRefFound ) { // remove applied hyps
+              myCurrentStudy->NewBuilder()->RemoveObjectWithChildren( myAlgoBranch );
+            }
+	    if ( found && shapeRefFound ) {
 	      aGroup = new HDFgroup( "Applied Algorithms", aTopGroup );
 	      aGroup->CreateOnDisk();
 
@@ -1070,9 +1083,48 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
 	    }
 
 	    // --> submesh objects sub-branches
+
 	    for ( int i = GetSubMeshOnVertexTag(); i <= GetSubMeshOnCompoundTag(); i++ ) {
 	      SALOMEDS::SObject_var mySubmeshBranch;
 	      found = gotBranch->FindSubObject( i, mySubmeshBranch );
+
+              if ( found ) // check if there is shape reference in submeshes
+              {
+                bool hasShapeRef = false;
+		SALOMEDS::ChildIterator_var itSM =
+                  myCurrentStudy->NewChildIterator( mySubmeshBranch );
+		for ( ; itSM->More(); itSM->Next() ) {
+		  SALOMEDS::SObject_var mySubRef, myShape, mySObject = itSM->Value();
+                  if ( mySObject->FindSubObject( GetRefOnShapeTag(), mySubRef ))
+                    mySubRef->ReferencedObject( myShape );
+                  if ( !CORBA::is_nil( myShape ) && !CORBA::is_nil( myShape->GetObject() ))
+                    hasShapeRef = true;
+                  else
+                  { // remove one submesh
+                    if ( shapeRefFound )
+                    { // unassign hypothesis
+                      SMESH::SMESH_subMesh_var mySubMesh =
+                        SMESH::SMESH_subMesh::_narrow( SObjectToObject( mySObject ));
+                      if ( !mySubMesh->_is_nil() ) {
+                        int shapeID = mySubMesh->GetId();
+                        TopoDS_Shape S = mySMESHDSMesh->IndexToShape( shapeID );
+                        const list<const SMESHDS_Hypothesis*>& hypList =
+                          mySMESHDSMesh->GetHypothesis( S );
+                        list<const SMESHDS_Hypothesis*>::const_iterator hyp = hypList.begin();
+                        while ( hyp != hypList.end() ) {
+                          int hypID = (*hyp++)->GetID(); // goto next here because
+                          myLocMesh.RemoveHypothesis( S, hypID ); // hypList changes here
+                        }
+                      }
+                    }
+                    myCurrentStudy->NewBuilder()->RemoveObjectWithChildren( mySObject );
+                  }
+                } // loop on submeshes of a type
+                if ( !shapeRefFound || !hasShapeRef ) { // remove the whole submeshes branch
+                  myCurrentStudy->NewBuilder()->RemoveObjectWithChildren( mySubmeshBranch );
+                  found = false;
+                }
+              }  // end check if there is shape reference in submeshes
 	      if ( found ) {
 		char name_meshgroup[ 30 ];
 		if ( i == GetSubMeshOnVertexTag() )
@@ -1099,7 +1151,8 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
 		for ( ; itSM->More(); itSM->Next() ) {
 		  SALOMEDS::SObject_var mySObject = itSM->Value();
 		  CORBA::Object_var anSubObject = SObjectToObject( mySObject );
-		  if ( !CORBA::is_nil( anSubObject ) ) {
+		  if ( !CORBA::is_nil( anSubObject ))
+                  {
 		    SMESH::SMESH_subMesh_var mySubMesh = SMESH::SMESH_subMesh::_narrow( anSubObject ) ;
 		    int subid = myStudyContext->findId( string( GetORB()->object_to_string( anSubObject ) ) );
 		      
@@ -1109,21 +1162,10 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
 		    aSubGroup = new HDFgroup( submeshGrpName, aGroup );
 		    aSubGroup->CreateOnDisk();
 
-//		    // Put submesh data to MED convertor
+		    // write reference on a shape, already checked if it exists
-//		    if ( myImpl->_mapSubMesh.find( mySubMesh->GetId() ) != myImpl->_mapSubMesh.end() ) {
+                    SALOMEDS::SObject_var mySubRef, myShape;
-//		      if(MYDEBUG) MESSAGE( "VSR - SMESH_Gen_i::Save(): saving submesh with ID = "
+                    if ( mySObject->FindSubObject( GetRefOnShapeTag(), mySubRef ))
-//                              << mySubMesh->GetId() << " to MED file" );
+                      mySubRef->ReferencedObject( myShape );
-//		      ::SMESH_subMesh* aLocalSubmesh = myImpl->_mapSubMesh[mySubMesh->GetId()];
-//		      myWriter.AddSubMesh( aLocalSubmesh->GetSubMeshDS(), subid );
-//		    }
-		    
-		    // write reference on a shape if exists
-		    SALOMEDS::SObject_var mySubRef;
-		    found = mySObject->FindSubObject( GetRefOnShapeTag(), mySubRef );
-		    if ( found ) {
-		      SALOMEDS::SObject_var myShape;
-		      bool ok = mySubRef->ReferencedObject( myShape );
-		      if ( ok ) {
                     string myRefOnObject = myShape->GetID();
                     if ( myRefOnObject.length() > 0 ) {
                       aSize[ 0 ] = myRefOnObject.length() + 1;
@@ -1132,8 +1174,6 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
                       aDataset->WriteOnDisk( ( char* )( myRefOnObject.c_str() ) );
                       aDataset->CloseOnDisk();
                     }
-		      }
-		    }
 
 		    // write applied hypotheses if exist
 		    SALOMEDS::SObject_var mySubHypBranch;
@@ -1257,6 +1297,7 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
 
 		    // Store the group contents into MED file
 		    if ( myLocMesh.GetGroup( myGroupImpl->GetLocalID() ) ) {
+
 		      if(MYDEBUG) MESSAGE( "VSR - SMESH_Gen_i::Save(): saving group with StoreName = "
                               << grpName << " to MED file" );
 		      SMESHDS_GroupBase* aGrpBaseDS =
@@ -1274,7 +1315,8 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
                       if ( aGeomGrp ) {
                         SALOMEDS::SObject_var mySubRef, myShape;
                         if (mySObject->FindSubObject( GetRefOnShapeTag(), mySubRef ) &&
-                            mySubRef->ReferencedObject( myShape ))
+                            mySubRef->ReferencedObject( myShape ) &&
+                            !CORBA::is_nil( myShape->GetObject() ))
                         {
                           string myRefOnObject = myShape->GetID();
                           if ( myRefOnObject.length() > 0 ) {
@@ -1287,13 +1329,18 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
                             aDataset->CloseOnDisk();
                           }
                         }
+                        else // shape ref is invalid:
+                        {
+                          // save a group on geometry as ordinary group
+                          myWriter.AddGroup( aGeomGrp );
+                        }
                       }
 		    }
 		  }
 		}
 		aGroup->CloseOnDisk();
 	      }
-	    }
+	    } // loop on groups 
 
 	    if ( strcmp( strHasData.c_str(), "1" ) == 0 )
             {
@@ -1303,6 +1350,8 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
 
               // Store node positions on sub-shapes (SMDS_Position):
 
+              if ( !mySMESHDSMesh->SubMeshes().empty() )
+              {
                 aGroup = new HDFgroup( "Node Positions", aTopGroup );
                 aGroup->CreateOnDisk();
 
@@ -1432,6 +1481,7 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
                 // close "Node Positions" group
                 aGroup->CloseOnDisk(); 
 
+              } // if ( there are submeshes in SMESHDS_Mesh )
             } // if ( hasData )
 
 	    // close mesh HDF group