NRI : Merge from V1_2.

This commit is contained in:
nri 2003-07-09 14:14:01 +00:00
parent b7f1da9ebf
commit ee43f0fd7a
5 changed files with 142 additions and 42 deletions

View File

@ -1,12 +1,32 @@
using namespace std; // GEOM GEOMGUI : GUI for Geometry component
// File : GeometryGUI_FilletDlg.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 : 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_FilletDlg.cxx
// Author : Damien COQUERET
// Module : GEOM
// $Header$ // $Header$
using namespace std;
#include "GeometryGUI_FilletDlg.h" #include "GeometryGUI_FilletDlg.h"
#include "GeometryGUI.h" #include "GeometryGUI.h"

View File

@ -1,12 +1,32 @@
using namespace std; // GEOM GEOMGUI : GUI for Geometry component
// File : GeometryGUI_PartitionDlg.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_PartitionDlg.cxx
// Author : Lucien PIGNOLONI
// Module : GEOM
// $Header$ // $Header$
using namespace std;
#include "GeometryGUI_PartitionDlg.h" #include "GeometryGUI_PartitionDlg.h"
#include "GeometryGUI.h" #include "GeometryGUI.h"
@ -212,8 +232,8 @@ void GeometryGUI_PartitionDlg::Init( SALOME_Selection* Sel )
myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ; myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ;
/* type for sub shape selection */ /* type for sub shape selection */
ComboBox1->insertItem( tr( "RECONSTRUCTION_LIMIT_SHAPE" ) ); // ComboBox1->insertItem( tr( "RECONSTRUCTION_LIMIT_SHAPE" ) );
// ComboBox1->insertItem( tr( "RECONSTRUCTION_LIMIT_SOLID" ) ); ComboBox1->insertItem( tr( "RECONSTRUCTION_LIMIT_SOLID" ) );
ComboBox1->insertItem( tr( "RECONSTRUCTION_LIMIT_SHELL" ) ); ComboBox1->insertItem( tr( "RECONSTRUCTION_LIMIT_SHELL" ) );
ComboBox1->insertItem( tr( "RECONSTRUCTION_LIMIT_FACE" ) ); ComboBox1->insertItem( tr( "RECONSTRUCTION_LIMIT_FACE" ) );
ComboBox1->insertItem( tr( "RECONSTRUCTION_LIMIT_WIRE" ) ); ComboBox1->insertItem( tr( "RECONSTRUCTION_LIMIT_WIRE" ) );
@ -284,13 +304,13 @@ void GeometryGUI_PartitionDlg::ClickOnApply()
{ {
GEOM::shape_type limit; GEOM::shape_type limit;
switch (myLimit) { switch (myLimit) {
// case 0: limit = GEOM::SOLID ; break;
case 0: limit = GEOM::SHAPE ; break; case 0: limit = GEOM::SHAPE ; break;
case 1: limit = GEOM::SOLID ; break; case 1: limit = GEOM::SHELL ; break;
case 2: limit = GEOM::SHELL ; break; case 2: limit = GEOM::FACE ; break;
case 3: limit = GEOM::FACE ; break; case 3: limit = GEOM::WIRE ; break;
case 4: limit = GEOM::WIRE ; break; case 4: limit = GEOM::EDGE ; break;
case 5: limit = GEOM::EDGE ; break; case 5: limit = GEOM::VERTEX; break;
case 6: limit = GEOM::VERTEX; break;
default:limit = GEOM::SHAPE; default:limit = GEOM::SHAPE;
} }
myGeomGUI->MakePartitionAndDisplay (myListShapes, myGeomGUI->MakePartitionAndDisplay (myListShapes,

View File

@ -1,12 +1,32 @@
using namespace std; // GEOM GEOMGUI : GUI for Geometry component
// File : GeometryGUI_RevolDlg.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_RevolDlg.cxx
// Author : Lucien PIGNOLONI
// Module : GEOM
// $Header$ // $Header$
using namespace std;
#include "GeometryGUI_RevolDlg.h" #include "GeometryGUI_RevolDlg.h"
#include <BRepAdaptor_Curve.hxx> #include <BRepAdaptor_Curve.hxx>

View File

@ -1,12 +1,32 @@
using namespace std; // GEOM GEOMGUI : GUI for Geometry component
// File : GeometryGUI_ScaleDlg.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_ScaleDlg.cxx
// Author : Lucien PIGNOLONI
// Module : GEOM
// $Header$ // $Header$
using namespace std;
#include "GeometryGUI_ScaleDlg.h" #include "GeometryGUI_ScaleDlg.h"
#include "GeometryGUI.h" #include "GeometryGUI.h"

View File

@ -1,9 +1,29 @@
// File : GeometryGUI_Swig.i // 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.i
// Author : Nicolas REJNERI, Paul RASCLE
// Module : GEOM
// $Header$ // $Header$
%{ %{