CCAR: synchronisation with V5_1_main branch

src/GEOM/Makefile.am

@@ -73,7 +73,7 @@ libGEOMbasic_la_CPPFLAGS =	\
 
 libGEOMbasic_la_LDFLAGS  =			\
 	$(CORBA_LIBS)				\
-	$(KERNEL_LDFLAGS) -lSALOMELocalTrace	\
+	$(KERNEL_LDFLAGS) -lSALOMELocalTrace -lSALOMEBasics	\
 	$(STDLIB)				\
 	$(CAS_LDPATH) -lTKXSBase		\
 	$(CAS_OCAF)				\

src/GEOMAlgo/GEOMAlgo.cdl

@@ -1,4 +1,6 @@
--- Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+--  Copyright (C) 2007-2010  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
 --
 --  This library is free software; you can redistribute it and/or
@@ -6,7 +8,7 @@
 --  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 
+--  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.
@@ -15,7 +17,7 @@
 --  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
 --
 -- File:	GEOMAlgo.cdl
 -- Created:	Sat Dec 04 12:36:22 2004

src/GEOMAlgo/GEOMAlgo_Builder.cxx

@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  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

src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape.hxx

@@ -1,23 +1,21 @@
-// File generated by CPPExt (Value)
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//                     Copyright (C) 1991 - 2000 by  
+//  This library is free software; you can redistribute it and/or
-//                      Matra Datavision SA.  All rights reserved.
+//  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.
 //
-//                     Copyright (C) 2001 - 2004 by
+//  This library is distributed in the hope that it will be useful,
-//                     Open CASCADE SA.  All rights reserved.
+//  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 file is part of the Open CASCADE Technology software.
+//  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
 //
-// This software may be distributed and/or modified under the terms and
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
-// and appearing in the file LICENSE included in the packaging of this file.
 //
-// This software is distributed on an "AS IS" basis, without warranty of any
-// kind, and Open CASCADE SA hereby disclaims all such warranties,
-// including without limitation, any warranties of merchantability, fitness
-// for a particular purpose or non-infringement. Please see the License for
-// the specific terms and conditions governing rights and limitations under the
-// License.
 
 #ifndef _GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape_HeaderFile
 #define _GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape_HeaderFile

src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape_0.cxx

@@ -1,23 +1,21 @@
-// File generated by CPPExt (Value)
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//                     Copyright (C) 1991 - 2000 by  
+//  This library is free software; you can redistribute it and/or
-//                      Matra Datavision SA.  All rights reserved.
+//  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.
 //
-//                     Copyright (C) 2001 - 2004 by
+//  This library is distributed in the hope that it will be useful,
-//                     Open CASCADE SA.  All rights reserved.
+//  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 file is part of the Open CASCADE Technology software.
+//  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
 //
-// This software may be distributed and/or modified under the terms and
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
-// and appearing in the file LICENSE included in the packaging of this file.
 //
-// This software is distributed on an "AS IS" basis, without warranty of any
-// kind, and Open CASCADE SA hereby disclaims all such warranties,
-// including without limitation, any warranties of merchantability, fitness
-// for a particular purpose or non-infringement. Please see the License for
-// the specific terms and conditions governing rights and limitations under the
-// License.
 
 #include <GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape.hxx>
 

src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape.hxx

@@ -1,24 +1,21 @@
-// File generated by CPPExt (Transient)
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
+//  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.
 //
-//                     Copyright (C) 1991 - 2000 by  
+//  This library is distributed in the hope that it will be useful,
-//                      Matra Datavision SA.  All rights reserved.
+//  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.
 //
-//                     Copyright (C) 2001 - 2004 by
+//  You should have received a copy of the GNU Lesser General Public
-//                     Open CASCADE SA.  All rights reserved.
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// This file is part of the Open CASCADE Technology software.
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-// This software may be distributed and/or modified under the terms and
-// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
-// and appearing in the file LICENSE included in the packaging of this file.
-//  
-// This software is distributed on an "AS IS" basis, without warranty of any
-// kind, and Open CASCADE SA hereby disclaims all such warranties,
-// including without limitation, any warranties of merchantability, fitness
-// for a particular purpose or non-infringement. Please see the License for
-// the specific terms and conditions governing rights and limitations under the
-// License.
 
 #ifndef _GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape_HeaderFile
 #define _GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape_HeaderFile

src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape_0.cxx

@@ -1,23 +1,21 @@
-// File generated by CPPExt (Transient)
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//                     Copyright (C) 1991 - 2000 by  
+//  This library is free software; you can redistribute it and/or
-//                      Matra Datavision SA.  All rights reserved.
+//  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.
 //
-//                     Copyright (C) 2001 - 2004 by
+//  This library is distributed in the hope that it will be useful,
-//                     Open CASCADE SA.  All rights reserved.
+//  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 file is part of the Open CASCADE Technology software.
+//  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
 //
