NRI : Merge from V1_2.

Makefile.in

@@ -121,7 +121,9 @@ tree_wire.png \
 vector.png \
 vector2points.png \
 vectordxyz.png \
-whatis.png
+whatis.png \
+ellipse.png \
+ellipsepointvector.png
 
 BIN_SCRIPT= \
 VERSION

idl/GEOM_Gen.idl

@@ -1,10 +1,26 @@
-// File :      GEOM_Gen.idl
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// Created :   
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// Author :    Lucien PIGNOLONI
+// 
-// Project :   SALOME
+//  This library is free software; you can redistribute it and/or 
-// Copyright : OPEN CASCADE
+//  modify it under the terms of the GNU Lesser General Public 
-// $HEADERS:
+//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : GEOM_Gen.idl
+//  Author : Lucien PIGNOLONI
 
 #ifndef __GEOM_GEN__
 #define __GEOM_GEN__
@@ -170,6 +186,11 @@ module GEOM
 		       in PointStruct pCircle,
 		       in PointStruct pEnd) raises (SALOME::SALOME_Exception) ;
 
+    GEOM_Shape MakeEllipse(in PointStruct pstruct,
+			   in DirStruct dstruct,
+			   in double major_radius,
+			   in double minor_radius) raises (SALOME::SALOME_Exception) ;
+
     //-----------------------------------------------------------//
     // Primitives Construction                                   //
     //-----------------------------------------------------------//

idl/GEOM_Shape.idl

@@ -1,10 +1,26 @@
-// File :      GEOM_Shape.idl
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// Created :   29 november 2001
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// Author :    Lucien PIGNOLONI
+// 
-// Project :   SALOME
+//  This library is free software; you can redistribute it and/or 
-// Copyright : OPEN CASCADE
+//  modify it under the terms of the GNU Lesser General Public 
-// $HEADERS: 
+//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : GEOM_Shape.idl
+//  Author : Lucien PIGNOLONI
 
 #ifndef __GEOM_Shape__
 #define __GEOM_Shape__

resources/GEOM_en.xml

@@ -46,7 +46,7 @@
     	<popup-item item-id="3011" pos-id="" label-id="Point" icon-id="point2.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
 	<popup-item item-id="3012" pos-id="" label-id="Line" icon-id="line.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
 	<popup-item item-id="3013" pos-id="" label-id="Circle" icon-id="circle.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
-
+	<popup-item item-id="3014" pos-id="" label-id="Ellipse" icon-id="ellipse.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
 	<popup-item item-id="3015" pos-id="" label-id="Arc" icon-id="arc.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
 	<separator pos-id="6"/>
 	<popup-item item-id="3016" pos-id="" label-id="Vector" icon-id="vector.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
@@ -195,7 +195,7 @@
   <toolbutton-item item-id="3011" pos-id="" label-id="Point" icon-id="point2.png" tooltip-id="Point" accel-id="" toggle-id="" execute-action=""/>
   <toolbutton-item item-id="3012" pos-id="" label-id="Line" icon-id="line.png" tooltip-id="Line" accel-id="" toggle-id="" execute-action=""/>
   <toolbutton-item item-id="3013" pos-id="" label-id="Circle" icon-id="circle.png" tooltip-id="Circle" accel-id="" toggle-id="" execute-action=""/>
-
+  <toolbutton-item item-id="3014" pos-id="" label-id="Ellipse" icon-id="ellipse.png" tooltip-id="Ellipse" accel-id="" toggle-id="" execute-action=""/>
   <toolbutton-item item-id="3015" pos-id="" label-id="Arc" icon-id="arc.png" tooltip-id="Arc" accel-id="" toggle-id="" execute-action=""/>
   <toolbutton-item item-id="3016" pos-id="" label-id="Vector" icon-id="vector.png" tooltip-id="Vector" accel-id="" toggle-id="" execute-action=""/>
   <toolbutton-item item-id="3017" pos-id="" label-id="Plane" icon-id="plane.png" tooltip-id="Plane" accel-id="" toggle-id="" execute-action=""/>   	

resources/GEOM_fr.xml

@@ -44,7 +44,7 @@
 	<popup-item item-id="3011" pos-id="" label-id="Point" icon-id="point2.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
 	<popup-item item-id="3012" pos-id="" label-id="Ligne" icon-id="line.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
 	<popup-item item-id="3013" pos-id="" label-id="Cercle" icon-id="circle.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
