NRI : Merge from V1_2.

This commit is contained in:
nri 2003-07-09 15:01:54 +00:00
parent d4e00c3e52
commit 08ddac36db
25 changed files with 603 additions and 166 deletions

View File

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

View File

@ -1,10 +1,26 @@
// 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 // File : GEOM_Gen.idl
// Created :
// Author : Lucien PIGNOLONI // Author : Lucien PIGNOLONI
// Project : SALOME
// Copyright : OPEN CASCADE
// $HEADERS:
#ifndef __GEOM_GEN__ #ifndef __GEOM_GEN__
#define __GEOM_GEN__ #define __GEOM_GEN__
@ -170,6 +186,11 @@ module GEOM
in PointStruct pCircle, in PointStruct pCircle,
in PointStruct pEnd) raises (SALOME::SALOME_Exception) ; 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 // // Primitives Construction //
//-----------------------------------------------------------// //-----------------------------------------------------------//

View File

@ -1,10 +1,26 @@
// 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 // File : GEOM_Shape.idl
// Created : 29 november 2001
// Author : Lucien PIGNOLONI // Author : Lucien PIGNOLONI
// Project : SALOME
// Copyright : OPEN CASCADE
// $HEADERS:
#ifndef __GEOM_Shape__ #ifndef __GEOM_Shape__
#define __GEOM_Shape__ #define __GEOM_Shape__

View File

@ -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="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="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="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=""/> <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"/> <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=""/> <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="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="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="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="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="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=""/> <toolbutton-item item-id="3017" pos-id="" label-id="Plane" icon-id="plane.png" tooltip-id="Plane" accel-id="" toggle-id="" execute-action=""/>

View File

@ -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="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="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="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=""/> <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"/> <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=""/> <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="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="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="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="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="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=""/> <toolbutton-item item-id="3017" pos-id="" label-id="Plan" icon-id="plane.png" tooltip-id="Plan" accel-id="" toggle-id="" execute-action=""/>

BIN
resources/ellipse.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 346 B

BIN
resources/ellipsepointvector.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 346 B

View File

@ -1,12 +1,32 @@
using namespace std; // 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 // File : GeometryGUI_CommonDlg.cxx
// Created :
// Author : Lucien PIGNOLONI // Author : Lucien PIGNOLONI
// Project : SALOME // Module : GEOM
// Module : GeometryGUI
// Copyright : OPEN CASCADE
// $Header$ // $Header$
using namespace std;
#include "GeometryGUI_CommonDlg.h" #include "GeometryGUI_CommonDlg.h"
#include "GeometryGUI.h" #include "GeometryGUI.h"

View File

@ -1,12 +1,32 @@
using namespace std; // 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 // File : GeometryGUI_CylinderDlg.cxx
// Created :
// Author : Lucien PIGNOLONI // Author : Lucien PIGNOLONI
// Project : SALOME // Module : GEOM
// Module : GeometryGUI
// Copyright : OPEN CASCADE
// $Header$ // $Header$
using namespace std;
#include "GeometryGUI_CylinderDlg.h" #include "GeometryGUI_CylinderDlg.h"
#include "GeometryGUI.h" #include "GeometryGUI.h"

View File

@ -1,13 +1,32 @@
using namespace std; // 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 // File : GeometryGUI_FaceDlg.cxx
// Created :
// Author : Lucien PIGNOLONI // Author : Lucien PIGNOLONI
// Project : SALOME // Module : GEOM
// Module : GeometryGUI
// Copyright : OPEN CASCADE
// $Header$ // $Header$
using namespace std;
#include "GeometryGUI_FaceDlg.h" #include "GeometryGUI_FaceDlg.h"
#include "GeometryGUI.h" #include "GeometryGUI.h"

View File

@ -1,13 +1,32 @@
using namespace std; // 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 // File : GeometryGUI_MaxToleranceDlg.cxx
// Created : Mon Mar 04 14:08:28 2002
// Author : Nicolas REJNERI // Author : Nicolas REJNERI
// Project : SALOME
// Module : GEOM // Module : GEOM
// Copyright : Open CASCADE 2002
// $Header$ // $Header$
using namespace std;
#include "GeometryGUI_MaxToleranceDlg.h" #include "GeometryGUI_MaxToleranceDlg.h"
#include "GeometryGUI.h" #include "GeometryGUI.h"

View File

@ -1,12 +1,32 @@
using namespace std; // 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 // File : GeometryGUI_MultiTranslationDlg.cxx
// Created :
// Author : Damien COQUERET // Author : Damien COQUERET
// Project : SALOME // Module : GEOM
// Module : GeometryGUI
// Copyright : OPEN CASCADE
// $Header$ // $Header$
using namespace std;
#include "GeometryGUI_MultiRotationDlg.h" #include "GeometryGUI_MultiRotationDlg.h"
#include "GeometryGUI.h" #include "GeometryGUI.h"

View File