-// This software may be distributed and/or modified under the terms and
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
-// and appearing in the file LICENSE included in the packaging of this file.
 //
-// This software is distributed on an "AS IS" basis, without warranty of any
-// kind, and Open CASCADE SA hereby disclaims all such warranties,
-// including without limitation, any warranties of merchantability, fitness
-// for a particular purpose or non-infringement. Please see the License for
-// the specific terms and conditions governing rights and limitations under the
-// License.
 
 #include <GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape.hxx>
 

src/GEOMAlgo/GEOMAlgo_DataMapOfOrientedShapeShape.hxx

@@ -1,23 +1,21 @@
-// File generated by CPPExt (Value)
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//                     Copyright (C) 1991 - 2000 by  
+//  This library is free software; you can redistribute it and/or
-//                      Matra Datavision SA.  All rights reserved.
+//  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.
 //
-//                     Copyright (C) 2001 - 2004 by
+//  This library is distributed in the hope that it will be useful,
-//                     Open CASCADE SA.  All rights reserved.
+//  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 file is part of the Open CASCADE Technology software.
+//  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
 //
-// This software may be distributed and/or modified under the terms and
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
-// and appearing in the file LICENSE included in the packaging of this file.
 //
-// This software is distributed on an "AS IS" basis, without warranty of any
-// kind, and Open CASCADE SA hereby disclaims all such warranties,
-// including without limitation, any warranties of merchantability, fitness
-// for a particular purpose or non-infringement. Please see the License for
-// the specific terms and conditions governing rights and limitations under the
-// License.
 
 #ifndef _GEOMAlgo_DataMapOfOrientedShapeShape_HeaderFile
 #define _GEOMAlgo_DataMapOfOrientedShapeShape_HeaderFile

src/GEOMAlgo/GEOMAlgo_DataMapOfOrientedShapeShape_0.cxx

@@ -1,23 +1,21 @@
-// File generated by CPPExt (Value)
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//                     Copyright (C) 1991 - 2000 by  
+//  This library is free software; you can redistribute it and/or
-//                      Matra Datavision SA.  All rights reserved.
+//  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.
 //
-//                     Copyright (C) 2001 - 2004 by
+//  This library is distributed in the hope that it will be useful,
-//                     Open CASCADE SA.  All rights reserved.
+//  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 file is part of the Open CASCADE Technology software.
+//  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
 //
-// This software may be distributed and/or modified under the terms and
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
-// and appearing in the file LICENSE included in the packaging of this file.
 //
-// This software is distributed on an "AS IS" basis, without warranty of any
-// kind, and Open CASCADE SA hereby disclaims all such warranties,
-// including without limitation, any warranties of merchantability, fitness
-// for a particular purpose or non-infringement. Please see the License for
-// the specific terms and conditions governing rights and limitations under the
-// License.
 
 #include <GEOMAlgo_DataMapOfOrientedShapeShape.hxx>
 

src/GEOMAlgo/GEOMAlgo_Tools.cdl

@@ -1,4 +1,4 @@
---  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+--  Copyright (C) 2007-2010  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

src/GEOMAlgo/GEOMAlgo_Tools.hxx

@@ -1,23 +1,24 @@
-// File generated by CPPExt (Value)
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//                     Copyright (C) 1991 - 2000 by  
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//                      Matra Datavision SA.  All rights reserved.
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//                     Copyright (C) 2001 - 2004 by
+//  This library is free software; you can redistribute it and/or
-//                     Open CASCADE SA.  All rights reserved.
+//  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 file is part of the Open CASCADE Technology software.
+//  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 software may be distributed and/or modified under the terms and
+//  You should have received a copy of the GNU Lesser General Public
-// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
+//  License along with this library; if not, write to the Free Software
-// and appearing in the file LICENSE included in the packaging of this file.
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-// This software is distributed on an "AS IS" basis, without warranty of any
-// kind, and Open CASCADE SA hereby disclaims all such warranties,
-// including without limitation, any warranties of merchantability, fitness
-// for a particular purpose or non-infringement. Please see the License for
-// the specific terms and conditions governing rights and limitations under the
-// License.
 
 #ifndef _GEOMAlgo_Tools_HeaderFile
 #define _GEOMAlgo_Tools_HeaderFile

src/GEOMAlgo/GEOMAlgo_Tools_1.cxx

@@ -1,9 +1,26 @@
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  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.
+//
+//  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
+//
 // File:	GEOMAlgo_Tools_1.cxx
 // Created:	Thu May  6 10:46:21 2010
 // Author:	Peter KURNEV
 //		<pkv@irinox>
 
-
 #include <GEOMAlgo_Tools.ixx>
 //
 #include <NCollection_DataMap.hxx>