-
+	<popup-item item-id="3014" pos-id="" label-id="Ellipse" icon-id="ellipse.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
 	<popup-item item-id="3015" pos-id="" label-id="Arc" icon-id="arc.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
 	<separator pos-id="6"/>
 	<popup-item item-id="3016" pos-id="" label-id="Vecteur" icon-id="vector.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
@@ -170,7 +170,7 @@
   <toolbutton-item item-id="3011" pos-id="" label-id="Point" icon-id="point2.png" tooltip-id="Point" accel-id="" toggle-id="" execute-action=""/>
   <toolbutton-item item-id="3012" pos-id="" label-id="Ligne" icon-id="line.png" tooltip-id="Ligne" accel-id="" toggle-id="" execute-action=""/>
   <toolbutton-item item-id="3013" pos-id="" label-id="Cercle" icon-id="circle.png" tooltip-id="Cercle" accel-id="" toggle-id="" execute-action=""/>
-
+  <toolbutton-item item-id="3014" pos-id="" label-id="Ellipse" icon-id="ellipse.png" tooltip-id="Ellipse" accel-id="" toggle-id="" execute-action=""/>
   <toolbutton-item item-id="3015" pos-id="" label-id="Arc" icon-id="arc.png" tooltip-id="Arc" accel-id="" toggle-id="" execute-action=""/>
   <toolbutton-item item-id="3016" pos-id="" label-id="Vecteur" icon-id="vector.png" tooltip-id="Vecteur" accel-id="" toggle-id="" execute-action=""/>
   <toolbutton-item item-id="3017" pos-id="" label-id="Plan" icon-id="plane.png" tooltip-id="Plan" accel-id="" toggle-id="" execute-action=""/>   	

src/GEOMGUI/GeometryGUI_CommonDlg.cxx

@@ -1,12 +1,32 @@
-using namespace std;
+//  GEOM GEOMGUI : GUI for Geometry component
-//  File      : GeometryGUI_CommonDlg.cxx
+//
-//  Created   :
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  Author    : Lucien PIGNOLONI
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-//  Project   : SALOME
+// 
-//  Module    : GeometryGUI
+//  This library is free software; you can redistribute it and/or 
-//  Copyright : OPEN CASCADE
+//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : GeometryGUI_CommonDlg.cxx
+//  Author : Lucien PIGNOLONI
+//  Module : GEOM
 //  $Header$
 
+using namespace std;
 #include "GeometryGUI_CommonDlg.h"
 
 #include "GeometryGUI.h"

src/GEOMGUI/GeometryGUI_CylinderDlg.cxx

@@ -1,12 +1,32 @@
-using namespace std;
+//  GEOM GEOMGUI : GUI for Geometry component
-//  File      : GeometryGUI_CylinderDlg.cxx
+//
-//  Created   :
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  Author    : Lucien PIGNOLONI
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-//  Project   : SALOME
+// 
-//  Module    : GeometryGUI
+//  This library is free software; you can redistribute it and/or 
-//  Copyright : OPEN CASCADE
+//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : GeometryGUI_CylinderDlg.cxx
+//  Author : Lucien PIGNOLONI
+//  Module : GEOM
 //  $Header$
 
+using namespace std;
 #include "GeometryGUI_CylinderDlg.h"
 
 #include "GeometryGUI.h"

src/GEOMGUI/GeometryGUI_FaceDlg.cxx

@@ -1,13 +1,32 @@
-using namespace std;
+//  GEOM GEOMGUI : GUI for Geometry component
-//  File      : GeometryGUI_FaceDlg.cxx
+//
-//  Created   :
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  Author    : Lucien PIGNOLONI
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-//  Project   : SALOME
+// 
-//  Module    : GeometryGUI
+//  This library is free software; you can redistribute it and/or 
-//  Copyright : OPEN CASCADE
+//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : GeometryGUI_FaceDlg.cxx
+//  Author : Lucien PIGNOLONI
+//  Module : GEOM
 //  $Header$
 
-
+using namespace std;
 #include "GeometryGUI_FaceDlg.h"
 #include "GeometryGUI.h"
 

src/GEOMGUI/GeometryGUI_MaxToleranceDlg.cxx