@ -1,12 +1,32 @@
using namespace std; // 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 // File : GeometryGUI_MultiTranslationDlg.cxx
// Created :
// Author : Damien COQUERET // Author : Damien COQUERET
// Project : SALOME // Module : GEOM
// Module : GeometryGUI
// Copyright : OPEN CASCADE
// $Header$ // $Header$
using namespace std;
#include "GeometryGUI_MultiTranslationDlg.h" #include "GeometryGUI_MultiTranslationDlg.h"
#include "GeometryGUI.h" #include "GeometryGUI.h"

View File

@ -1,12 +1,32 @@
using namespace std; // 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 // File : GeometryGUI_PipeDlg.cxx
// Created :
// Author : Lucien PIGNOLONI // Author : Lucien PIGNOLONI
// Project : SALOME // Module : GEOM
// Module : GeometryGUI
// Copyright : OPEN CASCADE
// $Header$ // $Header$
using namespace std;
#include "GeometryGUI_PipeDlg.h" #include "GeometryGUI_PipeDlg.h"
#include "GeometryGUI.h" #include "GeometryGUI.h"

View File

@ -1,12 +1,32 @@
using namespace std; // 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 // File : GeometryGUI_PropertiesDlg.cxx
// Created :
// Author : Lucien PIGNOLONI // Author : Lucien PIGNOLONI
// Project : SALOME // Module : GEOM
// Module : GeometryGUI
// Copyright : OPEN CASCADE
// $Header$ // $Header$
using namespace std;
#include "GeometryGUI_PropertiesDlg.h" #include "GeometryGUI_PropertiesDlg.h"
#include "GeometryGUI.h" #include "GeometryGUI.h"

View File

@ -1,12 +1,32 @@
using namespace std; // 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 // File : GeometryGUI_RotationDlg.cxx
// Created :
// Author : Lucien PIGNOLONI // Author : Lucien PIGNOLONI
// Project : SALOME // Module : GEOM
// Module : GeometryGUI
// Copyright : OPEN CASCADE
// $Header$ // $Header$
using namespace std;
#include "GeometryGUI_RotationDlg.h" #include "GeometryGUI_RotationDlg.h"
#include "GeometryGUI.h" #include "GeometryGUI.h"

View File

@ -1,12 +1,32 @@
using namespace std; // 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 // File : GeometryGUI_SewingDlg.cxx
// Created :
// Author : Lucien PIGNOLONI // Author : Lucien PIGNOLONI
// Project : SALOME // Module : GEOM
// Module : GeometryGUI
// Copyright : OPEN CASCADE
// $Header$ // $Header$
using namespace std;
#include "GeometryGUI_SewingDlg.h" #include "GeometryGUI_SewingDlg.h"
#include "GeometryGUI.h" #include "GeometryGUI.h"

View File

@ -1,12 +1,32 @@
using namespace std; // 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 // File : GeometryGUI_SubShapeDlg.cxx
// Created :
// Author : Lucien PIGNOLONI // Author : Lucien PIGNOLONI
// Project : SALOME // Module : GEOM
// Module : GeometryGUI
// Copyright : OPEN CASCADE
// $Header$ // $Header$
using namespace std;
#include "GeometryGUI_SubShapeDlg.h" #include "GeometryGUI_SubShapeDlg.h"
#include "GeometryGUI.h" #include "GeometryGUI.h"

View File

@ -1,12 +1,32 @@
using namespace std; // 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 // File : GeometryGUI_SuppressFacesDlg.cxx
// Created :
// Author : Lucien PIGNOLONI // Author : Lucien PIGNOLONI
// Project : SALOME // Module : GEOM
// Module : GeometryGUI
// Copyright : OPEN CASCADE
// $Header$ // $Header$
using namespace std;
#include "GeometryGUI_SuppressFacesDlg.h" #include "GeometryGUI_SuppressFacesDlg.h"
#include "GeometryGUI.h" #include "GeometryGUI.h"

View File

@ -1,12 +1,32 @@
using namespace std; // 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 // File : GeometryGUI_Swig.cxx
// Created : Tue Mar 26 15:08:38 2002
// Author : Nicolas REJNERI, Paul RASCLE // Author : Nicolas REJNERI, Paul RASCLE
// Project : SALOME
// Module : GEOM // Module : GEOM
// Copyright : Open CASCADE, EDF 2002
// $Header$ // $Header$
using namespace std;
#include "GeometryGUI_Swig.hxx" #include "GeometryGUI_Swig.hxx"
#include "utilities.h" #include "utilities.h"
@ -18,15 +38,6 @@ using namespace std;
#include "SALOMEGUI_ImportOperation.h" #include "SALOMEGUI_ImportOperation.h"
#include "OCCViewer_Viewer3d.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 <TopExp_Explorer.hxx>
#include <TopTools_MapOfShape.hxx> #include <TopTools_MapOfShape.hxx>
#include <BRepAdaptor_Surface.hxx> #include <BRepAdaptor_Surface.hxx>
@ -37,6 +48,15 @@ using namespace std;
#include <TopoDS_Edge.hxx> #include <TopoDS_Edge.hxx>
#include <TopoDS_Face.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; static GEOM_Client ShapeReader;
GEOM_Swig::GEOM_Swig() GEOM_Swig::GEOM_Swig()

