From: nri Date: Wed, 9 Jul 2003 14:14:01 +0000 (+0000) Subject: NRI : Merge from V1_2. X-Git-Tag: ihm_1~13 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ee43f0fd7ac209322a9084b57942e49bd0774753;p=modules%2Fgeom.git NRI : Merge from V1_2. --- diff --git a/src/GEOMGUI/GeometryGUI_FilletDlg.cxx b/src/GEOMGUI/GeometryGUI_FilletDlg.cxx index 3e576b111..f15159b06 100644 --- a/src/GEOMGUI/GeometryGUI_FilletDlg.cxx +++ b/src/GEOMGUI/GeometryGUI_FilletDlg.cxx @@ -1,12 +1,32 @@ -using namespace std; -// File : GeometryGUI_FilletDlg.cxx -// Created : -// Author : Damien COQUERET -// 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_FilletDlg.cxx +// Author : Damien COQUERET +// Module : GEOM // $Header$ +using namespace std; #include "GeometryGUI_FilletDlg.h" #include "GeometryGUI.h" diff --git a/src/GEOMGUI/GeometryGUI_PartitionDlg.cxx b/src/GEOMGUI/GeometryGUI_PartitionDlg.cxx index 14d5064a2..92f753c90 100644 --- a/src/GEOMGUI/GeometryGUI_PartitionDlg.cxx +++ b/src/GEOMGUI/GeometryGUI_PartitionDlg.cxx @@ -1,12 +1,32 @@ -using namespace std; -// File : GeometryGUI_PartitionDlg.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_PartitionDlg.cxx +// Author : Lucien PIGNOLONI +// Module : GEOM // $Header$ +using namespace std; #include "GeometryGUI_PartitionDlg.h" #include "GeometryGUI.h" @@ -212,8 +232,8 @@ void GeometryGUI_PartitionDlg::Init( SALOME_Selection* Sel ) myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ; /* type for sub shape selection */ - ComboBox1->insertItem( tr( "RECONSTRUCTION_LIMIT_SHAPE" ) ); -// ComboBox1->insertItem( tr( "RECONSTRUCTION_LIMIT_SOLID" ) ); +// ComboBox1->insertItem( tr( "RECONSTRUCTION_LIMIT_SHAPE" ) ); + ComboBox1->insertItem( tr( "RECONSTRUCTION_LIMIT_SOLID" ) ); ComboBox1->insertItem( tr( "RECONSTRUCTION_LIMIT_SHELL" ) ); ComboBox1->insertItem( tr( "RECONSTRUCTION_LIMIT_FACE" ) ); ComboBox1->insertItem( tr( "RECONSTRUCTION_LIMIT_WIRE" ) ); @@ -284,13 +304,13 @@ void GeometryGUI_PartitionDlg::ClickOnApply() { GEOM::shape_type limit; switch (myLimit) { +// case 0: limit = GEOM::SOLID ; break; case 0: limit = GEOM::SHAPE ; break; - case 1: limit = GEOM::SOLID ; break; - case 2: limit = GEOM::SHELL ; break; - case 3: limit = GEOM::FACE ; break; - case 4: limit = GEOM::WIRE ; break; - case 5: limit = GEOM::EDGE ; break; - case 6: limit = GEOM::VERTEX; break; + case 1: limit = GEOM::SHELL ; break; + case 2: limit = GEOM::FACE ; break; + case 3: limit = GEOM::WIRE ; break; + case 4: limit = GEOM::EDGE ; break; + case 5: limit = GEOM::VERTEX; break; default:limit = GEOM::SHAPE; } myGeomGUI->MakePartitionAndDisplay (myListShapes, diff --git a/src/GEOMGUI/GeometryGUI_RevolDlg.cxx b/src/GEOMGUI/GeometryGUI_RevolDlg.cxx index 5ee825929..1cbea9437 100644 --- a/src/GEOMGUI/GeometryGUI_RevolDlg.cxx +++ b/src/GEOMGUI/GeometryGUI_RevolDlg.cxx @@ -1,12 +1,32 @@ -using namespace std; -// File : GeometryGUI_RevolDlg.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_RevolDlg.cxx +// Author : Lucien PIGNOLONI +// Module : GEOM // $Header$ +using namespace std; #include "GeometryGUI_RevolDlg.h" #include diff --git a/src/GEOMGUI/GeometryGUI_ScaleDlg.cxx b/src/GEOMGUI/GeometryGUI_ScaleDlg.cxx index ec45a8740..b91517b8a 100644 --- a/src/GEOMGUI/GeometryGUI_ScaleDlg.cxx +++ b/src/GEOMGUI/GeometryGUI_ScaleDlg.cxx @@ -1,12 +1,32 @@ -using namespace std; -// File : GeometryGUI_ScaleDlg.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_ScaleDlg.cxx +// Author : Lucien PIGNOLONI +// Module : GEOM // $Header$ +using namespace std; #include "GeometryGUI_ScaleDlg.h" #include "GeometryGUI.h" diff --git a/src/GEOMGUI/GeometryGUI_Swig.i b/src/GEOMGUI/GeometryGUI_Swig.i index d693ca4c8..187133111 100644 --- a/src/GEOMGUI/GeometryGUI_Swig.i +++ b/src/GEOMGUI/GeometryGUI_Swig.i @@ -1,9 +1,29 @@ -// File : GeometryGUI_Swig.i -// 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.i +// Author : Nicolas REJNERI, Paul RASCLE +// Module : GEOM // $Header$ %{