@@ -1,13 +1,32 @@
-using namespace std;
+//  GEOM GEOMGUI : GUI for Geometry component
-//  File      : GeometryGUI_MaxToleranceDlg.cxx
+//
-//  Created   : Mon Mar 04 14:08:28 2002
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  Author    : Nicolas REJNERI
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-
+// 
-//  Project   : SALOME
+//  This library is free software; you can redistribute it and/or 
-//  Module    : GEOM
+//  modify it under the terms of the GNU Lesser General Public 
-//  Copyright : Open CASCADE 2002
+//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : GeometryGUI_MaxToleranceDlg.cxx
+//  Author : Nicolas REJNERI
+//  Module : GEOM
 //  $Header$
 
+using namespace std;
 #include "GeometryGUI_MaxToleranceDlg.h"
 
 #include "GeometryGUI.h"

src/GEOMGUI/GeometryGUI_MultiRotationDlg.cxx

@@ -1,12 +1,32 @@
-using namespace std;
+//  GEOM GEOMGUI : GUI for Geometry component
-//  File      : GeometryGUI_MultiTranslationDlg.cxx
+//
-//  Created   :
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  Author    : Damien COQUERET
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-//  Project   : SALOME
+// 
-//  Module    : GeometryGUI
+//  This library is free software; you can redistribute it and/or 
-//  Copyright : OPEN CASCADE
+//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : GeometryGUI_MultiTranslationDlg.cxx
+//  Author : Damien COQUERET
+//  Module : GEOM
 //  $Header$
 
+using namespace std;
 #include "GeometryGUI_MultiRotationDlg.h"
 
 #include "GeometryGUI.h"

src/GEOMGUI/GeometryGUI_MultiTranslationDlg.cxx

@@ -1,12 +1,32 @@
-using namespace std;
+//  GEOM GEOMGUI : GUI for Geometry component
-//  File      : GeometryGUI_MultiTranslationDlg.cxx
+//
-//  Created   :
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  Author    : Damien COQUERET
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-//  Project   : SALOME
+// 
-//  Module    : GeometryGUI
+//  This library is free software; you can redistribute it and/or 
-//  Copyright : OPEN CASCADE
+//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : GeometryGUI_MultiTranslationDlg.cxx
+//  Author : Damien COQUERET
+//  Module : GEOM
 //  $Header$
 
+using namespace std;
 #include "GeometryGUI_MultiTranslationDlg.h"
 
 #include "GeometryGUI.h"

src/GEOMGUI/GeometryGUI_PipeDlg.cxx

@@ -1,12 +1,32 @@
-using namespace std;
+//  GEOM GEOMGUI : GUI for Geometry component
-//  File      : GeometryGUI_PipeDlg.cxx
+//
-//  Created   :
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  Author    : Lucien PIGNOLONI
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-//  Project   : SALOME
+// 
-//  Module    : GeometryGUI
+//  This library is free software; you can redistribute it and/or 
-//  Copyright : OPEN CASCADE
+//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : GeometryGUI_PipeDlg.cxx
+//  Author : Lucien PIGNOLONI
+//  Module : GEOM
 //  $Header$
 
+using namespace std;
 #include "GeometryGUI_PipeDlg.h"
 
 #include "GeometryGUI.h"

src/GEOMGUI/GeometryGUI_PropertiesDlg.cxx

@@ -1,12 +1,32 @@
-using namespace std;
+//  GEOM GEOMGUI : GUI for Geometry component
-//  File      : GeometryGUI_PropertiesDlg.cxx
+//
-//  Created   :
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  Author    : Lucien PIGNOLONI
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-//  Project   : SALOME
+// 
-//  Module    : GeometryGUI
+//  This library is free software; you can redistribute it and/or 
-//  Copyright : OPEN CASCADE
+//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : GeometryGUI_PropertiesDlg.cxx
+//  Author : Lucien PIGNOLONI
+//  Module : GEOM
 //  $Header$
 
+using namespace std;
 #include "GeometryGUI_PropertiesDlg.h"
 
 #include "GeometryGUI.h"

src/GEOMGUI/GeometryGUI_RotationDlg.cxx

@@ -1,12 +1,32 @@
-using namespace std;
+//  GEOM GEOMGUI : GUI for Geometry component
-//  File      : GeometryGUI_RotationDlg.cxx
+//
-//  Created   :
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  Author    : Lucien PIGNOLONI
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-//  Project   : SALOME
+// 
-//  Module    : GeometryGUI
+//  This library is free software; you can redistribute it and/or 
-//  Copyright : OPEN CASCADE
+//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : GeometryGUI_RotationDlg.cxx
+//  Author : Lucien PIGNOLONI
+//  Module : GEOM
 //  $Header$
 
