From: adv <adv@opencascade.com>
Date: Thu, 16 Jan 2014 07:50:41 +0000 (+0000)
Subject: Minor changes.
X-Git-Tag: BR_hydro_v_1_0~90
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=27f08fdd5866af0b72cf6bb7f790c3a0d82550f8;p=modules%2Fhydro.git

Minor changes.
---

diff --git a/src/HYDROData/HYDROData_CalculationCase.cxx b/src/HYDROData/HYDROData_CalculationCase.cxx
index 9813ae94..6bc7bbfc 100644
--- a/src/HYDROData/HYDROData_CalculationCase.cxx
+++ b/src/HYDROData/HYDROData_CalculationCase.cxx
@@ -595,11 +595,11 @@ HYDROData_CalculationCase::PointClassification HYDROData_CalculationCase::GetPoi
   BRepTopAdaptor_FClass2d aClassifier( aZoneFace, Precision::Confusion() );
   TopAbs_State State = aClassifier.Perform( gp_Pnt2d(thePoint), Standard_False );
   if (State == TopAbs_OUT)
-	aRes =  POINT_OUT;
+    aRes =  POINT_OUT;
   else if(State == TopAbs_IN)
     aRes =  POINT_IN;
   else if(State == TopAbs_ON)
-    aRes =  POINT_ON;	  
+    aRes =  POINT_ON;
   return aRes;
 }
 
@@ -692,24 +692,24 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var
     {
       aSewing.Add( aShape );
 #ifdef DEB_CALCULATION
-	  TCollection_AsciiString aName = aNam + ++i + ".brep";
-	  BRepTools::Write(aShape ,aName.ToCString());
+      TCollection_AsciiString aName = aNam + ++i + ".brep";
+      BRepTools::Write(aShape ,aName.ToCString());
 #endif
     }
     else
     {
 #ifdef DEB_CALCULATION
-	  int j = 1;
+      int j = 1;
 #endif
       TopExp_Explorer anExp( aShape, TopAbs_FACE );
-	  for (; anExp.More(); anExp.Next() ) {
+      for (; anExp.More(); anExp.Next() ) {
         aSewing.Add( anExp.Current() );
 #ifdef DEB_CALCULATION
 
         TCollection_AsciiString aName = aNam + i + "_" + ++j + ".brep";
-		BRepTools::Write(anExp.Current() ,aName.ToCString());
+        BRepTools::Write(anExp.Current() ,aName.ToCString());
 #endif
-	  }
+      }
     }
   } // faces iterator
   
@@ -746,7 +746,7 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var
 
     NCollection_Sequence<int> aGroupIndexes;
     for( int i = 1, n = aGroupDef.Shapes.Length(); i <= n; i++ )
-	{
+    {
       const TopoDS_Shape& aShape = aGroupDef.Shapes.Value( i );
 #ifdef DEB_CALCULATION
       cout << "\nOld shape(" << i << ") = " << aShape.TShape() <<endl;
@@ -756,44 +756,33 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var
         continue;
 
 #ifdef DEB_CALCULATION
-	  const TopLoc_Location& aL1 = aShape.Location();
-	  const TopLoc_Location& aL2 = aModifiedShape.Location();
-	  cout << "\nNew shape(" << i << ") = " << aModifiedShape.TShape() << " Location is Equal = " << aL1.IsEqual(aL2)<<endl;
+      const TopLoc_Location& aL1 = aShape.Location();
+      const TopLoc_Location& aL2 = aModifiedShape.Location();
+      cout << "\nNew shape(" << i << ") = " << aModifiedShape.TShape() << " Location is Equal = " << aL1.IsEqual(aL2)<<endl;
 #endif
 
-      // Workaround for TopTools_IndexedMapOfShape::FindIndex()
-      /*for ( int anIndex = 1; anIndex <= aMapOfSubShapes.Extent(); anIndex++ )
-      {
-        if ( aModifiedShape.IsPartner( aMapOfSubShapes.FindKey( anIndex ) ) )
+      int anIndex = aMapOfSubShapes.FindIndex(aModifiedShape);
+      if ( anIndex > 0 ) {
+        aGroupIndexes.Append( anIndex );
+      } else {
+#ifdef DEB_CALCULATION    
+        TCollection_AsciiString aNam("Lost_");
+        if(!aMapOfSubShapes.Contains(aModifiedShape)) {
+        for ( int anIndex = 1; anIndex <= aMapOfSubShapes.Extent(); anIndex++ )
         {
-          aGroupIndexes.Append( anIndex );
-          break;
+           const TopoDS_Shape& aS = aMapOfSubShapes.FindKey( anIndex );
+           if ( aModifiedShape.IsPartner( aS ) )
+           {
+             cout <<"\nIndex in Map = " << anIndex << "TShape = " << aS.TShape() <<endl;
+             TCollection_AsciiString aName = aNam + i + "_" + anIndex + ".brep";
+             BRepTools::Write(aS ,aName.ToCString());
+            break;
+           }
+         }
         }
-      }
-    */
-	  int anIndex = aMapOfSubShapes.FindIndex(aModifiedShape);
-	  if(anIndex > 0) {
-		aGroupIndexes.Append( anIndex );
-        //break;
-	  } else {
-#ifdef DEB_CALCULATION	
-	  TCollection_AsciiString aNam("Lost_");
-	  if(!aMapOfSubShapes.Contains(aModifiedShape)) {
-       for ( int anIndex = 1; anIndex <= aMapOfSubShapes.Extent(); anIndex++ )
-       {
-	     const TopoDS_Shape& aS = aMapOfSubShapes.FindKey( anIndex );
-         if ( aModifiedShape.IsPartner( aS ) )
-		 {
-		   cout <<"\nIndex in Map = " << anIndex << "TShape = " << aS.TShape() <<endl;
-		   TCollection_AsciiString aName = aNam + i + "_" + anIndex + ".brep";
-		   BRepTools::Write(aS ,aName.ToCString());
-          break;
-		 }
-	   }
-	  }
 #endif
-	}
-	}
+      }
+    }
     if ( !aGroupIndexes.IsEmpty() )
       aGroupsData.Bind( aGroupDef.Name, aGroupIndexes );
   }