From 8abcb7d15699fa75aea80048932a5c9b71c65638 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 15 Oct 2007 12:19:01 +0000 Subject: [PATCH] *** empty log message *** --- src/BasicGUI/BasicGUI.cxx | 4 +- src/BasicGUI/BasicGUI.h | 8 +- src/BasicGUI/BasicGUI_ArcDlg.h | 4 +- src/BasicGUI/BasicGUI_CircleDlg.h | 4 +- src/BasicGUI/BasicGUI_CurveDlg.h | 4 +- src/BasicGUI/BasicGUI_EllipseDlg.h | 4 +- src/BasicGUI/BasicGUI_LineDlg.h | 4 +- src/BasicGUI/BasicGUI_MarkerDlg.h | 4 +- src/BasicGUI/BasicGUI_PlaneDlg.h | 4 +- src/BasicGUI/BasicGUI_PointDlg.h | 4 +- src/BasicGUI/BasicGUI_VectorDlg.h | 4 +- src/BasicGUI/BasicGUI_WorkingPlaneDlg.h | 4 +- src/BasicGUI/GEOM_BasicGUI.hxx | 42 ------- src/BasicGUI/Makefile.am | 113 ++++++++++-------- src/DisplayGUI/DisplayGUI.cxx | 4 +- src/DisplayGUI/DisplayGUI.h | 29 ++--- src/DisplayGUI/Makefile.am | 85 +++++++------ src/GEOMToolsGUI/GEOMToolsGUI.cxx | 4 +- src/GEOMToolsGUI/GEOMToolsGUI.h | 56 +++++---- src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h | 32 +++-- .../GEOMToolsGUI_TransparencyDlg.h | 16 +-- src/GEOMToolsGUI/GEOM_ToolsGUI.hxx | 37 ------ src/GEOMToolsGUI/Makefile.am | 93 +++++++------- 23 files changed, 228 insertions(+), 335 deletions(-) delete mode 100755 src/BasicGUI/GEOM_BasicGUI.hxx delete mode 100755 src/GEOMToolsGUI/GEOM_ToolsGUI.hxx diff --git a/src/BasicGUI/BasicGUI.cxx b/src/BasicGUI/BasicGUI.cxx index 03787d29c..107e6572f 100644 --- a/src/BasicGUI/BasicGUI.cxx +++ b/src/BasicGUI/BasicGUI.cxx @@ -198,7 +198,9 @@ gp_Pnt BasicGUI::ConvertClickToPoint( int x, int y, Handle(V3d_View) aView ) //===================================================================================== extern "C" { - BASICGUI_EXPORT +#ifdef WIN32 + __declspec( dllexport ) +#endif GEOMGUI* GetLibGUI( GeometryGUI* parent ) { return new BasicGUI( parent ); diff --git a/src/BasicGUI/BasicGUI.h b/src/BasicGUI/BasicGUI.h index 062c00639..aca5b305d 100644 --- a/src/BasicGUI/BasicGUI.h +++ b/src/BasicGUI/BasicGUI.h @@ -26,8 +26,6 @@ #ifndef BASICGUI_H #define BASICGUI_H -#include "GEOM_BasicGUI.hxx" - #include #include @@ -35,14 +33,14 @@ // class : BasicGUI // purpose : //================================================================================= -class BASICGUI_EXPORT BasicGUI : public GEOMGUI +class BasicGUI : public GEOMGUI { public: BasicGUI( GeometryGUI* ); ~BasicGUI(); - bool OnGUIEvent( int, SUIT_Desktop* ); - bool OnMousePress( QMouseEvent*, SUIT_Desktop*, SUIT_ViewWindow* ); + bool OnGUIEvent( int, SUIT_Desktop* ); + bool OnMousePress( QMouseEvent*, SUIT_Desktop*, SUIT_ViewWindow* ); gp_Pnt ConvertClickToPoint( int, int, Handle(V3d_View) ); }; diff --git a/src/BasicGUI/BasicGUI_ArcDlg.h b/src/BasicGUI/BasicGUI_ArcDlg.h index 03fd39db0..66d8b5998 100644 --- a/src/BasicGUI/BasicGUI_ArcDlg.h +++ b/src/BasicGUI/BasicGUI_ArcDlg.h @@ -26,8 +26,6 @@ #ifndef BASICGUI_ARCDLG_H #define BASICGUI_ARCDLG_H -#include "GEOM_BasicGUI.hxx" - #include class DlgRef_3Sel; @@ -37,7 +35,7 @@ class DlgRef_3Sel1Check; // class : BasicGUI_ArcDlg // purpose : //================================================================================= -class BASICGUI_EXPORT BasicGUI_ArcDlg : public GEOMBase_Skeleton +class BasicGUI_ArcDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BasicGUI/BasicGUI_CircleDlg.h b/src/BasicGUI/BasicGUI_CircleDlg.h index d6c61d395..c7c5f1dbc 100644 --- a/src/BasicGUI/BasicGUI_CircleDlg.h +++ b/src/BasicGUI/BasicGUI_CircleDlg.h @@ -26,8 +26,6 @@ #ifndef BASICGUI_CIRCLEDLG_H #define BASICGUI_CIRCLEDLG_H -#include "GEOM_BasicGUI.hxx" - #include class DlgRef_3Sel; @@ -37,7 +35,7 @@ class DlgRef_2Sel1Spin; // class : BasicGUI_CircleDlg // purpose : //================================================================================= -class BASICGUI_EXPORT BasicGUI_CircleDlg : public GEOMBase_Skeleton +class BasicGUI_CircleDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BasicGUI/BasicGUI_CurveDlg.h b/src/BasicGUI/BasicGUI_CurveDlg.h index 11f10e91a..833c2809c 100644 --- a/src/BasicGUI/BasicGUI_CurveDlg.h +++ b/src/BasicGUI/BasicGUI_CurveDlg.h @@ -25,8 +25,6 @@ #ifndef BASICGUI_CURVEDLG_H #define BASICGUI_CURVEDLG_H -#include "GEOM_BasicGUI.hxx" - #include #include @@ -37,7 +35,7 @@ class DlgRef_1Sel; // class : BasicGUI_CurveDlg // purpose : //================================================================================= -class BASICGUI_EXPORT BasicGUI_CurveDlg : public GEOMBase_Skeleton +class BasicGUI_CurveDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BasicGUI/BasicGUI_EllipseDlg.h b/src/BasicGUI/BasicGUI_EllipseDlg.h index 688e50c7b..62a32fb03 100644 --- a/src/BasicGUI/BasicGUI_EllipseDlg.h +++ b/src/BasicGUI/BasicGUI_EllipseDlg.h @@ -25,8 +25,6 @@ #ifndef BASICGUI_ELLIPSEDLG_H #define BASICGUI_ELLIPSEDLG_H -#include "GEOM_BasicGUI.hxx" - #include class DlgRef_2Sel2Spin; @@ -35,7 +33,7 @@ class DlgRef_2Sel2Spin; // class : BasicGUI_EllipseDlg // purpose : //================================================================================= -class BASICGUI_EXPORT BasicGUI_EllipseDlg : public GEOMBase_Skeleton +class BasicGUI_EllipseDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BasicGUI/BasicGUI_LineDlg.h b/src/BasicGUI/BasicGUI_LineDlg.h index c51bc695a..a15878501 100644 --- a/src/BasicGUI/BasicGUI_LineDlg.h +++ b/src/BasicGUI/BasicGUI_LineDlg.h @@ -26,8 +26,6 @@ #ifndef BASICGUI_LINEDLG_H #define BASICGUI_LINEDLG_H -#include "GEOM_BasicGUI.hxx" - #include class DlgRef_2Sel; @@ -36,7 +34,7 @@ class DlgRef_2Sel; // class : BasicGUI_LineDlg // purpose : //================================================================================= -class BASICGUI_EXPORT BasicGUI_LineDlg : public GEOMBase_Skeleton +class BasicGUI_LineDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BasicGUI/BasicGUI_MarkerDlg.h b/src/BasicGUI/BasicGUI_MarkerDlg.h index 5a17ce528..6df47fd6b 100644 --- a/src/BasicGUI/BasicGUI_MarkerDlg.h +++ b/src/BasicGUI/BasicGUI_MarkerDlg.h @@ -26,8 +26,6 @@ #ifndef BASICGUI_MARKERDLG_H #define BASICGUI_MARKERDLG_H -#include "GEOM_BasicGUI.hxx" - #include #include @@ -37,7 +35,7 @@ class DlgRef_3Sel; class QDoubleSpinBox; class QFrame; -class BASICGUI_EXPORT BasicGUI_MarkerDlg : public GEOMBase_Skeleton +class BasicGUI_MarkerDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BasicGUI/BasicGUI_PlaneDlg.h b/src/BasicGUI/BasicGUI_PlaneDlg.h index f94b8500c..dc2c83d52 100644 --- a/src/BasicGUI/BasicGUI_PlaneDlg.h +++ b/src/BasicGUI/BasicGUI_PlaneDlg.h @@ -26,8 +26,6 @@ #ifndef BASICGUI_PLANEDLG_H #define BASICGUI_PLANEDLG_H -#include "GEOM_BasicGUI.hxx" - #include class DlgRef_1Sel1Spin; @@ -38,7 +36,7 @@ class DlgRef_3Sel1Spin; // class : BasicGUI_PlaneDlg // purpose : //================================================================================= -class BASICGUI_EXPORT BasicGUI_PlaneDlg : public GEOMBase_Skeleton +class BasicGUI_PlaneDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BasicGUI/BasicGUI_PointDlg.h b/src/BasicGUI/BasicGUI_PointDlg.h index 8e264fa63..eb4d1c6f3 100644 --- a/src/BasicGUI/BasicGUI_PointDlg.h +++ b/src/BasicGUI/BasicGUI_PointDlg.h @@ -26,8 +26,6 @@ #ifndef BASICGUI_POINTDLG_H #define BASICGUI_POINTDLG_H -#include "GEOM_BasicGUI.hxx" - #include class DlgRef_1Sel1Spin; @@ -43,7 +41,7 @@ class gp_Pnt; // class : BasicGUI_PointDlg // purpose : //================================================================================= -class BASICGUI_EXPORT BasicGUI_PointDlg : public GEOMBase_Skeleton +class BasicGUI_PointDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BasicGUI/BasicGUI_VectorDlg.h b/src/BasicGUI/BasicGUI_VectorDlg.h index 8a941e832..c5169596d 100644 --- a/src/BasicGUI/BasicGUI_VectorDlg.h +++ b/src/BasicGUI/BasicGUI_VectorDlg.h @@ -26,8 +26,6 @@ #ifndef BASICGUI_VECTORDLG_H #define BASICGUI_VECTORDLG_H -#include "GEOM_BasicGUI.hxx" - #include class DlgRef_2Sel; @@ -37,7 +35,7 @@ class DlgRef_3Spin1Check; // class : BasicGUI_VectorDlg // purpose : //================================================================================= -class BASICGUI_EXPORT BasicGUI_VectorDlg : public GEOMBase_Skeleton +class BasicGUI_VectorDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h index 823dfa7c8..fd86690ea 100644 --- a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h +++ b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h @@ -26,8 +26,6 @@ #ifndef BASICGUI_WORKINGPLANEDLG_H #define BASICGUI_WORKINGPLANEDLG_H -#include "GEOM_BasicGUI.hxx" - #include #include @@ -41,7 +39,7 @@ class QCheckBox; // class : BasicGUI_WorkingPlaneDlg // purpose : //================================================================================= -class BASICGUI_EXPORT BasicGUI_WorkingPlaneDlg : public GEOMBase_Skeleton +class BasicGUI_WorkingPlaneDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BasicGUI/GEOM_BasicGUI.hxx b/src/BasicGUI/GEOM_BasicGUI.hxx deleted file mode 100755 index af2ec4216..000000000 --- a/src/BasicGUI/GEOM_BasicGUI.hxx +++ /dev/null @@ -1,42 +0,0 @@ -// 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_BasicGUI.hxx -// Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) -// - -#ifndef GEOM_BASICGUI_HXX -#define GEOM_BASICGUI_HXX - -#if defined WIN32 -# if defined BASICGUI_EXPORTS -# define BASICGUI_EXPORT __declspec( dllexport ) -# else -# define BASICGUI_EXPORT __declspec( dllimport ) -# endif -#else -# define BASICGUI_EXPORT -#endif - -#ifndef COORD_MIN -#define COORD_MIN -1e+15 -#define COORD_MAX +1e+15 -#endif // COORD_MIN - -#endif // GEOM_BASICGUI_HXX diff --git a/src/BasicGUI/Makefile.am b/src/BasicGUI/Makefile.am index 1a125c113..6dccd990e 100644 --- a/src/BasicGUI/Makefile.am +++ b/src/BasicGUI/Makefile.am @@ -1,5 +1,3 @@ -# GEOM BASICGUI : -# # Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # @@ -19,79 +17,90 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# File : Makefile.in -# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) +# File : Makefile.am +# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) +# Package : BasicGUI # include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files -salomeinclude_HEADERS = BasicGUI_PointDlg.h \ - GEOM_BasicGUI.hxx +salomeinclude_HEADERS = # Libraries targets lib_LTLIBRARIES = libBasicGUI.la # Sources files -dist_libBasicGUI_la_SOURCES = \ - BasicGUI.cxx \ - BasicGUI_PointDlg.cxx \ - BasicGUI_LineDlg.cxx \ - BasicGUI_CircleDlg.cxx \ - BasicGUI_EllipseDlg.cxx \ - BasicGUI_ArcDlg.cxx \ - BasicGUI_VectorDlg.cxx \ - BasicGUI_PlaneDlg.cxx \ - BasicGUI_WorkingPlaneDlg.cxx \ - BasicGUI_CurveDlg.cxx \ +dist_libBasicGUI_la_SOURCES = \ + BasicGUI.h \ + BasicGUI_ArcDlg.h \ + BasicGUI_CircleDlg.h \ + BasicGUI_CurveDlg.h \ + BasicGUI_EllipseDlg.h \ + BasicGUI_LineDlg.h \ + BasicGUI_MarkerDlg.h \ + BasicGUI_PlaneDlg.h \ + BasicGUI_PointDlg.h \ + BasicGUI_VectorDlg.h \ + BasicGUI_WorkingPlaneDlg.h \ + \ + BasicGUI.cxx \ + BasicGUI_PointDlg.cxx \ + BasicGUI_LineDlg.cxx \ + BasicGUI_CircleDlg.cxx \ + BasicGUI_EllipseDlg.cxx \ + BasicGUI_ArcDlg.cxx \ + BasicGUI_VectorDlg.cxx \ + BasicGUI_PlaneDlg.cxx \ + BasicGUI_WorkingPlaneDlg.cxx \ + BasicGUI_CurveDlg.cxx \ BasicGUI_MarkerDlg.cxx -MOC_FILES = \ - BasicGUI_PointDlg_moc.cxx \ - BasicGUI_LineDlg_moc.cxx \ - BasicGUI_CircleDlg_moc.cxx \ - BasicGUI_EllipseDlg_moc.cxx \ - BasicGUI_ArcDlg_moc.cxx \ - BasicGUI_VectorDlg_moc.cxx \ - BasicGUI_PlaneDlg_moc.cxx \ - BasicGUI_WorkingPlaneDlg_moc.cxx \ - BasicGUI_CurveDlg_moc.cxx \ +MOC_FILES = \ + BasicGUI_PointDlg_moc.cxx \ + BasicGUI_LineDlg_moc.cxx \ + BasicGUI_CircleDlg_moc.cxx \ + BasicGUI_EllipseDlg_moc.cxx \ + BasicGUI_ArcDlg_moc.cxx \ + BasicGUI_VectorDlg_moc.cxx \ + BasicGUI_PlaneDlg_moc.cxx \ + BasicGUI_WorkingPlaneDlg_moc.cxx \ + BasicGUI_CurveDlg_moc.cxx \ BasicGUI_MarkerDlg_moc.cxx -nodist_libBasicGUI_la_SOURCES= \ +nodist_libBasicGUI_la_SOURCES = \ $(MOC_FILES) - # LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Exception.idl SALOME_Component.idl # LIB_SERVER_IDL = # additionnal information to compil and link file -libBasicGUI_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(VTK_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(PYTHON_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(srcdir)/../OBJECT \ - -I$(srcdir)/../DlgRef \ - -I$(srcdir)/../GEOMGUI \ - -I$(srcdir)/../GEOMFiltersSelection \ - -I$(srcdir)/../GEOMBase \ - -I$(srcdir)/../GEOMImpl \ - -I$(srcdir)/../GEOMClient \ - -I$(top_builddir)/src/DlgRef \ - -I$(top_builddir)/idl \ +libBasicGUI_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(VTK_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(PYTHON_INCLUDES) \ + $(BOOST_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../OBJECT \ + -I$(srcdir)/../DlgRef \ + -I$(srcdir)/../GEOMGUI \ + -I$(srcdir)/../GEOMFiltersSelection \ + -I$(srcdir)/../GEOMBase \ + -I$(srcdir)/../GEOMImpl \ + -I$(srcdir)/../GEOMClient \ + -I$(top_builddir)/src/DlgRef \ + -I$(top_builddir)/idl \ -I$(top_builddir)/salome_adm/unix -libBasicGUI_la_LDFLAGS = \ - ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ - ../GEOMBase/libGEOMBase.la \ - ../GEOMGUI/libGEOM.la \ +libBasicGUI_la_LDFLAGS = \ + ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ + ../GEOMBase/libGEOMBase.la \ + ../GEOMGUI/libGEOM.la \ $(GUI_LDFLAGS) -lsuit diff --git a/src/DisplayGUI/DisplayGUI.cxx b/src/DisplayGUI/DisplayGUI.cxx index ce16392c5..86b67f313 100644 --- a/src/DisplayGUI/DisplayGUI.cxx +++ b/src/DisplayGUI/DisplayGUI.cxx @@ -466,7 +466,9 @@ void DisplayGUI::ChangeDisplayMode( const int mode, SUIT_ViewWindow* viewWindow //===================================================================================== extern "C" { - DISPLAYGUI_EXPORT +#ifdef WIN32 + __declspec( dllexport ) +#endif GEOMGUI* GetLibGUI( GeometryGUI* parent ) { return new DisplayGUI( parent ); diff --git a/src/DisplayGUI/DisplayGUI.h b/src/DisplayGUI/DisplayGUI.h index 475278b2d..dd7ba77ae 100644 --- a/src/DisplayGUI/DisplayGUI.h +++ b/src/DisplayGUI/DisplayGUI.h @@ -28,30 +28,21 @@ #include "GEOMGUI.h" -#if defined WIN32 -# if defined DISPLAYGUI_EXPORTS -# define DISPLAYGUI_EXPORT __declspec( dllexport ) -# else -# define DISPLAYGUI_EXPORT __declspec( dllimport ) -# endif -#else -# define DISPLAYGUI_EXPORT -#endif - //================================================================================= -// class : GEOMBase_Display +// class : DisplayGUI // purpose : //================================================================================= -//class QAD_ViewFrame; + class SUIT_ViewWindow; -class DISPLAYGUI_EXPORT DisplayGUI : public GEOMGUI + +class DisplayGUI : public GEOMGUI { public: - DisplayGUI( GeometryGUI* parent ); + DisplayGUI( GeometryGUI* ); ~DisplayGUI(); // Dispatch menu command - bool OnGUIEvent(int theCommandID, SUIT_Desktop* parent); + bool OnGUIEvent( int, SUIT_Desktop* ); // Display all GEOM objects void DisplayAll(); @@ -66,16 +57,16 @@ public: // DISPLAY MODE methods : 0 - wireframe, 1 - shading // Set display mode for the viewer (current viewer if - 0 ) - void SetDisplayMode( const int mode, SUIT_ViewWindow* viewWindow = 0 ); + void SetDisplayMode( const int, SUIT_ViewWindow* = 0 ); // Get display mode of the viewer (current viewer if - 0 ) - int GetDisplayMode( SUIT_ViewWindow* viewWindow = 0 ); + int GetDisplayMode( SUIT_ViewWindow* = 0 ); // Invert display mode ( shadin <-> wireframe ) for the viewer // (current viewer if = 0 ) - void InvertDisplayMode( SUIT_ViewWindow* viewWindow = 0 ); + void InvertDisplayMode( SUIT_ViewWindow* = 0 ); // Set display mode for selected objects in the viewer given // (current viewer if = 0 ) - void ChangeDisplayMode( const int mode, SUIT_ViewWindow* viewWindo = 0 ); + void ChangeDisplayMode( const int, SUIT_ViewWindow* = 0 ); }; #endif // DISPLAYGUI_H diff --git a/src/DisplayGUI/Makefile.am b/src/DisplayGUI/Makefile.am index 9f4f6a3bc..1f0054a73 100644 --- a/src/DisplayGUI/Makefile.am +++ b/src/DisplayGUI/Makefile.am @@ -1,42 +1,40 @@ -# GEOM DISPLAYGUI : +# GEOM DISPLAYGUI : # -# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# 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 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. +# 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 +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com # +# File : Makefile.am +# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) +# Package : DisplayGUI # -# -# File : Makefile.in -# Author : Damien COQUERET (OCC) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : GEOM -# $Header: include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files -salomeinclude_HEADERS = \ - DisplayGUI.h +salomeinclude_HEADERS = # Libraries targets lib_LTLIBRARIES = libDisplayGUI.la -dist_libDisplayGUI_la_SOURCES = DisplayGUI.cxx +dist_libDisplayGUI_la_SOURCES = \ + DisplayGUI.h \ + DisplayGUI.cxx #LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl @@ -44,27 +42,26 @@ dist_libDisplayGUI_la_SOURCES = DisplayGUI.cxx # additionnal information to compil and link file -libDisplayGUI_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(VTK_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(PYTHON_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(srcdir)/../GEOMGUI \ - -I$(srcdir)/../GEOMBase \ - -I$(srcdir)/../OBJECT \ - -I$(srcdir)/../GEOMImpl \ - -I$(srcdir)/../GEOMClient \ - -I$(top_builddir)/idl \ +libDisplayGUI_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(VTK_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(PYTHON_INCLUDES) \ + $(BOOST_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../GEOMGUI \ + -I$(srcdir)/../OBJECT \ + -I$(srcdir)/../GEOMImpl \ + -I$(srcdir)/../GEOMClient \ + -I$(top_builddir)/idl \ -I$(top_builddir)/salome_adm/unix -libDisplayGUI_la_LDFLAGS = \ - ../GEOMGUI/libGEOM.la \ - ../GEOMToolsGUI/libGEOMToolsGUI.la \ - $(GUI_LDFLAGS) -lsuit -lSVTK -lSOCC -lSalomePrs -lSalomeApp \ - $(VTK_LIBS) \ +libDisplayGUI_la_LDFLAGS = \ + ../GEOMGUI/libGEOM.la \ + $(GUI_LDFLAGS) -lsuit -lSVTK \ + -lSOCC -lSalomePrs -lSalomeApp \ + $(VTK_LIBS) \ $(QT_MT_LIBS) diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.cxx b/src/GEOMToolsGUI/GEOMToolsGUI.cxx index 5904a1a51..873bc9faa 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI.cxx @@ -759,7 +759,9 @@ void GEOMToolsGUI::deactivate() //===================================================================================== extern "C" { -GEOMTOOLSGUI_EXPORT +#ifdef WIN32 + __declspec( dllexport ) +#endif GEOMGUI* GetLibGUI( GeometryGUI* parent ) { return new GEOMToolsGUI( parent ); diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.h b/src/GEOMToolsGUI/GEOMToolsGUI.h index d3b4f7b62..d19717ebb 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI.h +++ b/src/GEOMToolsGUI/GEOMToolsGUI.h @@ -26,8 +26,6 @@ #ifndef GEOMTOOLSGUI_H #define GEOMTOOLSGUI_H -#include "GEOM_ToolsGUI.hxx" - #include #include @@ -42,51 +40,51 @@ class SALOME_ListIO; // class : GEOMToolsGUI // purpose : //================================================================================= -class GEOMTOOLSGUI_EXPORT GEOMToolsGUI : public GEOMGUI +class GEOMToolsGUI : public GEOMGUI { -public : +public: GEOMToolsGUI( GeometryGUI* ); // hide constructor to avoid direct creation ~GEOMToolsGUI(); - bool OnGUIEvent( int theCommandID, SUIT_Desktop* parent ); + bool OnGUIEvent( int, SUIT_Desktop* ); virtual void deactivate(); private: // Import and export topology methods - bool Import(); - bool Export(); + bool Import(); + bool Export(); - void OnEditCopy(); - void OnEditDelete(); + void OnEditCopy(); + void OnEditDelete(); - void OnSettingsColor(); - void OnSettingsIsos(); - void OnSettingsStep(); - void OnRename(); - void OnCheckGeometry(); + void OnSettingsColor(); + void OnSettingsIsos(); + void OnSettingsStep(); + void OnRename(); + void OnCheckGeometry(); // Popup commands - void OnColor(); - void OnTransparency(); - void OnNbIsos(); - void OnOpen(); - void OnSelectOnly(int mode); + void OnColor(); + void OnTransparency(); + void OnNbIsos(); + void OnOpen(); + void OnSelectOnly( int ); // returns name of Module (Component) of given objects (usually selected objects) // if objects belong to different Components, a NULL string is returned. - QString getParentComponent( _PTR( Study ), const SALOME_ListIO& ); - QString getParentComponent( _PTR(SObject) ); + QString getParentComponent( _PTR(Study), const SALOME_ListIO& ); + QString getParentComponent( _PTR(SObject) ); // Recursive deletion of object with children - void RemoveObjectWithChildren(_PTR(SObject) obj, - _PTR(Study) aStudy, - QList views, - GEOM_Displayer* disp); - + void RemoveObjectWithChildren( _PTR(SObject), + _PTR(Study), + QList, + GEOM_Displayer* ); + //checks if the object passed as the first argument depends on the second arguments - bool CheckSubObjectInUse(_PTR(SObject) checkobj, - _PTR(SObject) remobj, - _PTR(Study) aStudy); + bool CheckSubObjectInUse( _PTR(SObject), + _PTR(SObject), + _PTR(Study) ); }; diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h index 61302cc6a..c750b8eb1 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h +++ b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h @@ -26,8 +26,6 @@ #ifndef GEOMTOOLSGUI_NBISOSDLG_H #define GEOMTOOLSGUI_NBISOSDLG_H -#include "GEOM_ToolsGUI.hxx" - #include class QSpinBox; @@ -36,30 +34,30 @@ class QSpinBox; // class : GEOMToolsGUI_NbIsosDlg // purpose : //================================================================================= -class GEOMTOOLSGUI_EXPORT GEOMToolsGUI_NbIsosDlg : public QDialog +class GEOMToolsGUI_NbIsosDlg : public QDialog { - Q_OBJECT + Q_OBJECT public: - GEOMToolsGUI_NbIsosDlg( QWidget* parent ); - ~GEOMToolsGUI_NbIsosDlg(); + GEOMToolsGUI_NbIsosDlg( QWidget* ); + ~GEOMToolsGUI_NbIsosDlg(); - int getU() const; - int getV() const; - - void setU( const int ); - void setV( const int ); - + int getU() const; + int getV() const; + + void setU( const int ); + void setV( const int ); + private slots: - void ClickOnHelp(); + void ClickOnHelp(); private: - void keyPressEvent(QKeyEvent*); + void keyPressEvent( QKeyEvent* ); private: - QSpinBox* SpinBoxU; - QSpinBox* SpinBoxV; - QString myHelpFileName; + QSpinBox* SpinBoxU; + QSpinBox* SpinBoxV; + QString myHelpFileName; }; #endif // GEOMTOOLSGUI_NBISOSDLG_H diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h index 9b66c00aa..502d781bd 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h +++ b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h @@ -26,8 +26,6 @@ #ifndef GEOMTOOLSGUI_TRANSPARENCYDLG_H #define GEOMTOOLSGUI_TRANSPARENCYDLG_H -#include "GEOM_ToolsGUI.hxx" - #include class QSlider; @@ -37,19 +35,19 @@ class QSlider; // purpose : // : WARNING : that is a MODAL dialog. //================================================================================= -class GEOMTOOLSGUI_EXPORT GEOMToolsGUI_TransparencyDlg : public QDialog +class GEOMToolsGUI_TransparencyDlg : public QDialog { - Q_OBJECT + Q_OBJECT public: - GEOMToolsGUI_TransparencyDlg( QWidget* parent ); + GEOMToolsGUI_TransparencyDlg( QWidget* ); ~GEOMToolsGUI_TransparencyDlg(); private: - void keyPressEvent(QKeyEvent*); + void keyPressEvent( QKeyEvent* ); -private : - bool myFirstInit ; /* Inform for the first init */ +private: + bool myFirstInit; /* Inform for the first init */ QSlider* mySlider; QString myHelpFileName; @@ -58,8 +56,6 @@ private slots: void ClickOnClose(); void ClickOnHelp(); void ValueHasChanged( int ) ; - }; #endif // GEOMTOOLSGUI_TRANSPARENCYDLG_H - diff --git a/src/GEOMToolsGUI/GEOM_ToolsGUI.hxx b/src/GEOMToolsGUI/GEOM_ToolsGUI.hxx deleted file mode 100755 index 5223cb970..000000000 --- a/src/GEOMToolsGUI/GEOM_ToolsGUI.hxx +++ /dev/null @@ -1,37 +0,0 @@ -// 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_ToolsGUI.hxx -// Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) -// - -#ifndef GEOM_TOOLSGUI_HXX -#define GEOM_TOOLSGUI_HXX - -#if defined WIN32 -# if defined GEOMTOOLSGUI_EXPORTS -# define GEOMTOOLSGUI_EXPORT __declspec( dllexport ) -# else -# define GEOMTOOLSGUI_EXPORT __declspec( dllimport ) -# endif -#else -# define GEOMTOOLSGUI_EXPORT -#endif - -#endif // GEOM_TOOLSGUI_HXX diff --git a/src/GEOMToolsGUI/Makefile.am b/src/GEOMToolsGUI/Makefile.am index 45092979a..988470358 100644 --- a/src/GEOMToolsGUI/Makefile.am +++ b/src/GEOMToolsGUI/Makefile.am @@ -1,31 +1,26 @@ -# GEOM GEOMTOOLSGUI : -# -# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# 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 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. +# 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 +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com # +# File : Makefile.am +# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) +# Package : GEOMToolsGUI # -# -# File : Makefile.in -# Author : Damien COQUERET (OCC) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : GEOM -# $Header: include $(top_srcdir)/adm_local/unix/make_common_starter.am @@ -35,17 +30,21 @@ lib_LTLIBRARIES = libGEOMToolsGUI.la # header files salomeinclude_HEADERS = -dist_libGEOMToolsGUI_la_SOURCES = \ - GEOMToolsGUI.cxx \ - GEOMToolsGUI_1.cxx \ - GEOMToolsGUI_TransparencyDlg.cxx \ +dist_libGEOMToolsGUI_la_SOURCES = \ + GEOMToolsGUI.h \ + GEOMToolsGUI_NbIsosDlg.h \ + GEOMToolsGUI_TransparencyDlg.h \ + \ + GEOMToolsGUI.cxx \ + GEOMToolsGUI_1.cxx \ + GEOMToolsGUI_TransparencyDlg.cxx \ GEOMToolsGUI_NbIsosDlg.cxx -MOC_FILES = \ - GEOMToolsGUI_TransparencyDlg_moc.cxx \ +MOC_FILES = \ + GEOMToolsGUI_TransparencyDlg_moc.cxx \ GEOMToolsGUI_NbIsosDlg_moc.cxx -nodist_libGEOMToolsGUI_la_SOURCES= \ +nodist_libGEOMToolsGUI_la_SOURCES = \ $(MOC_FILES) #LIB_CLIENT_IDL = SALOMEDS_Attributes.idl \ @@ -56,25 +55,25 @@ nodist_libGEOMToolsGUI_la_SOURCES= \ #LIB_SERVER_IDL = # additionnal information to compile and link file -libGEOMToolsGUI_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(VTK_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(PYTHON_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(srcdir)/../OBJECT \ - -I$(srcdir)/../GEOMBase \ - -I$(srcdir)/../GEOMGUI \ - -I$(srcdir)/../GEOMClient \ - -I$(srcdir)/../GEOMImpl \ - -I$(top_builddir)/idl \ +libGEOMToolsGUI_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(VTK_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(PYTHON_INCLUDES) \ + $(BOOST_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../OBJECT \ + -I$(srcdir)/../GEOMBase \ + -I$(srcdir)/../GEOMGUI \ + -I$(srcdir)/../GEOMClient \ + -I$(srcdir)/../GEOMImpl \ + -I$(top_builddir)/idl \ -I$(top_builddir)/salome_adm/unix -libGEOMToolsGUI_la_LDFLAGS = \ - ../GEOMBase/libGEOMBase.la \ - ../GEOMGUI/libGEOM.la \ +libGEOMToolsGUI_la_LDFLAGS = \ + ../GEOMBase/libGEOMBase.la \ + ../GEOMGUI/libGEOM.la \ $(GUI_LDFLAGS) -lVTKViewer -lOCCViewer -lsuit -lSalomeApp -- 2.39.2