+using namespace std;
 #include "GeometryGUI_RotationDlg.h"
 
 #include "GeometryGUI.h"

src/GEOMGUI/GeometryGUI_SewingDlg.cxx

@@ -1,12 +1,32 @@
-using namespace std;
+//  GEOM GEOMGUI : GUI for Geometry component
-//  File      : GeometryGUI_SewingDlg.cxx
+//
-//  Created   :
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  Author    : Lucien PIGNOLONI
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-//  Project   : SALOME
+// 
-//  Module    : GeometryGUI
+//  This library is free software; you can redistribute it and/or 
-//  Copyright : OPEN CASCADE
+//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : GeometryGUI_SewingDlg.cxx
+//  Author : Lucien PIGNOLONI
+//  Module : GEOM
 //  $Header$
 
+using namespace std;
 #include "GeometryGUI_SewingDlg.h"
 
 #include "GeometryGUI.h"

src/GEOMGUI/GeometryGUI_SubShapeDlg.cxx

@@ -1,12 +1,32 @@
-using namespace std;
+//  GEOM GEOMGUI : GUI for Geometry component
-//  File      : GeometryGUI_SubShapeDlg.cxx
+//
-//  Created   :
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  Author    : Lucien PIGNOLONI
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-//  Project   : SALOME
+// 
-//  Module    : GeometryGUI
+//  This library is free software; you can redistribute it and/or 
-//  Copyright : OPEN CASCADE
+//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : GeometryGUI_SubShapeDlg.cxx
+//  Author : Lucien PIGNOLONI
+//  Module : GEOM
 //  $Header$
 
+using namespace std;
 #include "GeometryGUI_SubShapeDlg.h"
 
 #include "GeometryGUI.h"

src/GEOMGUI/GeometryGUI_SuppressFacesDlg.cxx

@@ -1,12 +1,32 @@
-using namespace std;
+//  GEOM GEOMGUI : GUI for Geometry component
-//  File      : GeometryGUI_SuppressFacesDlg.cxx
+//
-//  Created   :
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  Author    : Lucien PIGNOLONI
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-//  Project   : SALOME
+// 
-//  Module    : GeometryGUI
+//  This library is free software; you can redistribute it and/or 
-//  Copyright : OPEN CASCADE
+//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : GeometryGUI_SuppressFacesDlg.cxx
+//  Author : Lucien PIGNOLONI
+//  Module : GEOM
 //  $Header$
 
+using namespace std;
 #include "GeometryGUI_SuppressFacesDlg.h"
 
 #include "GeometryGUI.h"

src/GEOMGUI/GeometryGUI_Swig.cxx

@@ -1,12 +1,32 @@
-using namespace std;
+//  GEOM GEOMGUI : GUI for Geometry component
-//  File      : GeometryGUI_Swig.cxx
+//
-//  Created   : Tue Mar 26 15:08:38 2002
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  Author    : Nicolas REJNERI, Paul RASCLE
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-//  Project   : SALOME
+// 
-//  Module    : GEOM
+//  This library is free software; you can redistribute it and/or 
-//  Copyright : Open CASCADE, EDF 2002
+//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : GeometryGUI_Swig.cxx
+//  Author : Nicolas REJNERI, Paul RASCLE
+//  Module : GEOM
 //  $Header$
 
+using namespace std;
 #include "GeometryGUI_Swig.hxx"
 #include "utilities.h"
 
@@ -18,15 +38,6 @@ using namespace std;
 #include "SALOMEGUI_ImportOperation.h"
 
 #include "OCCViewer_Viewer3d.h"
-#include "VTKViewer_RenderWindowInteractor.h"
-#include "VTKViewer_ViewFrame.h"
-
-#include "GEOM_Actor.h"
-#include "GEOM_Client.hxx"
-#include "GEOM_AISShape.hxx"
-#include "GEOM_AssemblyBuilder.h"
-#include "GEOM_InteractiveObject.hxx"
-
 #include <TopExp_Explorer.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <BRepAdaptor_Surface.hxx>
@@ -37,6 +48,15 @@ using namespace std;
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 
+#include "VTKViewer_RenderWindowInteractor.h"
+#include "VTKViewer_ViewFrame.h"
+
+#include "GEOM_Actor.h"
+#include "GEOM_Client.hxx"
+#include "GEOM_AISShape.hxx"
+#include "GEOM_AssemblyBuilder.h"
+#include "GEOM_InteractiveObject.hxx"
+
 static GEOM_Client ShapeReader;
 
 GEOM_Swig::GEOM_Swig()