src/GEOMAlgo/GEOMAlgo_WESCorrector.cxx

@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  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

src/GEOMAlgo/GEOMAlgo_WESScaler.cdl

@@ -1,7 +1,4 @@
---  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+--  Copyright (C) 2007-2010  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
 --
 --  This library is free software; you can redistribute it and/or
 --  modify it under the terms of the GNU Lesser General Public
@@ -18,6 +15,7 @@
 --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 --
 --  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--
 -- File:	GEOMAlgo_WESScaler.cdl
 -- Created:	
 -- Author:	

src/GEOMAlgo/GEOMAlgo_WESScaler.cxx

@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  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
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

src/GEOMAlgo/GEOMAlgo_WESScaler.hxx

@@ -1,23 +1,21 @@
-// File generated by CPPExt (Value)
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//                     Copyright (C) 1991 - 2000 by  
+//  This library is free software; you can redistribute it and/or
-//                      Matra Datavision SA.  All rights reserved.
+//  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.
 //
-//                     Copyright (C) 2001 - 2004 by
+//  This library is distributed in the hope that it will be useful,
-//                     Open CASCADE SA.  All rights reserved.
+//  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 file is part of the Open CASCADE Technology software.
+//  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
 //
-// This software may be distributed and/or modified under the terms and
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
-// and appearing in the file LICENSE included in the packaging of this file.
 //
-// This software is distributed on an "AS IS" basis, without warranty of any
-// kind, and Open CASCADE SA hereby disclaims all such warranties,
-// including without limitation, any warranties of merchantability, fitness
-// for a particular purpose or non-infringement. Please see the License for
-// the specific terms and conditions governing rights and limitations under the
-// License.
 
 #ifndef _GEOMAlgo_WESScaler_HeaderFile
 #define _GEOMAlgo_WESScaler_HeaderFile

src/GEOMAlgo/GEOMAlgo_WESScaler.ixx

@@ -1,23 +1,21 @@
-// File generated by CPPExt (Value)
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//                     Copyright (C) 1991 - 2000 by  
+//  This library is free software; you can redistribute it and/or
-//                      Matra Datavision SA.  All rights reserved.
+//  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.
 //
-//                     Copyright (C) 2001 - 2004 by
+//  This library is distributed in the hope that it will be useful,
-//                     Open CASCADE SA.  All rights reserved.
+//  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 file is part of the Open CASCADE Technology software.
+//  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
 //
-// This software may be distributed and/or modified under the terms and
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
-// and appearing in the file LICENSE included in the packaging of this file.
 //
-// This software is distributed on an "AS IS" basis, without warranty of any
-// kind, and Open CASCADE SA hereby disclaims all such warranties,
-// including without limitation, any warranties of merchantability, fitness
-// for a particular purpose or non-infringement. Please see the License for
-// the specific terms and conditions governing rights and limitations under the
-// License.
 
 #include <GEOMAlgo_WESScaler.jxx>
 

src/GEOMAlgo/GEOMAlgo_WESScaler.jxx

@@ -1,3 +1,22 @@
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  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.
+//
+//  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
+//
+
 #ifndef _TopoDS_Face_HeaderFile
 #include <TopoDS_Face.hxx>
 #endif

src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape.hxx

@@ -1,23 +1,21 @@
-// File generated by CPPExt (Transient)
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//                     Copyright (C) 1991 - 2000 by  
+//  This library is free software; you can redistribute it and/or
-//                      Matra Datavision SA.  All rights reserved.
+//  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.
 //
-//                     Copyright (C) 2001 - 2004 by
+//  This library is distributed in the hope that it will be useful,
-//                     Open CASCADE SA.  All rights reserved.
+//  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 file is part of the Open CASCADE Technology software.
+//  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
 //
-// This software may be distributed and/or modified under the terms and
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
-// and appearing in the file LICENSE included in the packaging of this file.
 //
-// This software is distributed on an "AS IS" basis, without warranty of any
-// kind, and Open CASCADE SA hereby disclaims all such warranties,
-// including without limitation, any warranties of merchantability, fitness
-// for a particular purpose or non-infringement. Please see the License for
-// the specific terms and conditions governing rights and limitations under the
-// License.
 
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape_HeaderFile
 #define _Handle_GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape_HeaderFile

src/GEOMBase/GEOMBase_Helper.cxx

@@ -810,7 +810,6 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction )
     return false;
   }
 
-  START_TIMING;
   erasePreview( false );
 
   bool result = false;
@@ -884,7 +883,6 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction )
   }
 
   updateViewer();
-  END_TIMING(1);
 
   return result;
 }

src/GEOMClient/GEOM_Client.cxx

@@ -128,27 +128,13 @@ GEOM_Client::GEOM_Client(Engines::Container_ptr client)
 //=======================================================================
 Standard_Integer GEOM_Client::Find( const TCollection_AsciiString& IOR, TopoDS_Shape& S )
 {
-  //CCAR
+  if(_myIndexes.count(IOR) != 0)
-#if 1
-  if(_myIndexes.count(IOR)==0)
-    {
-      return 0;
-    }
-  else
     {
       Standard_Integer i =_myIndexes[IOR];
       S = myShapes.Value(i);
       return i;
     }
-#else
-  for ( Standard_Integer i = 1; i<= myIORs.Length(); i++ ) {
-    if (myIORs.Value(i).IsEqual(IOR)) {
-      S = myShapes.Value(i);
-      return i;
-    }
-  }
   return 0;
-#endif
 }
 
 //=======================================================================
@@ -249,8 +235,6 @@ TopoDS_Shape GEOM_Client::GetShape( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_p
   TopoDS_Shape aMainShape = GetShape (geom, aShape->GetMainShape());
   GEOM::ListOfLong_var list = aShape->GetSubShapeIndices();
 
-  START_TIMING;
-
   TopTools_IndexedMapOfShape anIndices;
   CORBA::String_var aMainIOR = geom->GetStringFromIOR(aShape->GetMainShape());
   TCollection_AsciiString mainIOR = (char*)aMainIOR.in();
@@ -258,7 +242,6 @@ TopoDS_Shape GEOM_Client::GetShape( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_p
   //find subshapes only one time
   if(_mySubShapes.count(mainIOR)==0)
     {
-      std::cerr << "find sub shapes " << std::endl;
       TopExp::MapShapes(aMainShape, anIndices);
       Standard_Integer ii = 1, nbSubSh = anIndices.Extent();
       for (; ii <= nbSubSh; ii++) 
@@ -269,7 +252,6 @@ TopoDS_Shape GEOM_Client::GetShape( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_p
 
   /* Case of only one subshape */
   if (list->length() == 1 && list[0] > 0) {
-    //S = anIndices.FindKey(list[0]);
     S = _mySubShapes[mainIOR][list[0]-1];
   }
   else {
@@ -279,7 +261,6 @@ TopoDS_Shape GEOM_Client::GetShape( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_p
     for (int i = 0; i < list->length(); i++) {
       if (0 < list[i] && list[i] <= anIndices.Extent()) {
         TopoDS_Shape aSubShape = _mySubShapes[mainIOR][list[i]-1];
-        //TopoDS_Shape aSubShape = anIndices.FindKey(list[i]);
         B.Add(aCompound, aSubShape);
       }
     }
@@ -287,6 +268,5 @@ TopoDS_Shape GEOM_Client::GetShape( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_p
     S = aCompound;
   }
   Bind(IOR, S);
-  END_TIMING(100);
   return S;
 }

src/GEOMGUI/GEOM_Displayer.cxx

@@ -311,11 +311,11 @@ void GEOM_Displayer::Display( const Handle(SALOME_InteractiveObject)& theIO,
 
     if ( prs )
     {
-    START_TIMING;
+    //START_TIMING;
       vf->BeforeDisplay( this );
       vf->Display( prs );
       vf->AfterDisplay( this );
-    END_TIMING(100);
+    //END_TIMING(100);
 
       if ( updateViewer )
         vf->Repaint();

src/GEOMGUI/GeometryGUI_Swig.cxx

@@ -175,7 +175,7 @@ void GEOM_Swig::createAndDisplayGO (const char* Entry, bool isUpdated)
           aStudyBuilder->Addreference(newObj1, obj);
           // commit transaction
           op->commit();*/
-      START_TIMING;
+      //START_TIMING;
           Handle(GEOM_InteractiveObject) anIO =
             new GEOM_InteractiveObject (const_cast<char*>(anIORValue.c_str()),
                                         const_cast<char*>(aFatherIOR.c_str()),
@@ -183,7 +183,7 @@ void GEOM_Swig::createAndDisplayGO (const char* Entry, bool isUpdated)
                                         const_cast<char*>( obj->GetID().c_str()));
 
           GEOM_Displayer(ActiveStudy).Display(anIO, myUpdateViewer);
-      END_TIMING(100);
+      //END_TIMING(100);
           /*if (SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(app)) {
             SVTK_View* aView = aViewWindow->getView();
             int aMode = aView->GetDisplayMode();

src/VTKExport/Makefile.am

@@ -40,6 +40,6 @@ libVTKExport_la_CPPFLAGS =	\
 
 libVTKExport_la_LDFLAGS  =			\
 	../OCC2VTK/libOCC2VTK.la		\
-	$(KERNEL_LDFLAGS) -lSALOMELocalTrace	\
+	$(KERNEL_LDFLAGS) -lSALOMELocalTrace -lSALOMEBasics	\
 	$(STDLIB)				\
 	$(CAS_LDPATH)