From: szy Date: Fri, 19 Aug 2005 11:51:38 +0000 (+0000) Subject: Windows porting X-Git-Tag: T_3_0_2a1~11 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=409b095d2575bc03423b699dd4416d1d12e53998;p=modules%2Fgeom.git Windows porting --- diff --git a/src/BasicGUI/BasicGUI.cxx b/src/BasicGUI/BasicGUI.cxx index b7ffcbf18..31217bc64 100644 --- a/src/BasicGUI/BasicGUI.cxx +++ b/src/BasicGUI/BasicGUI.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "BasicGUI.h" #include "GeometryGUI.h" @@ -56,6 +55,8 @@ using namespace std; #include "BasicGUI_WorkingPlaneDlg.h" // Method WORKING PLANE #include "BasicGUI_MarkerDlg.h" // Method REPAIR +using namespace std; + BasicGUI* BasicGUI::myGUIObject = 0; //======================================================================= diff --git a/src/BasicGUI/BasicGUI.h b/src/BasicGUI/BasicGUI.h index 29fbf1fe3..a2cd25a6f 100644 --- a/src/BasicGUI/BasicGUI.h +++ b/src/BasicGUI/BasicGUI.h @@ -34,6 +34,11 @@ #include +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define BASICGUI_WNT_EXPORT __declspec( dllexport ) +#else +#define BASICGUI_WNT_EXPORT +#endif //================================================================================= // class : BasicGUI // purpose : diff --git a/src/BasicGUI/BasicGUI_ArcDlg.h b/src/BasicGUI/BasicGUI_ArcDlg.h index f57313872..42b1a454b 100644 --- a/src/BasicGUI/BasicGUI_ArcDlg.h +++ b/src/BasicGUI/BasicGUI_ArcDlg.h @@ -31,7 +31,11 @@ #include "GEOMBase_Skeleton.h" #include "DlgRef_3Sel_QTD.h" - +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define BASICGUI_WNT_EXPORT __declspec( dllexport ) +#else +#define BASICGUI_WNT_EXPORT +#endif //================================================================================= // class : BasicGUI_ArcDlg // purpose : diff --git a/src/BasicGUI/BasicGUI_CircleDlg.h b/src/BasicGUI/BasicGUI_CircleDlg.h index 69fc638b1..3a61f7edf 100644 --- a/src/BasicGUI/BasicGUI_CircleDlg.h +++ b/src/BasicGUI/BasicGUI_CircleDlg.h @@ -38,7 +38,11 @@ //#include "GEOM_EdgeFilter.hxx" //#include "GEOM_ShapeTypeFilter.hxx" #include - +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define BASICGUI_WNT_EXPORT __declspec( dllexport ) +#else +#define BASICGUI_WNT_EXPORT +#endif //================================================================================= // class : BasicGUI_CircleDlg diff --git a/src/BasicGUI/BasicGUI_CurveDlg.h b/src/BasicGUI/BasicGUI_CurveDlg.h index a54e07dd4..623d35570 100644 --- a/src/BasicGUI/BasicGUI_CurveDlg.h +++ b/src/BasicGUI/BasicGUI_CurveDlg.h @@ -32,7 +32,11 @@ #include "DlgRef_1Sel_QTD.h" #include "BasicGUI.h" - +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define BASICGUI_WNT_EXPORT __declspec( dllexport ) +#else +#define BASICGUI_WNT_EXPORT +#endif //#include "GEOM_ShapeTypeFilter.hxx" //================================================================================= diff --git a/src/BasicGUI/BasicGUI_EllipseDlg.h b/src/BasicGUI/BasicGUI_EllipseDlg.h index 8a1dcf841..86f2cb33e 100644 --- a/src/BasicGUI/BasicGUI_EllipseDlg.h +++ b/src/BasicGUI/BasicGUI_EllipseDlg.h @@ -36,7 +36,11 @@ //#include "GEOM_ShapeTypeFilter.hxx" //#include "GEOM_EdgeFilter.hxx" #include - +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define BASICGUI_WNT_EXPORT __declspec( dllexport ) +#else +#define BASICGUI_WNT_EXPORT +#endif //================================================================================= // class : BasicGUI_EllipseDlg // purpose : diff --git a/src/BasicGUI/BasicGUI_LineDlg.h b/src/BasicGUI/BasicGUI_LineDlg.h index 92d373c99..7afed3c4e 100644 --- a/src/BasicGUI/BasicGUI_LineDlg.h +++ b/src/BasicGUI/BasicGUI_LineDlg.h @@ -32,6 +32,11 @@ #include "GEOMBase_Skeleton.h" #include "DlgRef_2Sel_QTD.h" +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define BASICGUI_WNT_EXPORT __declspec( dllexport ) +#else +#define BASICGUI_WNT_EXPORT +#endif //================================================================================= // class : BasicGUI_LineDlg diff --git a/src/BasicGUI/BasicGUI_MarkerDlg.h b/src/BasicGUI/BasicGUI_MarkerDlg.h index 2f76d8063..7b3cf3bde 100644 --- a/src/BasicGUI/BasicGUI_MarkerDlg.h +++ b/src/BasicGUI/BasicGUI_MarkerDlg.h @@ -37,6 +37,12 @@ class DlgRef_SpinBox; +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define BASICGUI_WNT_EXPORT __declspec( dllexport ) +#else +#define BASICGUI_WNT_EXPORT +#endif + class BasicGUI_MarkerDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BasicGUI/BasicGUI_PlaneDlg.h b/src/BasicGUI/BasicGUI_PlaneDlg.h index ba4f50f05..cf3c65c4b 100644 --- a/src/BasicGUI/BasicGUI_PlaneDlg.h +++ b/src/BasicGUI/BasicGUI_PlaneDlg.h @@ -34,6 +34,11 @@ #include "DlgRef_2Sel1Spin.h" #include "DlgRef_3Sel1Spin.h" +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define BASICGUI_WNT_EXPORT __declspec( dllexport ) +#else +#define BASICGUI_WNT_EXPORT +#endif //================================================================================= // class : BasicGUI_PlaneDlg diff --git a/src/BasicGUI/BasicGUI_PointDlg.cxx b/src/BasicGUI/BasicGUI_PointDlg.cxx index 97f3f71d8..29b7bf62e 100644 --- a/src/BasicGUI/BasicGUI_PointDlg.cxx +++ b/src/BasicGUI/BasicGUI_PointDlg.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "BasicGUI_PointDlg.h" #include "SUIT_Session.h" @@ -47,7 +46,7 @@ using namespace std; #include #include - +using namespace std; //================================================================================= // class : BasicGUI_PointDlg() // purpose : Constructs a BasicGUI_PointDlg which is a child of 'parent', with the diff --git a/src/BasicGUI/BasicGUI_PointDlg.h b/src/BasicGUI/BasicGUI_PointDlg.h index f149f816a..d05367203 100644 --- a/src/BasicGUI/BasicGUI_PointDlg.h +++ b/src/BasicGUI/BasicGUI_PointDlg.h @@ -37,6 +37,11 @@ class QLineEdit; class QGroupBox; +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define BASICGUI_WNT_EXPORT __declspec( dllexport ) +#else +#define BASICGUI_WNT_EXPORT +#endif //================================================================================= // class : BasicGUI_PointDlg // purpose : diff --git a/src/BasicGUI/BasicGUI_VectorDlg.cxx b/src/BasicGUI/BasicGUI_VectorDlg.cxx index 2dc5bd6e1..3581fca1a 100644 --- a/src/BasicGUI/BasicGUI_VectorDlg.cxx +++ b/src/BasicGUI/BasicGUI_VectorDlg.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "BasicGUI_VectorDlg.h" #include "SUIT_Desktop.h" @@ -40,6 +39,8 @@ using namespace std; #include "utilities.h" +using namespace std; + //================================================================================= // class : BasicGUI_VectorDlg() // purpose : Constructs a BasicGUI_VectorDlg which is a child of 'parent', with the diff --git a/src/BasicGUI/BasicGUI_VectorDlg.h b/src/BasicGUI/BasicGUI_VectorDlg.h index 76bd9b8be..8e87f2b84 100644 --- a/src/BasicGUI/BasicGUI_VectorDlg.h +++ b/src/BasicGUI/BasicGUI_VectorDlg.h @@ -36,6 +36,11 @@ #include "BasicGUI.h" //#include "GEOM_ShapeTypeFilter.hxx" +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define BASICGUI_WNT_EXPORT __declspec( dllexport ) +#else +#define BASICGUI_WNT_EXPORT +#endif //================================================================================= // class : BasicGUI_VectorDlg // purpose : diff --git a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx index 7aa6b1a30..cf56ed78c 100644 --- a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx +++ b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx @@ -25,7 +25,6 @@ // Author : Lucien PIGNOLONI // Module : GEOM -using namespace std; #include "BasicGUI_WorkingPlaneDlg.h" #include "GEOMBase.h" @@ -53,6 +52,8 @@ using namespace std; #include #include +using namespace std; + //================================================================================= // class : BasicGUI_WorkingPlaneDlg() // purpose : Constructs a BasicGUI_WorkingPlaneDlg which is a child of 'parent', with the diff --git a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h index 522631f57..4ee7a785d 100644 --- a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h +++ b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h @@ -33,19 +33,22 @@ #include "DlgRef_2Sel_QTD.h" #include "DlgRef_3Check_QTD.h" - +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define BASICGUI_WNT_EXPORT __declspec( dllexport ) +#else +#define BASICGUI_WNT_EXPORT +#endif //================================================================================= // class : BasicGUI_WorkingPlaneDlg // purpose : //================================================================================= -class BasicGUI_WorkingPlaneDlg : public GEOMBase_Skeleton +class BASICGUI_WNT_EXPORT BasicGUI_WorkingPlaneDlg : public GEOMBase_Skeleton { Q_OBJECT public: BasicGUI_WorkingPlaneDlg( GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~BasicGUI_WorkingPlaneDlg(); - virtual void closeEvent( QCloseEvent* e ); private: diff --git a/src/DisplayGUI/DisplayGUI.h b/src/DisplayGUI/DisplayGUI.h index 7c96393f2..64bfd1e1f 100644 --- a/src/DisplayGUI/DisplayGUI.h +++ b/src/DisplayGUI/DisplayGUI.h @@ -31,10 +31,15 @@ #include "GEOMGUI.h" #include "GEOMBase.h" -#ifdef WNT -#include +//#ifdef WNT +//#include +//#else +//#define SALOME_WNT_EXPORT +//#endif +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define DISPLAYGUI_WNT_EXPORT __declspec( dllexport ) #else -#define SALOME_WNT_EXPORT +#define DISPLAYGUI_WNT_EXPORT #endif //================================================================================= // class : GEOMBase_Display diff --git a/src/GEOMBase/GEOMBase.h b/src/GEOMBase/GEOMBase.h index e26eacab1..c118ac737 100644 --- a/src/GEOMBase/GEOMBase.h +++ b/src/GEOMBase/GEOMBase.h @@ -40,6 +40,17 @@ // QT Includes #include +//#if defined WNT +//#include +//#else +//#define SALOME_WNT_EXPORT +//#endif + +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define GEOMBASE_WNT_EXPORT __declspec( dllexport ) +#else +#define GEOMBASE_WNT_EXPORT +#endif class GEOM_Actor; class SALOME_ListIO; @@ -51,7 +62,7 @@ class QWidget; // class : GEOMBase // purpose : //================================================================================= -class GEOMBase +class GEOMBASE_WNT_EXPORT GEOMBase { public : GEOMBase(); diff --git a/src/GEOMBase/GEOMBase_Helper.h b/src/GEOMBase/GEOMBase_Helper.h index ac07a3ede..1cf601cb4 100755 --- a/src/GEOMBase/GEOMBase_Helper.h +++ b/src/GEOMBase/GEOMBase_Helper.h @@ -38,7 +38,16 @@ #include #include - +//#if defined WNT +//#include +//#else +//#define SALOME_WNT_EXPORT +//#endif +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define GEOMBASE_WNT_EXPORT __declspec( dllexport ) +#else +#define GEOMBASE_WNT_EXPORT +#endif typedef std::list ObjectList; class SalomeApp_Study; @@ -55,7 +64,7 @@ class TColStd_MapOfInteger; // performing common operations (display/erase, selection activation, // publication in a study, transaction management) //================================================================ -class GEOMBase_Helper +class GEOMBASE_WNT_EXPORT GEOMBase_Helper { public: GEOMBase_Helper( SUIT_Desktop* ); diff --git a/src/GEOMBase/GEOMBase_Skeleton.h b/src/GEOMBase/GEOMBase_Skeleton.h index a4ae0b4da..1d3144cc3 100644 --- a/src/GEOMBase/GEOMBase_Skeleton.h +++ b/src/GEOMBase/GEOMBase_Skeleton.h @@ -42,14 +42,25 @@ #include #include #include +//#if defined WNT +//#include +//#else +//#define SALOME_WNT_EXPORT +//#endif +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define GEOMBASE_WNT_EXPORT __declspec( dllexport ) +#else +#define GEOMBASE_WNT_EXPORT +#endif -class GEOMBase_Skeleton : public DlgRef_Skeleton_QTD, public GEOMBase_Helper +class GEOMBASE_WNT_EXPORT GEOMBase_Skeleton : public DlgRef_Skeleton_QTD, public GEOMBase_Helper { Q_OBJECT public: GEOMBase_Skeleton(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~GEOMBase_Skeleton(); +// int getConstructorId() const; // returns id of a selected "constructor" radio button or '-1' in case of error private : void Init(); diff --git a/src/GEOMBase/GEOM_Operation.h b/src/GEOMBase/GEOM_Operation.h index 6145a31d4..426de887d 100644 --- a/src/GEOMBase/GEOM_Operation.h +++ b/src/GEOMBase/GEOM_Operation.h @@ -31,9 +31,11 @@ #include "SUIT_Operation.h" #include +#include #include CORBA_CLIENT_HEADER(GEOM_Gen) -class GEOM_Operation : public SUIT_Operation + +class Standard_EXPORT GEOM_Operation : public SUIT_Operation { public: GEOM_Operation( SUIT_Application*, GEOM::GEOM_IOperations_ptr ); diff --git a/src/GEOMClient/GEOM_Client.cxx b/src/GEOMClient/GEOM_Client.cxx index 208f52e0e..1bdf7482c 100644 --- a/src/GEOMClient/GEOM_Client.cxx +++ b/src/GEOMClient/GEOM_Client.cxx @@ -28,6 +28,8 @@ #include +#include + #include #include "GEOM_Client.hxx" diff --git a/src/GEOMClient/GEOM_Client.hxx b/src/GEOMClient/GEOM_Client.hxx index 0dd255d35..fd6087b93 100644 --- a/src/GEOMClient/GEOM_Client.hxx +++ b/src/GEOMClient/GEOM_Client.hxx @@ -51,11 +51,16 @@ class TopoDS_Shape; #ifndef _Standard_Macro_HeaderFile #include #endif +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define GEOMCLIENT_WNT_EXPORT __declspec( dllexport ) +#else +#define GEOMCLIENT_WNT_EXPORT +#endif //===================================================================== // GEOM_Client : class definition //===================================================================== -class GEOM_Client { +class GEOMCLIENT_WNT_EXPORT GEOM_Client { public: @@ -73,15 +78,24 @@ public: } // Methods PUBLIC // - Standard_EXPORT GEOM_Client(); - Standard_EXPORT GEOM_Client(Engines::Container_ptr client); - Standard_EXPORT Standard_Integer Find( const TCollection_AsciiString& IOR, TopoDS_Shape& S ) ; - Standard_EXPORT Standard_Integer Find( const TopoDS_Shape& S, TCollection_AsciiString& IOR ) ; - Standard_EXPORT void Bind( const TCollection_AsciiString& IOR, const TopoDS_Shape& S ) ; - Standard_EXPORT TopoDS_Shape GetShape( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_ptr aShape ); - Standard_EXPORT void RemoveShapeFromBuffer( const TCollection_AsciiString& IOR ) ; - Standard_EXPORT void ClearClientBuffer() ; - Standard_EXPORT unsigned int BufferLength() ; + //Standard_EXPORT + GEOM_Client(); + //Standard_EXPORT + GEOM_Client(Engines::Container_ptr client); + //Standard_EXPORT + Standard_Integer Find( const TCollection_AsciiString& IOR, TopoDS_Shape& S ) ; + //Standard_EXPORT + Standard_Integer Find( const TopoDS_Shape& S, TCollection_AsciiString& IOR ) ; + //Standard_EXPORT + void Bind( const TCollection_AsciiString& IOR, const TopoDS_Shape& S ) ; + //Standard_EXPORT + TopoDS_Shape GetShape( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_ptr aShape ); + //Standard_EXPORT + void RemoveShapeFromBuffer( const TCollection_AsciiString& IOR ) ; + //Standard_EXPORT + void ClearClientBuffer() ; + //Standard_EXPORT + unsigned int BufferLength() ; TopoDS_Shape Load( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_ptr aShape); private: diff --git a/src/GEOMGUI/GEOMGUI.h b/src/GEOMGUI/GEOMGUI.h index d0a740f4b..69a9bb663 100644 --- a/src/GEOMGUI/GEOMGUI.h +++ b/src/GEOMGUI/GEOMGUI.h @@ -37,11 +37,21 @@ class QMouseEvent; class QKeyEvent; class GeometryGUI; +//#ifdef WNT +//#include +//#else +//#define SALOME_WNT_EXPORT +//#endif +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define GEOMGUI_WNT_EXPORT __declspec( dllexport ) +#else +#define GEOMGUI_WNT_EXPORT +#endif //================================================================================= // class : GEOMGUI // purpose : Base class for all geometry GUI subclasses //================================================================================= -class GEOMGUI : public QObject +class GEOMGUI_WNT_EXPORT GEOMGUI : public QObject { public : // Constructor diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h index ea2958a01..18be72e31 100644 --- a/src/GEOMGUI/GEOM_Displayer.h +++ b/src/GEOMGUI/GEOM_Displayer.h @@ -52,14 +52,18 @@ class SalomeApp_SelectionMgr; class SalomeApp_Study; class SUIT_SelectionFilter; //class SALOME_Selection; - -#ifdef WNT -#include +//#ifdef WNT +//#include +//#else +//#define SALOME_WNT_EXPORT +//#endif +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define GEOMGUI_WNT_EXPORT __declspec( dllexport ) #else -#define SALOME_WNT_EXPORT +#define GEOMGUI_WNT_EXPORT #endif -class SALOME_WNT_EXPORT GEOM_Displayer : public SALOME_Displayer +class GEOMGUI_WNT_EXPORT GEOM_Displayer : public SALOME_Displayer { public: diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index 2e1b295e8..166e56ab3 100644 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -67,14 +67,19 @@ #include #include + extern "C" { Standard_EXPORT CAM_Module* createModule() { return new GeometryGUI(); } } + + GEOM::GEOM_Gen_var GeometryGUI::myComponentGeom = GEOM::GEOM_Gen::_nil(); +GEOM::GEOM_Gen_var GeometryGUI::GetGeomGen() { return GeometryGUI::myComponentGeom; } + bool GeometryGUI::InitGeomGen() { GeometryGUI aGG; diff --git a/src/GEOMGUI/GeometryGUI.h b/src/GEOMGUI/GeometryGUI.h index 860cd795c..854dbc615 100644 --- a/src/GEOMGUI/GeometryGUI.h +++ b/src/GEOMGUI/GeometryGUI.h @@ -53,6 +53,18 @@ #define SALOME_WNT_EXPORT #endif +//#if defined WNT +//#include +//#else +//#define SALOME_WNT_EXPORT +//#endif + +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define GEOMGUI_WNT_EXPORT __declspec( dllexport ) +#else +#define GEOMGUI_WNT_EXPORT +#endif + typedef QMap GUIMap; class QDialog; @@ -61,12 +73,11 @@ class GEOMGUI_OCCSelector; class SalomeApp_VTKSelector; class SUIT_ViewManager; - //================================================================================= // class : GeometryGUI // purpose : //================================================================================= -class SALOME_WNT_EXPORT GeometryGUI : public SalomeApp_Module +class GEOMGUI_WNT_EXPORT GeometryGUI : public SalomeApp_Module { Q_OBJECT; @@ -82,7 +93,7 @@ public: static bool InitGeomGen(); //BugID IPAL9186: SRN: To be called by Python scripts - static GEOM::GEOM_Gen_var GetGeomGen() { return myComponentGeom; } + static GEOM::GEOM_Gen_var GetGeomGen();// { return GeometryGUI::myComponentGeom; } static CORBA::Object_var ClientSObjectToObject (_PTR(SObject) theSObject); static SALOMEDS::Study_var ClientStudyToStudy (_PTR(Study) theStudy); @@ -157,9 +168,9 @@ private: const bool isExpandAll = false, const bool isOCC = false, const int parentId = -1 ); -private: - static GEOM::GEOM_Gen_var myComponentGeom; // GEOM engine - +public: + static GEOM::GEOM_Gen_var myComponentGeom; // GEOM engine!!! +private: GUIMap myGUIMap; // GUI libraries map QDialog* myActiveDialogBox; // active dialog box GEOM_Client myShapeReader; // geom shape reader