src/GEOMGUI/GeometryGUI_Swig.hxx

@@ -1,9 +1,29 @@
-//  File      : GeometryGUI_Swig.hxx
+//  GEOM GEOMGUI : GUI for Geometry component
-//  Created   : Tue Mar 26 15:08:38 2002
+//
-//  Author    : Nicolas REJNERI, Paul RASCLE
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  Project   : SALOME
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-//  Module    : GEOM
+// 
-//  Copyright : Open CASCADE, EDF 2002
+//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : GeometryGUI_Swig.hxx
+//  Author : Nicolas REJNERI, Paul RASCLE
+//  Module : GEOM
 //  $Header$
 
 #ifndef _GeometryGUI_SWIG_HXX_

src/GEOMGUI/GeometryGUI_TorusDlg.cxx

@@ -1,12 +1,32 @@
-using namespace std;
+//  GEOM GEOMGUI : GUI for Geometry component
-//  File      : GeometryGUI_TorusDlg.cxx
+//
-//  Created   :
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  Author    : Lucien PIGNOLONI
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-//  Project   : SALOME
+// 
-//  Module    : GeometryGUI
+//  This library is free software; you can redistribute it and/or 
-//  Copyright : OPEN CASCADE
+//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : GeometryGUI_TorusDlg.cxx
+//  Author : Lucien PIGNOLONI
+//  Module : GEOM
 //  $Header$
 
+using namespace std;
 #include "GeometryGUI_TorusDlg.h"
 
 #include "GeometryGUI.h"

src/GEOMGUI/GeometryGUI_TranslationDlg.cxx

@@ -1,12 +1,32 @@
-using namespace std;
+//  GEOM GEOMGUI : GUI for Geometry component
-//  File      : GeometryGUI_TranslationDlg.cxx
+//
-//  Created   :
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  Author    : Lucien PIGNOLONI
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-//  Project   : SALOME
+// 
-//  Module    : GeometryGUI
+//  This library is free software; you can redistribute it and/or 
-//  Copyright : OPEN CASCADE
+//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : GeometryGUI_TranslationDlg.cxx
+//  Author : Lucien PIGNOLONI
+//  Module : GEOM
 //  $Header$
 
+using namespace std;
 #include "GeometryGUI_TranslationDlg.h"
 
 #include "GeometryGUI.h"

src/GEOMGUI/GeometryGUI_WhatisDlg.cxx

@@ -1,13 +1,32 @@
-using namespace std;
+//  GEOM GEOMGUI : GUI for Geometry component
-//  File      : GeometryGUI_WhatisDlg.cxx
+//
-//  Created   : Mon Mar 04 14:48:16 2002
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  Author    : Nicolas REJNERI
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-//  Project   : SALOME
+// 
-//  Module    : GEOM
+//  This library is free software; you can redistribute it and/or 
-//  Copyright : Open CASCADE 2002
+//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : GeometryGUI_WhatisDlg.cxx
+//  Author : Nicolas REJNERI
+//  Module : GEOM
 //  $Header$
 
-
+using namespace std;
 #include "GeometryGUI_WhatisDlg.h"
 
 #include "GeometryGUI.h"
@@ -16,7 +35,11 @@ using namespace std;
 #include "utilities.h"
 
 // Open CASCADE Includes
-#include <BRepTools_ShapeSet.hxx>
+//#include <BRepTools_ShapeSet.hxx>
+#include <TopTools_MapOfShape.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
+#include <TopoDS_Iterator.hxx>
 
 // QT Includes
 #include <qtextview.h>