View File

@ -1,9 +1,29 @@
// 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 // File : GeometryGUI_Swig.hxx
// Created : Tue Mar 26 15:08:38 2002
// Author : Nicolas REJNERI, Paul RASCLE // Author : Nicolas REJNERI, Paul RASCLE
// Project : SALOME
// Module : GEOM // Module : GEOM
// Copyright : Open CASCADE, EDF 2002
// $Header$ // $Header$
#ifndef _GeometryGUI_SWIG_HXX_ #ifndef _GeometryGUI_SWIG_HXX_

View File

@ -1,12 +1,32 @@
using namespace std; // 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 // File : GeometryGUI_TorusDlg.cxx
// Created :
// Author : Lucien PIGNOLONI // Author : Lucien PIGNOLONI
// Project : SALOME // Module : GEOM
// Module : GeometryGUI
// Copyright : OPEN CASCADE
// $Header$ // $Header$
using namespace std;
#include "GeometryGUI_TorusDlg.h" #include "GeometryGUI_TorusDlg.h"
#include "GeometryGUI.h" #include "GeometryGUI.h"

View File

@ -1,12 +1,32 @@
using namespace std; // 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 // File : GeometryGUI_TranslationDlg.cxx
// Created :
// Author : Lucien PIGNOLONI // Author : Lucien PIGNOLONI
// Project : SALOME // Module : GEOM
// Module : GeometryGUI
// Copyright : OPEN CASCADE
// $Header$ // $Header$
using namespace std;
#include "GeometryGUI_TranslationDlg.h" #include "GeometryGUI_TranslationDlg.h"
#include "GeometryGUI.h" #include "GeometryGUI.h"

View File

@ -1,13 +1,32 @@
using namespace std; // 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 // File : GeometryGUI_WhatisDlg.cxx
// Created : Mon Mar 04 14:48:16 2002
// Author : Nicolas REJNERI // Author : Nicolas REJNERI
// Project : SALOME
// Module : GEOM // Module : GEOM
// Copyright : Open CASCADE 2002
// $Header$ // $Header$
using namespace std;
#include "GeometryGUI_WhatisDlg.h" #include "GeometryGUI_WhatisDlg.h"
#include "GeometryGUI.h" #include "GeometryGUI.h"
@ -16,7 +35,11 @@ using namespace std;
#include "utilities.h" #include "utilities.h"
// Open CASCADE Includes // 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 // QT Includes
#include <qtextview.h> #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"; Astr = Astr + " Number of shapes in " + strdup(SelectedName.latin1()) + ": \n";
try { 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() ); Text->setText( Astr.ToCString() );
} }

View File

@ -1,15 +1,35 @@
# -* Makefile *- # 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 : Makefile.in
# Author : Marc Tajchman (CEA) # Author : Marc Tajchman (CEA)
# Date : 5/07/2001 # Module : GEOM
# $Header$ # $Header$
#
# source path
top_srcdir=@top_srcdir@ top_srcdir=@top_srcdir@
top_builddir=../.. top_builddir=../../..
srcdir=@srcdir@ srcdir=@srcdir@
VPATH=.:$(srcdir):$(top_srcdir)/idl:$(top_builddir)/idl VPATH=.:@srcdir@:@top_srcdir@/idl
@COMMENCE@ @COMMENCE@
@ -79,6 +99,7 @@ LIB_SRC = GeometryGUI.cxx \
GeometryGUI_MultiRotationDlg.cxx \ GeometryGUI_MultiRotationDlg.cxx \
GeometryGUI_Swig.cxx \ GeometryGUI_Swig.cxx \
GeometryGUI_SuppressHoleDlg.cxx \ GeometryGUI_SuppressHoleDlg.cxx \
GeometryGUI_EllipseDlg.cxx
LIB_MOC = \ LIB_MOC = \
GeometryGUI.h \ GeometryGUI.h \
@ -132,7 +153,8 @@ LIB_MOC = \
GeometryGUI_ChamferDlg.h \ GeometryGUI_ChamferDlg.h \
GeometryGUI_MultiTranslationDlg.h \ GeometryGUI_MultiTranslationDlg.h \
GeometryGUI_MultiRotationDlg.h \ GeometryGUI_MultiRotationDlg.h \
GeometryGUI_SuppressHoleDlg.h GeometryGUI_SuppressHoleDlg.h \
GeometryGUI_EllipseDlg.h
LIB_CLIENT_IDL = SALOME_Exception.idl \ LIB_CLIENT_IDL = SALOME_Exception.idl \
GEOM_Gen.idl \ GEOM_Gen.idl \
@ -146,8 +168,8 @@ LIB_SERVER_IDL =
# additionnal information to compil and link file # 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 LDFLAGS += -lOCCViewer -lVTKViewer -lSalomeObject -lSalomeGUI -lGEOMClient -lGEOMObject -lGEOMFiltersSelection -lGEOMSketcher $(OCC_KERNEL_LIBS) $(OCC_MODELER_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome