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

ENV: Windows porting.

Browse Source
This commit is contained in:
env 2005-08-11 04:14:22 +00:00
parent 424ee09297
commit f931ebe5b6
34 changed files with 164 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/GEOMBase/GEOMBase_Skeleton.cxx
View File

@ -26,7 +26,6 @@
// Module : GEOM // Module : GEOM
// $Header$ // $Header$
using namespace std;
#include "GEOMBase_Skeleton.h" #include "GEOMBase_Skeleton.h"
#include "GeometryGUI.h" #include "GeometryGUI.h"
@ -36,6 +35,8 @@ using namespace std;
#include <qpushbutton.h> #include <qpushbutton.h>
using namespace std;
//================================================================================= //=================================================================================
// class : GEOMBase_Skeleton() // class : GEOMBase_Skeleton()
// purpose : Constructs a GEOMBase_Skeleton which is a child of 'parent', with the // purpose : Constructs a GEOMBase_Skeleton which is a child of 'parent', with the

6
src/GEOMBase/GEOMBase_aParameterDlg.cxx
View File

@ -26,7 +26,6 @@
// Module : GEOM // Module : GEOM
// $Header$ // $Header$
using namespace std;
#include "GEOMBase_aParameterDlg.h" #include "GEOMBase_aParameterDlg.h"
#include "QtxDblSpinBox.h" #include "QtxDblSpinBox.h"
@ -39,6 +38,11 @@ using namespace std;
#include <qvariant.h> #include <qvariant.h>
#include <qvalidator.h> #include <qvalidator.h>
#ifndef WNT
using namespace std;
#endif
//====================================================================================== //======================================================================================
// function : GEOMBase_aParameterDlg() // function : GEOMBase_aParameterDlg()
// purpose : Constructs a GEOMBase_aParametertDlg which is a child of 'parent', with the // purpose : Constructs a GEOMBase_aParametertDlg which is a child of 'parent', with the

21
src/GEOMClient/GEOM_Client.cxx
View File