@@ -378,9 +401,44 @@ void GeometryGUI_WhatisDlg::CalculateWhatis(const TopoDS_Shape& S)
   Astr = Astr + " Number of shapes in " + strdup(SelectedName.latin1()) + ": \n";
 
   try {
-    BRepTools_ShapeSet BS;
+    //     BRepTools_ShapeSet BS;
-    BS.Add(S);
+    //     BS.Add(S);
-    BS.DumpExtent(Astr);
+    //     BS.DumpExtent(Astr);
+
+    int iType, nbTypes [TopAbs_SHAPE];
+    for (iType = 0; iType < TopAbs_SHAPE; ++iType)
+      nbTypes[ iType ] = 0;
+    nbTypes[ S.ShapeType() ]++;
+
+    TopTools_MapOfShape aMapOfShape;
+    aMapOfShape.Add( S );
+    TopTools_ListOfShape aListOfShape;
+    aListOfShape.Append( S );
+
+    TopTools_ListIteratorOfListOfShape itL(aListOfShape);
+    for (; itL.More(); itL.Next())
+    {
+      TopoDS_Iterator it(itL.Value());
+      for (; it.More(); it.Next())
+      {
+        TopoDS_Shape s = it.Value();
+        if (aMapOfShape.Add( s ))
+        {
+          aListOfShape.Append( s );
+          nbTypes[ s.ShapeType() ] ++;
+        }
+      }
+    }
+
+    Astr = Astr + " VERTEX    : " + TCollection_AsciiString(nbTypes[ TopAbs_VERTEX    ]) + "\n";
+    Astr = Astr + " EDGE      : " + TCollection_AsciiString(nbTypes[ TopAbs_EDGE      ]) + "\n";
+    Astr = Astr + " WIRE      : " + TCollection_AsciiString(nbTypes[ TopAbs_WIRE      ]) + "\n";
+    Astr = Astr + " FACE      : " + TCollection_AsciiString(nbTypes[ TopAbs_FACE      ]) + "\n";
+    Astr = Astr + " SHELL     : " + TCollection_AsciiString(nbTypes[ TopAbs_SHELL     ]) + "\n";
+    Astr = Astr + " SOLID     : " + TCollection_AsciiString(nbTypes[ TopAbs_SOLID     ]) + "\n";
+    Astr = Astr + " COMPSOLID : " + TCollection_AsciiString(nbTypes[ TopAbs_COMPSOLID ]) + "\n";
+    Astr = Astr + " COMPOUND  : " + TCollection_AsciiString(nbTypes[ TopAbs_COMPOUND  ]) + "\n";
+    Astr = Astr + " SHAPE     : " + TCollection_AsciiString(aMapOfShape.Extent()) + "\n";
 
     Text->setText( Astr.ToCString() );
   }

src/GEOMGUI/Makefile.in

@@ -1,15 +1,35 @@
-# -* Makefile *- 
+#  GEOM GEOMGUI : GUI for Geometry component
 #
-# Author : Marc Tajchman (CEA)
+#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-# Date : 5/07/2001
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-# $Header$
 # 
+#  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+#
+#
+#
+#  File   : Makefile.in
+#  Author : Marc Tajchman (CEA)
+#  Module : GEOM
+#  $Header$
 
-# source path
 top_srcdir=@top_srcdir@
-top_builddir=../..
+top_builddir=../../..
 srcdir=@srcdir@
-VPATH=.:$(srcdir):$(top_srcdir)/idl:$(top_builddir)/idl
+VPATH=.:@srcdir@:@top_srcdir@/idl
 
 
 @COMMENCE@
@@ -79,6 +99,7 @@ LIB_SRC =	GeometryGUI.cxx \
 		GeometryGUI_MultiRotationDlg.cxx \
 		GeometryGUI_Swig.cxx \
 		GeometryGUI_SuppressHoleDlg.cxx \
+		GeometryGUI_EllipseDlg.cxx
 
 LIB_MOC = \
                 GeometryGUI.h \
@@ -132,7 +153,8 @@ LIB_MOC = \
                 GeometryGUI_ChamferDlg.h \
                 GeometryGUI_MultiTranslationDlg.h \
                 GeometryGUI_MultiRotationDlg.h \
-                GeometryGUI_SuppressHoleDlg.h
+                GeometryGUI_SuppressHoleDlg.h \
+		GeometryGUI_EllipseDlg.h
 
 LIB_CLIENT_IDL = SALOME_Exception.idl \
 		 GEOM_Gen.idl \
@@ -146,8 +168,8 @@ LIB_SERVER_IDL =
 
 # additionnal information to compil and link file
 
-CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
+CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES)
-CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
+CXXFLAGS += $(OCC_CXXFLAGS)
 
 LDFLAGS += -lOCCViewer -lVTKViewer -lSalomeObject -lSalomeGUI -lGEOMClient -lGEOMObject -lGEOMFiltersSelection -lGEOMSketcher $(OCC_KERNEL_LIBS) $(OCC_MODELER_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome