From: nri Date: Wed, 9 Jul 2003 15:01:54 +0000 (+0000) Subject: NRI : Merge from V1_2. X-Git-Tag: ihm_1~9 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=08ddac36dba811dddbb7b5623484540bcb2dbe42;p=modules%2Fgeom.git NRI : Merge from V1_2. --- diff --git a/Makefile.in b/Makefile.in index 0fad469f3..3657e2248 100644 --- a/Makefile.in +++ b/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 diff --git a/idl/GEOM_Gen.idl b/idl/GEOM_Gen.idl index c4a1d83ec..e00ea89cd 100644 --- a/idl/GEOM_Gen.idl +++ b/idl/GEOM_Gen.idl @@ -1,10 +1,26 @@ -// File : GEOM_Gen.idl -// Created : -// Author : Lucien PIGNOLONI -// Project : SALOME -// Copyright : OPEN CASCADE -// $HEADERS: - +// Copyright (C) 2003 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 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 // //-----------------------------------------------------------// diff --git a/idl/GEOM_Shape.idl b/idl/GEOM_Shape.idl index f9c61eab0..b9091a0ed 100644 --- a/idl/GEOM_Shape.idl +++ b/idl/GEOM_Shape.idl @@ -1,10 +1,26 @@ -// File : GEOM_Shape.idl -// Created : 29 november 2001 -// Author : Lucien PIGNOLONI -// Project : SALOME -// Copyright : OPEN CASCADE -// $HEADERS: - +// Copyright (C) 2003 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 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__ diff --git a/resources/GEOM_en.xml b/resources/GEOM_en.xml index 0cbf65081..c2d623628 100644 --- a/resources/GEOM_en.xml +++ b/resources/GEOM_en.xml @@ -46,7 +46,7 @@ - + @@ -195,7 +195,7 @@ - + diff --git a/resources/GEOM_fr.xml b/resources/GEOM_fr.xml index fcf955312..855153c6f 100644 --- a/resources/GEOM_fr.xml +++ b/resources/GEOM_fr.xml @@ -44,7 +44,7 @@ - + @@ -170,7 +170,7 @@ - + diff --git a/resources/ellipse.png b/resources/ellipse.png new file mode 100755 index 000000000..8cd0e4aed Binary files /dev/null and b/resources/ellipse.png differ diff --git a/resources/ellipsepointvector.png b/resources/ellipsepointvector.png new file mode 100755 index 000000000..8cd0e4aed Binary files /dev/null and b/resources/ellipsepointvector.png differ diff --git a/src/GEOMGUI/GeometryGUI_CommonDlg.cxx b/src/GEOMGUI/GeometryGUI_CommonDlg.cxx index 259462dd8..17552ed53 100644 --- a/src/GEOMGUI/GeometryGUI_CommonDlg.cxx +++ b/src/GEOMGUI/GeometryGUI_CommonDlg.cxx @@ -1,12 +1,32 @@ -using namespace std; -// File : GeometryGUI_CommonDlg.cxx -// Created : -// Author : Lucien PIGNOLONI -// Project : SALOME -// Module : GeometryGUI -// Copyright : OPEN CASCADE +// GEOM GEOMGUI : GUI for Geometry component +// +// Copyright (C) 2003 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 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" diff --git a/src/GEOMGUI/GeometryGUI_CylinderDlg.cxx b/src/GEOMGUI/GeometryGUI_CylinderDlg.cxx index 259e1610d..d96817330 100644 --- a/src/GEOMGUI/GeometryGUI_CylinderDlg.cxx +++ b/src/GEOMGUI/GeometryGUI_CylinderDlg.cxx @@ -1,12 +1,32 @@ -using namespace std; -// File : GeometryGUI_CylinderDlg.cxx -// Created : -// Author : Lucien PIGNOLONI -// Project : SALOME -// Module : GeometryGUI -// Copyright : OPEN CASCADE +// GEOM GEOMGUI : GUI for Geometry component +// +// Copyright (C) 2003 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 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" diff --git a/src/GEOMGUI/GeometryGUI_FaceDlg.cxx b/src/GEOMGUI/GeometryGUI_FaceDlg.cxx index 80a07eb8f..499d5002a 100644 --- a/src/GEOMGUI/GeometryGUI_FaceDlg.cxx +++ b/src/GEOMGUI/GeometryGUI_FaceDlg.cxx @@ -1,13 +1,32 @@ -using namespace std; -// File : GeometryGUI_FaceDlg.cxx -// Created : -// Author : Lucien PIGNOLONI -// Project : SALOME -// Module : GeometryGUI -// Copyright : OPEN CASCADE +// GEOM GEOMGUI : GUI for Geometry component +// +// Copyright (C) 2003 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 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" diff --git a/src/GEOMGUI/GeometryGUI_MaxToleranceDlg.cxx b/src/GEOMGUI/GeometryGUI_MaxToleranceDlg.cxx index b1d06cc81..5b60d9df3 100644 --- a/src/GEOMGUI/GeometryGUI_MaxToleranceDlg.cxx +++ b/src/GEOMGUI/GeometryGUI_MaxToleranceDlg.cxx @@ -1,13 +1,32 @@ -using namespace std; -// File : GeometryGUI_MaxToleranceDlg.cxx -// Created : Mon Mar 04 14:08:28 2002 -// Author : Nicolas REJNERI - -// Project : SALOME -// Module : GEOM -// Copyright : Open CASCADE 2002 +// GEOM GEOMGUI : GUI for Geometry component +// +// Copyright (C) 2003 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 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" diff --git a/src/GEOMGUI/GeometryGUI_MultiRotationDlg.cxx b/src/GEOMGUI/GeometryGUI_MultiRotationDlg.cxx index 985fd7b02..537f06022 100644 --- a/src/GEOMGUI/GeometryGUI_MultiRotationDlg.cxx +++ b/src/GEOMGUI/GeometryGUI_MultiRotationDlg.cxx @@ -1,12 +1,32 @@ -using namespace std; -// File : GeometryGUI_MultiTranslationDlg.cxx -// Created : -// Author : Damien COQUERET -// Project : SALOME -// Module : GeometryGUI -// Copyright : OPEN CASCADE +// GEOM GEOMGUI : GUI for Geometry component +// +// Copyright (C) 2003 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 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" diff --git a/src/GEOMGUI/GeometryGUI_MultiTranslationDlg.cxx b/src/GEOMGUI/GeometryGUI_MultiTranslationDlg.cxx index 8e15b3af2..31d544d8a 100644 --- a/src/GEOMGUI/GeometryGUI_MultiTranslationDlg.cxx +++ b/src/GEOMGUI/GeometryGUI_MultiTranslationDlg.cxx @@ -1,12 +1,32 @@ -using namespace std; -// File : GeometryGUI_MultiTranslationDlg.cxx -// Created : -// Author : Damien COQUERET -// Project : SALOME -// Module : GeometryGUI -// Copyright : OPEN CASCADE +// GEOM GEOMGUI : GUI for Geometry component +// +// Copyright (C) 2003 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 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" diff --git a/src/GEOMGUI/GeometryGUI_PipeDlg.cxx b/src/GEOMGUI/GeometryGUI_PipeDlg.cxx index c25bd6b2d..0e45fb8a8 100644 --- a/src/GEOMGUI/GeometryGUI_PipeDlg.cxx +++ b/src/GEOMGUI/GeometryGUI_PipeDlg.cxx @@ -1,12 +1,32 @@ -using namespace std; -// File : GeometryGUI_PipeDlg.cxx -// Created : -// Author : Lucien PIGNOLONI -// Project : SALOME -// Module : GeometryGUI -// Copyright : OPEN CASCADE +// GEOM GEOMGUI : GUI for Geometry component +// +// Copyright (C) 2003 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 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" diff --git a/src/GEOMGUI/GeometryGUI_PropertiesDlg.cxx b/src/GEOMGUI/GeometryGUI_PropertiesDlg.cxx index aabd80c82..ba6c71b3e 100644 --- a/src/GEOMGUI/GeometryGUI_PropertiesDlg.cxx +++ b/src/GEOMGUI/GeometryGUI_PropertiesDlg.cxx @@ -1,12 +1,32 @@ -using namespace std; -// File : GeometryGUI_PropertiesDlg.cxx -// Created : -// Author : Lucien PIGNOLONI -// Project : SALOME -// Module : GeometryGUI -// Copyright : OPEN CASCADE +// GEOM GEOMGUI : GUI for Geometry component +// +// Copyright (C) 2003 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 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" diff --git a/src/GEOMGUI/GeometryGUI_RotationDlg.cxx b/src/GEOMGUI/GeometryGUI_RotationDlg.cxx index 56a5d2aa8..84e63dc42 100644 --- a/src/GEOMGUI/GeometryGUI_RotationDlg.cxx +++ b/src/GEOMGUI/GeometryGUI_RotationDlg.cxx @@ -1,12 +1,32 @@ -using namespace std; -// File : GeometryGUI_RotationDlg.cxx -// Created : -// Author : Lucien PIGNOLONI -// Project : SALOME -// Module : GeometryGUI -// Copyright : OPEN CASCADE +// GEOM GEOMGUI : GUI for Geometry component +// +// Copyright (C) 2003 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 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" diff --git a/src/GEOMGUI/GeometryGUI_SewingDlg.cxx b/src/GEOMGUI/GeometryGUI_SewingDlg.cxx index ed360d71c..d74ba155d 100644 --- a/src/GEOMGUI/GeometryGUI_SewingDlg.cxx +++ b/src/GEOMGUI/GeometryGUI_SewingDlg.cxx @@ -1,12 +1,32 @@ -using namespace std; -// File : GeometryGUI_SewingDlg.cxx -// Created : -// Author : Lucien PIGNOLONI -// Project : SALOME -// Module : GeometryGUI -// Copyright : OPEN CASCADE +// GEOM GEOMGUI : GUI for Geometry component +// +// Copyright (C) 2003 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 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" diff --git a/src/GEOMGUI/GeometryGUI_SubShapeDlg.cxx b/src/GEOMGUI/GeometryGUI_SubShapeDlg.cxx index 1a9c6bd84..945ff3c76 100644 --- a/src/GEOMGUI/GeometryGUI_SubShapeDlg.cxx +++ b/src/GEOMGUI/GeometryGUI_SubShapeDlg.cxx @@ -1,12 +1,32 @@ -using namespace std; -// File : GeometryGUI_SubShapeDlg.cxx -// Created : -// Author : Lucien PIGNOLONI -// Project : SALOME -// Module : GeometryGUI -// Copyright : OPEN CASCADE +// GEOM GEOMGUI : GUI for Geometry component +// +// Copyright (C) 2003 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 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" diff --git a/src/GEOMGUI/GeometryGUI_SuppressFacesDlg.cxx b/src/GEOMGUI/GeometryGUI_SuppressFacesDlg.cxx index caa6d8555..bdd7bfa90 100644 --- a/src/GEOMGUI/GeometryGUI_SuppressFacesDlg.cxx +++ b/src/GEOMGUI/GeometryGUI_SuppressFacesDlg.cxx @@ -1,12 +1,32 @@ -using namespace std; -// File : GeometryGUI_SuppressFacesDlg.cxx -// Created : -// Author : Lucien PIGNOLONI -// Project : SALOME -// Module : GeometryGUI -// Copyright : OPEN CASCADE +// GEOM GEOMGUI : GUI for Geometry component +// +// Copyright (C) 2003 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 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" diff --git a/src/GEOMGUI/GeometryGUI_Swig.cxx b/src/GEOMGUI/GeometryGUI_Swig.cxx index 36c28fa24..55727f909 100644 --- a/src/GEOMGUI/GeometryGUI_Swig.cxx +++ b/src/GEOMGUI/GeometryGUI_Swig.cxx @@ -1,12 +1,32 @@ -using namespace std; -// File : GeometryGUI_Swig.cxx -// Created : Tue Mar 26 15:08:38 2002 -// Author : Nicolas REJNERI, Paul RASCLE -// Project : SALOME -// Module : GEOM -// Copyright : Open CASCADE, EDF 2002 +// GEOM GEOMGUI : GUI for Geometry component +// +// Copyright (C) 2003 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 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 #include #include @@ -37,6 +48,15 @@ using namespace std; #include #include +#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() diff --git a/src/GEOMGUI/GeometryGUI_Swig.hxx b/src/GEOMGUI/GeometryGUI_Swig.hxx index cf457489f..b7218577d 100644 --- a/src/GEOMGUI/GeometryGUI_Swig.hxx +++ b/src/GEOMGUI/GeometryGUI_Swig.hxx @@ -1,9 +1,29 @@ -// File : GeometryGUI_Swig.hxx -// Created : Tue Mar 26 15:08:38 2002 -// Author : Nicolas REJNERI, Paul RASCLE -// Project : SALOME -// Module : GEOM -// Copyright : Open CASCADE, EDF 2002 +// GEOM GEOMGUI : GUI for Geometry component +// +// Copyright (C) 2003 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 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_ diff --git a/src/GEOMGUI/GeometryGUI_TorusDlg.cxx b/src/GEOMGUI/GeometryGUI_TorusDlg.cxx index cc53337d0..1936e1e0a 100644 --- a/src/GEOMGUI/GeometryGUI_TorusDlg.cxx +++ b/src/GEOMGUI/GeometryGUI_TorusDlg.cxx @@ -1,12 +1,32 @@ -using namespace std; -// File : GeometryGUI_TorusDlg.cxx -// Created : -// Author : Lucien PIGNOLONI -// Project : SALOME -// Module : GeometryGUI -// Copyright : OPEN CASCADE +// GEOM GEOMGUI : GUI for Geometry component +// +// Copyright (C) 2003 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 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" diff --git a/src/GEOMGUI/GeometryGUI_TranslationDlg.cxx b/src/GEOMGUI/GeometryGUI_TranslationDlg.cxx index ac50ced6b..9363938cb 100644 --- a/src/GEOMGUI/GeometryGUI_TranslationDlg.cxx +++ b/src/GEOMGUI/GeometryGUI_TranslationDlg.cxx @@ -1,12 +1,32 @@ -using namespace std; -// File : GeometryGUI_TranslationDlg.cxx -// Created : -// Author : Lucien PIGNOLONI -// Project : SALOME -// Module : GeometryGUI -// Copyright : OPEN CASCADE +// GEOM GEOMGUI : GUI for Geometry component +// +// Copyright (C) 2003 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 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" diff --git a/src/GEOMGUI/GeometryGUI_WhatisDlg.cxx b/src/GEOMGUI/GeometryGUI_WhatisDlg.cxx index a332ce5c9..97c2e81e3 100644 --- a/src/GEOMGUI/GeometryGUI_WhatisDlg.cxx +++ b/src/GEOMGUI/GeometryGUI_WhatisDlg.cxx @@ -1,13 +1,32 @@ -using namespace std; -// File : GeometryGUI_WhatisDlg.cxx -// Created : Mon Mar 04 14:48:16 2002 -// Author : Nicolas REJNERI -// Project : SALOME -// Module : GEOM -// Copyright : Open CASCADE 2002 +// GEOM GEOMGUI : GUI for Geometry component +// +// Copyright (C) 2003 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 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 +//#include +#include +#include +#include +#include // QT Includes #include @@ -373,15 +396,50 @@ void GeometryGUI_WhatisDlg::CalculateWhatis(const TopoDS_Shape& S) if( S.IsNull() ) return ; - + TCollection_AsciiString Astr; Astr = Astr + " Number of shapes in " + strdup(SelectedName.latin1()) + ": \n"; - + try { - BRepTools_ShapeSet BS; - BS.Add(S); - BS.DumpExtent(Astr); - + // BRepTools_ShapeSet BS; + // BS.Add(S); + // 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() ); } catch(Standard_Failure) { diff --git a/src/GEOMGUI/Makefile.in b/src/GEOMGUI/Makefile.in index 6e1a48bc4..9328d0999 100644 --- a/src/GEOMGUI/Makefile.in +++ b/src/GEOMGUI/Makefile.in @@ -1,15 +1,35 @@ -# -* Makefile *- +# GEOM GEOMGUI : GUI for Geometry component # -# Author : Marc Tajchman (CEA) -# Date : 5/07/2001 -# $Header$ +# Copyright (C) 2003 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 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 -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) +CXXFLAGS += $(OCC_CXXFLAGS) LDFLAGS += -lOCCViewer -lVTKViewer -lSalomeObject -lSalomeGUI -lGEOMClient -lGEOMObject -lGEOMFiltersSelection -lGEOMSketcher $(OCC_KERNEL_LIBS) $(OCC_MODELER_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome