X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOM%2FGEOM_SubShapeDriver.cxx;h=fa2d4cdca81f1df08428dff1cf86a7cd89705d76;hb=08a90cb03f6d2befe6f0b923bd690182ded48378;hp=76f05ac72e2e61dd121e66757123b10cfefb0158;hpb=004197ec827d52331f0d529202eb4e52a1c4388f;p=modules%2Fgeom.git

diff --git a/src/GEOM/GEOM_SubShapeDriver.cxx b/src/GEOM/GEOM_SubShapeDriver.cxx
index 76f05ac72..fa2d4cdca 100644
--- a/src/GEOM/GEOM_SubShapeDriver.cxx
+++ b/src/GEOM/GEOM_SubShapeDriver.cxx
@@ -1,23 +1,23 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #include <Standard_Stream.hxx>
@@ -27,33 +27,15 @@
 #include <GEOM_Function.hxx>
 #include <GEOM_Object.hxx>
 
-#include <BRep_Tool.hxx>
 #include <BRep_Builder.hxx>
-#include <BRepGProp.hxx>
 
-#include <TopAbs.hxx>
 #include <TopExp.hxx>
-#include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Wire.hxx>
-#include <TopoDS_Solid.hxx>
 #include <TopoDS_Compound.hxx>
-#include <TopoDS_Iterator.hxx>
-#include <TopExp_Explorer.hxx>
 #include <TopTools_MapOfShape.hxx>
-#include <TopTools_SequenceOfShape.hxx>
-#include <TopTools_Array1OfShape.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
-#include <GProp_GProps.hxx>
-#include <gp_Pnt.hxx>
-#include <TColStd_Array1OfReal.hxx>
-
-#include <Precision.hxx>
 #include <Standard_NullObject.hxx>
-#include <Standard_TypeMismatch.hxx>
-
 
 //=======================================================================
 //function : GEOM_SubShapeDriver
@@ -88,20 +70,18 @@ Standard_Integer GEOM_SubShapeDriver::Execute(TFunction_Logbook& log) const
   TopoDS_Compound aCompound;
   TopoDS_Shape aShape;
 
-  if (anIndices->Length() == 1 && anIndices->Value(1) == -1) { //The empty subshape
+  if (anIndices->Length() == 1 && anIndices->Value(1) == -1) { //The empty sub-shape
     B.MakeCompound(aCompound);
     aShape = aCompound;
-
-  } else {
-
+  }
+  else {
     TopTools_IndexedMapOfShape aMapOfShapes;
     TopExp::MapShapes(aMainShape, aMapOfShapes);
 
     if (anIndices->Length() > 1) {
-
       B.MakeCompound(aCompound);
 
-      for (int i = anIndices->Lower(); i<= anIndices->Upper(); i++) {
+      for (int i = anIndices->Lower(); i <= anIndices->Upper(); i++) {
         if (aMapOfShapes.Extent() < anIndices->Value(i))
           Standard_NullObject::Raise("GEOM_SubShapeDriver::Execute: Index is out of range");
         TopoDS_Shape aSubShape = aMapOfShapes.FindKey(anIndices->Value(i));
@@ -110,12 +90,12 @@ Standard_Integer GEOM_SubShapeDriver::Execute(TFunction_Logbook& log) const
       }
 
       aShape = aCompound;
-
-    } else {
-
-      if (aMapOfShapes.Extent() < anIndices->Value(1))
+    }
+    else {
+      int i = anIndices->Lower();
+      if (aMapOfShapes.Extent() < anIndices->Value(i))
         Standard_NullObject::Raise("GEOM_SubShapeDriver::Execute: Index is out of range");
-      aShape = aMapOfShapes.FindKey(anIndices->Value(1));
+      aShape = aMapOfShapes.FindKey(anIndices->Value(i));
     }
   }
 
@@ -128,7 +108,6 @@ Standard_Integer GEOM_SubShapeDriver::Execute(TFunction_Logbook& log) const
   return 1;
 }
 
-
 //=======================================================================
 //function :  GEOM_SubShapeDriver_Type_
 //purpose  :
@@ -137,11 +116,11 @@ Standard_EXPORT Handle_Standard_Type& GEOM_SubShapeDriver_Type_()
 {
 
   static Handle_Standard_Type aType1 = STANDARD_TYPE(TFunction_Driver);
-  if ( aType1.IsNull()) aType1 = STANDARD_TYPE(TFunction_Driver);
+  if (aType1.IsNull()) aType1 = STANDARD_TYPE(TFunction_Driver);
   static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
-  if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared);
+  if (aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared);
   static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
-  if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient);
+  if (aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient);
 
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
@@ -168,5 +147,5 @@ const Handle(GEOM_SubShapeDriver) Handle(GEOM_SubShapeDriver)::DownCast(const Ha
      }
   }
 
-  return _anOtherObject ;
+  return _anOtherObject;
 }