ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-02-03 23:40:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Windows porting

Browse Source
This commit is contained in:
szy 2005-08-19 11:51:38 +00:00
parent a8a220072b
commit 409b095d25
26 changed files with 178 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/BasicGUI/BasicGUI.cxx
View File

@ -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;
//=======================================================================

5
src/BasicGUI/BasicGUI.h
View File

@ -34,6 +34,11 @@
#include <V3d_View.hxx>
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define BASICGUI_WNT_EXPORT __declspec( dllexport )
#else
#define BASICGUI_WNT_EXPORT
#endif
//=================================================================================
// class : BasicGUI
// purpose :

6
src/BasicGUI/BasicGUI_ArcDlg.h
View File

@ -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 :

6
src/BasicGUI/BasicGUI_CircleDlg.h
View File

@ -38,7 +38,11 @@
//#include "GEOM_EdgeFilter.hxx"
//#include "GEOM_ShapeTypeFilter.hxx"
#include <gp_Dir.hxx>
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define BASICGUI_WNT_EXPORT __declspec( dllexport )
#else
#define BASICGUI_WNT_EXPORT
#endif
//=================================================================================
// class : BasicGUI_CircleDlg

6
src/BasicGUI/BasicGUI_CurveDlg.h
View File

@ -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"
//=================================================================================

6
src/BasicGUI/BasicGUI_EllipseDlg.h
View File

@ -36,7 +36,11 @@
//#include "GEOM_ShapeTypeFilter.hxx"
//#include "GEOM_EdgeFilter.hxx"
#include <gp_Dir.hxx>
#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 :

5
src/BasicGUI/BasicGUI_LineDlg.h
View File

@ -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

6
src/BasicGUI/BasicGUI_MarkerDlg.h
View File

@ -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

5
src/BasicGUI/BasicGUI_PlaneDlg.h
View File

@ -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

3
src/BasicGUI/BasicGUI_PointDlg.cxx
View File

@ -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 <BRep_Tool.hxx>
#include <qapplication.h>
using namespace std;
//=================================================================================
// class : BasicGUI_PointDlg()
// purpose : Constructs a BasicGUI_PointDlg which is a child of 'parent', with the

5
src/BasicGUI/BasicGUI_PointDlg.h
View File

@ -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 :

3
src/BasicGUI/BasicGUI_VectorDlg.cxx
View File

@ -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

5
src/BasicGUI/BasicGUI_VectorDlg.h
View File

@ -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 :

3
src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx
View File

@ -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 <qcheckbox.h>
#include <qlabel.h>
using namespace std;
//=================================================================================
// class : BasicGUI_WorkingPlaneDlg()
// purpose : Constructs a BasicGUI_WorkingPlaneDlg which is a child of 'parent', with the

9
src/BasicGUI/BasicGUI_WorkingPlaneDlg.h
View File

@ -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:

11
src/DisplayGUI/DisplayGUI.h
View File

@ -31,10 +31,15 @@
#include "GEOMGUI.h"
#include "GEOMBase.h"
#ifdef WNT
#include <SALOME_WNT.hxx>
//#ifdef WNT
//#include <SALOME_WNT.hxx>
//#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

13
src/GEOMBase/GEOMBase.h
View File

@ -40,6 +40,17 @@
// QT Includes
#include <qstring.h>
//#if defined WNT
//#include <SALOME_WNT.hxx>
//#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();

13
src/GEOMBase/GEOMBase_Helper.h
View File

@ -38,7 +38,16 @@
#include <qstring.h>
#include <list>
//#if defined WNT
//#include <SALOME_WNT.hxx>
//#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<GEOM::GEOM_Object_ptr> 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* );

13
src/GEOMBase/GEOMBase_Skeleton.h
View File

@ -42,14 +42,25 @@
#include <qpushbutton.h>
#include <qradiobutton.h>
#include <qbuttongroup.h>
//#if defined WNT
//#include <SALOME_WNT.hxx>
//#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();

4
src/GEOMBase/GEOM_Operation.h
View File

@ -31,9 +31,11 @@
#include "SUIT_Operation.h"
#include <SALOMEconfig.h>
#include <Standard_Macro.hxx>
#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 );

2
src/GEOMClient/GEOM_Client.cxx
View File

@ -28,6 +28,8 @@
#include <Standard_Stream.hxx>
#include <Standard_Stream.hxx>
#include <strstream>
#include "GEOM_Client.hxx"

34
src/GEOMClient/GEOM_Client.hxx
View File

@ -51,11 +51,16 @@ class TopoDS_Shape;
#ifndef _Standard_Macro_HeaderFile
#include <Standard_Macro.hxx>
#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:

12
src/GEOMGUI/GEOMGUI.h
View File

@ -37,11 +37,21 @@ class QMouseEvent;
class QKeyEvent;
class GeometryGUI;
//#ifdef WNT
//#include <SALOME_WNT.hxx>
//#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

14
src/GEOMGUI/GEOM_Displayer.h
View File

@ -52,14 +52,18 @@ class SalomeApp_SelectionMgr;
class SalomeApp_Study;
class SUIT_SelectionFilter;
//class SALOME_Selection;
#ifdef WNT
#include <SALOME_WNT.hxx>
//#ifdef WNT
//#include <SALOME_WNT.hxx>
//#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:

5
src/GEOMGUI/GeometryGUI.cxx
View File

@ -67,14 +67,19 @@
#include <vtkCamera.h>
#include <vtkRenderer.h>
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;

23
src/GEOMGUI/GeometryGUI.h
View File

@ -53,6 +53,18 @@
#define SALOME_WNT_EXPORT
#endif
//#if defined WNT
//#include <SALOME_WNT.hxx>
//#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<QString, GEOMGUI*> 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