@ -26,18 +26,15 @@
// Module : GEOM // Module : GEOM
// $Header$ // $Header$
#include <strstream> #include <Standard_Stream.hxx>
using namespace std; #include <strstream>
#include "GEOM_Client.hxx" #include "GEOM_Client.hxx"
#include <SALOMEconfig.h> #include <SALOMEconfig.h>
#include "OpUtil.hxx" #include "OpUtil.hxx"
#include "utilities.h" #include "utilities.h"
#include CORBA_SERVER_HEADER(SALOMEDS)
#include CORBA_SERVER_HEADER(GEOM_Gen)
#include <BRep_Builder.hxx> #include <BRep_Builder.hxx>
#include <BRepTools.hxx> #include <BRepTools.hxx>
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
@ -48,7 +45,14 @@ using namespace std;
#include <TopAbs.hxx> #include <TopAbs.hxx>
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#ifdef WNT
#include <process.h>
#else
#include <unistd.h> #include <unistd.h>
#endif
#include CORBA_SERVER_HEADER(SALOMEDS)
#include CORBA_SERVER_HEADER(GEOM_Gen)
#define HST_CLIENT_LEN 256 #define HST_CLIENT_LEN 256
@ -89,7 +93,12 @@ TopoDS_Shape GEOM_Client::Load( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_ptr a
//======================================================================= //=======================================================================
GEOM_Client::GEOM_Client() GEOM_Client::GEOM_Client()
{ {
pid_client = (long)getpid(); pid_client =
#ifdef WNT
(long)_getpid();
#else
(long)getpid();
#endif
} }
//======================================================================= //=======================================================================

2
src/GEOMFiltersSelection/GEOM_EdgeFilter.h
View File

@ -3,7 +3,7 @@
#include "GEOM_SelectionFilter.h" #include "GEOM_SelectionFilter.h"
class GEOM_EdgeFilter : public GEOM_SelectionFilter class Standard_EXPORT GEOM_EdgeFilter : public GEOM_SelectionFilter
{ {
public: public:
GEOM_EdgeFilter( SalomeApp_Study* study, const int kind ); GEOM_EdgeFilter( SalomeApp_Study* study, const int kind );

2
src/GEOMFiltersSelection/GEOM_FaceFilter.h
View File

@ -3,7 +3,7 @@
#include "GEOM_SelectionFilter.h" #include "GEOM_SelectionFilter.h"
class GEOM_FaceFilter : public GEOM_SelectionFilter class Standard_EXPORT GEOM_FaceFilter : public GEOM_SelectionFilter
{ {
public: public:
GEOM_FaceFilter( SalomeApp_Study* study, const int kind ); GEOM_FaceFilter( SalomeApp_Study* study, const int kind );

3
src/GEOMFiltersSelection/GEOM_LogicalFilter.h
View File

@ -2,10 +2,11 @@
#define GEOM_LOGICALFILTER_H #define GEOM_LOGICALFILTER_H
#include <SUIT_SelectionFilter.h> #include <SUIT_SelectionFilter.h>
#include <Standard_Macro.hxx>
#include <qptrlist.h> #include <qptrlist.h>
class GEOM_LogicalFilter : public SUIT_SelectionFilter class Standard_EXPORT GEOM_LogicalFilter : public SUIT_SelectionFilter
{ {
public: public:
enum { LO_OR, LO_AND, LO_NOT, LO_UNDEFINED }; enum { LO_OR, LO_AND, LO_NOT, LO_UNDEFINED };

6
src/GEOMFiltersSelection/GEOM_OCCFilter.h
View File

@ -10,10 +10,10 @@ class SalomeApp_SelectionMgr;
class GEOM_OCCFilter : public SelectMgr_Filter class GEOM_OCCFilter : public SelectMgr_Filter
{ {
public: public:
GEOM_OCCFilter( SalomeApp_SelectionMgr* theSelMgr); Standard_EXPORT GEOM_OCCFilter( SalomeApp_SelectionMgr* theSelMgr);
~GEOM_OCCFilter(); Standard_EXPORT ~GEOM_OCCFilter();
virtual Standard_Boolean IsOk( const Handle(SelectMgr_EntityOwner)& anObj ) const; Standard_EXPORT virtual Standard_Boolean IsOk( const Handle(SelectMgr_EntityOwner)& anObj ) const;
private: private:
SalomeApp_SelectionMgr* mySelMgr; SalomeApp_SelectionMgr* mySelMgr;

3
src/GEOMFiltersSelection/GEOM_PreviewFilter.h
View File

@ -2,8 +2,9 @@
#define GEOM_PREVIEW_FILTER_H #define GEOM_PREVIEW_FILTER_H
#include <SalomeApp_Filter.h> #include <SalomeApp_Filter.h>
#include <Standard_Macro.hxx>
class GEOM_PreviewFilter : public SalomeApp_Filter class Standard_EXPORT GEOM_PreviewFilter : public SalomeApp_Filter
{ {
public: public:
GEOM_PreviewFilter( SalomeApp_Study* study ); GEOM_PreviewFilter( SalomeApp_Study* study );

2
src/GEOMFiltersSelection/GEOM_SelectionFilter.h
View File

@ -11,7 +11,7 @@
#include <SALOMEconfig.h> #include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(GEOM_Gen) #include CORBA_SERVER_HEADER(GEOM_Gen)
class GEOM_SelectionFilter : public SalomeApp_Filter class Standard_EXPORT GEOM_SelectionFilter : public SalomeApp_Filter
{ {
public: public:
GEOM_SelectionFilter( SalomeApp_Study* study, const bool theAll = false ); GEOM_SelectionFilter( SalomeApp_Study* study, const bool theAll = false );

3
src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.cxx
View File

@ -26,7 +26,8 @@
// Module : GEOM // Module : GEOM
// $Header$ // $Header$
using namespace std; #include <Standard_Stream.hxx>
#include "GEOM_ShapeTypeFilter.ixx" #include "GEOM_ShapeTypeFilter.ixx"
#include "SALOME_InteractiveObject.hxx" #include "SALOME_InteractiveObject.hxx"
#include "GEOM_Client.hxx" #include "GEOM_Client.hxx"

2
src/GEOMFiltersSelection/GEOM_TypeFilter.h
View File

@ -7,7 +7,7 @@
#include <SALOMEconfig.h> #include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(GEOM_Gen) #include CORBA_SERVER_HEADER(GEOM_Gen)
class GEOM_TypeFilter : public GEOM_SelectionFilter class Standard_EXPORT GEOM_TypeFilter : public GEOM_SelectionFilter
{ {
public: public:
GEOM_TypeFilter(SalomeApp_Study* study, const int type, const bool isShapeType = false ); GEOM_TypeFilter(SalomeApp_Study* study, const int type, const bool isShapeType = false );

8
src/GEOMGUI/GEOMGUI_OCCSelector.cxx
View File

@ -153,7 +153,11 @@ void GEOMGUI_OCCSelector::setSelection( const SUIT_DataOwnerPtrList& aList )
Handle(AIS_InteractiveContext) ic = vw->getAISContext(); Handle(AIS_InteractiveContext) ic = vw->getAISContext();
#ifndef WNT
NCollection_DataMap<TCollection_AsciiString, TColStd_IndexedMapOfInteger> indexesMap; // "entry - list_of_int" map for LOCAL selection NCollection_DataMap<TCollection_AsciiString, TColStd_IndexedMapOfInteger> indexesMap; // "entry - list_of_int" map for LOCAL selection
#else
NCollection_DataMap<Standard_CString, TColStd_IndexedMapOfInteger> indexesMap; // "entry - list_of_int" map for LOCAL selection
#endif
QMap<QString,int> globalSelMap; // only Key=entry from this map is used. value(int) is NOT used at all. QMap<QString,int> globalSelMap; // only Key=entry from this map is used. value(int) is NOT used at all.
SelectMgr_IndexedMapOfOwner ownersmap; // map of owners to be selected SelectMgr_IndexedMapOfOwner ownersmap; // map of owners to be selected
@ -168,7 +172,11 @@ void GEOMGUI_OCCSelector::setSelection( const SUIT_DataOwnerPtrList& aList )
if ( subOwner ) if ( subOwner )
{ {
QString entry = subOwner->entry(); QString entry = subOwner->entry();
#ifndef WNT
if ( indexesMap.IsBound( TCollection_AsciiString((char*)entry.latin1()))) if ( indexesMap.IsBound( TCollection_AsciiString((char*)entry.latin1())))
#else
if ( indexesMap.IsBound( (char*)entry.latin1()))
#endif
{ {
TColStd_IndexedMapOfInteger& subIndexes = indexesMap.ChangeFind((char*)entry.latin1()); TColStd_IndexedMapOfInteger& subIndexes = indexesMap.ChangeFind((char*)entry.latin1());
subIndexes.Add( subOwner->index() ); subIndexes.Add( subOwner->index() );

8
src/GEOMGUI/GEOM_Displayer.h
View File

@ -53,7 +53,13 @@ class SalomeApp_Study;
class SUIT_SelectionFilter; class SUIT_SelectionFilter;
//class SALOME_Selection; //class SALOME_Selection;
class GEOM_Displayer : public SALOME_Displayer #ifdef WNT
#include <SALOME_WNT.hxx>
#else
#define SALOME_WNT_EXPORT
#endif
class SALOME_WNT_EXPORT GEOM_Displayer : public SALOME_Displayer
{ {
public: public:

8
src/GEOMGUI/GeometryGUI.h
View File

@ -38,6 +38,12 @@
#include "gp_Ax3.hxx" #include "gp_Ax3.hxx"
#ifdef WNT
#include <SALOME_WNT.hxx>
#else
#define SALOME_WNT_EXPORT
#endif
typedef QMap<QString, GEOMGUI*> GUIMap; typedef QMap<QString, GEOMGUI*> GUIMap;
class QDialog; class QDialog;
@ -51,7 +57,7 @@ class SUIT_ViewManager;
// class : GeometryGUI // class : GeometryGUI
// purpose : // purpose :
//================================================================================= //=================================================================================
class GeometryGUI : public SalomeApp_Module class SALOME_WNT_EXPORT GeometryGUI : public SalomeApp_Module
{ {
Q_OBJECT; Q_OBJECT;

6
src/GEOM_I/GEOM_DumpPython.cc
View File

@ -1,4 +1,8 @@
using namespace std; #ifdef WNT
#pragma warning( disable:4786 )
#endif
#include <Standard_Stream.hxx>
#include "GEOM_Gen_i.hh" #include "GEOM_Gen_i.hh"
#include <TCollection_AsciiString.hxx> #include <TCollection_AsciiString.hxx>

35
src/GEOM_I/GEOM_Gen_i.cc
View File

@ -1,3 +1,9 @@
#ifdef WNT
#pragma warning( disable:4786 )
#endif
#include <Standard_Stream.hxx>
#include "GEOM_Gen_i.hh" #include "GEOM_Gen_i.hh"
#include "GEOM_Object_i.hh" #include "GEOM_Object_i.hh"
@ -24,7 +30,6 @@
#include <TopAbs_ShapeEnum.hxx> #include <TopAbs_ShapeEnum.hxx>
#include "SALOMEDS_Tool.hxx" #include "SALOMEDS_Tool.hxx"
using namespace std;
//============================================================================ //============================================================================
// function : GEOM_Gen_i() // function : GEOM_Gen_i()
@ -493,7 +498,7 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::AddInStudy(SALOMEDS::Study_ptr theStudy, GEOM:
//============================================================================ //============================================================================
void GEOM_Gen_i::register_name(char * name) void GEOM_Gen_i::register_name(char * name)
{ {
GEOM::GEOM_Gen_ptr g = GEOM::GEOM_Gen::_narrow(POA_GEOM::GEOM_Gen::_this()); GEOM::GEOM_Gen_ptr g = GEOM::GEOM_Gen::_narrow(_this());
name_service->Register(g, strdup(name)); name_service->Register(g, strdup(name));
} }
@ -525,7 +530,7 @@ GEOM::GEOM_IBasicOperations_ptr GEOM_Gen_i::GetIBasicOperations(CORBA::Long theS
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
MESSAGE( "GEOM_Gen_i::GetIBasicOperations" ); MESSAGE( "GEOM_Gen_i::GetIBasicOperations" );
GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this(); GEOM::GEOM_Gen_ptr engine = _this();
GEOM_IBasicOperations_i* aServant = GEOM_IBasicOperations_i* aServant =
new GEOM_IBasicOperations_i(_poa, engine, _impl->GetIBasicOperations(theStudyID)); new GEOM_IBasicOperations_i(_poa, engine, _impl->GetIBasicOperations(theStudyID));
@ -545,7 +550,7 @@ GEOM::GEOM_ITransformOperations_ptr GEOM_Gen_i::GetITransformOperations(CORBA::L
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
MESSAGE( "GEOM_Gen_i::GetITransformOperations" ); MESSAGE( "GEOM_Gen_i::GetITransformOperations" );
GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this(); GEOM::GEOM_Gen_ptr engine = _this();
GEOM_ITransformOperations_i* aServant = GEOM_ITransformOperations_i* aServant =
new GEOM_ITransformOperations_i(_poa, engine, _impl->GetITransformOperations(theStudyID)); new GEOM_ITransformOperations_i(_poa, engine, _impl->GetITransformOperations(theStudyID));
@ -565,7 +570,7 @@ GEOM::GEOM_I3DPrimOperations_ptr GEOM_Gen_i::GetI3DPrimOperations(CORBA::Long th
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
MESSAGE( "GEOM_Gen_i::GetI3DPrimOperations" ); MESSAGE( "GEOM_Gen_i::GetI3DPrimOperations" );
GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this(); GEOM::GEOM_Gen_ptr engine = _this();
GEOM_I3DPrimOperations_i* aServant = GEOM_I3DPrimOperations_i* aServant =
new GEOM_I3DPrimOperations_i(_poa, engine, _impl->GetI3DPrimOperations(theStudyID)); new GEOM_I3DPrimOperations_i(_poa, engine, _impl->GetI3DPrimOperations(theStudyID));
@ -585,7 +590,7 @@ GEOM::GEOM_IShapesOperations_ptr GEOM_Gen_i::GetIShapesOperations(CORBA::Long th
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
MESSAGE( "GEOM_Gen_i::GetIShapesOperations" ); MESSAGE( "GEOM_Gen_i::GetIShapesOperations" );
GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this(); GEOM::GEOM_Gen_ptr engine = _this();
GEOM_IShapesOperations_i* aServant = GEOM_IShapesOperations_i* aServant =
new GEOM_IShapesOperations_i(_poa, engine, _impl->GetIShapesOperations(theStudyID)); new GEOM_IShapesOperations_i(_poa, engine, _impl->GetIShapesOperations(theStudyID));
@ -605,7 +610,7 @@ GEOM::GEOM_IBlocksOperations_ptr GEOM_Gen_i::GetIBlocksOperations(CORBA::Long th
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
MESSAGE( "GEOM_Gen_i::GetIBlocksOperations" ); MESSAGE( "GEOM_Gen_i::GetIBlocksOperations" );
GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this(); GEOM::GEOM_Gen_ptr engine = _this();
GEOM_IBlocksOperations_i* aServant = GEOM_IBlocksOperations_i* aServant =
new GEOM_IBlocksOperations_i(_poa, engine, _impl->GetIBlocksOperations(theStudyID)); new GEOM_IBlocksOperations_i(_poa, engine, _impl->GetIBlocksOperations(theStudyID));
@ -625,7 +630,7 @@ GEOM::GEOM_IBooleanOperations_ptr GEOM_Gen_i::GetIBooleanOperations(CORBA::Long
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
MESSAGE( "GEOM_Gen_i::GetIBooleanOperations" ); MESSAGE( "GEOM_Gen_i::GetIBooleanOperations" );
GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this(); GEOM::GEOM_Gen_ptr engine = _this();
GEOM_IBooleanOperations_i* aServant = GEOM_IBooleanOperations_i* aServant =
new GEOM_IBooleanOperations_i(_poa, engine, _impl->GetIBooleanOperations(theStudyID)); new GEOM_IBooleanOperations_i(_poa, engine, _impl->GetIBooleanOperations(theStudyID));
@ -645,7 +650,7 @@ GEOM::GEOM_ICurvesOperations_ptr GEOM_Gen_i::GetICurvesOperations(CORBA::Long th
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
MESSAGE( "GEOM_Gen_i::GetICurvesOperations" ); MESSAGE( "GEOM_Gen_i::GetICurvesOperations" );
GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this(); GEOM::GEOM_Gen_ptr engine = _this();
GEOM_ICurvesOperations_i* aServant = GEOM_ICurvesOperations_i* aServant =
new GEOM_ICurvesOperations_i(_poa, engine, _impl->GetICurvesOperations(theStudyID)); new GEOM_ICurvesOperations_i(_poa, engine, _impl->GetICurvesOperations(theStudyID));
@ -665,7 +670,7 @@ GEOM::GEOM_ILocalOperations_ptr GEOM_Gen_i::GetILocalOperations(CORBA::Long theS
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
MESSAGE( "GEOM_Gen_i::GetILocalOperations" ); MESSAGE( "GEOM_Gen_i::GetILocalOperations" );
GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this(); GEOM::GEOM_Gen_ptr engine = _this();
GEOM_ILocalOperations_i* aServant = GEOM_ILocalOperations_i* aServant =
new GEOM_ILocalOperations_i(_poa, engine, _impl->GetILocalOperations(theStudyID)); new GEOM_ILocalOperations_i(_poa, engine, _impl->GetILocalOperations(theStudyID));
@ -685,7 +690,7 @@ GEOM::GEOM_IHealingOperations_ptr GEOM_Gen_i::GetIHealingOperations(CORBA::Long
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
MESSAGE( "GEOM_Gen_i::IHealingOperations" ); MESSAGE( "GEOM_Gen_i::IHealingOperations" );
GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this(); GEOM::GEOM_Gen_ptr engine = _this();
GEOM_IHealingOperations_i* aServant = GEOM_IHealingOperations_i* aServant =
new GEOM_IHealingOperations_i(_poa, engine, _impl->GetIHealingOperations(theStudyID)); new GEOM_IHealingOperations_i(_poa, engine, _impl->GetIHealingOperations(theStudyID));
@ -705,7 +710,7 @@ GEOM::GEOM_IInsertOperations_ptr GEOM_Gen_i::GetIInsertOperations(CORBA::Long th
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
MESSAGE( "GEOM_Gen_i::GetIInsertOperations" ); MESSAGE( "GEOM_Gen_i::GetIInsertOperations" );
GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this(); GEOM::GEOM_Gen_ptr engine = _this();
GEOM_IInsertOperations_i* aServant = GEOM_IInsertOperations_i* aServant =
new GEOM_IInsertOperations_i(_poa, engine, _impl->GetIInsertOperations(theStudyID)); new GEOM_IInsertOperations_i(_poa, engine, _impl->GetIInsertOperations(theStudyID));
@ -725,7 +730,7 @@ GEOM::GEOM_IMeasureOperations_ptr GEOM_Gen_i::GetIMeasureOperations(CORBA::Long
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
MESSAGE( "GEOM_Gen_i::GetIMeasureOperations" ); MESSAGE( "GEOM_Gen_i::GetIMeasureOperations" );
GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this(); GEOM::GEOM_Gen_ptr engine = _this();
GEOM_IMeasureOperations_i* aServant = GEOM_IMeasureOperations_i* aServant =
new GEOM_IMeasureOperations_i(_poa, engine, _impl->GetIMeasureOperations(theStudyID)); new GEOM_IMeasureOperations_i(_poa, engine, _impl->GetIMeasureOperations(theStudyID));
@ -745,7 +750,7 @@ GEOM::GEOM_IGroupOperations_ptr GEOM_Gen_i::GetIGroupOperations(CORBA::Long theS
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
MESSAGE( "GEOM_Gen_i::GetIGroupOperations" ); MESSAGE( "GEOM_Gen_i::GetIGroupOperations" );
GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this(); GEOM::GEOM_Gen_ptr engine = _this();
GEOM_IGroupOperations_i* aServant = GEOM_IGroupOperations_i* aServant =
new GEOM_IGroupOperations_i(_poa, engine, _impl->GetIGroupOperations(theStudyID)); new GEOM_IGroupOperations_i(_poa, engine, _impl->GetIGroupOperations(theStudyID));
@ -831,7 +836,7 @@ GEOM::GEOM_Object_ptr GEOM_Gen_i::GetObject(CORBA::Long theStudyID, const char*
return obj._retn(); return obj._retn();
} }
GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this(); GEOM::GEOM_Gen_ptr engine = _this();
GEOM_Object_i* servant = new GEOM_Object_i(_poa, engine, handle_object); GEOM_Object_i* servant = new GEOM_Object_i(_poa, engine, handle_object);
obj = servant->_this(); obj = servant->_this();

2
src/GEOM_I/GEOM_Gen_i.hh
View File

@ -33,7 +33,7 @@
//===================================================================== //=====================================================================
// GEOM_Gen_i : class definition // GEOM_Gen_i : class definition
//===================================================================== //=====================================================================
class GEOM_Gen_i: public POA_GEOM::GEOM_Gen, public Engines_Component_i class GEOM_Gen_i: virtual public POA_GEOM::GEOM_Gen, virtual public Engines_Component_i
{ {
public: public:

2
src/GEOM_I/GEOM_I3DPrimOperations_i.cc
View File

@ -1,4 +1,4 @@
using namespace std; #include <Standard_Stream.hxx>
#include "GEOM_I3DPrimOperations_i.hh" #include "GEOM_I3DPrimOperations_i.hh"

2
src/GEOM_I/GEOM_IBasicOperations_i.cc
View File

@ -1,4 +1,4 @@
using namespace std; #include <Standard_Stream.hxx>
#include "GEOM_IBasicOperations_i.hh" #include "GEOM_IBasicOperations_i.hh"

2
src/GEOM_I/GEOM_IBlocksOperations_i.cc
View File

@ -1,4 +1,4 @@
using namespace std; #include <Standard_Stream.hxx>
#include "GEOM_IBlocksOperations_i.hh" #include "GEOM_IBlocksOperations_i.hh"

34
src/GEOM_I/GEOM_IBlocksOperations_i.hh
View File

@ -48,10 +48,10 @@ class GEOM_IBlocksOperations_i :
// Extract elements of blocks and blocks compounds // Extract elements of blocks and blocks compounds
GEOM::GEOM_Object_ptr GetPoint (GEOM::GEOM_Object_ptr theShape, GEOM::GEOM_Object_ptr GetPoint (GEOM::GEOM_Object_ptr theShape,
const CORBA::Double theX, CORBA::Double theX,
const CORBA::Double theY, CORBA::Double theY,
const CORBA::Double theZ, CORBA::Double theZ,
const CORBA::Double theEpsilon); CORBA::Double theEpsilon);
GEOM::GEOM_Object_ptr GetEdge (GEOM::GEOM_Object_ptr theShape, GEOM::GEOM_Object_ptr GetEdge (GEOM::GEOM_Object_ptr theShape,
GEOM::GEOM_Object_ptr thePoint1, GEOM::GEOM_Object_ptr thePoint1,
@ -81,8 +81,8 @@ class GEOM_IBlocksOperations_i :
// Check blocks compound // Check blocks compound
CORBA::Boolean IsCompoundOfBlocks (GEOM::GEOM_Object_ptr theCompound, CORBA::Boolean IsCompoundOfBlocks (GEOM::GEOM_Object_ptr theCompound,
const CORBA::Long theMinNbFaces, CORBA::Long theMinNbFaces,
const CORBA::Long theMaxNbFaces, CORBA::Long theMaxNbFaces,
CORBA::Long& theNbBlocks); CORBA::Long& theNbBlocks);
CORBA::Boolean CheckCompoundOfBlocks (GEOM::GEOM_Object_ptr theCompound, CORBA::Boolean CheckCompoundOfBlocks (GEOM::GEOM_Object_ptr theCompound,
@ -97,8 +97,8 @@ class GEOM_IBlocksOperations_i :
// Extract blocks from blocks compounds // Extract blocks from blocks compounds
GEOM::ListOfGO* ExplodeCompoundOfBlocks (GEOM::GEOM_Object_ptr theCompound, GEOM::ListOfGO* ExplodeCompoundOfBlocks (GEOM::GEOM_Object_ptr theCompound,
const CORBA::Long theMinNbFaces, CORBA::Long theMinNbFaces,
const CORBA::Long theMaxNbFaces); CORBA::Long theMaxNbFaces);
GEOM::GEOM_Object_ptr GetBlockNearPoint (GEOM::GEOM_Object_ptr theCompound, GEOM::GEOM_Object_ptr GetBlockNearPoint (GEOM::GEOM_Object_ptr theCompound,
GEOM::GEOM_Object_ptr thePoint); GEOM::GEOM_Object_ptr thePoint);
@ -111,17 +111,17 @@ class GEOM_IBlocksOperations_i :
// Operations on blocks with gluing of result // Operations on blocks with gluing of result
GEOM::GEOM_Object_ptr MakeMultiTransformation1D (GEOM::GEOM_Object_ptr theBlock, GEOM::GEOM_Object_ptr MakeMultiTransformation1D (GEOM::GEOM_Object_ptr theBlock,
const CORBA::Long theDirFace1, CORBA::Long theDirFace1,
const CORBA::Long theDirFace2, CORBA::Long theDirFace2,
const CORBA::Long theNbTimes); CORBA::Long theNbTimes);
GEOM::GEOM_Object_ptr MakeMultiTransformation2D (GEOM::GEOM_Object_ptr theBlock, GEOM::GEOM_Object_ptr MakeMultiTransformation2D (GEOM::GEOM_Object_ptr theBlock,
const CORBA::Long theDirFace1U, CORBA::Long theDirFace1U,
const CORBA::Long theDirFace2U, CORBA::Long theDirFace2U,
const CORBA::Long theNbTimesU, CORBA::Long theNbTimesU,
const CORBA::Long theDirFace1V, CORBA::Long theDirFace1V,
const CORBA::Long theDirFace2V, CORBA::Long theDirFace2V,
const CORBA::Long theNbTimesV); CORBA::Long theNbTimesV);
// Build groups for Propagation of 1D hypotheses // Build groups for Propagation of 1D hypotheses
GEOM::ListOfGO* Propagate (GEOM::GEOM_Object_ptr theShape); GEOM::ListOfGO* Propagate (GEOM::GEOM_Object_ptr theShape);

2
src/GEOM_I/GEOM_IBooleanOperations_i.cc
View File

@ -1,4 +1,4 @@
using namespace std; #include <Standard_Stream.hxx>
#include "GEOM_IBooleanOperations_i.hh" #include "GEOM_IBooleanOperations_i.hh"

4
src/GEOM_I/GEOM_IBooleanOperations_i.hh
View File

@ -28,8 +28,8 @@ class GEOM_IBooleanOperations_i :
const GEOM::ListOfGO& theTools, const GEOM::ListOfGO& theTools,
const GEOM::ListOfGO& theKeepInside, const GEOM::ListOfGO& theKeepInside,
const GEOM::ListOfGO& theRemoveInside, const GEOM::ListOfGO& theRemoveInside,
const CORBA::Short theLimit, CORBA::Short theLimit,
const CORBA::Boolean theRemoveWebs, CORBA::Boolean theRemoveWebs,
const GEOM::ListOfLong& theMaterials); const GEOM::ListOfLong& theMaterials);

2
src/GEOM_I/GEOM_ICurvesOperations_i.cc
View File

@ -1,4 +1,4 @@
using namespace std; #include <Standard_Stream.hxx>
#include "GEOM_ICurvesOperations_i.hh" #include "GEOM_ICurvesOperations_i.hh"

2
src/GEOM_I/GEOM_IGroupOperations_i.cc
View File

@ -1,4 +1,4 @@
using namespace std; #include <Standard_Stream.hxx>
#include "GEOM_IGroupOperations_i.hh" #include "GEOM_IGroupOperations_i.hh"

3
src/GEOM_I/GEOM_IHealingOperations_i.cc
View File

@ -1,5 +1,6 @@
#include <Standard_Stream.hxx>
#include <list> #include <list>
using namespace std;
#include "GEOM_IHealingOperations_i.hh" #include "GEOM_IHealingOperations_i.hh"
#include "GEOM_Engine.hxx" #include "GEOM_Engine.hxx"

6
src/GEOM_I/GEOM_IInsertOperations_i.cc
View File

@ -1,4 +1,8 @@
using namespace std; #ifdef WNT
#pragma warning( disable:4786 )
#endif
#include <Standard_Stream.hxx>
#include "GEOM_IInsertOperations_i.hh" #include "GEOM_IInsertOperations_i.hh"

2
src/GEOM_I/GEOM_ILocalOperations_i.cc
View File

@ -1,4 +1,4 @@
using namespace std; #include <Standard_Stream.hxx>
#include "GEOM_ILocalOperations_i.hh" #include "GEOM_ILocalOperations_i.hh"

2
src/GEOM_I/GEOM_IMeasureOperations_i.cc
View File

@ -1,4 +1,4 @@
using namespace std; #include <Standard_Stream.hxx>
#include "GEOM_IMeasureOperations_i.hh" #include "GEOM_IMeasureOperations_i.hh"

4
src/GEOM_I/GEOM_IOperations_i.cc
View File

@ -1,4 +1,4 @@
using namespace std; #include <Standard_Stream.hxx>
#include "GEOM_IOperations_i.hh" #include "GEOM_IOperations_i.hh"
@ -20,7 +20,9 @@ using namespace std;
//============================================================================= //=============================================================================
GEOM_IOperations_i::GEOM_IOperations_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, ::GEOM_IOperations* theImpl) GEOM_IOperations_i::GEOM_IOperations_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, ::GEOM_IOperations* theImpl)
#ifndef WNT
:SALOME::GenericObj_i( thePOA ), _impl(theImpl), _engine(theEngine) :SALOME::GenericObj_i( thePOA ), _impl(theImpl), _engine(theEngine)
#endif
{ {
thePOA->activate_object(this); thePOA->activate_object(this);
} }

2
src/GEOM_I/GEOM_IShapesOperations_i.cc
View File

@ -1,4 +1,4 @@
using namespace std; #include <Standard_Stream.hxx>
#include "GEOM_IShapesOperations_i.hh" #include "GEOM_IShapesOperations_i.hh"

50
src/GEOM_I/GEOM_IShapesOperations_i.hh
View File

@ -27,10 +27,10 @@ class GEOM_IShapesOperations_i :
GEOM::GEOM_Object_ptr MakeWire (const GEOM::ListOfGO& theEdgesAndWires); GEOM::GEOM_Object_ptr MakeWire (const GEOM::ListOfGO& theEdgesAndWires);
GEOM::GEOM_Object_ptr MakeFace (GEOM::GEOM_Object_ptr theWire, GEOM::GEOM_Object_ptr MakeFace (GEOM::GEOM_Object_ptr theWire,
const CORBA::Boolean isPlanarWanted); CORBA::Boolean isPlanarWanted);
GEOM::GEOM_Object_ptr MakeFaceWires (const GEOM::ListOfGO& theWires, GEOM::GEOM_Object_ptr MakeFaceWires (const GEOM::ListOfGO& theWires,
const CORBA::Boolean isPlanarWanted); CORBA::Boolean isPlanarWanted);
GEOM::GEOM_Object_ptr MakeShell (const GEOM::ListOfGO& theFacesAndShells); GEOM::GEOM_Object_ptr MakeShell (const GEOM::ListOfGO& theFacesAndShells);
@ -41,18 +41,18 @@ class GEOM_IShapesOperations_i :
GEOM::GEOM_Object_ptr MakeCompound (const GEOM::ListOfGO& theShapes); GEOM::GEOM_Object_ptr MakeCompound (const GEOM::ListOfGO& theShapes);
GEOM::GEOM_Object_ptr MakeGlueFaces (GEOM::GEOM_Object_ptr theShape, GEOM::GEOM_Object_ptr MakeGlueFaces (GEOM::GEOM_Object_ptr theShape,
const CORBA::Double theTolerance); CORBA::Double theTolerance);
GEOM::ListOfGO* MakeExplode (GEOM::GEOM_Object_ptr theShape, GEOM::ListOfGO* MakeExplode (GEOM::GEOM_Object_ptr theShape,
const CORBA::Long theShapeType, CORBA::Long theShapeType,
const CORBA::Boolean isSorted); CORBA::Boolean isSorted);
GEOM::ListOfLong* SubShapeAllIDs (GEOM::GEOM_Object_ptr theShape, GEOM::ListOfLong* SubShapeAllIDs (GEOM::GEOM_Object_ptr theShape,
const CORBA::Long theShapeType, CORBA::Long theShapeType,
const CORBA::Boolean isSorted); CORBA::Boolean isSorted);
GEOM::GEOM_Object_ptr GetSubShape (GEOM::GEOM_Object_ptr theMainShape, GEOM::GEOM_Object_ptr GetSubShape (GEOM::GEOM_Object_ptr theMainShape,
const CORBA::Long theID); CORBA::Long theID);
CORBA::Long NumberOfFaces (GEOM::GEOM_Object_ptr theShape); CORBA::Long NumberOfFaces (GEOM::GEOM_Object_ptr theShape);
CORBA::Long NumberOfEdges (GEOM::GEOM_Object_ptr theShape); CORBA::Long NumberOfEdges (GEOM::GEOM_Object_ptr theShape);
@ -63,41 +63,41 @@ class GEOM_IShapesOperations_i :
GEOM::ListOfGO* GetSharedShapes (GEOM::GEOM_Object_ptr theShape1, GEOM::ListOfGO* GetSharedShapes (GEOM::GEOM_Object_ptr theShape1,
GEOM::GEOM_Object_ptr theShape2, GEOM::GEOM_Object_ptr theShape2,
const CORBA::Long theShapeType); CORBA::Long theShapeType);
GEOM::ListOfGO* GetShapesOnPlane (GEOM::GEOM_Object_ptr theShape, GEOM::ListOfGO* GetShapesOnPlane (GEOM::GEOM_Object_ptr theShape,
const CORBA::Long theShapeType, CORBA::Long theShapeType,
GEOM::GEOM_Object_ptr theAx1, GEOM::GEOM_Object_ptr theAx1,
const GEOM::shape_state theState); GEOM::shape_state theState);
GEOM::ListOfGO* GetShapesOnCylinder (GEOM::GEOM_Object_ptr theShape, GEOM::ListOfGO* GetShapesOnCylinder (GEOM::GEOM_Object_ptr theShape,
const CORBA::Long theShapeType, CORBA::Long theShapeType,
GEOM::GEOM_Object_ptr theAxis, GEOM::GEOM_Object_ptr theAxis,
const CORBA::Double theRadius, CORBA::Double theRadius,
const GEOM::shape_state theState); GEOM::shape_state theState);
GEOM::ListOfGO* GetShapesOnSphere (GEOM::GEOM_Object_ptr theShape, GEOM::ListOfGO* GetShapesOnSphere (GEOM::GEOM_Object_ptr theShape,
const CORBA::Long theShapeType, CORBA::Long theShapeType,
GEOM::GEOM_Object_ptr theCenter, GEOM::GEOM_Object_ptr theCenter,
const CORBA::Double theRadius, CORBA::Double theRadius,
const GEOM::shape_state theState); GEOM::shape_state theState);
GEOM::ListOfLong* GetShapesOnPlaneIDs (GEOM::GEOM_Object_ptr theShape, GEOM::ListOfLong* GetShapesOnPlaneIDs (GEOM::GEOM_Object_ptr theShape,
const CORBA::Long theShapeType, CORBA::Long theShapeType,
GEOM::GEOM_Object_ptr theAx1, GEOM::GEOM_Object_ptr theAx1,
const GEOM::shape_state theState); GEOM::shape_state theState);
GEOM::ListOfLong* GetShapesOnCylinderIDs (GEOM::GEOM_Object_ptr theShape, GEOM::ListOfLong* GetShapesOnCylinderIDs (GEOM::GEOM_Object_ptr theShape,
const CORBA::Long theShapeType, CORBA::Long theShapeType,
GEOM::GEOM_Object_ptr theAxis, GEOM::GEOM_Object_ptr theAxis,
const CORBA::Double theRadius, CORBA::Double theRadius,
const GEOM::shape_state theState); GEOM::shape_state theState);
GEOM::ListOfLong* GetShapesOnSphereIDs (GEOM::GEOM_Object_ptr theShape, GEOM::ListOfLong* GetShapesOnSphereIDs (GEOM::GEOM_Object_ptr theShape,
const CORBA::Long theShapeType, CORBA::Long theShapeType,
GEOM::GEOM_Object_ptr theCenter, GEOM::GEOM_Object_ptr theCenter,
const CORBA::Double theRadius, CORBA::Double theRadius,
const GEOM::shape_state theState); GEOM::shape_state theState);
GEOM::GEOM_Object_ptr GetInPlace (GEOM::GEOM_Object_ptr theShapeWhere, GEOM::GEOM_Object_ptr GetInPlace (GEOM::GEOM_Object_ptr theShapeWhere,
GEOM::GEOM_Object_ptr theShapeWhat); GEOM::GEOM_Object_ptr theShapeWhat);

2
src/GEOM_I/GEOM_ITransformOperations_i.cc
View File

@ -1,4 +1,4 @@
using namespace std; #include <Standard_Stream.hxx>
#include "GEOM_ITransformOperations_i.hh" #include "GEOM_ITransformOperations_i.hh"

28
src/GEOM_I/GEOM_Object_i.cc
View File

@ -1,24 +1,28 @@
using namespace std; #include <Standard_OStream.hxx>
#include "GEOM_Object_i.hh" #include <GEOM_Object_i.hh>
//#include "GEOM_Gen_i.hh" //#include <GEOM_Gen_i.hh>
#include "GEOM_ISubShape.hxx" #include <GEOM_ISubShape.hxx>
#include "GEOMImpl_Types.hxx" #include <GEOMImpl_Types.hxx>
#include "utilities.h" #include "utilities.h"
#include "OpUtil.hxx" #include <fstream>
#include "Utils_ExceptHandlers.hxx" #include <strstream>
#include <OpUtil.hxx>
#include <Utils_ExceptHandlers.hxx>
#include <TDF_Tool.hxx> #include <TDF_Tool.hxx>
#include <TDF_Label.hxx> #include <TDF_Label.hxx>
#include <TCollection_AsciiString.hxx> #include <TCollection_AsciiString.hxx>
#include <fstream.h>
#include <strstream>
#include <BRepTools_ShapeSet.hxx> #include <BRepTools_ShapeSet.hxx>
#include <BRepTools.hxx> #include <BRepTools.hxx>
#include <TopAbs.hxx> #include <TopAbs.hxx>
#ifdef WNT
#pragma warning( disable:4786 )
#endif
//============================================================================= //=============================================================================
/*! /*!
* constructor: * constructor:
@ -27,7 +31,9 @@ using namespace std;
GEOM_Object_i::GEOM_Object_i (PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, GEOM_Object_i::GEOM_Object_i (PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine,
Handle(GEOM_Object) theImpl) Handle(GEOM_Object) theImpl)
:SALOME::GenericObj_i( thePOA ), _engine(theEngine), _impl(theImpl) #ifndef WNT
: SALOME::GenericObj_i( thePOA ), _engine(theEngine), _impl(theImpl)
#endif
{ {
thePOA->activate_object(this); thePOA->activate_object(this);
} }