-formatlist:SALOME_GEOM
-
+formatlist:SALOME_GEOM|BinOcaf
+!
+! SALOME_GEOM format
+!
SALOME_GEOM.Description: GEOM Document Version 1.0
SALOME_GEOM.FileExtension: sgd
SALOME_GEOM.StoragePlugin: ad696000-5b34-11d1-b5ba-00a0c9064368
SALOME_GEOMSchema: ad696002-5b34-11d1-b5ba-00a0c9064368
SALOME_GEOM.AttributeStoragePlugin: 47b0b826-d931-11d1-b5da-00a0c9064368
SALOME_GEOM.AttributeRetrievalPlugin: 47b0b827-d931-11d1-b5da-00a0c9064368
-
+!
+! BinOcaf format
+!
+BinOcaf.Description: Bin Ocaf Document Version 1.0
+BinOcaf.FileExtension: cbf
+BinOcaf.StoragePlugin: 03a56835-8269-11d5-aab2-0050044b1af1
+BinOcaf.RetrievalPlugin: 03a56836-8269-11d5-aab2-0050044b1af1
ad696000-5b34-11d1-b5ba-00a0c9064368.Location: @CAS_STDPLUGIN@
ad696001-5b34-11d1-b5ba-00a0c9064368.Location: @CAS_STDPLUGIN@
ad696002-5b34-11d1-b5ba-00a0c9064368.Location: @CAS_STDPLUGIN@
+!
+! BinOcaf Document Plugin
+!
+03a56835-8269-11d5-aab2-0050044b1af1.Location: @CAS_BINPLUGIN@
+03a56836-8269-11d5-aab2-0050044b1af1.Location: @CAS_BINPLUGIN@
#include <TopoDS_Shape.hxx>
#include <Geom_Plane.hxx>
-class Handle(Geom_RectangularTrimmedSurface);
+#include <Geom_RectangularTrimmedSurface.hxx>
class VolumeSection{
// Constructeur effectuant le maillage de peau de la shape
Standard_EXPORT VolumeSection(TopoDS_Shape , Standard_Real);
- //Methode qui affecte \80 un point,les coordonn\89es de centre de la boite englobante de la shape
+ //Methode qui affecte � un point,les coordonn�es de centre de la boite englobante de la shape
Standard_EXPORT void CenterOfGravity();
// Methode qui calcule le volume sous un plan Z = h
// Methode qui resout l'equation V(h)=constante
Standard_EXPORT Standard_Real Archimede(Standard_Real , Standard_Real);
- // Methode permettant de "setter" un plan afin de l'utiliser \80 l'interieur de la classe
+ // Methode permettant de "setter" un plan afin de l'utiliser � l'interieur de la classe
Standard_EXPORT void SetPlane(Handle (Geom_Plane));
- // Methode permettant de r\89cup\89rer la shape modifi\89e \80 l'ext\89rieur de la classe
+ // Methode permettant de r�cup�rer la shape modifi�e � l'ext�rieur de la classe
Standard_EXPORT TopoDS_Shape GetShape();
// Methode effectuant la rotation du plan et de la shape
// Methode effectuant la rotation inverse du plan et de la shape
Standard_EXPORT Handle (Geom_RectangularTrimmedSurface) InvMakeRotation(gp_Dir,Handle(Geom_RectangularTrimmedSurface));
- // Methode permettant de d\89couper le plan selon une projection de la Shape
+ // Methode permettant de d�couper le plan selon une projection de la Shape
Standard_EXPORT Handle (Geom_RectangularTrimmedSurface) TrimSurf();
- // Methode permmettant de deplacer le plan jusqu'a la position donn\89e par Archim\88de
+ // Methode permmettant de deplacer le plan jusqu'a la position donn�e par Archim�de
Standard_EXPORT Handle (Geom_RectangularTrimmedSurface) AjustePlan(Handle(Geom_RectangularTrimmedSurface),Standard_Real,gp_Pnt);
Standard_EXPORT void getZ( double& min, double& max);
#include <TopoDS_Shape.hxx>
#include <TopoDS_Edge.hxx>
-#include <TFunction_Logbook.hxx>
#include <StdFail_NotDone.hxx>
#include <TopExp.hxx>
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer AdvancedEngine_DividedDiskDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer AdvancedEngine_DividedDiskDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver);
// Methods PUBLIC
//
AdvancedEngine_DividedDiskDriver();
- virtual Standard_Integer Execute(TFunction_Logbook& log) const;
- virtual void Validate(TFunction_Logbook&) const {}
- Standard_Boolean MustExecute(const TFunction_Logbook&) const
- {
- return Standard_True;
- }
+ virtual Standard_Integer Execute(LOGBOOK& log) const;
+ virtual void Validate(LOGBOOK&) const {}
+ Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
static const Standard_GUID& GetID();
~AdvancedEngine_DividedDiskDriver() {};
TopoDS_Shell MakeDiskHexagon (double R, double Ratio) const;
TopoDS_Shape MakeDiskSquare (double R, double Ratio) const;
- DEFINE_STANDARD_RTTI( AdvancedEngine_DividedDiskDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver)
};
#endif // _AdvancedEngine_DividedDiskDriver_HXX
#include <OpUtil.hxx>
#include <Utils_ExceptHandlers.hxx>
-#include "GEOM_Function.hxx"
-#include "GEOM_PythonDump.hxx"
-#include "GEOMUtils.hxx"
-#include "GEOMAlgo_ClsfSurf.hxx"
-#include "GEOMAlgo_FinderShapeOn2.hxx"
-#include "GEOMAlgo_Splitter.hxx"
-
-#include "GEOMImpl_Gen.hxx"
-#include "GEOMImpl_Types.hxx"
-
-#include "GEOMImpl_IBasicOperations.hxx"
-#include "GEOMImpl_IBooleanOperations.hxx"
-#include "GEOMImpl_IShapesOperations.hxx"
-#include "GEOMImpl_ITransformOperations.hxx"
-#include "GEOMImpl_IBlocksOperations.hxx"
-#include "GEOMImpl_I3DPrimOperations.hxx"
-#include "GEOMImpl_ILocalOperations.hxx"
-#include "GEOMImpl_IHealingOperations.hxx"
-#include "GEOMImpl_IGroupOperations.hxx"
-#include "GEOMImpl_GlueDriver.hxx"
+#include <GEOM_Function.hxx>
+#include <GEOM_PythonDump.hxx>
+#include <GEOMUtils.hxx>
+#include <GEOMAlgo_ClsfSurf.hxx>
+#include <GEOMAlgo_FinderShapeOn2.hxx>
+#include <GEOMAlgo_Splitter.hxx>
+
+#include <GEOMImpl_Gen.hxx>
+#include <GEOMImpl_Types.hxx>
+
+#include <GEOMImpl_IBasicOperations.hxx>
+#include <GEOMImpl_IBooleanOperations.hxx>
+#include <GEOMImpl_IShapesOperations.hxx>
+#include <GEOMImpl_ITransformOperations.hxx>
+#include <GEOMImpl_IBlocksOperations.hxx>
+#include <GEOMImpl_I3DPrimOperations.hxx>
+#include <GEOMImpl_ILocalOperations.hxx>
+#include <GEOMImpl_IHealingOperations.hxx>
+#include <GEOMImpl_IGroupOperations.hxx>
+#include <GEOMImpl_GlueDriver.hxx>
#include <TDF_Tool.hxx>
#include <TFunction_DriverTable.hxx>
#include <TFunction_Driver.hxx>
-#include <TFunction_Logbook.hxx>
#include <TNaming_CopyShape.hxx>
#include <TopExp.hxx>
//=============================================================================
bool AdvancedEngine_IOperations::GetFacesOnSurf
(const TopoDS_Shape &theShape,
- const Handle_Geom_Surface& theSurface,
+ const Handle(Geom_Surface)& theSurface,
const Standard_Real theTolerance,
TopTools_ListOfShape &theFaces)
{
#include "GEOM_Engine.hxx"
#include "GEOM_Object.hxx"
+#include <TopTools_ListOfShape.hxx>
+#include <Geom_Surface.hxx>
+
#include <list>
#include <gp_Ax2.hxx>
class GEOMImpl_ILocalOperations;
class GEOMImpl_IHealingOperations;
class GEOMImpl_IGroupOperations;
-class Handle_Geom_Surface;
-class TopTools_ListOfShape;
class ADVANCEDENGINE_EXPORT AdvancedEngine_IOperations: public GEOM_IOperations
{
gp_Trsf aTrsf);
bool GetFacesOnSurf(const TopoDS_Shape &theShape,
- const Handle_Geom_Surface& theSurface,
+ const Handle(Geom_Surface)& theSurface,
const Standard_Real theTolerance,
TopTools_ListOfShape &theFaces);
#include <gp_Pln.hxx>
#include <gp_Dir.hxx>
#include <gp_Trsf.hxx>
-#include <TFunction_Logbook.hxx>
#include <StdFail_NotDone.hxx>
#include <BRepPrimAPI_MakeCone.hxx>
#include <BRepPrimAPI_MakeCylinder.hxx>
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer AdvancedEngine_PipeTShapeDriver::Execute (TFunction_Logbook& log) const
+Standard_Integer AdvancedEngine_PipeTShapeDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver);
// Methods PUBLIC
//
AdvancedEngine_PipeTShapeDriver();
- virtual Standard_Integer Execute(TFunction_Logbook& log) const;
- virtual void Validate(TFunction_Logbook&) const {}
- Standard_Boolean MustExecute(const TFunction_Logbook&) const
- {
- return Standard_True;
- }
+ virtual Standard_Integer Execute(LOGBOOK& log) const;
+ virtual void Validate(LOGBOOK&) const {}
+ Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
static const Standard_GUID& GetID();
~AdvancedEngine_PipeTShapeDriver() {};
std::vector<GEOM_Param>& params);
// Type management
//
-DEFINE_STANDARD_RTTI( AdvancedEngine_PipeTShapeDriver )
-
+ OCCT_DEFINE_STANDARD_RTTIEXT(AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver)
private:
/*!
#include "GEOM_Function.hxx"
-#include <TFunction_Logbook.hxx>
#include <StdFail_NotDone.hxx>
#include <TopoDS_Vertex.hxx>
//purpose :
//=======================================================================
TopoDS_Shape AdvancedEngine_SmoothingSurfaceDriver::MakeSmoothingSurfaceUnClosed
- (const Handle_TColgp_HArray1OfPnt &theListOfPoints,
+ (const Handle(TColgp_HArray1OfPnt) &theListOfPoints,
const Standard_Integer theNbMax,
const Standard_Integer theDegMax,
const Standard_Real theDMax) const
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer AdvancedEngine_SmoothingSurfaceDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer AdvancedEngine_SmoothingSurfaceDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver);
#include "GEOM_BaseDriver.hxx"
-#include <TFunction_Logbook.hxx>
#include <TColgp_HArray1OfPnt.hxx>
#include <TopoDS_Shape.hxx>
// Methods PUBLIC
//
AdvancedEngine_SmoothingSurfaceDriver();
- virtual Standard_Integer Execute(TFunction_Logbook& log) const;
- virtual void Validate(TFunction_Logbook&) const {}
- Standard_Boolean MustExecute(const TFunction_Logbook&) const
- {
- return Standard_True;
- }
+ virtual Standard_Integer Execute(LOGBOOK& log) const;
+ virtual void Validate(LOGBOOK&) const {}
+ Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
static const Standard_GUID& GetID();
~AdvancedEngine_SmoothingSurfaceDriver() {};
std::vector<GEOM_Param>& params);
// Type management
//
-DEFINE_STANDARD_RTTI( AdvancedEngine_SmoothingSurfaceDriver )
-
+ OCCT_DEFINE_STANDARD_RTTIEXT(AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver)
private:
TopoDS_Shape MakeSmoothingSurfaceUnClosed
- (const Handle_TColgp_HArray1OfPnt &theListOfPoints,
+ (const Handle(TColgp_HArray1OfPnt) &theListOfPoints,
const Standard_Integer theNbMax,
const Standard_Integer theDegMax,
const Standard_Real theDMax) const;
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer BREPPlugin_ExportDriver::Execute( TFunction_Logbook& log ) const
+Standard_Integer BREPPlugin_ExportDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
return 1;
}
-//=======================================================================
-//function : MustExecute
-//purpose :
-//=======================================================================
-Standard_Boolean BREPPlugin_ExportDriver::MustExecute( const TFunction_Logbook& ) const
-{
- return Standard_True;
-}
-
//================================================================================
/*!
* \brief Returns a name of creation operation and names and values of creation parameters
return false;
}
-IMPLEMENT_STANDARD_HANDLE( BREPPlugin_ExportDriver,GEOM_BaseDriver );
-IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ExportDriver,GEOM_BaseDriver );
+OCCT_IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ExportDriver,GEOM_BaseDriver );
// GEOM includes
#include "GEOM_BaseDriver.hxx"
-// OCCT includes
-#include <TFunction_Logbook.hxx>
-
DEFINE_STANDARD_HANDLE( BREPPlugin_ExportDriver, GEOM_BaseDriver );
class BREPPlugin_ExportDriver : public GEOM_BaseDriver
~BREPPlugin_ExportDriver() {};
static const Standard_GUID& GetID();
- virtual Standard_Integer Execute( TFunction_Logbook& log ) const;
- Standard_Boolean MustExecute( const TFunction_Logbook& ) const;
- virtual void Validate( TFunction_Logbook& ) const {}
+ virtual Standard_Integer Execute(LOGBOOK& log) const;
+ virtual void Validate(LOGBOOK&) const {}
+ Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
virtual bool GetCreationInformation( std::string& theOperationName,
std::vector<GEOM_Param>& params );
-DEFINE_STANDARD_RTTI( BREPPlugin_ExportDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(BREPPlugin_ExportDriver,GEOM_BaseDriver)
};
#endif // _BREPPlugin_ExportDriver_HXX
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer BREPPlugin_ImportDriver::Execute( TFunction_Logbook& log ) const
+Standard_Integer BREPPlugin_ImportDriver::Execute(LOGBOOK& log) const
{
if( Label().IsNull() ) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
aFunction->SetValue( aShape );
- log.SetTouched( Label() );
+#if OCC_VERSION_MAJOR < 7
+ log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
-//=======================================================================
-//function : MustExecute
-//purpose :
-//=======================================================================
-Standard_Boolean BREPPlugin_ImportDriver::MustExecute( const TFunction_Logbook& ) const
-{
- return Standard_True;
-}
-
//================================================================================
/*!
* \brief Returns a name of creation operation and names and values of creation parameters
return true;
}
-IMPLEMENT_STANDARD_HANDLE( BREPPlugin_ImportDriver, GEOM_BaseDriver );
-IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ImportDriver, GEOM_BaseDriver );
+OCCT_IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ImportDriver, GEOM_BaseDriver );
// GEOM includes
#include "GEOM_BaseDriver.hxx"
-// OCCT includes
-#include <TFunction_Logbook.hxx>
-
DEFINE_STANDARD_HANDLE( BREPPlugin_ImportDriver, GEOM_BaseDriver );
class BREPPlugin_ImportDriver : public GEOM_BaseDriver
~BREPPlugin_ImportDriver() {};
static const Standard_GUID& GetID();
- virtual Standard_Integer Execute( TFunction_Logbook& log ) const;
- Standard_Boolean MustExecute( const TFunction_Logbook& ) const;
- virtual void Validate( TFunction_Logbook& ) const {}
+ virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; }
+ virtual void Validate( LOGBOOK& ) const {}
virtual bool GetCreationInformation( std::string& theOperationName,
- std::vector<GEOM_Param>& params );
+ std::vector<GEOM_Param>& params );
-DEFINE_STANDARD_RTTI( BREPPlugin_ImportDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(BREPPlugin_ImportDriver,GEOM_BaseDriver)
};
#endif // _BREPPlugin_ImportDriver_HXX
#include <Precision.hxx>
-IMPLEMENT_STANDARD_HANDLE(BlockFix_BlockFixAPI, MMgt_TShared);
-IMPLEMENT_STANDARD_RTTIEXT(BlockFix_BlockFixAPI, MMgt_TShared);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(BlockFix_BlockFixAPI, MMgt_TShared);
//=======================================================================
//function : BlockFix_BlockFixAPI
#include <Standard.hxx>
#include <Standard_DefineHandle.hxx>
-#include <Handle_ShapeBuild_ReShape.hxx>
+#include <ShapeBuild_ReShape.hxx>
#include <TopoDS_Shape.hxx>
#include <Standard_Real.hxx>
#include <MMgt_TShared.hxx>
+#include <Basics_OCCTVersion.hxx>
+
DEFINE_STANDARD_HANDLE(BlockFix_BlockFixAPI, MMgt_TShared);
class BlockFix_BlockFixAPI : public MMgt_TShared
void SetShape(const TopoDS_Shape& Shape);
TopoDS_Shape Shape() const;
- Handle_ShapeBuild_ReShape& Context();
+ Handle(ShapeBuild_ReShape)& Context();
Standard_Real& Tolerance();
Standard_Integer& OptimumNbFaces();
Standard_EXPORT void Perform();
- DEFINE_STANDARD_RTTI(BlockFix_BlockFixAPI);
+ OCCT_DEFINE_STANDARD_RTTIEXT(BlockFix_BlockFixAPI,MMgt_TShared)
private:
- Handle_ShapeBuild_ReShape myContext;
+ Handle(ShapeBuild_ReShape) myContext;
TopoDS_Shape myShape;
Standard_Real myTolerance;
Standard_Integer myOptimumNbFaces;
#include <TopoDS_Edge.hxx>
#include <TopoDS_Face.hxx>
#include <TopoDS_Solid.hxx>
-#include <TopoDS_Shape.hxx>
#include <TopoDS_Vertex.hxx>
#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
#include <TopTools_IndexedMapOfShape.hxx>
#include <TopTools_MapOfShape.hxx>
-#include <TopTools_ListOfShape.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
//=======================================================================
#include <Standard_Boolean.hxx>
#include <Standard_Integer.hxx>
#include <TopTools_SequenceOfShape.hxx>
+#include <TopTools_ListOfShape.hxx>
#include <Standard_OStream.hxx>
-class TopoDS_Shape;
-class TopTools_ListOfShape;
-
#include <Standard.hxx>
#include <Standard_Macro.hxx>
#include <gp_Pnt.hxx>
-IMPLEMENT_STANDARD_HANDLE(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification);
-IMPLEMENT_STANDARD_RTTIEXT(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification);
//=======================================================================
//function : BlockFix_PeriodicSurfaceModifier()
#include <TColStd_IndexedMapOfTransient.hxx>
#include <BRepTools_Modification.hxx>
#include <Standard_Boolean.hxx>
-#include <Handle_Geom_Surface.hxx>
-#include <Handle_Geom_Curve.hxx>
-#include <Handle_Geom2d_Curve.hxx>
#include <GeomAbs_Shape.hxx>
+#include <Basics_OCCTVersion.hxx>
+
+class TopoDS_Vertex;
+class TopoDS_Edge;
class TopoDS_Face;
-class Geom_Surface;
class TopLoc_Location;
-class TopoDS_Edge;
+class Geom_Surface;
class Geom_Curve;
-class TopoDS_Vertex;
-class gp_Pnt;
class Geom2d_Curve;
+class gp_Pnt;
DEFINE_STANDARD_HANDLE(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification);
const TopoDS_Face& NewF1,
const TopoDS_Face& NewF2);
- DEFINE_STANDARD_RTTI(BlockFix_PeriodicSurfaceModifier);
+ OCCT_DEFINE_STANDARD_RTTIEXT(BlockFix_PeriodicSurfaceModifier,BRepTools_Modification)
private:
Standard_Real myTolerance;
#include <gp_Pnt.hxx>
#include <gp_Sphere.hxx>
-IMPLEMENT_STANDARD_HANDLE(BlockFix_SphereSpaceModifier, BRepTools_Modification);
-IMPLEMENT_STANDARD_RTTIEXT(BlockFix_SphereSpaceModifier, BRepTools_Modification);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(BlockFix_SphereSpaceModifier, BRepTools_Modification);
//=======================================================================
//function : BlockFix_SphereSpaceModifier
#include <TColStd_IndexedMapOfTransient.hxx>
#include <BRepTools_Modification.hxx>
#include <Standard_Boolean.hxx>
-#include <Handle_Geom_Surface.hxx>
-#include <Handle_Geom_Curve.hxx>
-#include <Handle_Geom2d_Curve.hxx>
#include <GeomAbs_Shape.hxx>
+#include <Basics_OCCTVersion.hxx>
+
+class TopoDS_Vertex;
+class TopoDS_Edge;
class TopoDS_Face;
-class Geom_Surface;
class TopLoc_Location;
-class TopoDS_Edge;
+class Geom_Surface;
class Geom_Curve;
-class TopoDS_Vertex;
-class gp_Pnt;
class Geom2d_Curve;
+class gp_Pnt;
DEFINE_STANDARD_HANDLE(BlockFix_SphereSpaceModifier, BRepTools_Modification);
const TopoDS_Face& NewF1, const TopoDS_Face& NewF2);
Standard_EXPORT Standard_Boolean ForRotation (const TopoDS_Face& F);
- DEFINE_STANDARD_RTTI(BlockFix_SphereSpaceModifier);
+ OCCT_DEFINE_STANDARD_RTTIEXT(BlockFix_SphereSpaceModifier,BRepTools_Modification)
private:
Standard_Real myTolerance;
private:
Standard_Real myTolerance;
- Handle_ShapeBuild_ReShape myContext;
+ Handle(ShapeBuild_ReShape) myContext;
};
#include <TopoDS_Wire.hxx>
#include <Prs3d_PointAspect.hxx>
-#include <Handle_Prs3d_PointAspect.hxx>
#include <iostream>
#define DEBTRACE(msg) {std::cerr<<std::flush<<__FILE__<<" ["<<__LINE__<<"] : "<<msg<<std::endl<<std::flush;}
struct CurveCreator_Section;
class CurveCreator_Displayer;
class AIS_Shape;
-class Handle_AIS_InteractiveObject;
+class AIS_InteractiveObject;
/**
* The CurveCreator_Curve object is represented as one or more sets of
/**
* Get the curve AIS object
*/
- virtual Handle_AIS_InteractiveObject getAISObject( const bool theNeedToBuild = false ) const;
+ virtual Handle(AIS_InteractiveObject) getAISObject( const bool theNeedToBuild = false ) const;
protected:
/**
#include "CurveCreator_Displayer.hxx"
-CurveCreator_Displayer::CurveCreator_Displayer( Handle_AIS_InteractiveContext theContext,
+CurveCreator_Displayer::CurveCreator_Displayer( Handle(AIS_InteractiveContext) theContext,
const int theZLayer ) :
myContext( theContext ), myZLayer( theZLayer )
{
typedef std::vector<Handle_AIS_InteractiveObject> AISObjectsList;
public:
- CurveCreator_Displayer( Handle_AIS_InteractiveContext theContext,
+ CurveCreator_Displayer( Handle(AIS_InteractiveContext) theContext,
const int theZLayer = -1 );
~CurveCreator_Displayer(void);
- void display( const Handle_AIS_InteractiveObject& theObject, bool isUpdate );
+ void display( const Handle(AIS_InteractiveObject)& theObject, bool isUpdate );
void eraseAll( bool isUpdate );
//void highlight( const AISObjectsList& theObjects, bool isHL );
Quantity_Color getActiveColor( bool isHL );
private:
- Handle_AIS_InteractiveContext myContext;
+ Handle(AIS_InteractiveContext) myContext;
AISObjectsList myObjects;
int myZLayer;
};
#include "CurveCreator_Macro.hxx"
#include <TColgp_HArray1OfPnt.hxx>
+#include <AIS_InteractiveObject.hxx>
#include <deque>
#include <vector>
#include <string>
#include <list>
-class Handle_AIS_InteractiveObject;
-
namespace CurveCreator
{
//! Type of the section
/*** Presentation methods ***/
/***********************************************/
- virtual Handle_AIS_InteractiveObject getAISObject( const bool theNeedToBuild = false ) const = 0;
+ virtual Handle(AIS_InteractiveObject) getAISObject( const bool theNeedToBuild = false ) const = 0;
protected:
virtual void constructAISObject() = 0;
//ASL: we switch off automatic highlight to improve performance of selection
theContext->SetAutomaticHilight( Standard_False );
- Handle_SelectMgr_Selection aSelection = anAISShape->Selection( AIS_Shape::SelectionMode( TopAbs_VERTEX ) );
+ Handle(SelectMgr_Selection) aSelection = anAISShape->Selection( AIS_Shape::SelectionMode( TopAbs_VERTEX ) );
for( aSelection->Init(); aSelection->More(); aSelection->Next() )
{
#if OCC_VERSION_LARGE > 0x06080100
const Handle(SelectMgr_SensitiveEntity) aHSenEntity = aSelection->Sensitive();
if( aHSenEntity.IsNull() )
continue;
- Handle_SelectBasics_SensitiveEntity aSenEntity = aHSenEntity->BaseSensitive();
+ Handle(SelectBasics_SensitiveEntity) aSenEntity = aHSenEntity->BaseSensitive();
#else
- Handle_SelectBasics_SensitiveEntity aSenEntity = aSelection->Sensitive();
+ Handle(SelectBasics_SensitiveEntity) aSenEntity = aSelection->Sensitive();
#endif
- Handle_Select3D_SensitivePoint aSenPnt = Handle_Select3D_SensitivePoint::DownCast( aSenEntity );
+ Handle(Select3D_SensitivePoint) aSenPnt = Handle(Select3D_SensitivePoint)::DownCast( aSenEntity );
gp_Pnt anOwnerPnt = aSenPnt->Point();
- Handle_SelectMgr_EntityOwner anOwner = Handle_SelectMgr_EntityOwner::DownCast( aSenPnt->OwnerId() );
+ Handle(SelectMgr_EntityOwner) anOwner = Handle(SelectMgr_EntityOwner)::DownCast( aSenPnt->OwnerId() );
CurveCreator_ICurve::SectionToPointList::const_iterator anIt = thePoints.begin(),
// purpose :
//=======================================================================
void CurveCreator_Utils::FindPlane
- (const Handle_TColgp_HArray1OfPnt &thePoints,
+ (const Handle(TColgp_HArray1OfPnt) &thePoints,
gp_Pln &thePlane,
Standard_Integer &thePlnStatus)
{
* \param IsBSpline BSpline flag. Output parameter.
* \return the array of points. Null handle in case of failure.
*/
- static Handle_TColgp_HArray1OfPnt getPoints
+ static Handle(TColgp_HArray1OfPnt) getPoints
(const TopoDS_Shape &theShape,
bool &IsClosed,
bool &IsBSpline);
* \param thePlnStatus the current status on input. It can be modified on
* output.
*/
- static void FindPlane(const Handle_TColgp_HArray1OfPnt &thePoints,
+ static void FindPlane(const Handle(TColgp_HArray1OfPnt) &thePoints,
gp_Pln &thePlane,
Standard_Integer &thePlnStatus);
#include "CurveCreator_Widget.h"
#include "CurveCreator_TreeView.h"
-#include "CurveCreator_ICurve.hxx"
-#include "CurveCreator.hxx"
#include "CurveCreator_NewSectionDlg.h"
#include "CurveCreator_Utils.hxx"
#include "CurveCreator_UtilsICurve.hxx"
#include "CurveCreator.hxx"
#include "CurveCreator_ICurve.hxx"
-#include <QWidget>
-#include <QMap>
-
-#include <OCCViewer_ViewWindow.h>
#include <SUIT_ViewWindow.h>
+#include <OCCViewer_ViewWindow.h>
+
#include <AIS_InteractiveObject.hxx>
#include <AIS_InteractiveContext.hxx>
-
+#include <AIS_ListOfInteractive.hxx>
#include <Geom_Curve.hxx>
#include <V3d_View.hxx>
#include <gp_Pnt.hxx>
-#include <TopoDS_Vertex.hxx> // TODO - remove
+
+#include <QWidget>
+#include <QMap>
+
+class CurveCreator_TableView;
+class CurveCreator_TreeView;
+class CurveCreator_NewSectionDlg;
class OCCViewer_Viewer;
class OCCViewer_ViewPort3d;
-class AIS_ListOfInteractive;
-
class QAction;
class QPixmap;
-class CurveCreator_TableView;
-class CurveCreator_TreeView;
-class CurveCreator_NewSectionDlg;
class CURVECREATOR_EXPORT CurveCreator_Widget : public QWidget
{
class AIS_Text:public AIS_InteractiveObject
{
public:
- // CASCADE RTTI
- DEFINE_STANDARD_RTTI(AIS_Text );
+ OCCT_DEFINE_STANDARD_RTTIEXT(AIS_Text,AIS_InteractiveObject)
AIS_Text(){};
Graphic3d_VerticalTextAlignment aVJustification;
};
-IMPLEMENT_STANDARD_HANDLE(AIS_Text, AIS_InteractiveObject)
-IMPLEMENT_STANDARD_RTTIEXT(AIS_Text, AIS_InteractiveObject)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(AIS_Text, AIS_InteractiveObject)
AIS_Text::AIS_Text( const TCollection_ExtendedString& text, const gp_Pnt& position,
Quantity_Color color = Quantity_NOC_YELLOW,
aPresentation->Clear();
- Handle_Prs3d_TextAspect asp = myDrawer->TextAspect();
+ Handle(Prs3d_TextAspect) asp = myDrawer->TextAspect();
asp->SetFont(aFont);
asp->SetColor(aColor);
gp_Pnt P(getLastPoint().x,getLastPoint().y,getLastPoint().z);
Handle(Geom_Axis2Placement) anAxis = new Geom_Axis2Placement(P,gp::DZ(),gp::DX());
Handle(AIS_Trihedron) anIO = new AIS_Trihedron(anAxis);
- anIO->SetSelectionMode(selMode);
+ anIO->GetContext()->Activate(anIO, selMode);
SOCC_Prs* aSPrs = dynamic_cast<SOCC_Prs*>
(((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->CreatePrs(0));
P0,
P1,
P2);
- if (anAngleIO == NULL)
+ if (anAngleIO.IsNull())
return;
if (store)
#include <GEOM_Application.hxx>
-#include <TColStd_SequenceOfExtendedString.hxx>
-
-IMPLEMENT_STANDARD_HANDLE (GEOM_Application, TDocStd_Application)
-IMPLEMENT_STANDARD_RTTIEXT(GEOM_Application, TDocStd_Application)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_Application, TDocStd_Application)
//=======================================================================
//function : GEOM_Application
void GEOM_Application::Formats(TColStd_SequenceOfExtendedString& Formats)
{
Formats.Append(TCollection_ExtendedString ("SALOME_GEOM"));
+#if OCC_VERSION_MAJOR > 6
+ Formats.Append(TCollection_ExtendedString ("BinOcaf"));
+#endif
}
#include <TDocStd_Application.hxx>
#include <Standard.hxx>
#include <Standard_DefineHandle.hxx>
+#include <TColStd_SequenceOfExtendedString.hxx>
-class TColStd_SequenceOfExtendedString;
+#include <Basics_OCCTVersion.hxx>
class GEOM_Application : public TDocStd_Application
{
Standard_EXPORT Standard_CString ResourcesName();
public:
- DEFINE_STANDARD_RTTI(GEOM_Application);
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_Application,TDocStd_Application)
};
DEFINE_STANDARD_HANDLE(GEOM_Application, TDocStd_Application)
#include "GEOM_Object.hxx"
#include "GEOM_Engine.hxx"
-#include <TColStd_HArray1OfInteger.hxx>
#include <TDataStd_Name.hxx>
#include <TDocStd_Owner.hxx>
-IMPLEMENT_STANDARD_HANDLE (GEOM_BaseDriver,TFunction_Driver);
-IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver);
//================================================================================
/*!
#ifndef __GEOM_BaseDriver_HXX__
#define __GEOM_BaseDriver_HXX__
+#include "GEOM_Function.hxx"
+
#include <TFunction_Driver.hxx>
+#include <TFunction_Logbook.hxx>
#include <TopAbs_ShapeEnum.hxx>
#include <TopAbs_State.hxx>
+#include <TColStd_HSequenceOfTransient.hxx>
+#include <TColStd_HArray1OfInteger.hxx>
+
+#include <Basics_OCCTVersion.hxx>
#include <string>
#include <vector>
#include <sstream>
-class Handle(GEOM_Function);
-class Handle(TColStd_HSequenceOfTransient);
-class Handle(TColStd_HArray1OfInteger);
+#if OCC_VERSION_MAJOR < 7
+ #define LOGBOOK TFunction_Logbook
+#else
+ #define LOGBOOK Handle(TFunction_Logbook)
+#endif
struct GEOM_Param
{
return params.back();
}
- DEFINE_STANDARD_RTTI (GEOM_BaseDriver)
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver)
};
DEFINE_STANDARD_HANDLE (GEOM_BaseDriver,TFunction_Driver);
#include <TDataStd_UAttribute.hxx>
#include <TDocStd_Document.hxx>
#include <TDocStd_Owner.hxx>
-#include <TFunction_Driver.hxx>
#include <TFunction_DriverTable.hxx>
#include "utilities.h"
return _label.FindChild(FREE_LABEL);
}
-IMPLEMENT_STANDARD_HANDLE (GEOM_BaseObject, Standard_Transient );
-IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseObject, Standard_Transient );
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseObject, Standard_Transient );
#include <TCollection_AsciiString.hxx>
#include <TDF_Label.hxx>
#include <TDataStd_TreeNode.hxx>
+#include <TFunction_Driver.hxx>
#include <vector>
class GEOM_BaseObject;
-class Handle(TFunction_Driver);
class GEOM_Engine;
DEFINE_STANDARD_HANDLE( GEOM_BaseObject, Standard_Transient );
int _docID;
public:
- DEFINE_STANDARD_RTTI( GEOM_BaseObject );
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_BaseObject,Standard_Transient)
};
#endif
#include <TColStd_MapOfTransient.hxx>
#include <TColStd_HSequenceOfInteger.hxx>
-#include <TColStd_HArray1OfByte.hxx>
#include <TColStd_DataMapIteratorOfDataMapOfIntegerTransient.hxx>
#include <Resource_DataMapIteratorOfDataMapOfAsciiStringAsciiString.hxx>
aDoc = Handle(TDocStd_Document)::DownCast(_mapIDDocument(theDocID));
}
else if (force) {
+#if OCC_VERSION_MAJOR > 6
+ _OCAFApp->NewDocument("BinOcaf", aDoc);
+#else
_OCAFApp->NewDocument("SALOME_GEOM", aDoc);
+#endif
aDoc->SetUndoLimit(_UndoLimit);
_mapIDDocument.Bind(theDocID, aDoc);
TDataStd_Integer::Set(aDoc->Main(), theDocID);
return false;
}
+#if OCC_VERSION_MAJOR > 6
+ // Replace old document format by the new one.
+ if (aDoc->StorageFormat().IsEqual("SALOME_GEOM")) {
+ aDoc->ChangeStorageFormat("BinOcaf");
+ }
+#endif
+
aDoc->SetUndoLimit(_UndoLimit);
if(_mapIDDocument.IsBound(theDocID)) _mapIDDocument.UnBind(theDocID);
if (aRefIt != theMapRefs.end()) {
// Recursively publish all references.
std::list< int >::const_iterator aRefTagIt = aRefIt->second.begin();
-
+
for(; aRefTagIt != aRefIt->second.end(); ++aRefTagIt) {
const TCollection_AsciiString aRefCmd = GetPublishCommands
(*aRefTagIt, theEntryToCmdMap, theMapRefs, thePublished);
#include <Resource_DataMapOfAsciiStringAsciiString.hxx>
#include <TDocStd_Document.hxx>
#include <TColStd_HArray1OfInteger.hxx>
+#include <TColStd_HArray1OfByte.hxx>
#include <TColStd_HSequenceOfAsciiString.hxx>
#include <TColStd_MapOfInteger.hxx>
#include <TDF_Label.hxx>
TCollection_AsciiString _pyName;
bool _unpublished;
};
-
-class Handle_TColStd_HArray1OfByte;
struct TVariable{
TCollection_AsciiString myVariable;
//function : getFunctionToSetValues
//purpose : dump any HArray into a string
//=======================================================================
-template< class Handle_HARRAY1 >
-TCollection_AsciiString arrayToSting( const Handle_HARRAY1& ar,
+template< class HandleArray1 >
+TCollection_AsciiString arrayToSting( const HandleArray1& ar,
const char* quote="")
{
TCollection_AsciiString s;
return TDataStd_ExtStringArray::GetID();
}
-IMPLEMENT_STANDARD_HANDLE (GEOM_Field, GEOM_BaseObject );
-IMPLEMENT_STANDARD_RTTIEXT(GEOM_Field, GEOM_BaseObject );
-IMPLEMENT_STANDARD_HANDLE (GEOM_FieldStep, GEOM_BaseObject );
-IMPLEMENT_STANDARD_RTTIEXT(GEOM_FieldStep, GEOM_BaseObject );
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_Field, GEOM_BaseObject );
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_FieldStep, GEOM_BaseObject );
DEFINE_STANDARD_HANDLE( GEOM_Field, GEOM_BaseObject );
DEFINE_STANDARD_HANDLE( GEOM_FieldStep, GEOM_BaseObject );
-
-
class GEOM_Field : public GEOM_BaseObject
{
GEOM_Field(const TDF_Label& theLabel);
// Returns all steps
Standard_EXPORT std::list< Handle(GEOM_FieldStep)> GetSteps();
- DEFINE_STANDARD_RTTI( GEOM_Field );
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_Field,GEOM_BaseObject)
private:
// Returns GUID of CAF data array
const Standard_GUID& GetDataID();
-
-
- DEFINE_STANDARD_RTTI( GEOM_FieldStep );
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_FieldStep,GEOM_BaseObject)
private:
#include <TColStd_ListOfInteger.hxx>
#include <TColStd_ListIteratorOfListOfInteger.hxx>
-#include <TColStd_HArray1OfReal.hxx>
-#include <TColStd_HArray1OfInteger.hxx>
-#include <TColStd_HSequenceOfTransient.hxx>
-#include <TCollection_AsciiString.hxx>
#include <TCollection_ExtendedString.hxx>
#include <cstdlib>
return reinterpret_cast<void*> ( address );
}
-IMPLEMENT_STANDARD_HANDLE (GEOM_Function, Standard_Transient);
-IMPLEMENT_STANDARD_RTTIEXT(GEOM_Function, Standard_Transient );
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_Function, Standard_Transient );
#include <Standard_Transient.hxx>
#include <Standard_GUID.hxx>
#include <TColStd_HArray1OfExtendedString.hxx>
+#include <TColStd_HArray1OfByte.hxx>
+#include <TColStd_HArray1OfReal.hxx>
+#include <TColStd_HArray1OfInteger.hxx>
+#include <TColStd_HSequenceOfTransient.hxx>
#include <TCollection_AsciiString.hxx>
#include <TDF_Label.hxx>
#include <TDF_LabelSequence.hxx>
#include <TDataStd_ListOfExtendedString.hxx>
#include <TopoDS_Shape.hxx>
-class Handle_TColStd_HArray1OfByte;
-class Handle_TColStd_HArray1OfReal;
-class Handle_TColStd_HArray1OfInteger;
-class Handle_TColStd_HSequenceOfTransient;
+#include <Basics_OCCTVersion.hxx>
+
class GEOM_Function;
DEFINE_STANDARD_HANDLE (GEOM_Function, Standard_Transient);
//Returns top label of this function's naming tree
Standard_EXPORT TDF_Label GetNamingEntry (const Standard_Boolean create = Standard_True);
- DEFINE_STANDARD_RTTI (GEOM_Function);
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_Function,Standard_Transient)
private:
return funs;
}
-IMPLEMENT_STANDARD_HANDLE (GEOM_Object, GEOM_BaseObject );
-IMPLEMENT_STANDARD_RTTIEXT(GEOM_Object, GEOM_BaseObject );
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_Object, GEOM_BaseObject );
#include <list>
class GEOM_Object;
-class Handle(TFunction_Driver);
+class TFunction_Driver;
class GEOM_Engine;
DEFINE_STANDARD_HANDLE( GEOM_Object, GEOM_BaseObject );
GetLastFunctions( const std::list< Handle(GEOM_Object) >& theObjects );
public:
- DEFINE_STANDARD_RTTI( GEOM_Object );
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_Object,GEOM_BaseObject)
};
#endif
//operator TCollection_AsciiString () const;
+#if OCC_VERSION_MAJOR >= 7
+ template <class T>
+ Standard_EXPORT TPythonDump& operator<< (const Handle(T)& theObject) { return *this << theObject.get(); }
+#endif
Standard_EXPORT TPythonDump& operator<< (bool theArg);
Standard_EXPORT TPythonDump& operator<< (long int theArg);
Standard_EXPORT TPythonDump& operator<< (int theArg);
//=============================================================================
bool GEOM_Solver::ComputeFunction(Handle(GEOM_Function) theFunction)
{
- if(theFunction == NULL) return false;
+ if(theFunction.IsNull()) return false;
Standard_GUID aGUID = theFunction->GetDriverGUID();
Handle(TFunction_Driver) aDriver;
if(!TFunction_DriverTable::Get()->FindDriver(aGUID, aDriver)) return false;
aDriver->Init(theFunction->GetEntry());
-
+
+#if OCC_VERSION_MAJOR < 7
TFunction_Logbook aLog;
+#else
+ Handle(TFunction_Logbook) aLog = TFunction_Logbook::Set( aDriver->Label() );
+#endif
if(aDriver->Execute(aLog) == 0) return false;
return true;
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOM_SubShapeDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOM_SubShapeDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
if (aShape.IsNull()) return 0;
aFunction->SetValue(aShape);
-
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOM_SubShapeDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOM_SubShapeDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOM_SubShapeDriver,GEOM_BaseDriver);
#ifndef _GEOM_SubShapeDriver_HeaderFile
#define _GEOM_SubShapeDriver_HeaderFile
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOM_SubShapeDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOM_SubShapeDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOM_SubShapeDriver() {};
+ Standard_EXPORT GEOM_SubShapeDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOM_SubShapeDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOM_SubShapeDriver )
-
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_SubShapeDriver,GEOM_BaseDriver)
};
#endif
#include <Standard_Macro.hxx>
#include <Standard_Boolean.hxx>
#if OCC_VERSION_LARGE > 0x06070100
-#include <Handle_IntTools_Context.hxx>
#include <IntTools_Context.hxx>
#else
-#include <Handle_BOPInt_Context.hxx>
#include <BOPInt_Context.hxx>
#endif
#include <Standard_Integer.hxx>
//
#include <GEOMAlgo_Clsf.hxx>
-IMPLEMENT_STANDARD_HANDLE(GEOMAlgo_Clsf, GEOMAlgo_HAlgo);
-IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_Clsf, GEOMAlgo_HAlgo);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_Clsf, GEOMAlgo_HAlgo);
//=======================================================================
//function :
#include <Standard_Real.hxx>
#include <GEOMAlgo_HAlgo.hxx>
#include <Standard_Boolean.hxx>
-#include <Handle_Geom_Curve.hxx>
-#include <Handle_Geom_Surface.hxx>
#include <Geom_Curve.hxx>
#include <Geom_Surface.hxx>
Standard_EXPORT
virtual Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const;
- DEFINE_STANDARD_RTTI(GEOMAlgo_Clsf);
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_Clsf,GEOMAlgo_HAlgo)
protected:
Standard_EXPORT
#include <GEOMAlgo_SurfaceTools.hxx>
-IMPLEMENT_STANDARD_HANDLE(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf)
-IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf)
//=======================================================================
//function :
#include <GeomAdaptor_Surface.hxx>
#include <GEOMAlgo_Clsf.hxx>
#include <Standard_Boolean.hxx>
-#include <Handle_Geom_Curve.hxx>
-#include <Handle_Geom_Surface.hxx>
#include <Geom_Curve.hxx>
#include <Geom_Surface.hxx>
Standard_EXPORT
virtual Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const;
- DEFINE_STANDARD_RTTI(GEOMAlgo_ClsfBox)
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox,GEOMAlgo_Clsf)
protected:
TopoDS_Shape myBox;
#include <Geom_Plane.hxx>
-
-IMPLEMENT_STANDARD_HANDLE(GEOMAlgo_ClsfQuad, GEOMAlgo_Clsf);
-IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad, GEOMAlgo_Clsf);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad, GEOMAlgo_Clsf);
//=======================================================================
//function :
Standard_EXPORT
virtual Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const;
- DEFINE_STANDARD_RTTI(GEOMAlgo_ClsfQuad);
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad,GEOMAlgo_Clsf)
protected:
#include <BRep_Builder.hxx>
#include <BRepClass3d_SolidClassifier.hxx>
-IMPLEMENT_STANDARD_HANDLE(GEOMAlgo_ClsfSolid, GEOMAlgo_Clsf)
-IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid, GEOMAlgo_Clsf)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid, GEOMAlgo_Clsf)
//=======================================================================
//function :
Standard_EXPORT
virtual void CheckData() ;
- DEFINE_STANDARD_RTTI(GEOMAlgo_ClsfSolid)
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid,GEOMAlgo_Clsf)
protected:
TopoDS_Shape myShape;
#include <GEOMAlgo_SurfaceTools.hxx>
-IMPLEMENT_STANDARD_HANDLE(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf);
-IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf);
//=======================================================================
//function :
#include <Standard.hxx>
#include <Standard_DefineHandle.hxx>
-#include <Handle_Geom_Surface.hxx>
#include <GeomAdaptor_Surface.hxx>
#include <GEOMAlgo_Clsf.hxx>
#include <Standard_Boolean.hxx>
-#include <Handle_Geom_Curve.hxx>
#include <Geom_Surface.hxx>
#include <Geom_Curve.hxx>
void SetSurface(const Handle(Geom_Surface)& aS) ;
Standard_EXPORT
- const Handle_Geom_Surface& Surface() const;
+ const Handle(Geom_Surface)& Surface() const;
Standard_EXPORT
virtual void Perform() ;
Standard_EXPORT
virtual Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const;
- DEFINE_STANDARD_RTTI(GEOMAlgo_ClsfSurf);
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf,GEOMAlgo_Clsf)
protected:
- Handle_Geom_Surface myS;
+ Handle(Geom_Surface) myS;
GeomAdaptor_Surface myGAS;
};
#endif
#include <TopTools_DataMapOfShapeListOfShape.hxx>
#include <TopTools_ListOfShape.hxx>
#include <TopTools_MapOfShape.hxx>
-
-class TopTools_IndexedMapOfShape;
+#include <TopTools_IndexedMapOfShape.hxx>
/**
#include <Standard_Macro.hxx>
#include <Standard_Boolean.hxx>
-#include <Handle_Geom_Surface.hxx>
#include <Geom_Surface.hxx>
#include <TopAbs_ShapeEnum.hxx>
void SetState(const GEOMAlgo_State aSF) ;
Standard_EXPORT
- const Handle_Geom_Surface& Surface() const;
+ const Handle(Geom_Surface)& Surface() const;
Standard_EXPORT
TopAbs_ShapeEnum ShapeType() const;
void FindVertices() ;
- Handle_Geom_Surface mySurface;
+ Handle(Geom_Surface) mySurface;
TopAbs_ShapeEnum myShapeType;
GEOMAlgo_State myState;
TopoDS_Shape myArg1;
#include <TopTools_ListOfShape.hxx>
#include <Geom_Surface.hxx>
-#include <Handle_Geom_Surface.hxx>
#include <GeomAdaptor_Surface.hxx>
#include <gp_Pnt.hxx>
Standard_Integer NbPntsMax() const;
Standard_EXPORT
- const Handle_Geom_Surface& Surface() const;
+ const Handle(Geom_Surface)& Surface() const;
Standard_EXPORT
TopAbs_ShapeEnum ShapeType() const;
virtual TopAbs_State GetPointState(const gp_Pnt& aP) ;
- Handle_Geom_Surface mySurface;
+ Handle(Geom_Surface) mySurface;
TopAbs_ShapeEnum myShapeType;
GEOMAlgo_State myState;
Standard_Integer myNbPntsMin;
void SetClsf(const Handle(GEOMAlgo_Clsf)& aClsf) ;
Standard_EXPORT
- const Handle_GEOMAlgo_Clsf& Clsf() const;
+ const Handle(GEOMAlgo_Clsf)& Clsf() const;
Standard_EXPORT
void SetShapeType(const TopAbs_ShapeEnum aST) ;
GEOMAlgo_State myState;
Standard_Integer myNbPntsMin;
Standard_Integer myNbPntsMax;
- Handle_GEOMAlgo_Clsf myClsf;
+ Handle(GEOMAlgo_Clsf) myClsf;
TopTools_ListOfShape myLS;
GEOMAlgo_IndexedDataMapOfShapeState myMSS;
};
#include <GEOMAlgo_GetInPlaceAPI.hxx>
#include <GEOMAlgo_GetInPlace.hxx>
-#include <GEOM_Function.hxx>
#include <GEOM_Object.hxx>
#include <GEOMUtils.hxx>
#include <TopExp_Explorer.hxx>
#include <TopoDS.hxx>
#include <TopoDS_Vertex.hxx>
-#include <TopTools_MapOfShape.hxx>
-
//=======================================================================
//function : GetInPlace
#ifndef _GEOMAlgo_GetInPlaceAPI_HeaderFile
#define _GEOMAlgo_GetInPlaceAPI_HeaderFile
+#include <GEOM_Function.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
+#include <TopTools_ListOfShape.hxx>
#include <gp_Vec.hxx>
class GEOMAlgo_GetInPlace;
-class Handle_GEOM_Function;
class BRepExtrema_DistShapeShape;
class TopoDS_Face;
class TopoDS_Shape;
-class TopTools_IndexedMapOfShape;
-class TopTools_ListOfShape;
-
/**
* This is an API class for all GetInPlace algorithm.
* list is not cleared at first.
*/
Standard_EXPORT static Standard_Boolean GetInPlaceByHistory
- (const Handle_GEOM_Function &theWhereFunction,
+ (const Handle(GEOM_Function) &theWhereFunction,
const TopTools_IndexedMapOfShape &theWhereIndices,
const TopoDS_Shape &theWhat,
TopTools_ListOfShape &theShapesInPlace);
const TopTools_IndexedDataMapOfShapeListOfShape& aMEV,
TopTools_IndexedDataMapOfShapeListOfShape& aMEVZ)
{
- Standard_Address pLE, pLV, pLVZ;
+ TopTools_ListOfShape *pLE, *pLV, *pLVZ;
Standard_Integer iRet, aNbVX;
TopTools_ListIteratorOfListOfShape aItLE, aItLV;
TopTools_MapOfShape aMFence;
//
iRet=0;
//
- pLE=aMVE.FindFromKey1(aVSD);
+#if OCC_VERSION_MAJOR < 7
+ pLE=const_cast<TopTools_ListOfShape*>(&aMVE.FindFromKey(aVSD));
+#else
+ pLE=const_cast<TopTools_IndexedDataMapOfShapeListOfShape&>(aMVE).ChangeSeek(aVSD);
+#endif
if (!pLE) {
return iRet;
}
- //
- const TopTools_ListOfShape& aLE=*((TopTools_ListOfShape*)pLE);
- aItLE.Initialize(aLE);
+ aItLE.Initialize(*pLE);
for (; aItLE.More(); aItLE.Next()) {
const TopoDS_Shape& aE=aItLE.Value();
//
- pLV=aMEV.FindFromKey1(aE);
+#if OCC_VERSION_MAJOR < 7
+ pLV=const_cast<TopTools_ListOfShape*>(&aMEV.FindFromKey(aE));
+#else
+ pLV=const_cast<TopTools_IndexedDataMapOfShapeListOfShape&>(aMEV).ChangeSeek(aE);
+#endif
if (!pLV) {
continue; // it should be not so
}
- //
aLVX.Clear();
- const TopTools_ListOfShape& aLV=*((TopTools_ListOfShape*)pLV);
- aItLV.Initialize(aLV);
+ aItLV.Initialize(*pLV);
for (; aItLV.More(); aItLV.Next()) {
const TopoDS_Shape& aV=aItLV.Value();
if (!aV.IsSame(aVSD)) {
//
iRet=1;
//
- pLVZ=aMEVZ.FindFromKey1(aE);
+#if OCC_VERSION_MAJOR < 7
+ pLVZ=const_cast<TopTools_ListOfShape*>(&aMEVZ.FindFromKey(aE));
+#else
+ pLVZ=aMEVZ.ChangeSeek(aE);
+#endif
if (!pLVZ) {
aMEVZ.Add(aE, aLVX);
}
else {
- TopTools_ListOfShape& aLVZ=*((TopTools_ListOfShape*)pLVZ);
+ TopTools_ListOfShape& aLVZ=*pLVZ;
aLVZ.Append(aLVX);
}
}
//
#include <GEOMAlgo_HAlgo.hxx>
-IMPLEMENT_STANDARD_HANDLE(GEOMAlgo_HAlgo, MMgt_TShared);
-IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_HAlgo, MMgt_TShared);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_HAlgo, MMgt_TShared);
//=======================================================================
// function:
#include <Standard_Integer.hxx>
#include <MMgt_TShared.hxx>
+#include <Basics_OCCTVersion.hxx>
+
DEFINE_STANDARD_HANDLE(GEOMAlgo_HAlgo, MMgt_TShared);
//=======================================================================
Standard_EXPORT
Standard_Integer WarningStatus() const;
- DEFINE_STANDARD_RTTI(GEOMAlgo_HAlgo);
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_HAlgo,MMgt_TShared)
protected:
Standard_EXPORT
#include <TopoDS_Shape.hxx>
#include <Standard_Real.hxx>
#if OCC_VERSION_LARGE > 0x06070100
-#include <Handle_IntTools_Context.hxx>
+ #include <IntTools_Context.hxx>
#else
-#include <Handle_BOPInt_Context.hxx>
+ #include <BOPInt_Context.hxx>
#endif
#include <GEOMAlgo_Algo.hxx>
//! Returns cashed geometrical tools <br>
Standard_EXPORT
#if OCC_VERSION_LARGE > 0x06070100
- const Handle_IntTools_Context& Context() const;
+ const Handle(IntTools_Context)& Context() const;
#else
- const Handle_BOPInt_Context& Context() const;
+ const Handle(BOPInt_Context)& Context() const;
#endif
Standard_EXPORT
Standard_Real myTolerance;
TopoDS_Shape myResult;
#if OCC_VERSION_LARGE > 0x06070100
- Handle_IntTools_Context myContext;
+ Handle(IntTools_Context) myContext;
#else
- Handle_BOPInt_Context myContext;
+ Handle(BOPInt_Context) myContext;
#endif
};
#endif
#include <Standard.hxx>
#include <Standard_Macro.hxx>
#include <Standard_Boolean.hxx>
-#include <Handle_Geom_Surface.hxx>
#include <Standard_Real.hxx>
#include <TopAbs_State.hxx>
#include <GEOMAlgo_State.hxx>
#include <OCCViewer_ViewModel.h>
#include <SVTK_ViewModel.h>
-#include <TColStd_MapOfInteger.hxx>
#include <TCollection_AsciiString.hxx>
#include <TColStd_IndexedMapOfInteger.hxx>
#include <SALOMEconfig.h>
#include CORBA_CLIENT_HEADER(GEOM_Gen)
+#include <TColStd_MapOfInteger.hxx>
+
#include <QString>
#include <QMap>
class SUIT_ViewWindow;
class SALOME_Prs;
class GEOM_Operation;
-class TColStd_MapOfInteger;
//================================================================
// Class : GEOMBase_Helper
#include <AIS_InteractiveObject.hxx>
#include <SelectMgr_EntityOwner.hxx>
-IMPLEMENT_STANDARD_HANDLE(GEOM_OCCFilter, SelectMgr_Filter)
-IMPLEMENT_STANDARD_RTTIEXT(GEOM_OCCFilter, SelectMgr_Filter)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_OCCFilter, SelectMgr_Filter)
//=======================================================================
// function : GEOM_OCCFilter
#include <Standard_DefineHandle.hxx>
+#include <Basics_OCCTVersion.hxx>
+
class LightApp_SelectionMgr;
class GEOM_OCCFilter : public SelectMgr_Filter
public:
- DEFINE_STANDARD_RTTI(GEOM_OCCFilter);
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_OCCFilter,SelectMgr_Filter)
};
#include <GEOM_OCCFilter.h>
#include <GEOM_Actor.h>
-#include <GEOM_AISShape.hxx>
#include <GEOM_AISDimension.hxx>
#include <GEOM_TopWireframeShape.hxx>
#include <GEOM_AISVector.hxx>
#include <AIS_AngleDimension.hxx>
#include <AIS_ListIteratorOfListOfInteractive.hxx>
#include <Aspect_PolygonOffsetMode.hxx>
-#include <Aspect_ColorScale.hxx>
+#if OCC_VERSION_MAJOR < 7
+ #include <Aspect_ColorScale.hxx>
+#endif
#include <Prs3d_IsoAspect.hxx>
#include <Prs3d_PointAspect.hxx>
#include <StdSelect_TypeOfEdge.hxx>
#include <Geom_Axis2Placement.hxx>
#include <Graphic3d_AspectFillArea3d.hxx>
#include <gp_Pln.hxx>
-#include <TColStd_MapOfInteger.hxx>
#include <TColStd_MapIteratorOfMapOfInteger.hxx>
#include <TopoDS_Iterator.hxx>
#include <Graphic3d_AspectMarker3d.hxx>
myViewFrame = 0;
+#if OCC_VERSION_MAJOR >= 7
+ myColorScale = new AIS_ColorScale;
+ myColorScale->SetZLayer (Graphic3d_ZLayerId_TopOSD);
+ myColorScale->SetTransformPersistence (Graphic3d_TMF_2d, gp_Pnt (-1,-1,0));
+#endif
+
myFieldDataType = GEOM::FDT_Double;
myFieldDimension = 0;
myFieldStepRangeMin = 0;
return aResultList;
}
-// Note: the method is copied from Aspect_ColorScale class
+// Note: the method is copied from AIS_ColorScale class
Standard_Integer GEOM_Displayer::HueFromValue( const Standard_Integer aValue,
const Standard_Integer aMin,
const Standard_Integer aMax )
return aHue;
}
-// Note: the method is copied from Aspect_ColorScale class
+// Note: the method is copied from AIS_ColorScale class
Standard_Boolean GEOM_Displayer::FindColor( const Standard_Real aValue,
const Standard_Real aMin,
const Standard_Real aMax,
if( !aViewModel )
return;
+#if OCC_VERSION_MAJOR < 7
Handle(V3d_Viewer) aViewer = aViewModel->getViewer3d();
if( aViewer.IsNull() )
return;
Handle(V3d_View) aView = aViewer->ActiveView();
if( aView.IsNull() )
return;
+#endif
Standard_Boolean anIsDisplayColorScale = Standard_False;
TCollection_AsciiString aColorScaleTitle;
if( anIsDisplayColorScale )
{
- Handle(Aspect_ColorScale) aColorScale = aView->ColorScale();
- if( !aColorScale.IsNull() )
+ SUIT_Session* session = SUIT_Session::session();
+ SUIT_ResourceMgr* resMgr = session->resourceMgr();
+
+ Standard_Real anXPos = resMgr->doubleValue( "Geometry", "scalar_bar_x_position", 0.05 );
+ Standard_Real anYPos = resMgr->doubleValue( "Geometry", "scalar_bar_y_position", 0.1 );
+ Standard_Real aWidth = resMgr->doubleValue( "Geometry", "scalar_bar_width", 0.2 );
+ Standard_Real aHeight = resMgr->doubleValue( "Geometry", "scalar_bar_height", 0.5 );
+ Standard_Integer aTextHeight = resMgr->integerValue( "Geometry", "scalar_bar_text_height", 14 );
+ Standard_Integer aNbIntervals = resMgr->integerValue( "Geometry", "scalar_bar_nb_intervals", 20 );
+
+#if OCC_VERSION_MAJOR < 7
+ Handle(Aspect_ColorScale) myColorScale = aView->ColorScale();
+ if( !myColorScale.IsNull() )
{
- SUIT_Session* session = SUIT_Session::session();
- SUIT_ResourceMgr* resMgr = session->resourceMgr();
-
- Standard_Real anXPos = resMgr->doubleValue( "Geometry", "scalar_bar_x_position", 0.05 );
- Standard_Real anYPos = resMgr->doubleValue( "Geometry", "scalar_bar_y_position", 0.1 );
- Standard_Real aWidth = resMgr->doubleValue( "Geometry", "scalar_bar_width", 0.2 );
- Standard_Real aHeight = resMgr->doubleValue( "Geometry", "scalar_bar_height", 0.5 );
- Standard_Integer aTextHeight = resMgr->integerValue( "Geometry", "scalar_bar_text_height", 14 );
- Standard_Integer aNbIntervals = resMgr->integerValue( "Geometry", "scalar_bar_nb_intervals", 20 );
-
- aColorScale->SetXPosition( anXPos );
- aColorScale->SetYPosition( anYPos );
- aColorScale->SetWidth( aWidth );
- aColorScale->SetHeight( aHeight );
-
- aColorScale->SetTextHeight( aTextHeight );
- aColorScale->SetNumberOfIntervals( anIsBoolean ? 2 : aNbIntervals );
-
- aColorScale->SetTitle( aColorScaleTitle );
- aColorScale->SetRange( aColorScaleMin, aColorScaleMax );
+#endif
+
+ myColorScale->SetXPosition( anXPos );
+ myColorScale->SetYPosition( anYPos );
+ myColorScale->SetWidth( aWidth );
+ myColorScale->SetHeight( aHeight );
+
+ myColorScale->SetTextHeight( aTextHeight );
+ myColorScale->SetNumberOfIntervals( anIsBoolean ? 2 : aNbIntervals );
+
+ myColorScale->SetTitle( aColorScaleTitle );
+ myColorScale->SetRange( aColorScaleMin, aColorScaleMax );
+
+#if OCC_VERSION_MAJOR < 7
}
if( !aView->ColorScaleIsDisplayed() )
aView->ColorScaleDisplay();
}
else
- {
if( aView->ColorScaleIsDisplayed() )
aView->ColorScaleErase();
+#else
+ if( !aViewModel->getAISContext()->IsDisplayed( myColorScale ) )
+ aViewModel->getAISContext()->Display( myColorScale );
}
+ else
+ if( aViewModel->getAISContext()->IsDisplayed( myColorScale ) )
+ aViewModel->getAISContext()->Erase( myColorScale );
+#endif
if( theIsRedisplayFieldSteps )
{
#define GEOM_DISPLAYER_H
#include "GEOM_GEOMGUI.hxx"
+#include <GEOM_AISShape.hxx>
#include <SALOME_InteractiveObject.hxx>
#include <LightApp_Displayer.h>
#include <LightApp_Study.h>
#include <Aspect_TypeOfMarker.hxx>
+#if OCC_VERSION_MAJOR >= 7
+ #include <AIS_ColorScale.hxx>
+#endif
#include <TCollection_AsciiString.hxx>
+#include <TColStd_MapOfInteger.hxx>
#include <Basics_OCCTVersion.hxx>
#include <QList>
typedef std::list<GEOM::GEOM_Object_ptr> ObjectList;
-class TColStd_MapOfInteger;
class LightApp_SelectionMgr;
class SalomeApp_Study;
class SalomeApp_Application;
class SUIT_SelectionFilter;
-class Handle_GEOM_AISShape;
class gp_Ax3;
-//class SALOME_Selection;
class GEOMGUI_EXPORT GEOM_Displayer : public LightApp_Displayer
{
std::string myTexture;
int myType;
SALOME_View* myViewFrame;
+#if OCC_VERSION_MAJOR >= 7
+ Handle(AIS_ColorScale) myColorScale;
+#endif
// Attributes
Quantity_Color myShadingColor;
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_3DSketcherDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_3DSketcherDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
if (aShape.IsNull()) return 0;
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_3DSketcherDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT(GEOMImpl_3DSketcherDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMImpl_3DSketcherDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_3DSketcherDriver_HeaderFile
#define _GEOMImpl_3DSketcherDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_3DSketcherDriver, GEOM_BaseDriver );
-#ifndef _GEOM_BaseDriver_HeaderFile
-#include <GEOM_BaseDriver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-
class GEOMImpl_3DSketcherDriver : public GEOM_BaseDriver {
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_3DSketcherDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_3DSketcherDriver() {};
+ Standard_EXPORT GEOMImpl_3DSketcherDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_3DSketcherDriver() {};
-Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName,
- std::vector<GEOM_Param>& params);
+ Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName,
+ std::vector<GEOM_Param>& params);
- // Type management
- //
- DEFINE_STANDARD_RTTI( GEOMImpl_3DSketcherDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_3DSketcherDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_ArcDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_ArcDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
if (aType == CIRC_ARC_THREE_PNT)
{
GC_MakeArcOfCircle arc (aP1, aP2, aP3);
- aShape = BRepBuilderAPI_MakeEdge(arc).Edge();
+ aShape = BRepBuilderAPI_MakeEdge(arc.Value()).Edge();
} else if ( aType == CIRC_ARC_CENTER ) { // CIRC_ARC_CENTER
Standard_Boolean sense = aCI.GetSense();
Handle(Geom_Circle) aGeomCirc = circ.Value();
GC_MakeArcOfCircle arc (aGeomCirc->Circ(), aP2, aP3, Standard_True);
- aShape = BRepBuilderAPI_MakeEdge(arc).Edge();
+ aShape = BRepBuilderAPI_MakeEdge(arc.Value()).Edge();
} else if ( aType == ELLIPSE_ARC_CENTER_TWO_PNT ) { // ELLIPSE_ARC_CENTER_TWO_PNT
if ( aP1.Distance(aP2) <= aP1.Distance(aP3) ) {
// Standard_ConstructionError::Raise("Arc creation aborted: the distance from Center Point to Point 1 needs to be bigger than the distance from Center Point to Point 2");
// double alpha = fabs(aV1.Angle(aV2));
GC_MakeArcOfEllipse arc (aGeomEllipse->Elips(), aP2, aP3, Standard_True);
- aShape = BRepBuilderAPI_MakeEdge(arc).Edge();
+ aShape = BRepBuilderAPI_MakeEdge(arc.Value()).Edge();
}
}
}
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_ArcDriver,GEOM_BaseDriver);
-
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArcDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArcDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_ArcDriver_HeaderFile
#define _GEOMImpl_ArcDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_ArcDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_ArcDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_ArcDriver() {};
+ Standard_EXPORT GEOMImpl_ArcDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_ArcDriver() {};
-Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName,
- std::vector<GEOM_Param>& params);
+ Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName,
+ std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_ArcDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ArcDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_ArchimedeDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_ArchimedeDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(tirant);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_ArchimedeDriver,GEOM_BaseDriver);
-
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArchimedeDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArchimedeDriver,GEOM_BaseDriver);
// File : GEOMImpl_ArchimedeDriver.hxx
// Module : GEOMImpl
-//
+
#ifndef _GEOMImpl_ArchimedeDriver_HeaderFile
#define _GEOMImpl_ArchimedeDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_ArchimedeDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_ArchimedeDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_ArchimedeDriver() {};
+ Standard_EXPORT GEOMImpl_ArchimedeDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_ArchimedeDriver() {};
-Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName,
- std::vector<GEOM_Param>& params);
+ Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName,
+ std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_ArchimedeDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ArchimedeDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_BlockDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_BlockDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_BlockDriver,GEOM_BaseDriver);
-
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BlockDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BlockDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_BlockDriver_HeaderFile
#define _GEOMImpl_BlockDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
#include <TopoDS_Shape.hxx>
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_BlockDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_BlockDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_BlockDriver() {};
+ Standard_EXPORT GEOMImpl_BlockDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
-Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName,
- std::vector<GEOM_Param>& params);
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_BlockDriver() {};
-private:
- void MultiTransformate1D (const TopoDS_Shape& theBlock,
- const TopoDS_Shape& theFace1,
- const TopoDS_Shape& theFace2,
- const Standard_Integer theNbIter,
- TopoDS_Shape& theResult) const;
-
- void MultiTransformate2D (const TopoDS_Shape& theBlock,
- const TopoDS_Shape& theFace1U,
- const TopoDS_Shape& theFace2U,
- const Standard_Integer theNbIterU,
- const TopoDS_Shape& theFace1V,
- const TopoDS_Shape& theFace2V,
- const Standard_Integer theNbIterV,
- TopoDS_Shape& theResult) const;
-
-DEFINE_STANDARD_RTTI( GEOMImpl_BlockDriver )
+ Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName,
+ std::vector<GEOM_Param>& params);
+private:
+ void MultiTransformate1D (const TopoDS_Shape& theBlock,
+ const TopoDS_Shape& theFace1,
+ const TopoDS_Shape& theFace2,
+ const Standard_Integer theNbIter,
+ TopoDS_Shape& theResult) const;
+
+ void MultiTransformate2D (const TopoDS_Shape& theBlock,
+ const TopoDS_Shape& theFace1U,
+ const TopoDS_Shape& theFace2U,
+ const Standard_Integer theNbIterU,
+ const TopoDS_Shape& theFace1V,
+ const TopoDS_Shape& theFace2V,
+ const Standard_Integer theNbIterV,
+ TopoDS_Shape& theResult) const;
+
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_BlockDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_BooleanDriver::Execute (TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_BooleanDriver,GEOM_BaseDriver);
-
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BooleanDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BooleanDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_BooleanDriver_HeaderFile
#define _GEOMImpl_BooleanDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TopoDS_Shape_HeaderFile
#include <TopoDS_Shape.hxx>
-#endif
-
-
-class Standard_Transient;
-class Handle_Standard_Type;
-class Handle(TFunction_Driver);
-class GEOMImpl_BooleanDriver;
-
-
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_BooleanDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_BooleanDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_BooleanDriver() {};
+ Standard_EXPORT GEOMImpl_BooleanDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_BooleanDriver() {};
-Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName,
- std::vector<GEOM_Param>& params);
+ Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName,
+ std::vector<GEOM_Param>& params);
private:
const TopoDS_Shape theShape2,
const Standard_Integer theType) const;
-DEFINE_STANDARD_RTTI( GEOMImpl_BooleanDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_BooleanDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_BoxDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_BoxDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_BoxDriver,GEOM_BaseDriver);
-
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BoxDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BoxDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_BoxDriver_HeaderFile
#define _GEOMImpl_BoxDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_BoxDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_BoxDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_BoxDriver() {};
+ Standard_EXPORT GEOMImpl_BoxDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_BoxDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationNameName,
std::vector<GEOM_Param>& params);
-
-DEFINE_STANDARD_RTTI( GEOMImpl_BoxDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_BoxDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_ChamferDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_ChamferDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_ChamferDriver,GEOM_BaseDriver);
-
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ChamferDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ChamferDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_ChamferDriver_HeaderFile
#define _GEOMImpl_ChamferDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_ChamferDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_ChamferDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_ChamferDriver() {};
+ Standard_EXPORT GEOMImpl_ChamferDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_ChamferDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_ChamferDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ChamferDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_CircleDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_CircleDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_CircleDriver,GEOM_BaseDriver);
-
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CircleDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CircleDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_CircleDriver_HeaderFile
#define _GEOMImpl_CircleDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_CircleDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_CircleDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_CircleDriver() {};
+ Standard_EXPORT GEOMImpl_CircleDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_CircleDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_CircleDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_CircleDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_ConeDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_ConeDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
}
if (aShape.IsNull()) return 0;
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
aFunction->SetValue(aShape);
return 1;
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_ConeDriver,GEOM_BaseDriver);
-
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ConeDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ConeDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_ConeDriver_HeaderFile
#define _GEOMImpl_ConeDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_ConeDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_ConeDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_ConeDriver() {};
+ Standard_EXPORT GEOMImpl_ConeDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_ConeDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_ConeDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ConeDriver,GEOM_BaseDriver)
};
#endif
#include <TopExp.hxx>
#include <TNaming_CopyShape.hxx>
#include <TColStd_IndexedDataMapOfTransientTransient.hxx>
-#include <TFunction_Logbook.hxx>
-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
#include <TopTools_ListOfShape.hxx>
#include <TopTools_MapIteratorOfMapOfShape.hxx>
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_CopyDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_CopyDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aCopy);
- log.SetTouched(Label());
+#if OCC_VERSION_MAJOR < 7
+ log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
* \brief Performs Transfer Data operation.
*/
//================================================================================
-
-Standard_Integer GEOMImpl_CopyDriver::transferData(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_CopyDriver::transferData(LOGBOOK& log) const
{
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
GEOMImpl_ITransferData aTD (aFunction);
return Standard_True;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_CopyDriver,GEOM_BaseDriver);
-
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CopyDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CopyDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_CopyDriver_HeaderFile
#define _GEOMImpl_CopyDriver_HeaderFile
-class TopoDS_Shape;
-class TopTools_IndexedDataMapOfShapeListOfShape;
-class TopTools_IndexedMapOfShape;
-class Standard_GUID;
-
+#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
+class TopoDS_Shape;
+class Standard_GUID;
DEFINE_STANDARD_HANDLE( GEOMImpl_CopyDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_CopyDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_CopyDriver() {};
+ Standard_EXPORT GEOMImpl_CopyDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_CopyDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_CopyDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_CopyDriver,GEOM_BaseDriver)
private:
- Standard_Integer transferData(TFunction_Logbook& log) const;
+ Standard_Integer transferData(LOGBOOK& log) const;
Standard_Boolean getInPlace
(const TopoDS_Shape &theSourceShape,
const TopoDS_Shape &theDestinationShape,
const Handle(GEOM_Function) &theDestinationRef,
TopTools_IndexedDataMapOfShapeListOfShape &theMapSourceDest) const;
-
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_CylinderDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_CylinderDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
if (aShape.IsNull()) return 0;
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_CylinderDriver,GEOM_BaseDriver);
-
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CylinderDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CylinderDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_CylinderDriver_HeaderFile
#define _GEOMImpl_CylinderDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_CylinderDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_CylinderDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_CylinderDriver() {};
+ Standard_EXPORT GEOMImpl_CylinderDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_CylinderDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_CylinderDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_CylinderDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_DiskDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_DiskDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
- log.SetTouched(Label());
+#if OCC_VERSION_MAJOR < 7
+ log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_DiskDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_DiskDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_DiskDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_DiskDriver_HeaderFile
#define _GEOMImpl_DiskDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_DiskDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_DiskDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_DiskDriver() {};
+ Standard_EXPORT GEOMImpl_DiskDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_DiskDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_DiskDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_DiskDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_EllipseDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_EllipseDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
- log.SetTouched(Label());
+#if OCC_VERSION_MAJOR < 7
+ log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_EllipseDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_EllipseDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_EllipseDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_EllipseDriver_HeaderFile
#define _GEOMImpl_EllipseDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_EllipseDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_EllipseDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_EllipseDriver() {};
+ Standard_EXPORT GEOMImpl_EllipseDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_EllipseDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_EllipseDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_EllipseDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_ExportDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_ExportDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
if( !GEOMImpl_IECallBack::GetCallBack( aFormatName )->Export( GetDocID(), obj, aFileName, aFormatName ) );
return 0;
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return false;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_ExportDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ExportDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ExportDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_ExportDriver_HeaderFile
#define _GEOMImpl_ExportDriver_HeaderFile
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_ExportDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_ExportDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_ExportDriver() {};
+ Standard_EXPORT GEOMImpl_ExportDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_ExportDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_ExportDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ExportDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_FaceDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_FaceDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_FaceDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FaceDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FaceDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_FaceDriver_HeaderFile
#define _GEOMImpl_FaceDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_FaceDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_FaceDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_FaceDriver() {};
+ Standard_EXPORT GEOMImpl_FaceDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_FaceDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_FaceDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_FaceDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_FieldDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_FieldDriver::Execute(LOGBOOK& log) const
{
return 0;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_FieldDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FieldDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FieldDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_FieldDriver_HeaderFile
#define _GEOMImpl_FieldDriver_HeaderFile
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_FieldDriver, GEOM_BaseDriver );
{
public:
Standard_EXPORT GEOMImpl_FieldDriver();
- Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
- Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
- Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_FieldDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- DEFINE_STANDARD_RTTI( GEOMImpl_FieldDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_FieldDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_Fillet1dDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_Fillet1dDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
}
aFunction->SetValue(aResult);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_Fillet1dDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet1dDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet1dDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_Fillet1dDriver_HeaderFile
#define _GEOMImpl_Fillet1dDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
#include <TopoDS_Wire.hxx>
#include <TopTools_ListOfShape.hxx>
-class Standard_Transient;
-class Handle_Standard_Type;
-class Handle(TFunction_Driver);
-class GEOMImpl_Fillet1dDriver;
-
-
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_Fillet1dDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
Standard_EXPORT GEOMImpl_Fillet1dDriver();
Standard_EXPORT ~GEOMImpl_Fillet1dDriver() {};
Standard_EXPORT static const Standard_GUID& GetID();
- Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
- Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
- Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
Standard_EXPORT bool MakeFillet(const TopoDS_Wire&, const TopTools_ListOfShape&,
const Standard_Real, bool, TopoDS_Wire&) const;
-DEFINE_STANDARD_RTTI( GEOMImpl_Fillet1dDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_Fillet1dDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_Fillet2dDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_Fillet2dDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
if (aShape.IsNull()) return 0;
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_Fillet2dDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet2dDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet2dDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_Fillet2dDriver_HeaderFile
#define _GEOMImpl_Fillet2dDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_Fillet2dDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_Fillet2dDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_Fillet2dDriver() {};
+ Standard_EXPORT GEOMImpl_Fillet2dDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_Fillet2dDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_Fillet2dDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_Fillet2dDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_FilletDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_FilletDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_FilletDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FilletDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FilletDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_FilletDriver_HeaderFile
#define _GEOMImpl_FilletDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_FilletDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_FilletDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_FilletDriver() {};
+ Standard_EXPORT GEOMImpl_FilletDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_FilletDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_FilletDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_FilletDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_FillingDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_FillingDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_FillingDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FillingDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FillingDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_FillingDriver_HeaderFile
#define _GEOMImpl_FillingDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_FillingDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_FillingDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_FillingDriver() {};
+ Standard_EXPORT GEOMImpl_FillingDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_FillingDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_FillingDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_FillingDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_GlueDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_GlueDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
if (!aWrn.IsEmpty()) {
Standard_Failure::Raise(aWrn.ToCString());
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_GlueDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_GlueDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_GlueDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_GlueDriver_HeaderFile
#define _GEOMImpl_GlueDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
#include <TopTools_MapOfShape.hxx>
-
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
+#include <TopTools_DataMapOfShapeListOfShape.hxx>
#include <TopoDS_Shape.hxx>
#include <TCollection_AsciiString.hxx>
-class TColStd_SequenceOfExtendedString;
-class TopTools_DataMapOfShapeListOfShape;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_GlueDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_GlueDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_GlueDriver() {};
+ Standard_EXPORT GEOMImpl_GlueDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_GlueDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-Standard_EXPORT static TopoDS_Shape GlueFaces
- (const TopoDS_Shape &theShape,
- const Standard_Real theTolerance,
- const Standard_Boolean doKeepNonSolids = Standard_True,
- TopTools_DataMapOfShapeListOfShape *pMapModif = NULL);
+ Standard_EXPORT static TopoDS_Shape GlueFaces (const TopoDS_Shape& theShape,
+ const Standard_Real theTolerance,
+ const Standard_Boolean doKeepNonSolids = Standard_True,
+ TopTools_DataMapOfShapeListOfShape* pMapModif = NULL);
/*
-Standard_EXPORT TopoDS_Shape GlueFacesWithWarnings (const TopoDS_Shape& theShape,
- const Standard_Real theTolerance,
- const Standard_Boolean doKeepNonSolids,
- TCollection_AsciiString& theWarning) const;
-
-Standard_EXPORT static TopoDS_Shape GlueFacesByList (const TopoDS_Shape& theShape,
- const Standard_Real theTolerance,
- const Standard_Boolean doKeepNonSolids,
- const TopTools_MapOfShape& aFaces);
+ Standard_EXPORT TopoDS_Shape GlueFacesWithWarnings (const TopoDS_Shape& theShape,
+ const Standard_Real theTolerance,
+ const Standard_Boolean doKeepNonSolids,
+ TCollection_AsciiString& theWarning) const;
+
+ Standard_EXPORT static TopoDS_Shape GlueFacesByList (const TopoDS_Shape& theShape,
+ const Standard_Real theTolerance,
+ const Standard_Boolean doKeepNonSolids,
+ const TopTools_MapOfShape& aFaces);
*/
-Standard_EXPORT TopoDS_Shape GlueWithWarnings (const TopoDS_Shape& theShape,
- const Standard_Real theTolerance,
- const TopAbs_ShapeEnum theShapeType,
- const Standard_Boolean doKeepNonSolids,
- TCollection_AsciiString& theWarning) const;
-
-Standard_EXPORT static TopoDS_Shape GlueByList (const TopoDS_Shape& theShape,
- const Standard_Real theTolerance,
- const Standard_Boolean doKeepNonSolids,
- const TopTools_MapOfShape& theShapesList,
- const Standard_Boolean doGlueAllEdges);
-
-
-DEFINE_STANDARD_RTTI( GEOMImpl_GlueDriver )
+ Standard_EXPORT TopoDS_Shape GlueWithWarnings (const TopoDS_Shape& theShape,
+ const Standard_Real theTolerance,
+ const TopAbs_ShapeEnum theShapeType,
+ const Standard_Boolean doKeepNonSolids,
+ TCollection_AsciiString& theWarning) const;
+
+ Standard_EXPORT static TopoDS_Shape GlueByList (const TopoDS_Shape& theShape,
+ const Standard_Real theTolerance,
+ const Standard_Boolean doKeepNonSolids,
+ const TopTools_MapOfShape& theShapesList,
+ const Standard_Boolean doGlueAllEdges);
+
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_GlueDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_HealingDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_HealingDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
*stats = healer.GetStatistics();
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_HealingDriver,GEOM_BaseDriver);
-
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_HealingDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_HealingDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_HealingDriver_HeaderFile
#define _GEOMImpl_HealingDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
#include <TopoDS_Shape.hxx>
#include <TopoDS_Edge.hxx>
+#include <TopTools_SequenceOfShape.hxx>
#include <TColStd_HSequenceOfTransient.hxx>
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
class GEOMImpl_IHealing;
class ShHealOper_Tool;
-class TopTools_SequenceOfShape;
DEFINE_STANDARD_HANDLE( GEOMImpl_HealingDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
Standard_EXPORT GEOMImpl_HealingDriver();
Standard_EXPORT ~GEOMImpl_HealingDriver() {};
Standard_EXPORT static const Standard_GUID& GetID();
- Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
- Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
- Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
Standard_EXPORT static Standard_Boolean AreEdgesC1 (const TopoDS_Edge& E1, const TopoDS_Edge& E2);
Standard_EXPORT static void FuseCollinearEdges (const TopoDS_Shape&,
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- // Type management
- //
-DEFINE_STANDARD_RTTI( GEOMImpl_HealingDriver )
-
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_HealingDriver,GEOM_BaseDriver)
private:
Standard_Boolean ShapeProcess ( GEOMImpl_IHealing*, const TopoDS_Shape&, TopoDS_Shape& ) const;
#include <TFunction_DriverTable.hxx>
#include <TFunction_Driver.hxx>
-#include <TFunction_Logbook.hxx>
#include <TDF_Tool.hxx>
#include <GEOM_Function.hxx>
#include <Precision.hxx>
#include <TopExp.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
#include <Standard_Failure.hxx>
#include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
#include "GEOM_Object.hxx"
#include <TDocStd_Document.hxx>
#include <TColStd_HSequenceOfTransient.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
class GEOMImpl_IGroupOperations;
class GEOMImpl_IPipe;
-class TopTools_IndexedMapOfShape;
-
class GEOMImpl_I3DPrimOperations : public GEOM_IOperations {
public:
#include <TFunction_DriverTable.hxx>
#include <TFunction_Driver.hxx>
-#include <TFunction_Logbook.hxx>
#include <TDF_Tool.hxx>
#include <GEOM_Function.hxx>
#include <TFunction_DriverTable.hxx>
#include <TFunction_Driver.hxx>
-#include <TFunction_Logbook.hxx>
#include <TDataStd_Integer.hxx>
#include <TDF_Tool.hxx>
#include <TopTools_ListOfShape.hxx>
#include <TColStd_HSequenceOfTransient.hxx>
+#include <TColStd_HArray1OfInteger.hxx>
#include <list>
class GEOM_Engine;
-class Handle(GEOM_Object);
-class Handle(TColStd_HArray1OfInteger);
+class GEOM_Object;
class GEOMImpl_IBlocksOperations : public GEOM_IOperations {
public:
#include "GEOM_IOperations.hxx"
+#include <TColStd_HArray1OfInteger.hxx>
#include "list"
class GEOM_Engine;
-class Handle(GEOM_Object);
-class Handle(TColStd_HArray1OfInteger);
+class GEOM_Object;
class GEOMImpl_IBooleanOperations : public GEOM_IOperations {
public:
#include <list>
class GEOM_Engine;
-class Handle(GEOM_Object);
+class GEOM_Object;
class GEOMImpl_ICurvesOperations : public GEOM_IOperations {
#include "GEOMImpl_Types.hxx"
-#include "GEOM_Field.hxx"
#include "GEOM_Function.hxx"
#include "GEOM_IField.hxx"
#include "GEOM_Object.hxx"
#include "GEOM_PythonDump.hxx"
-#include <TColStd_HArray1OfExtendedString.hxx>
#include <TDataStd_ListIteratorOfListOfExtendedString.hxx>
#include <utilities.h>
#include "GEOM_IOperations.hxx"
+#include <GEOM_Field.hxx>
+
#include <TColStd_HSequenceOfTransient.hxx>
+#include <TColStd_HArray1OfExtendedString.hxx>
-class Handle(GEOM_Field);
-class Handle(GEOM_Object);
-class Handle(TColStd_HArray1OfExtendedString);
+class GEOM_Object;
class GEOMImpl_IFieldOperations : public GEOM_IOperations {
public:
#include <TFunction_DriverTable.hxx>
#include <TFunction_Driver.hxx>
-#include <TFunction_Logbook.hxx>
#include <TDF_Tool.hxx>
#include <TDataStd_Integer.hxx>
#include <TFunction_DriverTable.hxx>
#include <TFunction_Driver.hxx>
-#include <TFunction_Logbook.hxx>
#include <TDF_ChildIDIterator.hxx>
#include <TDF_Tool.hxx>
#include <TDataStd_Integer.hxx>
#include <BRepTools.hxx>
#include <gp_Pnt.hxx>
-#include <TColStd_HArray1OfByte.hxx>
#include <TColStd_HArray1OfReal.hxx>
#include <Standard_Failure.hxx>
#include <TDocStd_Document.hxx>
#include <TColStd_HSequenceOfAsciiString.hxx>
+#include <TColStd_HArray1OfByte.hxx>
#include <TCollection_HAsciiString.hxx>
#include <NCollection_DataMap.hxx>
#include <NCollection_List.hxx>
class GEOMImpl_IGroupOperations;
class GEOMImpl_IFieldOperations;
-class Handle_TColStd_HArray1OfByte;
-
class GEOMImpl_IInsertOperations : public GEOM_IOperations {
public:
#include <TFunction_DriverTable.hxx>
#include <TFunction_Driver.hxx>
-#include <TFunction_Logbook.hxx>
#include <TDF_Tool.hxx>
#include <TopExp.hxx>
#include <Precision.hxx>
class GEOM_Engine;
-class Handle(GEOM_Object);
+class GEOM_Object;
class GEOMImpl_IMeasureOperations : public GEOM_IOperations {
public:
GEOMImpl_IPolyline2D(Handle(GEOM_Function) theFunction): _func(theFunction) {}
- void SetNames(const Handle_TColStd_HArray1OfExtendedString &theValue)
+ void SetNames(const Handle(TColStd_HArray1OfExtendedString) &theValue)
{ _func->SetStringArray(POLY_ARG_NAMES, theValue); }
- Handle_TColStd_HArray1OfExtendedString GetNames()
+ Handle(TColStd_HArray1OfExtendedString) GetNames()
{ return _func->GetStringArray(POLY_ARG_NAMES); }
- void SetTypes(const Handle_TColStd_HArray1OfByte &theValue)
+ void SetTypes(const Handle(TColStd_HArray1OfByte) &theValue)
{ _func->SetByteArray(POLY_ARG_TYPES, theValue); }
- Handle_TColStd_HArray1OfByte GetTypes()
+ Handle(TColStd_HArray1OfByte) GetTypes()
{ return _func->GetByteArray(POLY_ARG_TYPES); }
- void SetClosedFlags(const Handle_TColStd_HArray1OfByte &theValue)
+ void SetClosedFlags(const Handle(TColStd_HArray1OfByte) &theValue)
{ _func->SetBooleanArray(POLY_ARG_CLOSEDS, theValue); }
- Handle_TColStd_HArray1OfByte GetClosedFlags()
+ Handle(TColStd_HArray1OfByte) GetClosedFlags()
{ return _func->GetBooleanArray(POLY_ARG_CLOSEDS); }
- void SetWorkingPlaneDbls(const Handle_TColStd_HArray1OfReal &thePlane)
+ void SetWorkingPlaneDbls(const Handle(TColStd_HArray1OfReal) &thePlane)
{ _func->SetRealArray(POLY_ARG_WPLANE_DBLS, thePlane); }
- Handle_TColStd_HArray1OfReal GetWorkingPlaneDbls()
+ Handle(TColStd_HArray1OfReal) GetWorkingPlaneDbls()
{ return _func->GetRealArray(POLY_ARG_WPLANE_DBLS); }
- void SetWorkingPlane(const Handle_GEOM_Function &thePlane)
+ void SetWorkingPlane(const Handle(GEOM_Function) &thePlane)
{ _func->SetReference(POLY_ARG_WPLANE_OBJ, thePlane); }
- Handle_GEOM_Function GetWorkingPlane()
+ Handle(GEOM_Function) GetWorkingPlane()
{ return _func->GetReference(POLY_ARG_WPLANE_OBJ); }
void SetCoords(const std::list <std::list <double> > &theValue);
#include <Geom_Surface.hxx>
#include <Geom_TrimmedCurve.hxx>
#include <Precision.hxx>
-#include <TColStd_HArray1OfInteger.hxx>
#include <TDF_Tool.hxx>
#include <TDataStd_Integer.hxx>
#include <TDataStd_ListIteratorOfListOfExtendedString.hxx>
#include <TopTools_MapOfShape.hxx>
#include <TopTools_SequenceOfShape.hxx>
#include <TopoDS.hxx>
+#include <TopoDS_TShape.hxx>
#include <TopoDS_Compound.hxx>
#include <TopoDS_Edge.hxx>
#include <TopoDS_Face.hxx>
return true;
}
-#include <TopoDS_TShape.hxx>
//=======================================================================
//function : isSameFace
//purpose : Returns True if two faces coincide
#include <TColStd_HSequenceOfTransient.hxx>
#include <TColStd_HSequenceOfInteger.hxx>
+#include <TColStd_HArray1OfInteger.hxx>
#include <Geom_Surface.hxx>
#include <list>
class GEOM_Engine;
-class Handle(GEOM_Object);
-class Handle(TColStd_HArray1OfInteger);
+class GEOM_Object;
class TopoDS_Shape;
class GEOMImpl_IShapesOperations : public GEOM_IOperations
#include <TFunction_DriverTable.hxx>
#include <TFunction_Driver.hxx>
-#include <TFunction_Logbook.hxx>
#include <TDF_Tool.hxx>
#include <BRep_Tool.hxx>
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_ImportDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_ImportDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
Handle(GEOM_Object) anImported = Handle(GEOM_Object)::DownCast( aSeq->Value(1) );
TopoDS_Shape aShape = anImported->GetValue();
aFunction->SetValue( aShape );
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_ImportDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ImportDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ImportDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_ImportDriver_HeaderFile
#define _GEOMImpl_ImportDriver_HeaderFile
-
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-#include <TCollection_AsciiString.hxx>
-
-class TColStd_SequenceOfExtendedString;
-
-
#include "GEOM_BaseDriver.hxx"
DEFINE_STANDARD_HANDLE( GEOMImpl_ImportDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_ImportDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_ImportDriver() {};
+ Standard_EXPORT GEOMImpl_ImportDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_ImportDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_ImportDriver )
+
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ImportDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_LineDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_LineDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_LineDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_LineDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_LineDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_LineDriver_HeaderFile
#define _GEOMImpl_LineDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_LineDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_LineDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_LineDriver() {};
+ Standard_EXPORT GEOMImpl_LineDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_LineDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_LineDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_LineDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_MarkerDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_MarkerDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_MarkerDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MarkerDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MarkerDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_MarkerDriver_HeaderFile
#define _GEOMImpl_MarkerDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_MarkerDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_MarkerDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_MarkerDriver() {};
+ Standard_EXPORT GEOMImpl_MarkerDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_MarkerDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_MarkerDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_MarkerDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_MeasureDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_MeasureDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
- log.SetTouched(Label());
+#if OCC_VERSION_MAJOR < 7
+ log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_MeasureDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MeasureDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MeasureDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_MeasureDriver_HeaderFile
#define _GEOMImpl_MeasureDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_MeasureDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_MeasureDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_MeasureDriver() {};
+ Standard_EXPORT GEOMImpl_MeasureDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_MeasureDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_MeasureDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_MeasureDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_MirrorDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_MirrorDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
- log.SetTouched(Label());
+#if OCC_VERSION_MAJOR < 7
+ log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_MirrorDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MirrorDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MirrorDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_MirrorDriver_HeaderFile
#define _GEOMImpl_MirrorDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_MirrorDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_MirrorDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_MirrorDriver() {};
+ Standard_EXPORT GEOMImpl_MirrorDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_MirrorDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_MirrorDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_MirrorDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_OffsetDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_OffsetDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_OffsetDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_OffsetDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_OffsetDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_OffsetDriver_HeaderFile
#define _GEOMImpl_OffsetDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_OffsetDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_OffsetDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_OffsetDriver() {};
+ Standard_EXPORT GEOMImpl_OffsetDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_OffsetDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_OffsetDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_OffsetDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_PartitionDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_PartitionDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
}
}
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_PartitionDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PartitionDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PartitionDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_PartitionDriver_HeaderFile
#define _GEOMImpl_PartitionDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_PartitionDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_PartitionDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_PartitionDriver() {};
+ Standard_EXPORT GEOMImpl_PartitionDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_PartitionDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_PartitionDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PartitionDriver,GEOM_BaseDriver)
};
#endif
GeomAPI_Interpolate anInt(HAP,Standard_False,1.e-7);
anInt.Load(aDir1,aDir2);
anInt.Perform();
- Handle(Geom_Curve) iso = anInt.Curve();
+ const Handle(Geom_BSplineCurve) iso = anInt.Curve();
fp = iso->FirstParameter();
lp = iso->LastParameter();
step = (lp-fp)/(NbP-1);
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_PipeDriver::Execute (TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_PipeDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
TopoDS_Shape aRes = GEOMUtils::CompsolidToCompound(aShape);
aFunction->SetValue(aRes);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_PipeDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipeDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipeDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_PipeDriver_HeaderFile
#define _GEOMImpl_PipeDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
#include <TopoDS_Wire.hxx>
#include <TopoDS_Shape.hxx>
#include <TopTools_HSequenceOfShape.hxx>
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_PipeDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
Standard_EXPORT GEOMImpl_PipeDriver();
- Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
- Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
- Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const
- { return Standard_True; }
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK& log) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK& log) const { return Standard_True; }
+
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_PipeDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- // Type management
- //
-DEFINE_STANDARD_RTTI( GEOMImpl_PipeDriver )
-
-
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PipeDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_PipePathDriver::Execute (TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_PipePathDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
if (aRes.IsNull()) return 0;
aFunction->SetValue(aRes);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_PipePathDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipePathDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipePathDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_PipePathDriver_HeaderFile
#define _GEOMImpl_PipePathDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-#include <TopoDS_Wire.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopTools_HSequenceOfShape.hxx>
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_PipePathDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
Standard_EXPORT GEOMImpl_PipePathDriver();
- Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
- Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
- Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const
- { return Standard_True; }
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_PipePathDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- // Type management
- //
-DEFINE_STANDARD_RTTI( GEOMImpl_PipePathDriver )
-
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PipePathDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_PlaneDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_PlaneDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
if (gp_Vec(aP1, aP2).IsParallel(gp_Vec(aP1, aP3), Precision::Angular()))
Standard_ConstructionError::Raise("Plane creation aborted: points lay on one line");
GC_MakePlane aMakePlane (aP1, aP2, aP3);
- aShape = BRepBuilderAPI_MakeFace(aMakePlane, -aSize, +aSize, -aSize, +aSize,
+ aShape = BRepBuilderAPI_MakeFace(aMakePlane.Value(),
+ -aSize, +aSize, -aSize, +aSize,
Precision::Confusion()).Shape();
} else if (aType == PLANE_FACE) {
Handle(GEOM_Function) aRef = aPI.GetFace();
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_PlaneDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PlaneDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PlaneDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_PlaneDriver_HeaderFile
#define _GEOMImpl_PlaneDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_PlaneDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_PlaneDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_PlaneDriver() {};
+ Standard_EXPORT GEOMImpl_PlaneDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_PlaneDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_PlaneDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PlaneDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_PointDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_PointDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
//aShape.Infinite(Standard_True); // VSR: 05/04/2010: Fix 20668 (Fit All for points & lines)
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_PointDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PointDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PointDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_PointDriver_HeaderFile
#define _GEOMImpl_PointDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_PointDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_PointDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_PointDriver() {};
+ Standard_EXPORT GEOMImpl_PointDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_PointDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_PointDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PointDriver,GEOM_BaseDriver)
};
#endif
//function : MakePolyline2D
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_PolylineDriver::MakePolyline2D
- (TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_PolylineDriver::MakePolyline2D(LOGBOOK& log) const
{
if (Label().IsNull()) {
return 0;
}
aFunction->SetValue(aShape);
- log.SetTouched(Label());
+#if OCC_VERSION_MAJOR < 7
+ log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_PolylineDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_PolylineDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
- log.SetTouched(Label());
+#if OCC_VERSION_MAJOR < 7
+ log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_PolylineDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PolylineDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PolylineDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_PolylineDriver_HeaderFile
#define _GEOMImpl_PolylineDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_PolylineDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_PolylineDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_PolylineDriver() {};
+ Standard_EXPORT GEOMImpl_PolylineDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_PolylineDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
private:
- Standard_Integer MakePolyline2D(TFunction_Logbook& log) const;
+ Standard_Integer MakePolyline2D(LOGBOOK& log) const;
-DEFINE_STANDARD_RTTI( GEOMImpl_PolylineDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PolylineDriver,GEOM_BaseDriver)
};
#endif
*/
GEOMImpl_PolylineDumper
(const std::list <std::list <double> > &theCoords,
- const Handle_TColStd_HArray1OfExtendedString &theNames,
- const Handle_TColStd_HArray1OfByte &theTypes,
- const Handle_TColStd_HArray1OfByte &theCloseds,
- const Handle_TColStd_HArray1OfReal &thePlnCoords);
+ const Handle(TColStd_HArray1OfExtendedString) &theNames,
+ const Handle(TColStd_HArray1OfByte) &theTypes,
+ const Handle(TColStd_HArray1OfByte) &theCloseds,
+ const Handle(TColStd_HArray1OfReal) &thePlnCoords);
/**
* This construcor initializes the object with 2D polyline creation
*/
GEOMImpl_PolylineDumper
(const std::list <std::list <double> > &theCoords,
- const Handle_TColStd_HArray1OfExtendedString &theNames,
- const Handle_TColStd_HArray1OfByte &theTypes,
- const Handle_TColStd_HArray1OfByte &theCloseds,
- const Handle_GEOM_Object &theWorkingPlane);
+ const Handle(TColStd_HArray1OfExtendedString) &theNames,
+ const Handle(TColStd_HArray1OfByte) &theTypes,
+ const Handle(TColStd_HArray1OfByte) &theCloseds,
+ const Handle(GEOM_Object) &theWorkingPlane);
/**
* This method returns Standard_True if the dump description is created
* \param theObject the newly created object.
* \return Standard_True in case of success; Standard_False otherwise.
*/
- Standard_Boolean Dump(const Handle_GEOM_Object &theObject);
+ Standard_Boolean Dump(const Handle(GEOM_Object) &theObject);
protected:
private:
const std::list <std::list <double> > &myCoords;
- Handle_TColStd_HArray1OfExtendedString myNames;
- Handle_TColStd_HArray1OfByte myTypes;
- Handle_TColStd_HArray1OfByte myCloseds;
- Handle_TColStd_HArray1OfReal myPlnCoords;
- Handle_GEOM_Object myWorkingPlane;
+ Handle(TColStd_HArray1OfExtendedString) myNames;
+ Handle(TColStd_HArray1OfByte) myTypes;
+ Handle(TColStd_HArray1OfByte) myCloseds;
+ Handle(TColStd_HArray1OfReal) myPlnCoords;
+ Handle(GEOM_Object) myWorkingPlane;
Standard_Boolean myIsDone;
TCollection_ExtendedString myDescr;
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_PositionDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_PositionDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_PositionDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PositionDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PositionDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_PositionDriver_HeaderFile
#define _GEOMImpl_PositionDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_PositionDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_PositionDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_PositionDriver() {};
+ Standard_EXPORT GEOMImpl_PositionDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_PositionDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_PositionDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PositionDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_PrismDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_PrismDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aRes);
}
-
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_PrismDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PrismDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PrismDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_PrismDriver_HeaderFile
#define _GEOMImpl_PrismDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
#include <TopoDS_Shape.hxx>
#include <gp_Vec.hxx>
#include <Standard_Real.hxx>
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_PrismDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
-
Standard_EXPORT GEOMImpl_PrismDriver();
Standard_EXPORT ~GEOMImpl_PrismDriver() {};
- Standard_EXPORT virtual Standard_Integer Execute (TFunction_Logbook& log) const;
- Standard_EXPORT virtual void Validate (TFunction_Logbook&) const {}
- Standard_EXPORT Standard_Boolean MustExecute (const TFunction_Logbook&) const { return Standard_True; }
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate (LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute (const LOGBOOK&) const { return Standard_True; }
+
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT static TopoDS_Shape MakeScaledPrism (const TopoDS_Shape& theShapeBase,
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- // Type management
-
-DEFINE_STANDARD_RTTI( GEOMImpl_PrismDriver )
-
-
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PrismDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_ProjectionDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_ProjectionDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
if (aShape.IsNull()) return 0;
aFunction->SetValue(aShape);
- log.SetTouched(Label());
+#if OCC_VERSION_MAJOR < 7
+ log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
} else if (aType == PROJECTION_ON_WIRE) {
// Perform projection of point on a wire or an edge.
GEOMImpl_IProjection aProj (aFunction);
}
// Transform the curve to cylinder's parametric space.
+#if OCC_VERSION_MAJOR < 7
GEOMUtils::Handle(HTrsfCurve2d) aTrsfCurve =
+#else
+ Handle(GEOMUtils::HTrsfCurve2d) aTrsfCurve =
+#endif
new GEOMUtils::HTrsfCurve2d(aCurve, aPar[0], aPar[1], aTrsf2d);
Approx_Curve2d aConv (aTrsfCurve, aPar[0], aPar[1],
aUResol, aVResol, GeomAbs_C1,
return aResult;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_ProjectionDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ProjectionDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ProjectionDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_ProjectionDriver_HeaderFile
#define _GEOMImpl_ProjectionDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
class TopoDS_Shape;
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_ProjectionDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_ProjectionDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_ProjectionDriver() {};
+ Standard_EXPORT GEOMImpl_ProjectionDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_ProjectionDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ProjectionDriver,GEOM_BaseDriver)
+
private:
TopoDS_Shape projectOnCylinder(const TopoDS_Shape &theShape,
const Standard_Real theStartAngle,
const Standard_Real theAngleLength,
const Standard_Real theAngleRotation) const;
-
-public:
-
-DEFINE_STANDARD_RTTI( GEOMImpl_ProjectionDriver )
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_RevolutionDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_RevolutionDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
TopoDS_Shape aRes = GEOMUtils::CompsolidToCompound(aShape);
aFunction->SetValue(aRes);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_RevolutionDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RevolutionDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RevolutionDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_RevolutionDriver_HeaderFile
#define _GEOMImpl_RevolutionDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_RevolutionDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_RevolutionDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_RevolutionDriver() {};
+ Standard_EXPORT GEOMImpl_RevolutionDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_RevolutionDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_RevolutionDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_RevolutionDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_RotateDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_RotateDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_RotateDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RotateDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RotateDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_RotateDriver_HeaderFile
#define _GEOMImpl_RotateDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_RotateDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_RotateDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_RotateDriver() {};
+ Standard_EXPORT GEOMImpl_RotateDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_RotateDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_RotateDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_RotateDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_ScaleDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_ScaleDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
- log.SetTouched(Label());
+#if OCC_VERSION_MAJOR < 7
+ log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_ScaleDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ScaleDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ScaleDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_ScaleDriver_HeaderFile
#define _GEOMImpl_ScaleDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_ScaleDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_ScaleDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_ScaleDriver() {};
+ Standard_EXPORT GEOMImpl_ScaleDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_ScaleDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_ScaleDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ScaleDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_ShapeDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_ShapeDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
if (!aWarning.IsEmpty())
Standard_Failure::Raise(aWarning.ToCString());
if (closed_flag) {
// Check if closed curve is reordered.
- Handle(Geom_Curve) aCurve = concatcurve->Value(concatcurve->Lower());
+ Handle(Geom_BSplineCurve) aCurve = concatcurve->Value(concatcurve->Lower());
Standard_Real aFPar = aCurve->FirstParameter();
gp_Pnt aPFirst;
gp_Pnt aPntVtx = BRep_Tool::Pnt(FirstVertex);
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_ShapeDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ShapeDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ShapeDriver,GEOM_BaseDriver);
//modified by NIZNHY-PKV Wed Dec 28 13:48:31 2011f
#include <TopoDS_Iterator.hxx>
#ifndef _GEOMImpl_ShapeDriver_HeaderFile
#define _GEOMImpl_ShapeDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
#include <TopoDS_Shape.hxx>
#include <TopoDS_Edge.hxx>
#include <TopoDS_Wire.hxx>
#include <TColStd_HSequenceOfTransient.hxx>
-class TColStd_SequenceOfExtendedString;
-class TopoDS_Face;
-
+#include <GEOM_BaseDriver.hxx>
-#include "GEOM_BaseDriver.hxx"
+class TopoDS_Face;
DEFINE_STANDARD_HANDLE( GEOMImpl_ShapeDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
Standard_EXPORT GEOMImpl_ShapeDriver();
Standard_EXPORT ~GEOMImpl_ShapeDriver() {};
- Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
- Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
- Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT static TopoDS_Edge MakeEdgeFromWire (const TopoDS_Shape& aWire,
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- // Type management
- //
-DEFINE_STANDARD_RTTI( GEOMImpl_ShapeDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ShapeDriver,GEOM_BaseDriver)
private:
const Standard_Real theUMax,
const Standard_Real theVMin,
const Standard_Real theVMax) const;
-
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_SketcherDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_SketcherDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
// set the function result
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_SketcherDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SketcherDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SketcherDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_SketcherDriver_HeaderFile
#define _GEOMImpl_SketcherDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_SketcherDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_SketcherDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_SketcherDriver() {};
+ Standard_EXPORT GEOMImpl_SketcherDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_SketcherDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_SketcherDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_SketcherDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_SphereDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_SphereDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
- log.SetTouched(Label());
+#if OCC_VERSION_MAJOR < 7
+ log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_SphereDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SphereDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SphereDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_SphereDriver_HeaderFile
#define _GEOMImpl_SphereDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_SphereDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_SphereDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_SphereDriver() {};
+ Standard_EXPORT GEOMImpl_SphereDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_SphereDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_SphereDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_SphereDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_SplineDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_SplineDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_SplineDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SplineDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SplineDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_SplineDriver_HeaderFile
#define _GEOMImpl_SplineDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_SplineDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_SplineDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_SplineDriver() {};
+ Standard_EXPORT GEOMImpl_SplineDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_SplineDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_SplineDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_SplineDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_ThruSectionsDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_ThruSectionsDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_ThruSectionsDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ThruSectionsDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ThruSectionsDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_ThruSectionsDriver_HeaderFile
#define _GEOMImpl_ThruSectionsDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_ThruSectionsDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_ThruSectionsDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_ThruSectionsDriver() {};
+ Standard_EXPORT GEOMImpl_ThruSectionsDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_ThruSectionsDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_ThruSectionsDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ThruSectionsDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_TorusDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_TorusDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
if (aShape.IsNull()) return 0;
aFunction->SetValue(aShape);
- log.SetTouched(Label());
+#if OCC_VERSION_MAJOR < 7
+ log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_TorusDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TorusDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TorusDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_TorusDriver_HeaderFile
#define _GEOMImpl_TorusDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_TorusDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_TorusDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_TorusDriver() {};
+ Standard_EXPORT GEOMImpl_TorusDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_TorusDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_TorusDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_TorusDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_TranslateDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_TranslateDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_TranslateDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TranslateDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TranslateDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_TranslateDriver_HeaderFile
#define _GEOMImpl_TranslateDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_TranslateDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_TranslateDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_TranslateDriver() {};
+ Standard_EXPORT GEOMImpl_TranslateDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_TranslateDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_TranslateDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_TranslateDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_VectorDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_VectorDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_VectorDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_VectorDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_VectorDriver,GEOM_BaseDriver);
#ifndef _GEOMImpl_VectorDriver_HeaderFile
#define _GEOMImpl_VectorDriver_HeaderFile
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-#include "GEOM_BaseDriver.hxx"
+#include <GEOM_BaseDriver.hxx>
DEFINE_STANDARD_HANDLE( GEOMImpl_VectorDriver, GEOM_BaseDriver );
public:
- // Methods PUBLIC
- //
-Standard_EXPORT GEOMImpl_VectorDriver();
-Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_VectorDriver() {};
+ Standard_EXPORT GEOMImpl_VectorDriver();
+ Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+
+ Standard_EXPORT static const Standard_GUID& GetID();
+ Standard_EXPORT ~GEOMImpl_VectorDriver() {};
Standard_EXPORT virtual
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
-DEFINE_STANDARD_RTTI( GEOMImpl_VectorDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_VectorDriver,GEOM_BaseDriver)
+
};
#endif
class SalomeApp_Study;
class SVTK_View;
class QColor;
-class Handle_SALOME_InteractiveObject;
-class Handle_AIS_InteractiveContext;
+class SALOME_InteractiveObject;
+class AIS_InteractiveContext;
#include <QList>
#include <GEOMUtils_HTrsfCurve2d.hxx>
namespace GEOMUtils {
- IMPLEMENT_STANDARD_HANDLE (HTrsfCurve2d, Adaptor2d_HCurve2d);
- IMPLEMENT_STANDARD_RTTIEXT(HTrsfCurve2d, Adaptor2d_HCurve2d);
+ OCCT_IMPLEMENT_STANDARD_RTTIEXT(HTrsfCurve2d, Adaptor2d_HCurve2d);
}
//=======================================================================
public:
- DEFINE_STANDARD_RTTI(HTrsfCurve2d);
-
+ OCCT_DEFINE_STANDARD_RTTIEXT(HTrsfCurve2d,Adaptor2d_HCurve2d)
};
}
const Standard_Real /*Tol*/) const
{
Handle(Geom2d_Curve) aCurve = myCurve.Curve();
+#if OCC_VERSION_MAJOR < 7
GEOMUtils::Handle(HTrsfCurve2d) aAHCurve =
+#else
+ Handle(GEOMUtils::HTrsfCurve2d) aAHCurve =
+#endif
new GEOMUtils::HTrsfCurve2d(aCurve, First, Last, myTrsf);
return aAHCurve;
#ifndef _GEOMUtils_TrsfCurve2d_HXX_
#define _GEOMUtils_TrsfCurve2d_HXX_
-
#include <GEOMUtils_Trsf2d.hxx>
+#include <Basics_OCCTVersion.hxx>
+
#include <Geom2dHatch_Hatcher.hxx>
#include <GeomAbs_IsoType.hxx>
#include <TColStd_HArray1OfInteger.hxx>
GEOM_BaseObject_i::GEOM_BaseObject_i (PortableServer::POA_ptr thePOA,
GEOM::GEOM_Gen_ptr theEngine,
- Handle(GEOM_BaseObject) theImpl)
+ HANDLE_NAMESPACE(GEOM_BaseObject) theImpl)
: SALOME::GenericObj_i( thePOA ), _engine(theEngine), _impl(theImpl)
{
}
TCollection_AsciiString anEntry;
for (int i = 1; i<=aLength; i++) {
- Handle(GEOM_BaseObject) anObj = Handle(GEOM_BaseObject)::DownCast(aSeq->Value(i));
+ HANDLE_NAMESPACE(GEOM_BaseObject) anObj = HANDLE_NAMESPACE(GEOM_BaseObject)::DownCast(aSeq->Value(i));
if (anObj.IsNull()) continue;
TDF_Tool::Entry(anObj->GetEntry(), anEntry);
GEOM::GEOM_BaseObject_var obj = _engine->GetObject(anObj->GetDocID(), (char*) anEntry.ToCString());
TCollection_AsciiString anEntry;
for (int i = 1; i<=aLength; i++) {
- Handle(GEOM_BaseObject) anObj = Handle(GEOM_BaseObject)::DownCast(aSeq->Value(i));
+ HANDLE_NAMESPACE(GEOM_BaseObject) anObj = HANDLE_NAMESPACE(GEOM_BaseObject)::DownCast(aSeq->Value(i));
if (anObj.IsNull()) continue;
GEOM::GEOM_BaseObject_var obj = _engine->GetObject(anObj->GetDocID(),
anObj->GetEntryString().ToCString());
int nbI = 0;
for ( int i = 1; i <= nbFun; ++i )
{
- Handle(GEOM_BaseDriver) driver =
- Handle(GEOM_BaseDriver)::DownCast( _impl->GetCreationDriver( i ));
+ HANDLE_NAMESPACE(GEOM_BaseDriver) driver =
+ HANDLE_NAMESPACE(GEOM_BaseDriver)::DownCast( _impl->GetCreationDriver( i ));
if ( !driver.IsNull() )
{
std::vector<GEOM_Param> params;
class GEOM_I_EXPORT GEOM_BaseObject_i : public virtual POA_GEOM::GEOM_BaseObject, public virtual SALOME::GenericObj_i
{
public:
- GEOM_BaseObject_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(GEOM_BaseObject) theImpl);
+ GEOM_BaseObject_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_BaseObject) theImpl);
~GEOM_BaseObject_i();
virtual char* GetEntry();
virtual GEOM::CreationInformationSeq* GetCreationInformation();
- Handle(GEOM_BaseObject) GetImpl() { return _impl; }
+ HANDLE_NAMESPACE(GEOM_BaseObject) GetImpl() { return _impl; }
protected:
private:
- Handle(GEOM_BaseObject) _impl;
+ HANDLE_NAMESPACE(GEOM_BaseObject) _impl;
};
#endif
GEOM_Field_i::GEOM_Field_i (PortableServer::POA_ptr thePOA,
GEOM::GEOM_Gen_ptr theEngine,
- Handle(GEOM_Field) theImpl):
+ HANDLE_NAMESPACE(GEOM_Field) theImpl):
SALOME::GenericObj_i( thePOA ),
GEOM_BaseObject_i( thePOA, theEngine, theImpl ),
_impl( theImpl )
GEOM::GEOM_Object_ptr GEOM_Field_i::GetShape()
{
GEOM::GEOM_Object_var shapeVar;
- Handle(GEOM_Object) shape = _impl->GetShape();
+ HANDLE_NAMESPACE(GEOM_Object) shape = _impl->GetShape();
if ( !shape.IsNull() )
{
GEOM::GEOM_BaseObject_var obj = _engine->GetObject( shape->GetDocID(),
GEOM::GEOM_FieldStep_ptr GEOM_Field_i::AddStep(::CORBA::Long stepID, ::CORBA::Long stamp)
{
GEOM::GEOM_FieldStep_var stepVar;
- Handle(GEOM_FieldStep) step = _impl->AddStep( stepID, stamp );
+ HANDLE_NAMESPACE(GEOM_FieldStep) step = _impl->AddStep( stepID, stamp );
if ( !step.IsNull() )
{
GEOM::GEOM_BaseObject_var obj = _engine->GetObject( step->GetDocID(),
GEOM::ListOfLong* GEOM_Field_i::GetSteps()
{
- std::list< Handle(GEOM_FieldStep)> stepList = _impl->GetSteps();
- std::list< Handle(GEOM_FieldStep)>::iterator stp = stepList.begin();
+ std::list< HANDLE_NAMESPACE(GEOM_FieldStep)> stepList = _impl->GetSteps();
+ std::list< HANDLE_NAMESPACE(GEOM_FieldStep)>::iterator stp = stepList.begin();
GEOM::ListOfLong_var stepIds = new GEOM::ListOfLong();
stepIds->length( stepList.size() );
GEOM::GEOM_FieldStep_ptr GEOM_Field_i::GetStep(CORBA::Long stepID)
{
GEOM::GEOM_FieldStep_var stepVar;
- Handle(GEOM_FieldStep) step = _impl->GetStep(stepID);
+ HANDLE_NAMESPACE(GEOM_FieldStep) step = _impl->GetStep(stepID);
if ( !step.IsNull() )
{
GEOM::GEOM_BaseObject_var obj = _engine->GetObject( step->GetDocID(),
GEOM_FieldStep_i::GEOM_FieldStep_i(PortableServer::POA_ptr thePOA,
GEOM::GEOM_Gen_ptr theEngine,
- Handle(GEOM_FieldStep) theImpl):
+ HANDLE_NAMESPACE(GEOM_FieldStep) theImpl):
SALOME::GenericObj_i( thePOA ),
GEOM_BaseObject_i( thePOA, theEngine, theImpl ),
_impl( theImpl )
GEOM::GEOM_Field_ptr GEOM_FieldStep_i::GetField()
{
GEOM::GEOM_Field_var fieldVar;
- Handle(GEOM_Field) field = _impl->GetField();
+ HANDLE_NAMESPACE(GEOM_Field) field = _impl->GetField();
if ( !field.IsNull() )
{
GEOM::GEOM_BaseObject_var obj = _engine->GetObject( field->GetDocID(),
*/
//================================================================================
-GEOM_BoolFieldStep_i::GEOM_BoolFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(GEOM_FieldStep) theImpl):
+GEOM_BoolFieldStep_i::GEOM_BoolFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl):
SALOME::GenericObj_i( thePOA ),
GEOM_BaseObject_i( thePOA, theEngine, theImpl ),
GEOM_FieldStep_i( thePOA, theEngine, theImpl )
*/
//================================================================================
-GEOM_IntFieldStep_i::GEOM_IntFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(GEOM_FieldStep) theImpl):
+GEOM_IntFieldStep_i::GEOM_IntFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl):
SALOME::GenericObj_i( thePOA ),
GEOM_BaseObject_i( thePOA, theEngine, theImpl ),
GEOM_FieldStep_i( thePOA, theEngine, theImpl )
*/
//================================================================================
-GEOM_DoubleFieldStep_i::GEOM_DoubleFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(GEOM_FieldStep) theImpl):
+GEOM_DoubleFieldStep_i::GEOM_DoubleFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl):
SALOME::GenericObj_i( thePOA ),
GEOM_BaseObject_i( thePOA, theEngine, theImpl ),
GEOM_FieldStep_i( thePOA, theEngine, theImpl )
*/
//================================================================================
-GEOM_StringFieldStep_i::GEOM_StringFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(GEOM_FieldStep) theImpl):
+GEOM_StringFieldStep_i::GEOM_StringFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl):
SALOME::GenericObj_i( thePOA ),
GEOM_BaseObject_i( thePOA, theEngine, theImpl ),
GEOM_FieldStep_i( thePOA, theEngine, theImpl )
class GEOM_I_EXPORT GEOM_Field_i : public virtual POA_GEOM::GEOM_Field, public virtual GEOM_BaseObject_i
{
public:
- GEOM_Field_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(GEOM_Field) theImpl);
+ GEOM_Field_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_Field) theImpl);
~GEOM_Field_i();
virtual GEOM::GEOM_Object_ptr GetShape();
private:
- Handle(GEOM_Field) _impl;
+ HANDLE_NAMESPACE(GEOM_Field) _impl;
};
//================================================================================
class GEOM_I_EXPORT GEOM_FieldStep_i : public virtual POA_GEOM::GEOM_FieldStep, public virtual GEOM_BaseObject_i
{
public:
- GEOM_FieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(GEOM_FieldStep) theImpl);
+ GEOM_FieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl);
~GEOM_FieldStep_i();
virtual void SetStamp(::CORBA::Long stamp);
protected:
- Handle(GEOM_FieldStep) _impl;
+ HANDLE_NAMESPACE(GEOM_FieldStep) _impl;
};
//================================================================================
class GEOM_I_EXPORT GEOM_BoolFieldStep_i : public virtual POA_GEOM::GEOM_BoolFieldStep, public virtual GEOM_FieldStep_i
{
public:
- GEOM_BoolFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(GEOM_FieldStep) theImpl);
+ GEOM_BoolFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl);
virtual ::CORBA::Boolean SetValues(const ::GEOM::short_array& boolValues);
virtual GEOM::short_array* GetValues();
class GEOM_I_EXPORT GEOM_IntFieldStep_i : public virtual POA_GEOM::GEOM_IntFieldStep, public virtual GEOM_FieldStep_i
{
public:
- GEOM_IntFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(GEOM_FieldStep) theImpl);
+ GEOM_IntFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl);
virtual ::CORBA::Boolean SetValues(const ::GEOM::ListOfLong& intValues);
virtual GEOM::ListOfLong* GetValues();
class GEOM_I_EXPORT GEOM_DoubleFieldStep_i : public virtual POA_GEOM::GEOM_DoubleFieldStep, public virtual GEOM_FieldStep_i
{
public:
- GEOM_DoubleFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(GEOM_FieldStep) theImpl);
+ GEOM_DoubleFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl);
virtual ::CORBA::Boolean SetValues(const ::GEOM::ListOfDouble& doubleValues);
virtual GEOM::ListOfDouble* GetValues();
class GEOM_I_EXPORT GEOM_StringFieldStep_i : public virtual POA_GEOM::GEOM_StringFieldStep, public virtual GEOM_FieldStep_i
{
public:
- GEOM_StringFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(GEOM_FieldStep) theImpl);
+ GEOM_StringFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl);
virtual ::CORBA::Boolean SetValues(const ::GEOM::string_array& strValues);
virtual GEOM::string_array* GetValues();
#define GEOM_I_EXPORT
#endif
+#include <Basics_OCCTVersion.hxx>
+#if OCC_VERSION_MAJOR < 7
+ #define HANDLE_NAMESPACE(CLS) Handle(CLS)
+#else
+ #define HANDLE_NAMESPACE(CLS) Handle(::CLS)
+#endif
+
#endif //_GEOM_GEOM_I_HXX_
#include <TColStd_HArray1OfInteger.hxx>
#include <TopAbs_ShapeEnum.hxx>
#include <TopExp.hxx>
-#include <TopTools_SequenceOfShape.hxx>
#include <OSD.hxx>
#include <TDataStd_ChildNodeIterator.hxx>
#include <TDocStd_Owner.hxx>
{
SALOMEDS::Study_var aStudy = theSObject->GetStudy();
- Handle(GEOM_BaseObject) anObject =
+ HANDLE_NAMESPACE(GEOM_BaseObject) anObject =
_impl->GetObject(aStudy->StudyId(), aLocalPersistentID);
if ( !anObject.IsNull() )
{
{
// recieve current TopoDS shape
CORBA::String_var entry = aShape->GetEntry();
- Handle(GEOM_Object) aGShape = Handle(GEOM_Object)::DownCast
+ HANDLE_NAMESPACE(GEOM_Object) aGShape = HANDLE_NAMESPACE(GEOM_Object)::DownCast
( _impl->GetObject( aShape->GetStudyID(), entry ));
TopoDS_Shape TopoSh = aGShape->GetValue();
// find label of main shape
aMainSh = aMainSh->GetMainShape();
}
entry = aMainSh->GetEntry();
- Handle(GEOM_BaseObject) anObj = _impl->GetObject( aMainSh->GetStudyID(), entry );
+ HANDLE_NAMESPACE(GEOM_BaseObject) anObj = _impl->GetObject( aMainSh->GetStudyID(), entry );
TDF_Label aMainLbl = anObj->GetFunction(1)->GetNamingEntry();
// check all named shapes using iterator
GEOM::ListOfGO_var aResList)
{
CORBA::String_var entry = theMainShape->GetEntry();
- //Handle(GEOM_Object) aMainShape = _impl->GetObject(theMainShape->GetStudyID(), entry);
+ //HANDLE_NAMESPACE(GEOM_Object) aMainShape = _impl->GetObject(theMainShape->GetStudyID(), entry);
Handle(TColStd_HArray1OfInteger) anArray;
if(SeqS.Length()>0) {
// create a group
GEOM::GEOM_Object_wrap GrObj = GOp->CreateGroup( theMainShape, SeqS(1).ShapeType() );
AddInStudy(theStudy, GrObj, GrName, theMainShape._retn());
//CORBA::String_var GrEntry = GrObj->GetEntry();
- //Handle(GEOM_Object) HGrObj = _impl->GetObject(GrObj->GetStudyID(), GrEntry);
+ //HANDLE_NAMESPACE(GEOM_Object) HGrObj = _impl->GetObject(GrObj->GetStudyID(), GrEntry);
// add named objects
- //Handle(GEOM_Object) anObj;
+ //HANDLE_NAMESPACE(GEOM_Object) anObj;
for(int i=1; i<=SeqS.Length(); i++) {
TopoDS_Shape aValue = SeqS.Value(i);
//anArray = new TColStd_HArray1OfInteger(1,1);
GOp->AddObject(GrObj,anIndex);
//anObj = GEOM_Engine::GetEngine()->AddObject(aMainShape->GetDocID(), GEOM_SUBSHAPE);
//if (anObj.IsNull()) continue;
- //Handle(GEOM_Function) aFunction = anObj->AddFunction(GEOM_Object::GetSubShapeID(), 1);
+ //HANDLE_NAMESPACE(GEOM_Function) aFunction = anObj->AddFunction(GEOM_Object::GetSubShapeID(), 1);
//if (aFunction.IsNull()) continue;
//GEOM_ISubShape aSSI(aFunction);
//aSSI.SetMainShape(aMainShape->GetLastFunction());
if(theMainShape->_is_nil()) return aResList._retn();
CORBA::String_var entry = theMainShape->GetEntry();
- Handle(GEOM_Object) aMainShape = Handle(GEOM_Object)::DownCast
+ HANDLE_NAMESPACE(GEOM_Object) aMainShape = HANDLE_NAMESPACE(GEOM_Object)::DownCast
( _impl->GetObject( theMainShape->GetStudyID(), entry ));
if (aMainShape.IsNull()) return aResList._retn();
TopoDS_Shape MainSh = aMainShape->GetValue();
if (isMultiFile)
aNameWithExt = TCollection_AsciiString((char*)(SALOMEDS_Tool::GetNameFromPath
(theComponent->GetStudy()->URL())).c_str());
+#if OCC_VERSION_MAJOR > 6
+ aNameWithExt += TCollection_AsciiString("_GEOM.cbf");
+#else
aNameWithExt += TCollection_AsciiString("_GEOM.sgd");
+#endif
aSeq[0] = CORBA::string_dup(aNameWithExt.ToCString());
// Build a full file name of temporary file
TCollection_AsciiString aFullName = TCollection_AsciiString((char*)aTmpDir.c_str()) + aNameWithExt;
// Prepare a file name to open
TCollection_AsciiString aNameWithExt("");
SALOMEDS::Study_var study = theComponent->GetStudy();
+
+#if OCC_VERSION_MAJOR > 6
+ // Get the file name.
+ int i;
+ int aLength = aSeq->length();
+ const char *aGeomSgd = "_GEOM.sgd";
+ const char *aGeomcbf = "_GEOM.cbf";
+
+ for(i = 0; i < aLength; i++) {
+ std::string aName(aSeq[i]);
+
+ if (aName.rfind(aGeomSgd) != std::string::npos ||
+ aName.rfind(aGeomcbf) != std::string::npos) {
+ aNameWithExt = aName.c_str();
+ break;
+ }
+ }
+#else
if (isMultiFile) {
CORBA::String_var url = study->URL();
aNameWithExt = (char*)SALOMEDS_Tool::GetNameFromPath(url.in()).c_str();
}
+
aNameWithExt += "_GEOM.sgd";
+#endif
+
TCollection_AsciiString aFullName = (TCollection_AsciiString((char*)aTmpDir.c_str()) + aNameWithExt);
// Open document
//Create a new GEOM_Object
- Handle(GEOM_Object) anObj = _impl->AddObject(aNewSO->GetStudy()->StudyId(), theObjectID);
- Handle(GEOM_Function) aFunction = anObj->AddFunction(GEOMImpl_CopyDriver::GetID(), COPY_WITHOUT_REF);
+ HANDLE_NAMESPACE(GEOM_Object) anObj = _impl->AddObject(aNewSO->GetStudy()->StudyId(), theObjectID);
+ HANDLE_NAMESPACE(GEOM_Function) aFunction = anObj->AddFunction(GEOMImpl_CopyDriver::GetID(), COPY_WITHOUT_REF);
aFunction->SetValue(aTopology);
TCollection_AsciiString anEntry;
GEOM::GEOM_Object_var anArgOTrsf = aTrsfOpSv->TransformLikeOtherCopy(anArgO, theObject);
if (!CORBA::is_nil(anArgOTrsf)) {
CORBA::String_var anArgOTrsfEntry = anArgOTrsf->GetEntry();
- Handle(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry);
- Handle(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction();
+ HANDLE_NAMESPACE(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry);
+ HANDLE_NAMESPACE(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction();
anArgOTrsfFun->SetDescription("");
aSubO = aShapesOp->GetInPlace(theObject, anArgOTrsf);
}
/*
- Handle(GEOM_Function) anOFun = theObject->GetLastFunction();
+ HANDLE_NAMESPACE(GEOM_Function) anOFun = theObject->GetLastFunction();
if (!anOFun.IsNull()) {
CORBA::String_var entryArg = anArgO->GetEntry();
- Handle(GEOM_Object) anArgOImpl = _impl->GetObject(anArgO->GetStudyID(), entryArg);
+ HANDLE_NAMESPACE(GEOM_Object) anArgOImpl = _impl->GetObject(anArgO->GetStudyID(), entryArg);
if (!anArgOImpl.IsNull()) {
TopoDS_Shape anArgOShape = anArgOImpl->GetValue();
TopoDS_Shape aMultiArgShape;
{}
}
GEOM::GEOM_Object_var anArgOMulti = (aMultiArgShape); // TODO
- Handle(GEOM_Function) anArgOMultiFun = anArgOMulti->GetLastFunction();
+ HANDLE_NAMESPACE(GEOM_Function) anArgOMultiFun = anArgOMulti->GetLastFunction();
anArgOMultiFun->SetDescription("");
aSubO = aShapesOp->GetInPlace(theObject, anArgOMulti);
}
aResParts->length(nb);
if (nb > 0)
{
- Handle(GEOM_BaseObject) aMainObj = _impl->GetObject(theObject->GetStudyID(), theObject->GetEntry());
- Handle(GEOM_Function) aFunction = aMainObj->GetLastFunction();
+ HANDLE_NAMESPACE(GEOM_BaseObject) aMainObj = _impl->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+ HANDLE_NAMESPACE(GEOM_Function) aFunction = aMainObj->GetLastFunction();
GEOM::TPythonDump pd (aFunction, true);
pd <<"[";
int i = 0, j = 0;
anObjEntryMap.insert(anEntry);
aResParts[nbRes++] = anObj;
// clear python dump of object
- Handle(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anEntry);
- Handle(GEOM_Function) anObjFun = aGeomObj->GetLastFunction();
+ HANDLE_NAMESPACE(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anEntry);
+ HANDLE_NAMESPACE(GEOM_Function) anObjFun = aGeomObj->GetLastFunction();
if ( !anObjFun.IsNull() )
anObjFun->SetDescription( "" );
if ( j > 0 )
GEOM::GEOM_Object_var anObj = anOutArgs[ i ];
if (CORBA::is_nil(anObj))
continue;
- Handle(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anObj->GetEntry());
+ HANDLE_NAMESPACE(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anObj->GetEntry());
if ( j > 0 )
pd << ", ";
pd << aGeomObj;
GEOM::GEOM_Object_var anArgOTrsf = aTrsfOpSv->TransformLikeOtherCopy(anOldSubO, theNewO);
if (!CORBA::is_nil(anArgOTrsf)) {
CORBA::String_var anArgOTrsfEntry = anArgOTrsf->GetEntry();
- Handle(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry);
- Handle(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction();
+ HANDLE_NAMESPACE(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry);
+ HANDLE_NAMESPACE(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction();
anArgOTrsfFun->SetDescription("");
aNewSubO = aShapesOp->GetInPlace(theNewO, anArgOTrsf);
}
GEOM::GEOM_Object_var anArgOTrsf = aTrsfOpSv->TransformLikeOtherCopy(anArgO, theObject);
if (!CORBA::is_nil(anArgOTrsf)) {
CORBA::String_var anArgOTrsfEntry = anArgOTrsf->GetEntry();
- Handle(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry);
- Handle(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction();
+ HANDLE_NAMESPACE(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry);
+ HANDLE_NAMESPACE(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction();
anArgOTrsfFun->SetDescription("");
aSubO = aShapesOp->GetInPlace(theObject, anArgOTrsf);
}
aResParts->length(nb);
if (nb > 0)
{
- Handle(GEOM_BaseObject) aMainObj = _impl->GetObject(theObject->GetStudyID(), theObject->GetEntry());
- Handle(GEOM_Function) aFunction = aMainObj->GetLastFunction();
+ HANDLE_NAMESPACE(GEOM_BaseObject) aMainObj = _impl->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+ HANDLE_NAMESPACE(GEOM_Function) aFunction = aMainObj->GetLastFunction();
GEOM::TPythonDump pd (aFunction, true);
pd <<"[";
int i = 0, j = 0;
anObjEntryMap.insert(anEntry);
aResParts[nbRes++] = anObj;
// clear python dump of object
- Handle(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anEntry);
- Handle(GEOM_Function) anObjFun = aGeomObj->GetLastFunction();
+ HANDLE_NAMESPACE(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anEntry);
+ HANDLE_NAMESPACE(GEOM_Function) anObjFun = aGeomObj->GetLastFunction();
if ( !anObjFun.IsNull() )
anObjFun->SetDescription( "" );
if ( j > 0 )
GEOM::GEOM_Object_var anObj = theArgs[ i ];
if (CORBA::is_nil(anObj))
continue;
- Handle(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anObj->GetEntry());
+ HANDLE_NAMESPACE(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anObj->GetEntry());
if ( j > 0 )
pd << ", ";
pd << aGeomObj;
GEOM::GEOM_Object_var anArgOTrsf = aTrsfOpSv->TransformLikeOtherCopy(anOldSubO, theNewO);
if (!CORBA::is_nil(anArgOTrsf)) {
CORBA::String_var anArgOTrsfEntry = anArgOTrsf->GetEntry();
- Handle(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry);
- Handle(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction();
+ HANDLE_NAMESPACE(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry);
+ HANDLE_NAMESPACE(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction();
anArgOTrsfFun->SetDescription("");
aNewSubO = aShapesOp->GetInPlace(theNewO, anArgOTrsf);
}
if (CORBA::is_nil(theMainShape) || theIndices.length() < 1)
return GEOM::GEOM_Object::_nil();
CORBA::String_var entry = theMainShape->GetEntry();
- Handle(GEOM_Object) aMainShape = Handle(GEOM_Object)::DownCast
+ HANDLE_NAMESPACE(GEOM_Object) aMainShape = HANDLE_NAMESPACE(GEOM_Object)::DownCast
( _impl->GetObject( theMainShape->GetStudyID(), entry ));
if (aMainShape.IsNull()) return GEOM::GEOM_Object::_nil();
Handle(TColStd_HArray1OfInteger) anArray = new TColStd_HArray1OfInteger(1, theIndices.length());
for(Standard_Integer i = 0; i<theIndices.length(); i++) anArray->SetValue(i+1, theIndices[i]);
- Handle(GEOM_Object) anObject = _impl->AddSubShape(aMainShape, anArray, true);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = _impl->AddSubShape(aMainShape, anArray, true);
if(anObject.IsNull()) return GEOM::GEOM_Object::_nil();
TCollection_AsciiString anEntry;
void GEOM_Gen_i::RemoveObject(GEOM::GEOM_BaseObject_ptr theObject)
{
CORBA::String_var anEntry = theObject->GetEntry();
- Handle(GEOM_BaseObject) anObject = _impl->GetObject(theObject->GetStudyID(), anEntry, false);
+ HANDLE_NAMESPACE(GEOM_BaseObject) anObject = _impl->GetObject(theObject->GetStudyID(), anEntry, false);
if (!anObject.IsNull())
_impl->RemoveObject(anObject);
}
GEOM::GEOM_BaseObject_ptr GEOM_Gen_i::GetObject (CORBA::Long theStudyID, const char* theEntry)
{
GEOM::GEOM_BaseObject_var obj;
- Handle(GEOM_BaseObject) handle_object = _impl->GetObject(theStudyID, (char*)theEntry);
+ HANDLE_NAMESPACE(GEOM_BaseObject) handle_object = _impl->GetObject(theStudyID, (char*)theEntry);
if (handle_object.IsNull()) return obj._retn();
TCollection_AsciiString stringIOR = handle_object->GetIOR();
GEOM_BaseObject_i* servant = 0;
switch( handle_object->GetType() ) {
case GEOM_FIELD: {
- servant = new GEOM_Field_i (_poa, engine, Handle(GEOM_Field)::DownCast( handle_object ));
+ servant = new GEOM_Field_i (_poa, engine, HANDLE_NAMESPACE(GEOM_Field)::DownCast( handle_object ));
break;
}
case GEOM_FIELD_STEP: {
- Handle(GEOM_FieldStep) step = Handle(GEOM_FieldStep)::DownCast( handle_object );
- Handle(GEOM_Field) field = step->GetField();
+ HANDLE_NAMESPACE(GEOM_FieldStep) step = HANDLE_NAMESPACE(GEOM_FieldStep)::DownCast( handle_object );
+ HANDLE_NAMESPACE(GEOM_Field) field = step->GetField();
int type = ( !field.IsNull() ? field->GetDataType() : 0 );
switch( type ) {
case GEOM::FDT_Bool:
break;
}
default:
- servant = new GEOM_Object_i (_poa, engine, Handle(GEOM_Object)::DownCast( handle_object ));
+ servant = new GEOM_Object_i (_poa, engine, HANDLE_NAMESPACE(GEOM_Object)::DownCast( handle_object ));
}
PortableServer::ObjectId_var id = _poa->activate_object(servant);
std::string aGboEntry = gbo->GetEntry();
Handle(TDocStd_Document) aDoc = GEOM_Engine::GetEngine()->GetDocument(gbo->GetStudyID());
Handle(TDataStd_TreeNode) aNode, aRoot;
- Handle(GEOM_Function) aFunction;
+ HANDLE_NAMESPACE(GEOM_Function) aFunction;
if (aDoc->Main().FindAttribute(GEOM_Function::GetFunctionTreeID(), aRoot)) {
// go through the whole OCAF tree
TDataStd_ChildNodeIterator Itr( aRoot );
Handle(TDocStd_Document) aDoc = GEOM_Engine::GetEngine()->GetDocument(theStudy->StudyId());
Handle(TDataStd_TreeNode) aNode, aRoot;
- Handle(GEOM_Function) aFunction;
+ HANDLE_NAMESPACE(GEOM_Function) aFunction;
if (aDoc->Main().FindAttribute(GEOM_Function::GetFunctionTreeID(), aRoot)) {
// go through the whole OCAF tree
TDF_Label aLabel;
// because they could not be modified anyhow.
std::set<std::string> aToBeInSelected;
for ( it = aSelected.begin(); it != aSelected.end(); ++it ) {
- Handle(GEOM_BaseObject) handle_object = _impl->GetObject( theStudy->StudyId(), (*it).c_str(), false);
+ HANDLE_NAMESPACE(GEOM_BaseObject) handle_object = _impl->GetObject( theStudy->StudyId(), (*it).c_str(), false);
if ( handle_object.IsNull() )
continue;
std::set<std::string>& anOthers)
{
std::set<std::string>::iterator foundIt;
- Handle(GEOM_BaseObject) handle_object = _impl->GetObject( theStudy->StudyId(), aSelectedEntry.c_str(), false);
+ HANDLE_NAMESPACE(GEOM_BaseObject) handle_object = _impl->GetObject( theStudy->StudyId(), aSelectedEntry.c_str(), false);
if ( handle_object.IsNull() )
return;
- Handle(GEOM_Function) aShapeFun = handle_object->GetFunction(1);
+ HANDLE_NAMESPACE(GEOM_Function) aShapeFun = handle_object->GetFunction(1);
if ( aShapeFun.IsNull() || !aShapeFun->HasSubShapeReferences() )
return;
#include "GEOMUtils.hxx"
#include <TopTools_IndexedMapOfShape.hxx>
+#include <TopTools_SequenceOfShape.hxx>
#include <map>
#include <set>
//#include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
-class TopTools_SequenceOfShape;
-
//=====================================================================
// Generic operations creator (for plugins mechanism)
//=====================================================================
GetOperations()->SetNotDone();
//Create the Box
- Handle(GEOM_Object) anObject = GetOperations()->MakeBoxDXDYDZ(theDX, theDY, theDZ);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeBoxDXDYDZ(theDX, theDY, theDZ);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
//Set a not done flag
GetOperations()->SetNotDone();
- Handle(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
- Handle(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
if (aPnt1.IsNull() || aPnt2.IsNull()) return aGEOMObject._retn();
//Create the Box
- Handle(GEOM_Object) anObject = GetOperations()->MakeBoxTwoPnt(aPnt1, aPnt2);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeBoxTwoPnt(aPnt1, aPnt2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
return aGEOMObject._retn();
//Create the Face
- Handle(GEOM_Object) anObject = GetOperations()->MakeFaceHW(theH, theW, theOrientation);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeFaceHW(theH, theW, theOrientation);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference object
- Handle(GEOM_Object) anObj = GetObjectImpl(theObj);
+ HANDLE_NAMESPACE(GEOM_Object) anObj = GetObjectImpl(theObj);
if (anObj.IsNull())
return aGEOMObject._retn();
//Create the Face
- Handle(GEOM_Object) anObject = GetOperations()->MakeFaceObjHW(anObj, theH, theW);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeFaceObjHW(anObj, theH, theW);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- Handle(GEOM_Object) aPnt = GetObjectImpl(thePnt);
- Handle(GEOM_Object) aVec = GetObjectImpl(theVec);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt);
+ HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec);
if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn();
// Make Disk
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeDiskPntVecR(aPnt, aVec, theR);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- Handle(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
- Handle(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
- Handle(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn();
// Make Disk
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeDiskThreePnt(aPnt1, aPnt2, aPnt3);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
return aGEOMObject._retn();
//Create the Face
- Handle(GEOM_Object) anObject = GetOperations()->MakeDiskR(theR, theOrientation);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeDiskR(theR, theOrientation);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Create the Cylinder
- Handle(GEOM_Object) anObject = GetOperations()->MakeCylinderRH(theR, theH);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeCylinderRH(theR, theH);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Create the Cylinder
- Handle(GEOM_Object) anObject = GetOperations()->MakeCylinderRHA(theR, theH, theA);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeCylinderRHA(theR, theH, theA);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- Handle(GEOM_Object) aPnt = GetObjectImpl(thePnt);
- Handle(GEOM_Object) aVec = GetObjectImpl(theVec);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt);
+ HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec);
if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn();
//Create the Cylinder
- Handle(GEOM_Object) anObject = GetOperations()->MakeCylinderPntVecRH(aPnt, aVec, theR, theH);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeCylinderPntVecRH(aPnt, aVec, theR, theH);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- Handle(GEOM_Object) aPnt = GetObjectImpl(thePnt);
- Handle(GEOM_Object) aVec = GetObjectImpl(theVec);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt);
+ HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec);
if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn();
//Create the Cylinder
- Handle(GEOM_Object) anObject = GetOperations()->MakeCylinderPntVecRHA(aPnt, aVec, theR, theH, theA);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeCylinderPntVecRHA(aPnt, aVec, theR, theH, theA);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Create the Cone
- Handle(GEOM_Object) anObject = GetOperations()->MakeConeR1R2H(theR1, theR2, theH);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeConeR1R2H(theR1, theR2, theH);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- Handle(GEOM_Object) aPnt = GetObjectImpl(thePnt);
- Handle(GEOM_Object) aVec = GetObjectImpl(theVec);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt);
+ HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec);
if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn();
//Create the Cone
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeConePntVecR1R2H(aPnt, aVec, theR1, theR2, theH);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Create the Cone
- Handle(GEOM_Object) anObject = GetOperations()->MakeSphereR(theR);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeSphereR(theR);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference point
- Handle(GEOM_Object) aPnt = GetObjectImpl(thePnt);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt);
if (aPnt.IsNull()) return aGEOMObject._retn();
//Create the Sphere
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeSpherePntR(aPnt, theR);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
// Make Torus
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeTorusRR(theRMajor, theRMinor);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- Handle(GEOM_Object) aPnt = GetObjectImpl(thePnt);
- Handle(GEOM_Object) aVec = GetObjectImpl(theVec);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt);
+ HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec);
if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn();
// Make Torus
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeTorusPntVecRR(aPnt, aVec, theRMajor, theRMinor);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aBase = GetObjectImpl(theBase);
- Handle(GEOM_Object) aVec = GetObjectImpl(theVec);
+ HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
+ HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec);
if (aBase.IsNull() || aVec.IsNull()) return aGEOMObject._retn();
//Create the Prism
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakePrismVecH(aBase, aVec, theH);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aBase = GetObjectImpl(theBase);
- Handle(GEOM_Object) aVec = GetObjectImpl(theVec);
+ HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
+ HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec);
if (aBase.IsNull() || aVec.IsNull()) return aGEOMObject._retn();
//Create the Prism
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakePrismVecH2Ways(aBase, aVec, theH);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aBase = GetObjectImpl(theBase);
- Handle(GEOM_Object) aVec = GetObjectImpl(theVec);
+ HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
+ HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec);
if (aBase.IsNull() || aVec.IsNull()) return aGEOMObject._retn();
//Create the Prism
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakePrismVecH(aBase, aVec, theH, theScaleFactor);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aBase = GetObjectImpl(theBase);
- Handle(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
- Handle(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
+ HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
if (aBase.IsNull() || aPoint1.IsNull() || aPoint2.IsNull())
return aGEOMObject._retn();
//Create the Prism
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakePrismTwoPnt(aBase, aPoint1, aPoint2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aBase = GetObjectImpl(theBase);
- Handle(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
- Handle(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
+ HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
if (aBase.IsNull() || aPoint1.IsNull() || aPoint2.IsNull())
return aGEOMObject._retn();
//Create the Prism
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakePrismTwoPnt2Ways(aBase, aPoint1, aPoint2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aBase = GetObjectImpl(theBase);
- Handle(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
- Handle(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
+ HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
if (aBase.IsNull() || aPoint1.IsNull() || aPoint2.IsNull())
return aGEOMObject._retn();
//Create the Prism
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakePrismTwoPnt(aBase, aPoint1, aPoint2, theScaleFactor);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aBase = GetObjectImpl(theBase);
+ HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
if (aBase.IsNull()) return aGEOMObject._retn();
//Create the Prism
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakePrismDXDYDZ(aBase, theDX, theDY, theDZ);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aBase = GetObjectImpl(theBase);
+ HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
if (aBase.IsNull()) return aGEOMObject._retn();
//Create the Prism
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakePrismDXDYDZ2Ways(aBase, theDX, theDY, theDZ);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aBase = GetObjectImpl(theBase);
+ HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
if (aBase.IsNull()) return aGEOMObject._retn();
//Create the Prism
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakePrismDXDYDZ(aBase, theDX, theDY, theDZ, theScaleFactor);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aInit = GetObjectImpl(theInitShape);
- Handle(GEOM_Object) aBase = GetObjectImpl(theBase);
+ HANDLE_NAMESPACE(GEOM_Object) aInit = GetObjectImpl(theInitShape);
+ HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
if (aBase.IsNull() || aInit.IsNull()) return aGEOMObject._retn();
//Create the Prism
- Handle(GEOM_Object) anObject = GetOperations()->MakeDraftPrism(aInit, aBase, theHeight, theAngle, theFuse, theInvert);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeDraftPrism(aInit, aBase, theHeight, theAngle, theFuse, theInvert);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aBase = GetObjectImpl(theBase);
- Handle(GEOM_Object) aPath = GetObjectImpl(thePath);
+ HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
+ HANDLE_NAMESPACE(GEOM_Object) aPath = GetObjectImpl(thePath);
if (aBase.IsNull() || aPath.IsNull()) return aSeq._retn();
Standard_Integer aLength = aHSeq->Length();
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
- aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aBase = GetObjectImpl(theBase);
- Handle(GEOM_Object) anAxis = GetObjectImpl(theAxis);
+ HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
+ HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis);
if (aBase.IsNull() || anAxis.IsNull()) return aGEOMObject._retn();
//Create the Revolution
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeRevolutionAxisAngle(aBase, anAxis, theAngle);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aBase = GetObjectImpl(theBase);
- Handle(GEOM_Object) anAxis = GetObjectImpl(theAxis);
+ HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
+ HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis);
if (aBase.IsNull() || anAxis.IsNull()) return aGEOMObject._retn();
//Create the Revolution
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeRevolutionAxisAngle2Ways(aBase, anAxis, theAngle);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- std::list< Handle(GEOM_Object) > aShapes;
+ std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes;
if (! GetListOfObjectsImpl( theContours, aShapes ))
return aGEOMObject._retn();
}
//Create the Solid
- Handle(GEOM_Object) anObject = GetOperations()->MakeFilling
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeFilling
(aShapes, theMinDeg, theMaxDeg, theTol2D, theTol3D, theNbIter, aMethod, theApprox);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
//Get the shapes
aLen = theSeqSections.length();
for (ind = 0; ind < aLen; ind++) {
- Handle(GEOM_Object) aSh = GetObjectImpl(theSeqSections[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theSeqSections[ind]);
if (!aSh.IsNull())
aSeqSections->Append(aSh);
}
return aGEOMObject._retn();
// Make shell or solid
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeThruSections(aSeqSections,theModeSolid,thePreci,theRuled);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
if (aNbLocs && aNbBases != aNbLocs)
return aSeq._retn();
- Handle(GEOM_Object) aPath = GetObjectImpl(thePath);
+ HANDLE_NAMESPACE(GEOM_Object) aPath = GetObjectImpl(thePath);
if (aPath.IsNull())
return aSeq._retn();
for (ind = 0; ind < aNbBases; ind++) {
- Handle(GEOM_Object) aBase = GetObjectImpl(theBases[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBases[ind]);
if (aBase.IsNull())
continue;
if (aNbLocs)
{
- Handle(GEOM_Object) aLoc = GetObjectImpl(theLocations[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aLoc = GetObjectImpl(theLocations[ind]);
if (aLoc.IsNull())
continue;
aSeqLocations->Append(aLoc);
Standard_Integer aLength = aHSeq->Length();
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
- aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
if (aNbLocs && aNbBases != aNbLocs)
return aSeq._retn();
- Handle(GEOM_Object) aPath = GetObjectImpl(thePath);
+ HANDLE_NAMESPACE(GEOM_Object) aPath = GetObjectImpl(thePath);
if (aPath.IsNull())
return aSeq._retn();
for (ind = 0; ind < aNbBases; ind++) {
- Handle(GEOM_Object) aBase = GetObjectImpl(theBases[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBases[ind]);
if (aBase.IsNull())
continue;
if (aNbLocs) {
- Handle(GEOM_Object) aLoc = GetObjectImpl(theLocations[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aLoc = GetObjectImpl(theLocations[ind]);
if (aLoc.IsNull())
continue;
aSeqLocations->Append(aLoc);
aSeqBases->Append(aBase);
if (aNbSubBases >= aNbBases) {
- Handle(GEOM_Object) aSubBase = GetObjectImpl(theSubBases[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aSubBase = GetObjectImpl(theSubBases[ind]);
if (aSubBase.IsNull()) {
aSeqSubBases->Clear();
aNbSubBases = 0;
Standard_Integer aLength = aHSeq->Length();
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
- aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
return aSeq._retn();
for (ind = 0; ind < aNbBases; ind++) {
- Handle(GEOM_Object) aBase = GetObjectImpl(theBases[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBases[ind]);
if (aBase.IsNull())
continue;
if (aNbLocs) {
- Handle(GEOM_Object) aLoc = GetObjectImpl(theLocations[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aLoc = GetObjectImpl(theLocations[ind]);
if (aLoc.IsNull())
continue;
aSeqLocations->Append(aLoc);
Standard_Integer aLength = aHSeq->Length();
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
- aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aBase = GetObjectImpl(theBase);
- Handle(GEOM_Object) aPath = GetObjectImpl(thePath);
- Handle(GEOM_Object) aVec = GetObjectImpl(theVec);
+ HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
+ HANDLE_NAMESPACE(GEOM_Object) aPath = GetObjectImpl(thePath);
+ HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec);
if (aBase.IsNull() || aPath.IsNull() || aVec.IsNull()) return aSeq._retn();
Standard_Integer aLength = aHSeq->Length();
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
- aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
//Get the basic object
- Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
// Get faces IDs.
//Create the thickened shape
if (doCopy)
{
- Handle(GEOM_Object) anObject = GetOperations()->MakeThickening(
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeThickening(
aBasicObject, aFaceIDs, theOffset, doCopy, theInside);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
// Get the reference objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) aBase1 = GetObjectImpl(theBase1);
- Handle(GEOM_Object) aBase2 = GetObjectImpl(theBase2);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aBase1 = GetObjectImpl(theBase1);
+ HANDLE_NAMESPACE(GEOM_Object) aBase2 = GetObjectImpl(theBase2);
if (aShape.IsNull() || aBase1.IsNull() || aBase2.IsNull()) return aGEOMObject._retn();
// Create the Path
- Handle(GEOM_Object) anObject = GetOperations()->RestorePath(aShape, aBase1, aBase2);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->RestorePath(aShape, aBase1, aBase2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
// Get the reference objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aGEOMObject._retn();
Handle(TColStd_HSequenceOfTransient) aSeqBases1 = new TColStd_HSequenceOfTransient;
int aNbBases2 = theBase2.length();
for (ind = 0; ind < aNbBases1; ind++) {
- Handle(GEOM_Object) aBase = GetObjectImpl(theBase1[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase1[ind]);
if (!aBase.IsNull())
aSeqBases1->Append(aBase);
}
for (ind = 0; ind < aNbBases2; ind++) {
- Handle(GEOM_Object) aBase = GetObjectImpl(theBase2[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase2[ind]);
if (!aBase.IsNull())
aSeqBases2->Append(aBase);
}
return aGEOMObject._retn();
// Create the Path
- Handle(GEOM_Object) anObject = GetOperations()->RestorePath(aShape, aSeqBases1, aSeqBases2);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->RestorePath(aShape, aSeqBases1, aSeqBases2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Create the point
- Handle(GEOM_Object) anObject = GetOperations()->MakePointXYZ(theX, theY, theZ);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakePointXYZ(theX, theY, theZ);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference point
- Handle(GEOM_Object) aReference = GetObjectImpl(theReference);
+ HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theReference);
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the point
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakePointWithReference(aReference, theX, theY, theZ);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Lines
- Handle(GEOM_Object) aRef1 = GetObjectImpl(theLine1);
- Handle(GEOM_Object) aRef2 = GetObjectImpl(theLine2);
+ HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(theLine1);
+ HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theLine2);
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the point
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakePointOnLinesIntersection(aRef1, aRef2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference curve
- Handle(GEOM_Object) aReference = GetObjectImpl(theCurve);
+ HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theCurve);
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the point
- Handle(GEOM_Object) anObject = GetOperations()->MakePointOnCurve
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakePointOnCurve
(aReference, theParameter, takeOrientationIntoAccount);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference curve
- Handle(GEOM_Object) aReference = GetObjectImpl(theCurve);
+ HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theCurve);
if (aReference.IsNull()) return aGEOMObject._retn();
//Get the reference point (can be NULL)
- Handle(GEOM_Object) aRefPoint;
+ HANDLE_NAMESPACE(GEOM_Object) aRefPoint;
if (!CORBA::is_nil(theStartPoint)) {
aRefPoint = GetObjectImpl(theStartPoint);
}
//Create the point
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakePointOnCurveByLength(aReference, theLength, aRefPoint);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference curve
- Handle(GEOM_Object) aReference = GetObjectImpl(theCurve);
+ HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theCurve);
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the point
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakePointOnCurveByCoord(aReference, theXParameter,
theYParameter, theZParameter);
if (!GetOperations()->IsDone() || anObject.IsNull())
GetOperations()->SetNotDone();
//Get the reference surface
- Handle(GEOM_Object) aReference = GetObjectImpl(theSurface);
+ HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theSurface);
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the point
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakePointOnSurface(aReference, theUParameter, theVParameter);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference surface
- Handle(GEOM_Object) aReference = GetObjectImpl(theSurface);
+ HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theSurface);
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the point
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakePointOnSurfaceByCoord(aReference, theXParameter,
theYParameter, theZParameter);
if (!GetOperations()->IsDone() || anObject.IsNull())
GetOperations()->SetNotDone();
//Get the reference face
- Handle(GEOM_Object) aReference = GetObjectImpl(theFace);
+ HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theFace);
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the point
- Handle(GEOM_Object) anObject = GetOperations()->MakePointOnFace(aReference);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakePointOnFace(aReference);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference curve
- Handle(GEOM_Object) aReference = GetObjectImpl(theCurve);
+ HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theCurve);
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the vector
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeTangentOnCurve(aReference, theParameter);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
//Create the Vector
- Handle(GEOM_Object) anObject = GetOperations()->MakeVectorDXDYDZ(theDX, theDY, theDZ);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeVectorDXDYDZ(theDX, theDY, theDZ);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- Handle(GEOM_Object) aRef1 = GetObjectImpl(thePnt1);
- Handle(GEOM_Object) aRef2 = GetObjectImpl(thePnt2);
+ HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(thePnt1);
+ HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(thePnt2);
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the vector
- Handle(GEOM_Object) anObject = GetOperations()->MakeVectorTwoPnt(aRef1, aRef2);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeVectorTwoPnt(aRef1, aRef2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aRef1 = GetObjectImpl(thePnt);
- Handle(GEOM_Object) aRef2 = GetObjectImpl(theDir);
+ HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(thePnt);
+ HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theDir);
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the Line
- Handle(GEOM_Object) anObject = GetOperations()->MakeLine(aRef1, aRef2);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeLine(aRef1, aRef2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- Handle(GEOM_Object) aRef1 = GetObjectImpl(thePnt1);
- Handle(GEOM_Object) aRef2 = GetObjectImpl(thePnt2);
+ HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(thePnt1);
+ HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(thePnt2);
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the Line
- Handle(GEOM_Object) anObject = GetOperations()->MakeLineTwoPnt(aRef1, aRef2);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeLineTwoPnt(aRef1, aRef2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- Handle(GEOM_Object) aRef1 = GetObjectImpl(theFace1);
- Handle(GEOM_Object) aRef2 = GetObjectImpl(theFace2);
+ HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(theFace1);
+ HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theFace2);
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the Line
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeLineTwoFaces(aRef1, aRef2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the references
- Handle(GEOM_Object) aRef1 = GetObjectImpl(thePnt);
- Handle(GEOM_Object) aRef2 = GetObjectImpl(theVec);
+ HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(thePnt);
+ HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theVec);
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the plane
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakePlanePntVec(aRef1, aRef2, theTrimSize);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- Handle(GEOM_Object) aRef1 = GetObjectImpl(thePnt1);
- Handle(GEOM_Object) aRef2 = GetObjectImpl(thePnt2);
- Handle(GEOM_Object) aRef3 = GetObjectImpl(thePnt3);
+ HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(thePnt1);
+ HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(thePnt2);
+ HANDLE_NAMESPACE(GEOM_Object) aRef3 = GetObjectImpl(thePnt3);
if (aRef1.IsNull() || aRef2.IsNull() || aRef3.IsNull())
return aGEOMObject._retn();
//Create the plane
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakePlaneThreePnt(aRef1, aRef2, aRef3, theTrimSize);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference face
- Handle(GEOM_Object) aRef = GetObjectImpl(theFace);
+ HANDLE_NAMESPACE(GEOM_Object) aRef = GetObjectImpl(theFace);
if (aRef.IsNull()) return aGEOMObject._retn();
//Create the plane
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakePlaneFace(aRef, theTrimSize);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the references
- Handle(GEOM_Object) aRef1 = GetObjectImpl(theVec1);
- Handle(GEOM_Object) aRef2 = GetObjectImpl(theVec2);
+ HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(theVec1);
+ HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theVec2);
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the plane
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakePlane2Vec(aRef1, aRef2, theTrimSize);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the references
- Handle(GEOM_Object) aRef1 = GetObjectImpl(theLCS);
+ HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(theLCS);
//Create the plane
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakePlaneLCS(aRef1, theTrimSize, theOrientation);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Create the point
- Handle(GEOM_Object) anObject = GetOperations()->MakeMarker(theOX , theOY , theOZ,
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeMarker(theOX , theOY , theOZ,
theXDX, theXDY, theXDZ,
theYDX, theYDY, theYDZ);
if (!GetOperations()->IsDone() || anObject.IsNull())
GetOperations()->SetNotDone();
//Get the referenced object
- Handle(GEOM_Object) aRef = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aRef = GetObjectImpl(theShape);
if (aRef.IsNull()) return aGEOMObject._retn();
//Create the point
- Handle(GEOM_Object) anObject = GetOperations()->MakeMarkerFromShape(aRef);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeMarkerFromShape(aRef);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the referenced objects
- Handle(GEOM_Object) aRef1 = GetObjectImpl(theOrigin);
- Handle(GEOM_Object) aRef2 = GetObjectImpl(theXVec);
- Handle(GEOM_Object) aRef3 = GetObjectImpl(theYVec);
+ HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(theOrigin);
+ HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theXVec);
+ HANDLE_NAMESPACE(GEOM_Object) aRef3 = GetObjectImpl(theYVec);
if (aRef1.IsNull() || aRef2.IsNull() || aRef3.IsNull()) return aGEOMObject._retn();
//Create the point
- Handle(GEOM_Object) anObject = GetOperations()->MakeMarkerPntTwoVec(aRef1,
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeMarkerPntTwoVec(aRef1,
aRef2,
aRef3);
if (!GetOperations()->IsDone() || anObject.IsNull())
GetOperations()->SetNotDone();
//Get the reference face
- Handle(GEOM_Object) aRef = GetObjectImpl(theFace);
+ HANDLE_NAMESPACE(GEOM_Object) aRef = GetObjectImpl(theFace);
if (aRef.IsNull()) return aGEOMObject._retn();
//Create the plane
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeTangentPlaneOnFace(aRef, theParameterU,theParameterV,theTrimSize);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference edges
- Handle(GEOM_Object) anEdge1 = GetObjectImpl(theEdge1);
- Handle(GEOM_Object) anEdge2 = GetObjectImpl(theEdge2);
- Handle(GEOM_Object) anEdge3 = GetObjectImpl(theEdge3);
- Handle(GEOM_Object) anEdge4 = GetObjectImpl(theEdge4);
+ HANDLE_NAMESPACE(GEOM_Object) anEdge1 = GetObjectImpl(theEdge1);
+ HANDLE_NAMESPACE(GEOM_Object) anEdge2 = GetObjectImpl(theEdge2);
+ HANDLE_NAMESPACE(GEOM_Object) anEdge3 = GetObjectImpl(theEdge3);
+ HANDLE_NAMESPACE(GEOM_Object) anEdge4 = GetObjectImpl(theEdge4);
if (anEdge1.IsNull() || anEdge2.IsNull() ||
anEdge3.IsNull() || anEdge4.IsNull()) return aGEOMObject._retn();
//Create the Face
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeQuad(anEdge1, anEdge2, anEdge3, anEdge4);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference edges
- Handle(GEOM_Object) anEdge1 = GetObjectImpl(theEdge1);
- Handle(GEOM_Object) anEdge2 = GetObjectImpl(theEdge2);
+ HANDLE_NAMESPACE(GEOM_Object) anEdge1 = GetObjectImpl(theEdge1);
+ HANDLE_NAMESPACE(GEOM_Object) anEdge2 = GetObjectImpl(theEdge2);
if (anEdge1.IsNull() || anEdge2.IsNull()) return aGEOMObject._retn();
//Create the Face
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeQuad2Edges(anEdge1, anEdge2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- Handle(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
- Handle(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
- Handle(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
- Handle(GEOM_Object) aPnt4 = GetObjectImpl(thePnt4);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt4 = GetObjectImpl(thePnt4);
if (aPnt1.IsNull() || aPnt2.IsNull() ||
aPnt3.IsNull() || aPnt4.IsNull()) return aGEOMObject._retn();
//Create the Face
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeQuad4Vertices(aPnt1, aPnt2, aPnt3, aPnt4);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Faces
- Handle(GEOM_Object) anFace1 = GetObjectImpl(theFace1);
- Handle(GEOM_Object) anFace2 = GetObjectImpl(theFace2);
- Handle(GEOM_Object) anFace3 = GetObjectImpl(theFace3);
- Handle(GEOM_Object) anFace4 = GetObjectImpl(theFace4);
- Handle(GEOM_Object) anFace5 = GetObjectImpl(theFace5);
- Handle(GEOM_Object) anFace6 = GetObjectImpl(theFace6);
+ HANDLE_NAMESPACE(GEOM_Object) anFace1 = GetObjectImpl(theFace1);
+ HANDLE_NAMESPACE(GEOM_Object) anFace2 = GetObjectImpl(theFace2);
+ HANDLE_NAMESPACE(GEOM_Object) anFace3 = GetObjectImpl(theFace3);
+ HANDLE_NAMESPACE(GEOM_Object) anFace4 = GetObjectImpl(theFace4);
+ HANDLE_NAMESPACE(GEOM_Object) anFace5 = GetObjectImpl(theFace5);
+ HANDLE_NAMESPACE(GEOM_Object) anFace6 = GetObjectImpl(theFace6);
if (anFace1.IsNull() || anFace2.IsNull() ||
anFace3.IsNull() || anFace4.IsNull() ||
anFace5.IsNull() || anFace6.IsNull()) return aGEOMObject._retn();
//Create the Face
- Handle(GEOM_Object) anObject = GetOperations()->MakeHexa
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeHexa
(anFace1, anFace2, anFace3, anFace4, anFace5, anFace6);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Faces
- Handle(GEOM_Object) anFace1 = GetObjectImpl(theFace1);
- Handle(GEOM_Object) anFace2 = GetObjectImpl(theFace2);
+ HANDLE_NAMESPACE(GEOM_Object) anFace1 = GetObjectImpl(theFace1);
+ HANDLE_NAMESPACE(GEOM_Object) anFace2 = GetObjectImpl(theFace2);
if (anFace1.IsNull() || anFace2.IsNull()) return aGEOMObject._retn();
//Create the Face
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeHexa2Faces(anFace1, anFace2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Compound
- Handle(GEOM_Object) aCompound = GetObjectImpl(theCompound);
+ HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound);
if (aCompound.IsNull()) return aGEOMObject._retn();
//Create the Blocks Compound
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeBlockCompound(aCompound);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aGEOMObject._retn();
//Create the Point
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->GetPoint(aShape, theX, theY, theZ, theEpsilon);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
// Get the reference Objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint);
if (aShape.IsNull() || aPoint.IsNull()) return aGEOMObject._retn();
// Create the Point
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->GetVertexNearPoint(aShape, aPoint);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
- Handle(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
if (aShape.IsNull() ||
aPoint1.IsNull() || aPoint2.IsNull()) return aGEOMObject._retn();
//Create the Point
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->GetEdge(aShape, aPoint1, aPoint2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint);
if (aShape.IsNull() || aPoint.IsNull()) return aGEOMObject._retn();
//Create the Edge
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->GetEdgeNearPoint(aShape, aPoint);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
- Handle(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
- Handle(GEOM_Object) aPoint3 = GetObjectImpl(thePoint3);
- Handle(GEOM_Object) aPoint4 = GetObjectImpl(thePoint4);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint3 = GetObjectImpl(thePoint3);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint4 = GetObjectImpl(thePoint4);
if (aShape.IsNull() ||
aPoint1.IsNull() || aPoint2.IsNull() ||
aPoint3.IsNull() || aPoint4.IsNull()) return aGEOMObject._retn();
//Create the Face
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->GetFaceByPoints(aShape, aPoint1, aPoint2, aPoint3, aPoint4);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) anEdge1 = GetObjectImpl(theEdge1);
- Handle(GEOM_Object) anEdge2 = GetObjectImpl(theEdge2);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) anEdge1 = GetObjectImpl(theEdge1);
+ HANDLE_NAMESPACE(GEOM_Object) anEdge2 = GetObjectImpl(theEdge2);
if (aShape.IsNull() ||
anEdge1.IsNull() || anEdge2.IsNull()) return aGEOMObject._retn();
//Create the Face
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->GetFaceByEdges(aShape, anEdge1, anEdge2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) aFace = GetObjectImpl(theFace);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace);
if (aShape.IsNull() || aFace.IsNull()) return aGEOMObject._retn();
//Create the Face
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->GetOppositeFace(aShape, aFace);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint);
if (aShape.IsNull() || aPoint.IsNull()) return aGEOMObject._retn();
//Create the Face
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->GetFaceNearPoint(aShape, aPoint);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) aVector = GetObjectImpl(theVector);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector);
if (aShape.IsNull() || aVector.IsNull()) return aGEOMObject._retn();
//Create the Face
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->GetFaceByNormale(aShape, aVector);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
// Get the reference Objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint);
if (aShape.IsNull() || aPoint.IsNull()) return aGEOMObject._retn();
// Create the Shape
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->GetShapesNearPoint(aShape, aPoint, theShapeType, theTolerance);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Compound
- Handle(GEOM_Object) aCompound = GetObjectImpl(theCompound);
+ HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound);
if (aCompound.IsNull()) return aSeq._retn();
//Explode
Standard_Integer aLength = aHSeq->Length();
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
- aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference Compound
- Handle(GEOM_Object) aCompound = GetObjectImpl(theCompound);
+ HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound);
if (aCompound.IsNull()) return isComp;
//Check
GetOperations()->SetNotDone();
//Get the reference Compound
- Handle(GEOM_Object) aCompound = GetObjectImpl(theCompound);
+ HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound);
if (aCompound.IsNull()) return isComp;
//Check
const GEOM::GEOM_IBlocksOperations::BCErrors& theErrors)
{
//Get the reference Compound
- Handle(GEOM_Object) aCompound = GetObjectImpl(theCompound);
+ HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound);
if (aCompound.IsNull()) return NULL;
// Convert the errors sequence
GetOperations()->SetNotDone();
//Get the reference Objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aGEOMObject._retn();
//Get the result
- Handle(GEOM_Object) aFaces;
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) aFaces;
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->GetNonBlocks(aShape, theToleranceC1, aFaces);
if (!GetOperations()->IsDone())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aGEOMObject._retn();
//Get the result
- Handle(GEOM_Object) anObject = GetOperations()->RemoveExtraEdges(aShape, theOptimumNbFaces);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->RemoveExtraEdges(aShape, theOptimumNbFaces);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aGEOMObject._retn();
//Get the result
- Handle(GEOM_Object) anObject = GetOperations()->UnionFaces(aShape);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->UnionFaces(aShape);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Objects
- Handle(GEOM_Object) aCompound = GetObjectImpl(theCompound);
+ HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound);
if (aCompound.IsNull()) return aGEOMObject._retn();
//Get the result
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->CheckAndImprove(aCompound);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Objects
- Handle(GEOM_Object) aCompound = GetObjectImpl(theCompound);
- Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint);
+ HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint);
if (aCompound.IsNull() || aPoint.IsNull()) return aGEOMObject._retn();
//Get the block
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->GetBlockNearPoint(aCompound, aPoint);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Compound
- Handle(GEOM_Object) aCompound = GetObjectImpl(theCompound);
+ HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound);
if (aCompound.IsNull()) return aGEOMObject._retn();
//Get the parts
aLen = theParts.length();
for (ind = 0; ind < aLen; ind++) {
- Handle(GEOM_Object) aSh = GetObjectImpl(theParts[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theParts[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aParts->Append(aSh);
}
//Get the Block
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->GetBlockByParts(aCompound, aParts);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Compound
- Handle(GEOM_Object) aCompound = GetObjectImpl(theCompound);
+ HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound);
if (aCompound.IsNull()) return aSeq._retn();
//Get the parts
aLen = theParts.length();
for (ind = 0; ind < aLen; ind++) {
- Handle(GEOM_Object) aSh = GetObjectImpl(theParts[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theParts[ind]);
if (aSh.IsNull()) return aSeq._retn();
aParts->Append(aSh);
}
Standard_Integer aLength = aHSeq->Length();
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
- aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the object itself and the vector of translation
- Handle(GEOM_Object) aBasicObject = GetObjectImpl(theBlock);
+ HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theBlock);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Perform the transformation
- Handle(GEOM_Object) anObject = GetOperations()->MakeMultiTransformation1D
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeMultiTransformation1D
(aBasicObject, theDirFace1, theDirFace2, theNbTimes);
if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the object itself
- Handle(GEOM_Object) aBasicObject = GetObjectImpl(theBlock);
+ HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theBlock);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Perform the transformation
- Handle(GEOM_Object) anObject = GetOperations()->MakeMultiTransformation2D
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeMultiTransformation2D
(aBasicObject,
theDirFace1U, theDirFace2U, theNbTimesU,
theDirFace1V, theDirFace2V, theNbTimesV);
GetOperations()->SetNotDone();
//Get the reference Shape
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aSeq._retn();
//Get the Propagation chains
Standard_Integer aLength = aHSeq->Length();
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
- aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference shapes
- Handle(GEOM_Object) aSh1 = GetObjectImpl(theShape1);
- Handle(GEOM_Object) aSh2 = GetObjectImpl(theShape2);
+ HANDLE_NAMESPACE(GEOM_Object) aSh1 = GetObjectImpl(theShape1);
+ HANDLE_NAMESPACE(GEOM_Object) aSh2 = GetObjectImpl(theShape2);
if (aSh1.IsNull() || aSh2.IsNull()) return aGEOMObject._retn();
// Make Boolean
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeBoolean(aSh1, aSh2, theOp, IsCheckSelfInte);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference shapes
- Handle(GEOM_Object) aSh1 = GetObjectImpl(theShape1);
- Handle(GEOM_Object) aSh2 = GetObjectImpl(theShape2);
+ HANDLE_NAMESPACE(GEOM_Object) aSh1 = GetObjectImpl(theShape1);
+ HANDLE_NAMESPACE(GEOM_Object) aSh2 = GetObjectImpl(theShape2);
if (aSh1.IsNull() || aSh2.IsNull()) return aGEOMObject._retn();
// Make Boolean
- Handle(GEOM_Object) anObject = GetOperations()->MakeFuse
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeFuse
(aSh1, aSh2, IsCheckSelfInte, IsRmExtraEdges);
if (!GetOperations()->IsDone() || anObject.IsNull())
}
// Make fusion
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeFuseList(aShapes, IsCheckSelfInte, IsRmExtraEdges);
if (!GetOperations()->IsDone() || anObject.IsNull())
}
// Make fusion
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeCommonList(aShapes, IsCheckSelfInte);
if (!GetOperations()->IsDone() || anObject.IsNull())
//Set a not done flag
GetOperations()->SetNotDone();
- Handle(GEOM_Object) aMainShape = GetObjectImpl(theMainShape);
+ HANDLE_NAMESPACE(GEOM_Object) aMainShape = GetObjectImpl(theMainShape);
if (aMainShape.IsNull()) {
return aGEOMObject._retn();
}
// Make fusion
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeCutList(aMainShape, aShapes, IsCheckSelfInte);
if (!GetOperations()->IsDone() || anObject.IsNull())
}
// Make Partition
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakePartition(aShapes, aTools, aKeepIns, aRemIns,
theLimit, theRemoveWebs, aMaterials,
theKeepNonlimitShapes,
}
// Make Partition
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakePartition(aShapes, aTools, aKeepIns, aRemIns,
theLimit, theRemoveWebs, aMaterials,
theKeepNonlimitShapes,
GetOperations()->SetNotDone();
//Get the reference shapes
- Handle(GEOM_Object) aSh = GetObjectImpl(theShape);
- Handle(GEOM_Object) aPl = GetObjectImpl(thePlane);
+ HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aPl = GetObjectImpl(thePlane);
if (aSh.IsNull() || aPl.IsNull()) return aGEOMObject._retn();
// Make Half Partition
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeHalfPartition(aSh, aPl);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
//if (thePnt == NULL || theVec == NULL) return aGEOMObject._retn();
//Get the arguments
- Handle(GEOM_Object) aPnt, aVec;
+ HANDLE_NAMESPACE(GEOM_Object) aPnt, aVec;
if (!CORBA::is_nil(thePnt)) {
aPnt = GetObjectImpl(thePnt);
if (aPnt.IsNull()) return aGEOMObject._retn();
}
// Make Circle
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeCirclePntVecR(aPnt, aVec, theR);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- Handle(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
- Handle(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
- Handle(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn();
// Make Circle
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeCircleThreePnt(aPnt1, aPnt2, aPnt3);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- Handle(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
- Handle(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
- Handle(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn();
// Make Circle
- Handle(GEOM_Object) anObject = GetOperations()->MakeCircleCenter2Pnt(aPnt1, aPnt2, aPnt3);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeCircleCenter2Pnt(aPnt1, aPnt2, aPnt3);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
//if (thePnt == NULL || theVec == NULL) return aGEOMObject._retn();
//Get the arguments
- Handle(GEOM_Object) aPnt, aVec, aVecMaj;
+ HANDLE_NAMESPACE(GEOM_Object) aPnt, aVec, aVecMaj;
if (!CORBA::is_nil(thePnt)) {
aPnt = GetObjectImpl(thePnt);
if (aPnt.IsNull()) return aGEOMObject._retn();
}
// Make Ellipse
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeEllipse(aPnt, aVec, theRMajor, theRMinor, aVecMaj);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
//if (thePnt == NULL || theVec == NULL || theVecMaj == NULL) return aGEOMObject._retn();
//Get the arguments
- Handle(GEOM_Object) aPnt, aVec, aVecMaj;
+ HANDLE_NAMESPACE(GEOM_Object) aPnt, aVec, aVecMaj;
if (!CORBA::is_nil(thePnt)) {
aPnt = GetObjectImpl(thePnt);
if (aPnt.IsNull()) return aGEOMObject._retn();
}
// Make Ellipse
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeEllipse(aPnt, aVec, theRMajor, theRMinor, aVecMaj);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- Handle(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
- Handle(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
- Handle(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn();
// Make Arc
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeArc(aPnt1, aPnt2, aPnt3);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- Handle(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
- Handle(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
- Handle(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn();
// Make ArcCenter
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeArcCenter(aPnt1, aPnt2, aPnt3,theSense);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- Handle(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
- Handle(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
- Handle(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn();
// Make Arc
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeArcOfEllipse(aPnt1, aPnt2, aPnt3);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
//Get the reference point
int ind = 0;
int aLen = thePoints.length();
- std::list<Handle(GEOM_Object)> aPoints;
+ std::list<HANDLE_NAMESPACE(GEOM_Object)> aPoints;
for (; ind < aLen; ind++) {
- Handle(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]);
if (aPnt.IsNull()) return aGEOMObject._retn();
aPoints.push_back(aPnt);
}
// Make Polyline
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakePolyline(aPoints, theIsClosed);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
//Get the reference point
int ind = 0;
int aLen = thePoints.length();
- std::list<Handle(GEOM_Object)> aPoints;
+ std::list<HANDLE_NAMESPACE(GEOM_Object)> aPoints;
for (; ind < aLen; ind++) {
- Handle(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]);
if (aPnt.IsNull()) return aGEOMObject._retn();
aPoints.push_back(aPnt);
}
// Make Bezier curve
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeSplineBezier(aPoints, theIsClosed);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
//Get the reference point
int ind = 0;
int aLen = thePoints.length();
- std::list<Handle(GEOM_Object)> aPoints;
+ std::list<HANDLE_NAMESPACE(GEOM_Object)> aPoints;
for (; ind < aLen; ind++) {
- Handle(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]);
if (aPnt.IsNull()) return aGEOMObject._retn();
aPoints.push_back(aPnt);
}
// Make Polyline
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeSplineInterpolation(aPoints, theIsClosed, theDoReordering);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
//Get the reference points
int ind = 0;
int aLen = thePoints.length();
- std::list<Handle(GEOM_Object)> aPoints;
+ std::list<HANDLE_NAMESPACE(GEOM_Object)> aPoints;
for (; ind < aLen; ind++) {
- Handle(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]);
if (aPnt.IsNull()) return aGEOMObject._retn();
aPoints.push_back(aPnt);
}
//Get the reference vectors
- Handle(GEOM_Object) aVec1 = GetObjectImpl(theFirstVec);
- Handle(GEOM_Object) aVec2 = GetObjectImpl(theLastVec);
+ HANDLE_NAMESPACE(GEOM_Object) aVec1 = GetObjectImpl(theFirstVec);
+ HANDLE_NAMESPACE(GEOM_Object) aVec2 = GetObjectImpl(theLastVec);
if (aVec1.IsNull() || aVec2.IsNull()) return aGEOMObject._retn();
// Make Polyline
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeSplineInterpolWithTangents(aPoints, aVec1, aVec2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
}
// Make Polyline
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeCurveParametric(thexExpr, theyExpr, thezExpr,
theParamMin, theParamMax,
theParamStep, aType);
}
// Make Polyline
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeCurveParametric(thexExpr, theyExpr, thezExpr,
theParamMin, theParamMax,
0.0, aType, theParamNbStep, true);
//Set a not done flag
GetOperations()->SetNotDone();
- Handle(GEOM_Object) aFace = GetObjectImpl(theFace);
+ HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace);
// Make isoline
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeIsoline(aFace, IsUIsoline, theParameter);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
aWorkingPlane.push_back(theWorkingPlane[ind]);
// Make Sketcher
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeSketcher(theCommand, aWorkingPlane);
if (!GetOperations()->IsDone() || anObject.IsNull())
return GEOM::GEOM_Object::_nil();
//Set a not done flag
GetOperations()->SetNotDone();
- Handle(GEOM_Object) aWorkingPlane = GetObjectImpl(theWorkingPlane);
+ HANDLE_NAMESPACE(GEOM_Object) aWorkingPlane = GetObjectImpl(theWorkingPlane);
// Make Sketcher
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeSketcherOnPlane(theCommand, aWorkingPlane);
if (!GetOperations()->IsDone() || anObject.IsNull())
return GEOM::GEOM_Object::_nil();
GetOperations()->SetNotDone();
// Make 3D Sketcher
- Handle(GEOM_Object) anObject = GetOperations()->Make3DSketcherCommand(theCommand);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Make3DSketcherCommand(theCommand);
if (!GetOperations()->IsDone() || anObject.IsNull())
return GEOM::GEOM_Object::_nil();
aCoords.push_back(theCoordinates[ind]);
// Make Sketcher
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->Make3DSketcher(aCoords);
if (!GetOperations()->IsDone() || anObject.IsNull())
return GEOM::GEOM_Object::_nil();
}
// Make Polyline
- Handle(GEOM_Object) anObject = GetOperations()->MakePolyline2D
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakePolyline2D
(aCoords, aNames, aTypes, aCloseds, aWorkingPlane);
if (!GetOperations()->IsDone() || anObject.IsNull()) {
Handle(TColStd_HArray1OfByte) aCloseds =
ConvertBoolArray(theClosedList);
std::list <std::list <double> > aCoords;
- Handle(GEOM_Object) aWorkingPlane =
+ HANDLE_NAMESPACE(GEOM_Object) aWorkingPlane =
GetObjectImpl(theWorkingPlane);
ConvertListListDouble(theCoordsList, aCoords);
// Make Polyline
- Handle(GEOM_Object) anObject = GetOperations()->MakePolyline2DOnPlane
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakePolyline2DOnPlane
(aCoords, aNames, aTypes, aCloseds, aWorkingPlane);
if (!GetOperations()->IsDone() || anObject.IsNull()) {
for ( size_t i = 0; i < theComponentNames.length(); ++i )
compNames->SetValue( i+1, theComponentNames[ i ].in() );
}
- Handle(GEOM_Object) aShapeRef = GetObjectImpl( theShape );
- Handle(GEOM_Field) aFieldRef = GetOperations()->CreateField( aShapeRef,
+ HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl( theShape );
+ HANDLE_NAMESPACE(GEOM_Field) aFieldRef = GetOperations()->CreateField( aShapeRef,
theName,
(int) theType,
theDimension,
CORBA::Long GEOM_IFieldOperations_i::CountFields( GEOM::GEOM_Object_ptr shape)
{
- Handle(GEOM_Object) go = GetObjectImpl( shape );
+ HANDLE_NAMESPACE(GEOM_Object) go = GetObjectImpl( shape );
return ( CORBA::Long) GetOperations()->CountFields( go );
}
{
GEOM::ListOfFields_var fields = new GEOM::ListOfFields;
- Handle(GEOM_Object) go = GetObjectImpl( shape );
+ HANDLE_NAMESPACE(GEOM_Object) go = GetObjectImpl( shape );
Handle(TColStd_HSequenceOfTransient) seq = GetOperations()->GetFields( go );
if ( !seq.IsNull() )
int nbF = 0;
for ( int i = 1; i <= seq->Length(); ++i )
{
- Handle(GEOM_Field) f = Handle(GEOM_Field)::DownCast( seq->Value( i ));
+ HANDLE_NAMESPACE(GEOM_Field) f = HANDLE_NAMESPACE(GEOM_Field)::DownCast( seq->Value( i ));
GEOM::GEOM_Field_var fvar = GEOM::GEOM_Field::_narrow( GetBaseObject( f ));
if ( !fvar->_is_nil() )
fields[ nbF++ ] = fvar._retn();
{
GEOM::GEOM_Field_var field;
- Handle(GEOM_Object) go = GetObjectImpl( shape );
+ HANDLE_NAMESPACE(GEOM_Object) go = GetObjectImpl( shape );
- Handle(GEOM_Field) f = GetOperations()->GetField( go, name );
+ HANDLE_NAMESPACE(GEOM_Field) f = GetOperations()->GetField( go, name );
field = GEOM::GEOM_Field::_narrow( GetBaseObject( f ));
return field._retn();
::CORBA::Long GEOM_IFieldOperations_i::GetNbSubShapes(::GEOM::GEOM_Object_ptr shape,
::CORBA::Short fieldDim)
{
- Handle(GEOM_Object) go = GetObjectImpl( shape );
+ HANDLE_NAMESPACE(GEOM_Object) go = GetObjectImpl( shape );
return GEOM_Field::GetNbSubShapes( go, fieldDim );
}
if (theShapeType < 0) return aGEOMObject._retn();
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetObjectImpl(theMainShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theMainShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Create the Fillet
- Handle(GEOM_Object) anObject = GetOperations()->CreateGroup(aShapeRef, (TopAbs_ShapeEnum)theShapeType);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->CreateGroup(aShapeRef, (TopAbs_ShapeEnum)theShapeType);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference group
- Handle(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
+ HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
if (aGroupRef.IsNull()) return;
GetOperations()->AddObject(aGroupRef, theSubShapeId);
GetOperations()->SetNotDone();
//Get the reference group
- Handle(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
+ HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
if (aGroupRef.IsNull()) return;
GetOperations()->RemoveObject(aGroupRef, theSubShapeId);
GetOperations()->SetNotDone();
//Get the reference group
- Handle(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
+ HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
if (aGroupRef.IsNull()) return;
//Get sub-shape to add
int ind, aLen = theSubShapes.length();
for (ind = 0; ind < aLen; ind++) {
- Handle(GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]);
if (aSh.IsNull()) return;
aSubShapes->Append(aSh);
}
GetOperations()->SetNotDone();
//Get the reference group
- Handle(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
+ HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
if (aGroupRef.IsNull()) return;
//Get sub-shape to remove
int ind, aLen = theSubShapes.length();
for (ind = 0; ind < aLen; ind++) {
- Handle(GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]);
if (aSh.IsNull()) return;
aSubShapes->Append(aSh);
}
GetOperations()->SetNotDone();
//Get the reference group
- Handle(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
+ HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
if (aGroupRef.IsNull()) return;
//Get sub-shape to add
GetOperations()->SetNotDone();
//Get the reference group
- Handle(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
+ HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
if (aGroupRef.IsNull()) return;
//Get sub-shape to remove
GetOperations()->SetNotDone();
//Get the reference groups
- Handle(GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1);
- Handle(GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2);
+ HANDLE_NAMESPACE(GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1);
+ HANDLE_NAMESPACE(GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2);
if (aGroupRef1.IsNull() || aGroupRef2.IsNull()) return aGEOMObject._retn();
//Perform the operation
- Handle(GEOM_Object) anObject = GetOperations()->UnionGroups(aGroupRef1, aGroupRef2);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->UnionGroups(aGroupRef1, aGroupRef2);
if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn();
return GetObject(anObject);
GetOperations()->SetNotDone();
//Get the reference groups
- Handle(GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1);
- Handle(GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2);
+ HANDLE_NAMESPACE(GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1);
+ HANDLE_NAMESPACE(GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2);
if (aGroupRef1.IsNull() || aGroupRef2.IsNull()) return aGEOMObject._retn();
//Perform the operation
- Handle(GEOM_Object) anObject = GetOperations()->IntersectGroups(aGroupRef1, aGroupRef2);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->IntersectGroups(aGroupRef1, aGroupRef2);
if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn();
return GetObject(anObject);
GetOperations()->SetNotDone();
//Get the reference groups
- Handle(GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1);
- Handle(GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2);
+ HANDLE_NAMESPACE(GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1);
+ HANDLE_NAMESPACE(GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2);
if (aGroupRef1.IsNull() || aGroupRef2.IsNull()) return aGEOMObject._retn();
//Perform the operation
- Handle(GEOM_Object) anObject = GetOperations()->CutGroups(aGroupRef1, aGroupRef2);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->CutGroups(aGroupRef1, aGroupRef2);
if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn();
return GetObject(anObject);
int ind, aLen = theGList.length();
for (ind = 0; ind < aLen; ind++) {
- Handle(GEOM_Object) aGr = GetObjectImpl(theGList[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aGr = GetObjectImpl(theGList[ind]);
if (aGr.IsNull()) return aGEOMObject._retn();
aGroups->Append(aGr);
}
//Perform the operation
- Handle(GEOM_Object) anObject = GetOperations()->UnionListOfGroups(aGroups);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->UnionListOfGroups(aGroups);
if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn();
return GetObject(anObject);
int ind, aLen = theGList.length();
for (ind = 0; ind < aLen; ind++) {
- Handle(GEOM_Object) aGr = GetObjectImpl(theGList[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aGr = GetObjectImpl(theGList[ind]);
if (aGr.IsNull()) return aGEOMObject._retn();
aGroups->Append(aGr);
}
//Perform the operation
- Handle(GEOM_Object) anObject = GetOperations()->IntersectListOfGroups(aGroups);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->IntersectListOfGroups(aGroups);
if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn();
return GetObject(anObject);
int ind, aLen = theGList1.length();
for (ind = 0; ind < aLen; ind++) {
- Handle(GEOM_Object) aGr = GetObjectImpl(theGList1[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aGr = GetObjectImpl(theGList1[ind]);
if (aGr.IsNull()) return aGEOMObject._retn();
aGroups1->Append(aGr);
}
aLen = theGList2.length();
for (ind = 0; ind < aLen; ind++) {
- Handle(GEOM_Object) aGr = GetObjectImpl(theGList2[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aGr = GetObjectImpl(theGList2[ind]);
if (aGr.IsNull()) return aGEOMObject._retn();
aGroups2->Append(aGr);
}
//Perform the operation
- Handle(GEOM_Object) anObject = GetOperations()->CutListOfGroups(aGroups1, aGroups2);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->CutListOfGroups(aGroups1, aGroups2);
if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn();
return GetObject(anObject);
GetOperations()->SetNotDone();
//Get the reference group
- Handle(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
+ HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
if (aGroupRef.IsNull()) return -1;
return GetOperations()->GetType(aGroupRef);
GetOperations()->SetNotDone();
//Get the reference group
- Handle(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
+ HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
if (aGroupRef.IsNull()) return aGEOMObject._retn();
- Handle(GEOM_Object) anObject = GetOperations()->GetMainShape(aGroupRef);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->GetMainShape(aGroupRef);
if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn();
return GetObject(anObject);
GetOperations()->SetNotDone();
//Get the reference group
- Handle(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
+ HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
if (aGroupRef.IsNull()) return aList._retn();
aList = new GEOM::ListOfLong;
// return aGEOMObject._retn();
// Get the object itself
- Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull())
return aGEOMObject._retn();
// Perform
- Handle(GEOM_Object) aNewObject = GetOperations()->ShapeProcess( anObject,
+ HANDLE_NAMESPACE(GEOM_Object) aNewObject = GetOperations()->ShapeProcess( anObject,
ConvertStringArray( theOperations ), ConvertStringArray( theParams ),
ConvertStringArray( theValues ) );
if ( !GetOperations()->IsDone() || aNewObject.IsNull() )
GetOperations()->SetNotDone();
// Get the object itself
- Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull())
return aGEOMObject._retn();
// if theFaces is empty - it's OK, it means that ALL faces must be removed
// Perform
- Handle(GEOM_Object) aNewObject =
+ HANDLE_NAMESPACE(GEOM_Object) aNewObject =
GetOperations()->SuppressFaces( anObject, Convert( theFaces ) );
if (!GetOperations()->IsDone() || aNewObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
// Get the object itself
- Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull())
return aGEOMObject._retn();
// Perform
- Handle(GEOM_Object) aNewObject =
+ HANDLE_NAMESPACE(GEOM_Object) aNewObject =
GetOperations()->CloseContour( anObject, Convert( theWires ), isCommonVertex );
if (!GetOperations()->IsDone() || aNewObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
// Get the object itself
- Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull())
return aGEOMObject._retn();
// if theWires is empty - it's OK, it means that ALL wires should be removed
// Perform
- Handle(GEOM_Object) aNewObject =
+ HANDLE_NAMESPACE(GEOM_Object) aNewObject =
GetOperations()->RemoveIntWires( anObject, Convert( theWires ) );
if (!GetOperations()->IsDone() || aNewObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
// Get the object itself
- Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull())
return aGEOMObject._retn();
// if theWires is empty - it's OK, it means that ALL wires should be removed
// Perform
- Handle(GEOM_Object) aNewObject =
+ HANDLE_NAMESPACE(GEOM_Object) aNewObject =
GetOperations()->FillHoles( anObject, Convert( theWires ) );
if (!GetOperations()->IsDone() || aNewObject.IsNull())
return aGEOMObject._retn();
return aGEOMObject._retn();
//Get the shapes
- std::list< Handle(GEOM_Object) > aShapes;
+ std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes;
if (! GetListOfObjectsImpl( theObjects, aShapes ))
return aGEOMObject._retn();
// Perform
- Handle(GEOM_Object) aNewObject = GetOperations()->Sew( aShapes, theTolerance, false );
+ HANDLE_NAMESPACE(GEOM_Object) aNewObject = GetOperations()->Sew( aShapes, theTolerance, false );
if (!GetOperations()->IsDone() || aNewObject.IsNull())
return aGEOMObject._retn();
return aGEOMObject._retn();
//Get the shapes
- std::list< Handle(GEOM_Object) > aShapes;
+ std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes;
if (! GetListOfObjectsImpl( theObjects, aShapes ))
return aGEOMObject._retn();
// Perform
- Handle(GEOM_Object) aNewObject = GetOperations()->Sew( aShapes, theTolerance, true );
+ HANDLE_NAMESPACE(GEOM_Object) aNewObject = GetOperations()->Sew( aShapes, theTolerance, true );
if (!GetOperations()->IsDone() || aNewObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
// Get the objects
- std::list< Handle(GEOM_Object) > aShapes;
+ std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes;
if (! GetListOfObjectsImpl( theSolids, aShapes ))
return aGEOMObject._retn();
// Perform
- Handle(GEOM_Object) aNewObject = GetOperations()->RemoveInternalFaces(aShapes);
+ HANDLE_NAMESPACE(GEOM_Object) aNewObject = GetOperations()->RemoveInternalFaces(aShapes);
if (!GetOperations()->IsDone() || aNewObject.IsNull())
return aGEOMObject._retn();
return aGEOMObject._retn();
// Get the object itself
- Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull())
return aGEOMObject._retn();
// Perform
- Handle(GEOM_Object) aNewObject =
+ HANDLE_NAMESPACE(GEOM_Object) aNewObject =
GetOperations()->DivideEdge( anObject, theIndex, theValue, isByParameter );
if (!GetOperations()->IsDone() || aNewObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
// Get the object itself
- Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull())
return aGEOMObject._retn();
// Get the points
- std::list< Handle(GEOM_Object) > aPoints;
+ std::list< HANDLE_NAMESPACE(GEOM_Object) > aPoints;
if (! GetListOfObjectsImpl( thePoints, aPoints ))
return aGEOMObject._retn();
// Perform
- Handle(GEOM_Object) aNewObject =
+ HANDLE_NAMESPACE(GEOM_Object) aNewObject =
GetOperations()->DivideEdgeByPoint( anObject, theIndex, aPoints );
if (!GetOperations()->IsDone() || aNewObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aWire = GetObjectImpl(theWire);
+ HANDLE_NAMESPACE(GEOM_Object) aWire = GetObjectImpl(theWire);
if (aWire.IsNull()) return aGEOMObject._retn();
int ind, aLen;
- std::list<Handle(GEOM_Object)> aVerts;
+ std::list<HANDLE_NAMESPACE(GEOM_Object)> aVerts;
//Get the shapes
aLen = theVertices.length();
for (ind = 0; ind < aLen; ind++) {
- Handle(GEOM_Object) aSh = GetObjectImpl(theVertices[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theVertices[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aVerts.push_back(aSh);
}
//Perform operation
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->FuseCollinearEdgesWithinWire(aWire, aVerts);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
Handle(TColStd_HSequenceOfTransient) anObjects = new TColStd_HSequenceOfTransient();
for ( size_t i = 0; i < theObjects.length(); ++i )
{
- Handle(GEOM_Object) anObject = GetObjectImpl(theObjects[i]);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObjects[i]);
if (anObject.IsNull())
return false;
anObjects->Append( anObject );
int i, n = aClosed->Length();
theClosedWires->length( n );
for ( i = 1; i <= n; i++ )
- (*theClosedWires)[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aClosed->Value(i)));
+ (*theClosedWires)[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aClosed->Value(i)));
n = anOpen->Length();
theOpenWires->length( n );
for ( i = 1, n = anOpen->Length(); i <= n; i++ )
- (*theOpenWires)[i-1] = GetObject(Handle(GEOM_Object)::DownCast(anOpen->Value(i)));
+ (*theOpenWires)[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(anOpen->Value(i)));
return true;
}
aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
// Get the object itself
- Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull())
return aGEOMObject._retn();
// Perform
-// Handle(GEOM_Object) aNewObject =
+// HANDLE_NAMESPACE(GEOM_Object) aNewObject =
GetOperations()->ChangeOrientation( anObject );
// if (!GetOperations()->IsDone() || aNewObject.IsNull())
// return aGEOMObject._retn();
GetOperations()->SetNotDone();
// Get the object itself
- Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull())
return aGEOMObject._retn();
// Perform
- Handle(GEOM_Object) aNewObject =
+ HANDLE_NAMESPACE(GEOM_Object) aNewObject =
GetOperations()->ChangeOrientationCopy( anObject );
if (!GetOperations()->IsDone() || aNewObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
// Get the object itself
- Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull())
return aGEOMObject._retn();
// Perform
- Handle(GEOM_Object) aNewObject =
+ HANDLE_NAMESPACE(GEOM_Object) aNewObject =
GetOperations()->LimitTolerance(anObject, theTolerance);
if (!GetOperations()->IsDone() || aNewObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference shape
- Handle(GEOM_Object) anOriginal = GetObjectImpl(theOriginal);
+ HANDLE_NAMESPACE(GEOM_Object) anOriginal = GetObjectImpl(theOriginal);
if (anOriginal.IsNull()) return aGEOMObject._retn();
//Create the copy
- Handle(GEOM_Object) anObject = GetOperations()->MakeCopy(anOriginal);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeCopy(anOriginal);
if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference shape
- Handle(GEOM_Object) anOriginal = GetObjectImpl(theOriginal);
+ HANDLE_NAMESPACE(GEOM_Object) anOriginal = GetObjectImpl(theOriginal);
if (anOriginal.IsNull()) return;
//Export the shape to the file
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
- aSeq[i-1] = GetBaseObject(Handle(GEOM_BaseObject)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetBaseObject(HANDLE_NAMESPACE(GEOM_BaseObject)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
char* buf = (char*)theStream.NP_data();
std::istringstream aStream (buf);
- Handle(GEOM_Object) anObject = GetOperations()->RestoreShape(aStream);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->RestoreShape(aStream);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
}
//Get the reference shape
- Handle(GEOM_Object) aShapeFrom = GetObjectImpl(theObjectFrom);
- Handle(GEOM_Object) aShapeTo = GetObjectImpl(theObjectTo);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeFrom = GetObjectImpl(theObjectFrom);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeTo = GetObjectImpl(theObjectTo);
if (aShapeFrom.IsNull() || aShapeTo.IsNull())
{
GEOM::GEOM_Object_var aGEOMObject;
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Create the Fillet
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeFilletAll(aShapeRef, theR);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GEOM::GEOM_Object_var aGEOMObject;
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference edges
}
//Create the Fillet
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeFilletEdges(aShapeRef, theR, anEdges);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GEOM::GEOM_Object_var aGEOMObject;
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference edges
}
//Create the Fillet
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeFilletEdgesR1R2(aShapeRef, theR1, theR2, anEdges);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GEOM::GEOM_Object_var aGEOMObject;
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference faces
}
//Create the Fillet
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeFilletFaces(aShapeRef, theR, aFaces);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GEOM::GEOM_Object_var aGEOMObject;
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference faces
}
//Create the Fillet
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeFilletFacesR1R2(aShapeRef, theR1, theR2, aFaces);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GEOM::GEOM_Object_var aGEOMObject;
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference vertex
}
//Create the Fillet
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeFillet2D(aShapeRef, theR, aVertexes);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GEOM::GEOM_Object_var aGEOMObject;
//Get the reference shape (wire)
- Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference vertex
}
//Create the Fillet
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeFillet1D(aShapeRef, theR, aVertexes, doIgnoreSecantVertices);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GEOM::GEOM_Object_var aGEOMObject;
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Create the Chamfer
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeChamferAll(aShapeRef, theD);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GEOM::GEOM_Object_var aGEOMObject;
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Create the Chamfer
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeChamferEdge(aShapeRef, theD1, theD2, theFace1, theFace2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GEOM::GEOM_Object_var aGEOMObject;
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Create the Chamfer
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeChamferEdgeAD(aShapeRef, theD, theAngle, theFace1, theFace2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GEOM::GEOM_Object_var aGEOMObject;
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference faces
}
//Create the Chamfer
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeChamferFaces(aShapeRef, theD1, theD2, aFaces);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GEOM::GEOM_Object_var aGEOMObject;
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference faces
}
//Create the Chamfer
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeChamferFacesAD(aShapeRef, theD, theAngle, aFaces);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GEOM::GEOM_Object_var aGEOMObject;
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference edges
}
//Create the Chamfer
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeChamferEdges(aShapeRef, theD1, theD2, aEdges);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GEOM::GEOM_Object_var aGEOMObject;
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference edges
}
//Create the Chamfer
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeChamferEdgesAD(aShapeRef, theD, theAngle, aEdges);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GEOM::GEOM_Object_var aGEOMObject;
//Get the reference shape
- Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Create the Archimede
- Handle(GEOM_Object) anObject = GetOperations()->MakeArchimede
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeArchimede
(aShapeRef, theWeight, theWaterDensity, theMeshingDeflection);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
(GEOM::GEOM_Object_ptr theShape, GEOM::GEOM_Object_ptr theSubShape)
{
//Get the reference shapes
- Handle(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
- Handle(GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape);
if (aShapeRef.IsNull() || aSubShapeRef.IsNull()) return -1;
//Get the unique ID of <theSubShape> inside <theShape>
GEOM::ListOfDouble_var aDoublesArray = new GEOM::ListOfDouble();
//Get the reference shape
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (!aShape.IsNull()) {
Handle(TColStd_HSequenceOfInteger) anIntegers = new TColStd_HSequenceOfInteger;
Zz = Xx = 1.;
//Get the reference shape
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return;
// Get shape parameters
GetOperations()->SetNotDone();
//Get the reference shape
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aGEOMObject._retn();
// Make Point - centre of mass of theShape
- Handle(GEOM_Object) anObject = GetOperations()->GetCentreOfMass(aShape);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->GetCentreOfMass(aShape);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference shape
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if ( aShape.IsNull() ) return aGEOMObject._retn();
// Get vertex by index
- Handle(GEOM_Object) anObject = GetOperations()->GetVertexByIndex(aShape, theIndex);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->GetVertexByIndex(aShape, theIndex);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference shape
- Handle(GEOM_Object) aFace = GetObjectImpl(theFace);
+ HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace);
if (aFace.IsNull()) return aGEOMObject._retn();
// Get the OptionalPoint (can be not defined)
- Handle(GEOM_Object) anOptionalPoint = GetObjectImpl(theOptionalPoint);
+ HANDLE_NAMESPACE(GEOM_Object) anOptionalPoint = GetObjectImpl(theOptionalPoint);
// Make Vector - normal to theFace (in point theOptionalPoint if the face is not planar)
- Handle(GEOM_Object) anObject = GetOperations()->GetNormal(aFace, anOptionalPoint);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->GetNormal(aFace, anOptionalPoint);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference shape
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return;
// Get shape parameters
GetOperations()->SetNotDone();
//Get the reference shape
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return;
// Get shape parameters
GetOperations()->SetNotDone();
//Get the reference shape
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return;
// Get shape parameters
GetOperations()->SetNotDone();
//Get the reference shape
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aGEOMObject._retn();
// Make Box - bounding box of theShape
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->GetBoundingBox(aShape, precise);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference shape
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return;
// Get shape parameters
}
//Get the reference shape
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull())
{
}
//Get the reference shape
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull())
{
const GEOM::GEOM_IMeasureOperations::ShapeErrors &theErrors)
{
//Get the reference shape
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) {
return NULL;
GEOM::ListOfLong_var anIntegersArray = new GEOM::ListOfLong();
// Get the reference shape
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (!aShape.IsNull()) {
GEOMImpl_IMeasureOperations::SICheckLevel aCheckLevel;
GEOM::ListOfLong_var anIntegersArray = new GEOM::ListOfLong();
// Get the reference shape
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (!aShape.IsNull()) {
Handle(TColStd_HSequenceOfInteger) anIntegers = new TColStd_HSequenceOfInteger;
GEOM::ListOfLong_var anIntegersArray2 = new GEOM::ListOfLong();
// Get the reference shape
- Handle(GEOM_Object) aShape1 = GetObjectImpl(theShape1);
- Handle(GEOM_Object) aShape2 = GetObjectImpl(theShape2);
+ HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1);
+ HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2);
if (!aShape1.IsNull() && !aShape2.IsNull()) {
Handle(TColStd_HSequenceOfInteger) anIntegers1 = new TColStd_HSequenceOfInteger;
GetOperations()->SetNotDone();
//Get the reference shape
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return CORBA::string_dup("WRN_NULL_OBJECT_OR_SHAPE");
// Get shape parameters
GetOperations()->SetNotDone();
//Get the reference shape
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return NULL;
// Get shape parameters
GEOM::ListOfBool_var aResults = new GEOM::ListOfBool;
aResults->length(nb_points);
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
std::vector<double> tmp(3*nb_points);
for (int i = 0; i < 3*nb_points; i++)
GetOperations()->SetNotDone();
//Get the reference shape
- Handle(GEOM_Object) aShape1 = GetObjectImpl(theShape1);
- Handle(GEOM_Object) aShape2 = GetObjectImpl(theShape2);
+ HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1);
+ HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2);
if (aShape1.IsNull() || aShape2.IsNull()) return -1.0;
// Get shape parameters
GEOM::ListOfDouble_var aDoublesArray = new GEOM::ListOfDouble();
//Get the reference shape
- Handle(GEOM_Object) aShape1 = GetObjectImpl(theShape1);
- Handle(GEOM_Object) aShape2 = GetObjectImpl(theShape2);
+ HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1);
+ HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2);
if (!aShape1.IsNull() && !aShape2.IsNull()) {
Handle(TColStd_HSequenceOfReal) aDoubles = new TColStd_HSequenceOfReal;
GetOperations()->SetNotDone();
//Get the reference shape
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull())
return;
GetOperations()->SetNotDone();
//Get the reference shapes
- Handle(GEOM_Object) aShape1 = GetObjectImpl(theShape1);
- Handle(GEOM_Object) aShape2 = GetObjectImpl(theShape2);
+ HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1);
+ HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2);
if (aShape1.IsNull() || aShape2.IsNull()) return -1.0;
// Get the angle
GetOperations()->SetNotDone();
//Get the reference shapes
- Handle(GEOM_Object) aShape1 = GetObjectImpl(theShape1);
- Handle(GEOM_Object) aShape2 = GetObjectImpl(theShape2);
+ HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1);
+ HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2);
if (aShape1.IsNull() || aShape2.IsNull()) return -1.0;
// Get the angle
GetOperations()->SetNotDone();
//Get the reference shape
- Handle(GEOM_Object) aShape = GetObjectImpl(theCurve);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theCurve);
if(aShape.IsNull()) return -1.0;
return GetOperations()->CurveCurvatureByParam(aShape,theParam);
GetOperations()->SetNotDone();
//Get the reference shape
- Handle(GEOM_Object) aShape = GetObjectImpl(theCurve);
- Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theCurve);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint);
if( aShape.IsNull() || aPoint.IsNull() ) return -1.0;
return GetOperations()->CurveCurvatureByPoint(aShape,aPoint);
GetOperations()->SetNotDone();
//Get the reference shape
- Handle(GEOM_Object) aShape = GetObjectImpl(theSurf);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theSurf);
if(aShape.IsNull()) return -1.0;
return GetOperations()->MaxSurfaceCurvatureByParam(aShape,theUParam,theVParam);
GetOperations()->SetNotDone();
//Get the reference shape
- Handle(GEOM_Object) aShape = GetObjectImpl(theSurf);
- Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theSurf);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint);
if( aShape.IsNull() || aPoint.IsNull() ) return -1.0;
return GetOperations()->MaxSurfaceCurvatureByPoint(aShape,aPoint);
GetOperations()->SetNotDone();
//Get the reference shape
- Handle(GEOM_Object) aShape = GetObjectImpl(theSurf);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theSurf);
if (aShape.IsNull()) return -1.0;
return GetOperations()->MinSurfaceCurvatureByParam(aShape,theUParam,theVParam);
GetOperations()->SetNotDone();
//Get the reference shape
- Handle(GEOM_Object) aShape = GetObjectImpl(theSurf);
- Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theSurf);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint);
if (aShape.IsNull() || aPoint.IsNull()) return -1.0;
return GetOperations()->MinSurfaceCurvatureByPoint(aShape,aPoint);
*/
//=============================================================================
GEOM::GEOM_BaseObject_ptr
-GEOM_IOperations_i::GetBaseObject(Handle(GEOM_BaseObject) theObject)
+GEOM_IOperations_i::GetBaseObject(HANDLE_NAMESPACE(GEOM_BaseObject) theObject)
{
GEOM::GEOM_BaseObject_var GO;
if (theObject.IsNull()) return GO._retn();
* GetObjectImpl
*/
//=============================================================================
-Handle(GEOM_BaseObject)
+HANDLE_NAMESPACE(GEOM_BaseObject)
GEOM_IOperations_i::GetBaseObjectImpl(GEOM::GEOM_BaseObject_ptr theObject)
{
- Handle(GEOM_BaseObject) anImpl;
+ HANDLE_NAMESPACE(GEOM_BaseObject) anImpl;
if (!CORBA::is_nil(theObject)) {
CORBA::String_var anEntry = theObject->GetEntry();
anImpl = GetImpl()->GetEngine()->GetObject( theObject->GetStudyID(), anEntry );
* GetObject
*/
//=============================================================================
-GEOM::GEOM_Object_ptr GEOM_IOperations_i::GetObject(Handle(GEOM_Object) theObject)
+GEOM::GEOM_Object_ptr GEOM_IOperations_i::GetObject(HANDLE_NAMESPACE(GEOM_Object) theObject)
{
return GEOM::GEOM_Object::_narrow( GetBaseObject( theObject ));
}
* GetObjectImpl
*/
//=============================================================================
-Handle(GEOM_Object) GEOM_IOperations_i::GetObjectImpl(GEOM::GEOM_Object_ptr theObject)
+HANDLE_NAMESPACE(GEOM_Object) GEOM_IOperations_i::GetObjectImpl(GEOM::GEOM_Object_ptr theObject)
{
- return Handle(GEOM_Object)::DownCast( GetBaseObjectImpl( theObject ));
+ return HANDLE_NAMESPACE(GEOM_Object)::DownCast( GetBaseObjectImpl( theObject ));
}
//=============================================================================
int aNbObj = theObjects.length();
for (i = 0; i < aNbObj; i++) {
- Handle(GEOM_Object) anObj = GetObjectImpl(theObjects[i]);
+ HANDLE_NAMESPACE(GEOM_Object) anObj = GetObjectImpl(theObjects[i]);
if (anObj.IsNull()) {
aResult.Nullify();
//=======================================================================
bool GEOM_IOperations_i::GetListOfObjectsImpl(const GEOM::ListOfGO& theObjects,
- std::list< Handle(GEOM_Object) >& theList)
+ std::list< HANDLE_NAMESPACE(GEOM_Object) >& theList)
{
int i;
int aNbObj = theObjects.length();
for (i = 0; i < aNbObj; i++) {
- Handle(GEOM_Object) anObj = GetObjectImpl(theObjects[i]);
+ HANDLE_NAMESPACE(GEOM_Object) anObj = GetObjectImpl(theObjects[i]);
if (anObj.IsNull())
return false;
virtual CORBA::Long GetStudyID();
- virtual GEOM::GEOM_BaseObject_ptr GetBaseObject(Handle(GEOM_BaseObject) theObject);
- virtual Handle(GEOM_BaseObject) GetBaseObjectImpl(GEOM::GEOM_BaseObject_ptr theObject);
- virtual GEOM::GEOM_Object_ptr GetObject(Handle(GEOM_Object) theObject);
- virtual Handle(GEOM_Object) GetObjectImpl(GEOM::GEOM_Object_ptr theObject);
+ virtual GEOM::GEOM_BaseObject_ptr GetBaseObject(HANDLE_NAMESPACE(GEOM_BaseObject) theObject);
+ virtual HANDLE_NAMESPACE(GEOM_BaseObject) GetBaseObjectImpl(GEOM::GEOM_BaseObject_ptr theObject);
+ virtual GEOM::GEOM_Object_ptr GetObject(HANDLE_NAMESPACE(GEOM_Object) theObject);
+ virtual HANDLE_NAMESPACE(GEOM_Object) GetObjectImpl(GEOM::GEOM_Object_ptr theObject);
virtual void StartOperation();
Handle(TColStd_HSequenceOfTransient)
GetListOfObjectsImpl(const GEOM::ListOfGO& theObjects);
bool GetListOfObjectsImpl(const GEOM::ListOfGO& theObjects,
- std::list< Handle(GEOM_Object) >& theList);
+ std::list< HANDLE_NAMESPACE(GEOM_Object) >& theList);
Handle(TColStd_HArray1OfExtendedString)
ConvertStringArray(const GEOM::string_array &theInArray);
GetOperations()->SetNotDone();
//Get the reference points
- Handle(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
- Handle(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
if (aPnt1.IsNull() || aPnt2.IsNull()) return aGEOMObject._retn();
//Create the Edge
- Handle(GEOM_Object) anObject = GetOperations()->MakeEdge(aPnt1, aPnt2);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeEdge(aPnt1, aPnt2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference curve
- Handle(GEOM_Object) aRefCurve = GetObjectImpl(theCurve);
+ HANDLE_NAMESPACE(GEOM_Object) aRefCurve = GetObjectImpl(theCurve);
if (aRefCurve.IsNull()) return aGEOMObject._retn();
//Get the reference point (can be NULL)
- Handle(GEOM_Object) aRefPoint;
+ HANDLE_NAMESPACE(GEOM_Object) aRefPoint;
if (!CORBA::is_nil(theStartPoint)) {
aRefPoint = GetObjectImpl(theStartPoint);
}
//Create the point
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeEdgeOnCurveByLength(aRefCurve, theLength, aRefPoint);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the source wire
- Handle(GEOM_Object) aWire = GetObjectImpl(theWire);
+ HANDLE_NAMESPACE(GEOM_Object) aWire = GetObjectImpl(theWire);
if (aWire.IsNull()) return aGEOMObject._retn();
//Create the Edge
- Handle(GEOM_Object) anObject = GetOperations()->MakeEdgeWire(aWire, theLinearTolerance, theAngularTolerance);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeEdgeWire(aWire, theLinearTolerance, theAngularTolerance);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
int ind, aLen;
- std::list<Handle(GEOM_Object)> aShapes;
+ std::list<HANDLE_NAMESPACE(GEOM_Object)> aShapes;
//Get the shapes
aLen = theEdgesAndWires.length();
for (ind = 0; ind < aLen; ind++) {
- Handle(GEOM_Object) aSh = GetObjectImpl(theEdgesAndWires[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theEdgesAndWires[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aShapes.push_back(aSh);
}
// Make Solid
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeWire(aShapes, theTolerance);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference wire
- Handle(GEOM_Object) aWire = GetObjectImpl(theWire);
+ HANDLE_NAMESPACE(GEOM_Object) aWire = GetObjectImpl(theWire);
if (aWire.IsNull()) return aGEOMObject._retn();
//Create the Face
- Handle(GEOM_Object) anObject = GetOperations()->MakeFace(aWire, isPlanarWanted);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeFace(aWire, isPlanarWanted);
//if (!GetOperations()->IsDone() || anObject.IsNull())
// enable warning status
if (anObject.IsNull())
GetOperations()->SetNotDone();
int ind, aLen;
- std::list<Handle(GEOM_Object)> aShapes;
+ std::list<HANDLE_NAMESPACE(GEOM_Object)> aShapes;
//Get the shapes
aLen = theWires.length();
for (ind = 0; ind < aLen; ind++) {
- Handle(GEOM_Object) aSh = GetObjectImpl(theWires[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theWires[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aShapes.push_back(aSh);
}
// Make Face
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeFaceWires(aShapes, isPlanarWanted);
//if (!GetOperations()->IsDone() || anObject.IsNull())
// enable warning status
GetOperations()->SetNotDone();
//Get the reference face and wire
- Handle(GEOM_Object) aFace = GetObjectImpl(theFace);
- Handle(GEOM_Object) aWire = GetObjectImpl(theWire);
+ HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace);
+ HANDLE_NAMESPACE(GEOM_Object) aWire = GetObjectImpl(theWire);
if (aFace.IsNull() || aWire.IsNull()) {
return aGEOMObject._retn();
}
//Create the Face
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeFaceFromSurface(aFace, aWire);
if (anObject.IsNull()) {
GetOperations()->SetNotDone();
//Get the shapes
- std::list<Handle(GEOM_Object)> aConstraints;
+ std::list<HANDLE_NAMESPACE(GEOM_Object)> aConstraints;
for( int ind = 0; ind < theConstraints.length(); ind++ ) {
- Handle(GEOM_Object) anObject = GetObjectImpl( theConstraints[ind] );
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl( theConstraints[ind] );
aConstraints.push_back(anObject);
}
// Make Face
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeFaceWithConstraints( aConstraints );
// enable warning status
GetOperations()->SetNotDone();
int ind, aLen;
- std::list<Handle(GEOM_Object)> aShapes;
+ std::list<HANDLE_NAMESPACE(GEOM_Object)> aShapes;
//Get the shapes
aLen = theFacesAndShells.length();
for (ind = 0; ind < aLen; ind++) {
- Handle(GEOM_Object) aSh = GetObjectImpl(theFacesAndShells[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theFacesAndShells[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aShapes.push_back(aSh);
}
// Make Solid
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeShell(aShapes);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aShell = GetObjectImpl(theShell);
+ HANDLE_NAMESPACE(GEOM_Object) aShell = GetObjectImpl(theShell);
if (aShell.IsNull()) return aGEOMObject._retn();
- std::list<Handle(GEOM_Object)> aShapes;
+ std::list<HANDLE_NAMESPACE(GEOM_Object)> aShapes;
aShapes.push_back(aShell);
//Create the Solid
- Handle(GEOM_Object) anObject = GetOperations()->MakeSolidShells(aShapes);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeSolidShells(aShapes);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
int ind, aLen;
- std::list<Handle(GEOM_Object)> aShapes;
+ std::list<HANDLE_NAMESPACE(GEOM_Object)> aShapes;
//Get the shapes
aLen = theShells.length();
for (ind = 0; ind < aLen; ind++) {
- Handle(GEOM_Object) aSh = GetObjectImpl(theShells[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theShells[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aShapes.push_back(aSh);
}
// Make Solid
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeSolidShells(aShapes);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
int ind, aLen;
- std::list<Handle(GEOM_Object)> aShapes;
+ std::list<HANDLE_NAMESPACE(GEOM_Object)> aShapes;
//Get the shapes
aLen = theShapes.length();
for (ind = 0; ind < aLen; ind++) {
- Handle(GEOM_Object) aSh = GetObjectImpl(theShapes[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theShapes[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aShapes.push_back(aSh);
}
// Make Solid
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeCompound(aShapes);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
int ind, aLen;
- std::list<Handle(GEOM_Object)> aShapes;
+ std::list<HANDLE_NAMESPACE(GEOM_Object)> aShapes;
//Get the shapes
aLen = theFacesOrShells.length();
for (ind = 0; ind < aLen; ind++) {
- Handle(GEOM_Object) aSh = GetObjectImpl(theFacesOrShells[ind]);
+ ::HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theFacesOrShells[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aShapes.push_back(aSh);
}
// Make Solid
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeSolidFromConnectedFaces(aShapes, isIntersect);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- std::list< Handle(GEOM_Object) > aShapes;
+ std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes;
if (! GetListOfObjectsImpl( theShapes, aShapes ))
return aGEOMObject._retn();
//Perform the gluing
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeGlueFaces(aShapes, theTolerance, doKeepNonSolids);
//if (!GetOperations()->IsDone() || anObject.IsNull())
// to allow warning
GetOperations()->SetNotDone();
//Get the reference objects
- std::list< Handle(GEOM_Object) > aShapes;
+ std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes;
if (! GetListOfObjectsImpl( theShapes, aShapes ))
return aSeq._retn();
Standard_Integer aLength = aHSeq->Length();
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
- aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference objects
- std::list< Handle(GEOM_Object) > aShapes;
+ std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes;
if (! GetListOfObjectsImpl( theShapes, aShapes ))
return aGEOMObject._retn();
//Get the shapes
- std::list<Handle(GEOM_Object)> aFaces;
+ std::list<HANDLE_NAMESPACE(GEOM_Object)> aFaces;
if (! GetListOfObjectsImpl( theFaces, aFaces ))
return aGEOMObject._retn();
//Perform the gluing
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeGlueFacesByList(aShapes, theTolerance, aFaces,
doKeepNonSolids, doGlueAllEdges);
//if (!GetOperations()->IsDone() || anObject.IsNull())
GetOperations()->SetNotDone();
//Get the reference objects
- std::list< Handle(GEOM_Object) > aShapes;
+ std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes;
if (! GetListOfObjectsImpl( theShapes, aShapes ))
return aGEOMObject._retn();
//Perform the gluing
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeGlueEdges(aShapes, theTolerance);
//if (!GetOperations()->IsDone() || anObject.IsNull())
// to allow warning
GetOperations()->SetNotDone();
//Get the reference objects
- std::list< Handle(GEOM_Object) > aShapes;
+ std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes;
if (! GetListOfObjectsImpl( theShapes, aShapes ))
return aSeq._retn();
Standard_Integer aLength = aHSeq->Length();
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
- aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference objects
- std::list< Handle(GEOM_Object) > aShapes;
+ std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes;
if (! GetListOfObjectsImpl( theShapes, aShapes ))
return aGEOMObject._retn();
//Get the shapes
- std::list<Handle(GEOM_Object)> anEdges;
+ std::list<HANDLE_NAMESPACE(GEOM_Object)> anEdges;
if (! GetListOfObjectsImpl( theEdges, anEdges ))
return aGEOMObject._retn();
//Perform the gluing
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->MakeGlueEdgesByList(aShapes, theTolerance, anEdges);
//if (!GetOperations()->IsDone() || anObject.IsNull())
// to allow warning
{
GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aSeq._retn();
Handle(TColStd_HSequenceOfTransient) aHSeq =
Standard_Integer aLength = aHSeq->Length();
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
- aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
{
GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aSeq._retn();
Handle(TColStd_HSequenceOfTransient) aHSeq =
Standard_Integer aLength = aHSeq->Length();
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
- aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
{
GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aSeq._retn();
Handle(TColStd_HSequenceOfTransient) aHSeq =
Standard_Integer aLength = aHSeq->Length();
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
- aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
{
GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aSeq._retn();
Handle(TColStd_HSequenceOfTransient) aHSeq =
Standard_Integer aLength = aHSeq->Length();
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
- aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
{
GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong;
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aSeq._retn();
Handle(TColStd_HSequenceOfInteger) aHSeq =
{
GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong;
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aSeq._retn();
Handle(TColStd_HSequenceOfInteger) aHSeq =
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theMainShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theMainShape);
if (aShape.IsNull()) return aGEOMObject._retn();
- Handle(GEOM_Object) anObject = GetOperations()->GetSubShape(aShape, theID);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->GetSubShape(aShape, theID);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
if (theIndices.length() < 1)
return aSeq._retn();
- Handle(GEOM_Object) aShape = GetObjectImpl(theMainShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theMainShape);
if (aShape.IsNull()) return aSeq._retn();
Handle(TColStd_HArray1OfInteger) anArray = new TColStd_HArray1OfInteger (1, theIndices.length());
Standard_Integer aLength = aHSeq->Length();
aSeq->length(aLength);
for (i = 0; i < aLength; i++)
- aSeq[i] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i+1)));
+ aSeq[i] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i+1)));
return aSeq._retn();
}
(GEOM::GEOM_Object_ptr theMainShape, GEOM::GEOM_Object_ptr theSubShape)
{
//Get the reference shapes
- Handle(GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape);
- Handle(GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape);
+ HANDLE_NAMESPACE(GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape);
+ HANDLE_NAMESPACE(GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape);
if (aMainShapeRef.IsNull() || aSubShapeRef.IsNull()) return -1;
GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong;
//Get the reference main shape
- Handle(GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape);
+ HANDLE_NAMESPACE(GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape);
if (aMainShapeRef.IsNull()) return aSeq._retn();
//Get the subshapes
- std::list<Handle(GEOM_Object)> aShapes;
+ std::list<HANDLE_NAMESPACE(GEOM_Object)> aShapes;
int aLen = theSubShapes.length();
for (int ind = 0; ind < aLen; ind++) {
- Handle(GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]);
+ HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]);
if (aSh.IsNull())
{
MESSAGE("NULL shape")
(GEOM::GEOM_Object_ptr theMainShape, GEOM::GEOM_Object_ptr theSubShape)
{
//Get the reference shapes
- Handle(GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape);
- Handle(GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape);
+ HANDLE_NAMESPACE(GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape);
+ HANDLE_NAMESPACE(GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape);
if (aMainShapeRef.IsNull() || aSubShapeRef.IsNull()) return -1;
char* GEOM_IShapesOperations_i::GetShapeTypeString (GEOM::GEOM_Object_ptr theShape)
{
//Get the reference shape
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return NULL;
// Get shape parameters
GEOM::GEOM_Object_ptr theObject,
const CORBA::Long theObjectIndex)
{
- Handle(GEOM_Object) aSubObject = GetObjectImpl( theSubObject );
- Handle(GEOM_Object) anObject = GetObjectImpl( theObject );
+ HANDLE_NAMESPACE(GEOM_Object) aSubObject = GetObjectImpl( theSubObject );
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl( theObject );
if( anObject.IsNull() || aSubObject.IsNull() )
return false;
CORBA::Long GEOM_IShapesOperations_i::NumberOfSubShapes (GEOM::GEOM_Object_ptr theShape,
const CORBA::Long theShapeType)
{
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return -1;
CORBA::Long aNb = GetOperations()->NumberOfSubShapes(aShape, theShapeType);
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aGEOMObject._retn();
//Create the Solid
- Handle(GEOM_Object) anObject = GetOperations()->ReverseShape(aShape);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->ReverseShape(aShape);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong;
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aSeq._retn();
Handle(TColStd_HSequenceOfInteger) aHSeq =
GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
- Handle(GEOM_Object) aShape1 = GetObjectImpl(theShape1);
- Handle(GEOM_Object) aShape2 = GetObjectImpl(theShape2);
+ HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1);
+ HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2);
if (aShape1.IsNull() || aShape2.IsNull()) return aSeq._retn();
Standard_Integer aLength = aHSeq->Length();
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
- aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
//Get the shapes
- std::list<Handle(GEOM_Object)> aShapes;
+ std::list<HANDLE_NAMESPACE(GEOM_Object)> aShapes;
if (! GetListOfObjectsImpl( theShapes, aShapes ))
return aSeq._retn();
Standard_Integer aLength = aHSeq->Length();
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
- aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) anAx1 = GetObjectImpl(theAx1);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) anAx1 = GetObjectImpl(theAx1);
if (aShape.IsNull() || anAx1.IsNull()) return aSeq._retn();
Standard_Integer aLength = aHSeq->Length();
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
- aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) anAx1 = GetObjectImpl(theAx1);
- Handle(GEOM_Object) anPnt = GetObjectImpl(thePnt);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) anAx1 = GetObjectImpl(theAx1);
+ HANDLE_NAMESPACE(GEOM_Object) anPnt = GetObjectImpl(thePnt);
if (aShape.IsNull() || anAx1.IsNull() || anPnt.IsNull()) return aSeq._retn();
Standard_Integer aLength = aHSeq->Length();
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
- aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) anAxis = GetObjectImpl(theAxis);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis);
if (aShape.IsNull() || anAxis.IsNull()) return aSeq._retn();
Standard_Integer aLength = aHSeq->Length();
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
- aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) anAxis = GetObjectImpl(theAxis);
- Handle(GEOM_Object) aPnt = GetObjectImpl(thePnt);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt);
if (aShape.IsNull() || anAxis.IsNull() || aPnt.IsNull()) return aSeq._retn();
Standard_Integer aLength = aHSeq->Length();
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
- aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) aCenter = GetObjectImpl(theCenter);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aCenter = GetObjectImpl(theCenter);
if (aShape.IsNull() || aCenter.IsNull()) return aSeq._retn();
Standard_Integer aLength = aHSeq->Length();
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
- aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) aTopLeftPoint = GetObjectImpl(theTopLeftPoint);
- Handle(GEOM_Object) aTopRigthPoint = GetObjectImpl(theTopRigthPoint);
- Handle(GEOM_Object) aBottomLeftPoint = GetObjectImpl(theBottomLeftPoint);
- Handle(GEOM_Object) aBottomRigthPoint = GetObjectImpl(theBottomRigthPoint);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aTopLeftPoint = GetObjectImpl(theTopLeftPoint);
+ HANDLE_NAMESPACE(GEOM_Object) aTopRigthPoint = GetObjectImpl(theTopRigthPoint);
+ HANDLE_NAMESPACE(GEOM_Object) aBottomLeftPoint = GetObjectImpl(theBottomLeftPoint);
+ HANDLE_NAMESPACE(GEOM_Object) aBottomRigthPoint = GetObjectImpl(theBottomRigthPoint);
if (aShape.IsNull() ||
aTopLeftPoint.IsNull() ||
Standard_Integer aLength = aHSeq->Length();
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
- aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) anAx1 = GetObjectImpl(theAx1);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) anAx1 = GetObjectImpl(theAx1);
if (aShape.IsNull() || anAx1.IsNull()) return aSeq._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) anAx1 = GetObjectImpl(theAx1);
- Handle(GEOM_Object) anPnt = GetObjectImpl(thePnt);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) anAx1 = GetObjectImpl(theAx1);
+ HANDLE_NAMESPACE(GEOM_Object) anPnt = GetObjectImpl(thePnt);
if (aShape.IsNull() || anAx1.IsNull() || anPnt.IsNull()) return aSeq._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) anAxis = GetObjectImpl(theAxis);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis);
if (aShape.IsNull() || anAxis.IsNull()) return aSeq._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) anAxis = GetObjectImpl(theAxis);
- Handle(GEOM_Object) aPnt = GetObjectImpl(thePnt);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis);
+ HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt);
if (aShape.IsNull() || anAxis.IsNull() || aPnt.IsNull()) return aSeq._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) aCenter = GetObjectImpl(theCenter);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aCenter = GetObjectImpl(theCenter);
if (aShape.IsNull() || aCenter.IsNull()) return aSeq._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) aTopLeftPoint = GetObjectImpl(theTopLeftPoint);
- Handle(GEOM_Object) aTopRigthPoint = GetObjectImpl(theTopRigthPoint);
- Handle(GEOM_Object) aBottomLeftPoint = GetObjectImpl(theBottomLeftPoint);
- Handle(GEOM_Object) aBottomRigthPoint = GetObjectImpl(theBottomRigthPoint);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aTopLeftPoint = GetObjectImpl(theTopLeftPoint);
+ HANDLE_NAMESPACE(GEOM_Object) aTopRigthPoint = GetObjectImpl(theTopRigthPoint);
+ HANDLE_NAMESPACE(GEOM_Object) aBottomLeftPoint = GetObjectImpl(theBottomLeftPoint);
+ HANDLE_NAMESPACE(GEOM_Object) aBottomRigthPoint = GetObjectImpl(theBottomRigthPoint);
if (aShape.IsNull() ||
aTopLeftPoint.IsNull() ||
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) aBox = GetObjectImpl(theBox);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aBox = GetObjectImpl(theBox);
if (aShape.IsNull() || aBox.IsNull() )
return aSeq._retn();
Standard_Integer aLength = aHSeq->Length();
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
- aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) aBox = GetObjectImpl(theBox);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aBox = GetObjectImpl(theBox);
if (aShape.IsNull() || aBox.IsNull() )
return aSeq._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape);
if (aShape.IsNull() || aCheckShape.IsNull() )
return aSeq._retn();
Standard_Integer aLength = aHSeq->Length();
aSeq->length(aLength);
for (Standard_Integer i = 1; i <= aLength; i++)
- aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape);
if (aShape.IsNull() || aCheckShape.IsNull() )
return aGEOMObject._retn();
//Get Shapes On Shape
- Handle(GEOM_Object) anObject = GetOperations()->GetShapesOnShapeAsCompound
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->GetShapesOnShapeAsCompound
(aCheckShape,aShape, theShapeType,ShapeState(theState));
if (anObject.IsNull())
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape);
if (aShape.IsNull() || aCheckShape.IsNull() )
return aSeq._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere);
- Handle(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat);
if (aShapeWhere.IsNull() ||
aShapeWhat.IsNull()) return aGEOMObject._retn();
//Get Shapes in place of aShapeWhat
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->GetInPlace(aShapeWhere, aShapeWhat);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere);
- Handle(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat);
if (aShapeWhere.IsNull() ||
aShapeWhat.IsNull()) return aGEOMObject._retn();
//Get Shapes in place of aShapeWhat
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->GetInPlaceOld(aShapeWhere, aShapeWhat);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere);
- Handle(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat);
if (aShapeWhere.IsNull() ||
aShapeWhat.IsNull()) return aGEOMObject._retn();
//Get Shapes in place of aShapeWhat
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->GetInPlaceByHistory(aShapeWhere, aShapeWhat);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere);
- Handle(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat);
if (aShapeWhere.IsNull() ||
aShapeWhat.IsNull()) return aGEOMObject._retn();
//Get Shapes in place of aShapeWhat
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->GetSame(aShapeWhere, aShapeWhat);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong;
//Get the reference objects
- Handle(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere);
- Handle(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere);
+ HANDLE_NAMESPACE(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat);
if (aShapeWhere.IsNull() ||
aShapeWhat.IsNull()) return aSeq._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) anEdge = GetObjectImpl(theEdge);
+ HANDLE_NAMESPACE(GEOM_Object) anEdge = GetObjectImpl(theEdge);
if (anEdge.IsNull()) {
return aGEOMObject._retn();
}
//Get Shapes in place of aShapeWhat
- Handle(GEOM_Object) aNewEdge =
+ HANDLE_NAMESPACE(GEOM_Object) aNewEdge =
GetOperations()->ExtendEdge(anEdge, theMin, theMax);
if (!GetOperations()->IsDone() || aNewEdge.IsNull()) {
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aFace = GetObjectImpl(theFace);
+ HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace);
if (aFace.IsNull()) {
return aGEOMObject._retn();
}
//Get Shapes in place of aShapeWhat
- Handle(GEOM_Object) aNewFace =
+ HANDLE_NAMESPACE(GEOM_Object) aNewFace =
GetOperations()->ExtendFace(aFace, theUMin, theUMax, theVMin, theVMax);
if (!GetOperations()->IsDone() || aNewFace.IsNull()) {
GetOperations()->SetNotDone();
//Get the reference object
- Handle(GEOM_Object) aFace = GetObjectImpl(theFace);
+ HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace);
if (aFace.IsNull()) {
return aGEOMObject._retn();
}
//Get Shapes in place of aShapeWhat
- Handle(GEOM_Object) aNewFace = GetOperations()->MakeSurfaceFromFace(aFace);
+ HANDLE_NAMESPACE(GEOM_Object) aNewFace = GetOperations()->MakeSurfaceFromFace(aFace);
if (!GetOperations()->IsDone() || aNewFace.IsNull()) {
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
- Handle(GEOM_Object) aStartPoint = GetObjectImpl(theStartPoint);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aStartPoint = GetObjectImpl(theStartPoint);
if (aShape.IsNull() || aStartPoint.IsNull()) {
return aSeq._retn();
aSeq->length(aLength);
for (i = 1; i <= aLength; i++) {
- aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
}
return aSeq._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) {
return aSeq._retn();
aSeq->length(aLength);
for (i = 1; i <= aLength; i++) {
- aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
}
return aSeq._retn();
aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
//Get the object itself
- Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the first point of translation
- Handle(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
if (aPoint1.IsNull()) return aGEOMObject._retn();
//Get the second point of translation
- Handle(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
if (aPoint2.IsNull()) return aGEOMObject._retn();
//Perform the translation
GetOperations()->SetNotDone();
//Get the object itself
- Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the first point of translation
- Handle(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
if (aPoint1.IsNull()) return aGEOMObject._retn();
//Get the second point of translation
- Handle(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
if (aPoint2.IsNull()) return aGEOMObject._retn();
//Create the translated shape
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->TranslateTwoPointsCopy(aBasicObject, aPoint1, aPoint2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
//Get the object itself
- Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Perform the translation
GetOperations()->SetNotDone();
//Get the object itself
- Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Create the translated shape
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->TranslateDXDYDZCopy(aBasicObject, theDX, theDY, theDZ);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
//Get the object itself
- Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the vector of translation
- Handle(GEOM_Object) aVector = GetObjectImpl(theVector);
+ HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector);
if (aVector.IsNull()) return aGEOMObject._retn();
//Perform the translation
GetOperations()->SetNotDone();
//Get the object itself
- Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the vector of translation
- Handle(GEOM_Object) aVector = GetObjectImpl(theVector);
+ HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector);
if (aVector.IsNull()) return aGEOMObject._retn();
//Perform the translation
- Handle(GEOM_Object) anObject = GetOperations()->TranslateVectorCopy(aBasicObject, aVector);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->TranslateVectorCopy(aBasicObject, aVector);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
//Get the object itself
- Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the vector of translation
- Handle(GEOM_Object) aVector = GetObjectImpl(theVector);
+ HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector);
if (aVector.IsNull()) return aGEOMObject._retn();
//Perform the translation
if (theCopy) {
- Handle(GEOM_Object) anObject = GetOperations()->
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->
TranslateVectorDistance(aBasicObject, aVector, theDistance, theCopy);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
//Get the object itself
- Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the axis of revolution
- Handle(GEOM_Object) anAxis = GetObjectImpl(theAxis);
+ HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis);
if (anAxis.IsNull()) return aGEOMObject._retn();
//Perform the rotation
GetOperations()->SetNotDone();
//Get the object itself
- Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the axis of rotation
- Handle(GEOM_Object) anAxis = GetObjectImpl(theAxis);
+ HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis);
if (anAxis.IsNull()) return aGEOMObject._retn();
//Perform the rotation
- Handle(GEOM_Object) anObject = GetOperations()->RotateCopy(aBasicObject, anAxis, theAngle);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->RotateCopy(aBasicObject, anAxis, theAngle);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
}
//Get the object itself
- Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the plane
- Handle(GEOM_Object) aPlane = GetObjectImpl(thePlane);
+ HANDLE_NAMESPACE(GEOM_Object) aPlane = GetObjectImpl(thePlane);
if (aPlane.IsNull()) return aGEOMObject._retn();
//Perform the mirror
GetOperations()->SetNotDone();
//Get the object itself
- Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the vector of translation
- Handle(GEOM_Object) aPlane = GetObjectImpl(thePlane);
+ HANDLE_NAMESPACE(GEOM_Object) aPlane = GetObjectImpl(thePlane);
if (aPlane.IsNull()) return aGEOMObject._retn();
//Perform the mirror
- Handle(GEOM_Object) anObject = GetOperations()->MirrorPlaneCopy(aBasicObject, aPlane);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MirrorPlaneCopy(aBasicObject, aPlane);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
}
//Get the object itself
- Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the axis
- Handle(GEOM_Object) aAxis = GetObjectImpl(theAxis);
+ HANDLE_NAMESPACE(GEOM_Object) aAxis = GetObjectImpl(theAxis);
if (aAxis.IsNull()) return aGEOMObject._retn();
//Perform the mirror
GetOperations()->SetNotDone();
//Get the object itself
- Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the vector of translation
- Handle(GEOM_Object) aAxis = GetObjectImpl(theAxis);
+ HANDLE_NAMESPACE(GEOM_Object) aAxis = GetObjectImpl(theAxis);
if (aAxis.IsNull()) return aGEOMObject._retn();
//Perform the mirror
- Handle(GEOM_Object) anObject = GetOperations()->MirrorAxisCopy(aBasicObject, aAxis);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MirrorAxisCopy(aBasicObject, aAxis);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
}
//Get the object itself
- Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the point
- Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint);
if (aPoint.IsNull()) return aGEOMObject._retn();
//Perform the mirror
GetOperations()->SetNotDone();
//Get the object itself
- Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the vector of translation
- Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint);
if (aPoint.IsNull()) return aGEOMObject._retn();
//Perform the mirror
- Handle(GEOM_Object) anObject = GetOperations()->MirrorPointCopy(aBasicObject, aPoint);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MirrorPointCopy(aBasicObject, aPoint);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
}
//Get the basic object
- Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Create the offset shape
GetOperations()->SetNotDone();
//Get the basic object
- Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Create the offset shape
- Handle(GEOM_Object) anObject = GetOperations()->OffsetShapeCopy(aBasicObject, theOffset);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->OffsetShapeCopy(aBasicObject, theOffset);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the input objects
- Handle(GEOM_Object) aSource = GetObjectImpl(theSource);
- Handle(GEOM_Object) aTarget = GetObjectImpl(theTarget);
+ HANDLE_NAMESPACE(GEOM_Object) aSource = GetObjectImpl(theSource);
+ HANDLE_NAMESPACE(GEOM_Object) aTarget = GetObjectImpl(theTarget);
if (aSource.IsNull() || aTarget.IsNull()) return aGEOMObject._retn();
//Create the projection
- Handle(GEOM_Object) anObject = GetOperations()->ProjectShapeCopy(aSource, aTarget);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->ProjectShapeCopy(aSource, aTarget);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference shape
- Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint);
- Handle(GEOM_Object) aWire = GetObjectImpl(theWire);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint);
+ HANDLE_NAMESPACE(GEOM_Object) aWire = GetObjectImpl(theWire);
if (aPoint.IsNull() || aWire.IsNull()) {
return -1.0;
}
- Handle(GEOM_Object) aPointOnEdge;
+ HANDLE_NAMESPACE(GEOM_Object) aPointOnEdge;
Standard_Integer anEdgeIndex;
CORBA::Double aResult = GetOperations()->ProjectPointOnWire
(aPoint, aWire, aPointOnEdge, anEdgeIndex);
}
//Get the object itself
- Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the point
- Handle(GEOM_Object) aPoint;
+ HANDLE_NAMESPACE(GEOM_Object) aPoint;
if (!thePoint->_is_nil()) {
aPoint = GetObjectImpl(thePoint);
if (aPoint.IsNull()) return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the basic object
- Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the point
- Handle(GEOM_Object) aPoint;
+ HANDLE_NAMESPACE(GEOM_Object) aPoint;
if (!thePoint->_is_nil()) {
aPoint = GetObjectImpl(thePoint);
if (aPoint.IsNull()) return aGEOMObject._retn();
}
//Perform the scale
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->ScaleShapeCopy(aBasicObject, aPoint, theFactor);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
}
//Get the object itself
- Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the point
- Handle(GEOM_Object) aPoint;
+ HANDLE_NAMESPACE(GEOM_Object) aPoint;
if (!thePoint->_is_nil()) {
aPoint = GetObjectImpl(thePoint);
if (aPoint.IsNull()) return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the basic object
- Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the point
- Handle(GEOM_Object) aPoint;
+ HANDLE_NAMESPACE(GEOM_Object) aPoint;
if (!thePoint->_is_nil()) {
aPoint = GetObjectImpl(thePoint);
if (aPoint.IsNull()) return aGEOMObject._retn();
}
//Perform the scale
- Handle(GEOM_Object) anObject = GetOperations()->ScaleShapeAlongAxes
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->ScaleShapeAlongAxes
(aBasicObject, aPoint, theFactorX, theFactorY, theFactorZ, /*doCopy*/true);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
}
//Get the basic object
- Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the Start LCS (may be NULL for positioning from global LCS)
- Handle(GEOM_Object) aStartLCS;
+ HANDLE_NAMESPACE(GEOM_Object) aStartLCS;
if (!CORBA::is_nil(theStartLCS)) {
aStartLCS = GetObjectImpl(theStartLCS);
if (aStartLCS.IsNull()) return aGEOMObject._retn();
}
//Get the End LCS
- Handle(GEOM_Object) aEndLCS = GetObjectImpl(theEndLCS);
+ HANDLE_NAMESPACE(GEOM_Object) aEndLCS = GetObjectImpl(theEndLCS);
if (aEndLCS.IsNull()) return aGEOMObject._retn();
//Perform the Position
GetOperations()->SetNotDone();
//Get the basic object
- Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the Start LCS (may be NULL for positioning from global LCS)
- Handle(GEOM_Object) aStartLCS;
+ HANDLE_NAMESPACE(GEOM_Object) aStartLCS;
if (!CORBA::is_nil(theStartLCS)) {
aStartLCS = GetObjectImpl(theStartLCS);
if (aStartLCS.IsNull()) return aGEOMObject._retn();
}
//Get the End LCS
- Handle(GEOM_Object) aEndLCS = GetObjectImpl(theEndLCS);
+ HANDLE_NAMESPACE(GEOM_Object) aEndLCS = GetObjectImpl(theEndLCS);
if (aEndLCS.IsNull()) return aGEOMObject._retn();
//Perform the position
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->PositionShapeCopy(aBasicObject, aStartLCS, aEndLCS);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the basic object
- Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the path object
- Handle(GEOM_Object) aPathObject = GetObjectImpl(thePath);
+ HANDLE_NAMESPACE(GEOM_Object) aPathObject = GetObjectImpl(thePath);
if (aPathObject.IsNull()) return aGEOMObject._retn();
//Perform the position
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->PositionAlongPath(aBasicObject, aPathObject, theDistance, theCopy, theReverse);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GEOM::GEOM_Object_var aGEOMObject;
//Get the object itself
- Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the vector of translation
- Handle(GEOM_Object) aVector = GetObjectImpl(theVector);
+ HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector);
//if (aVector.IsNull()) return aGEOMObject._retn(); // DX by default
//Perform the translation
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->Translate1D(aBasicObject, aVector, theStep, theNbTimes);
if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn();
GEOM::GEOM_Object_var aGEOMObject;
//Get the object itself
- Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the vector1 of translation
- Handle(GEOM_Object) aVector1 = GetObjectImpl(theVector1);
+ HANDLE_NAMESPACE(GEOM_Object) aVector1 = GetObjectImpl(theVector1);
//if (aVector1.IsNull()) return aGEOMObject._retn(); // DX by default
//Get the vector2 of translation
- Handle(GEOM_Object) aVector2 = GetObjectImpl(theVector2);
+ HANDLE_NAMESPACE(GEOM_Object) aVector2 = GetObjectImpl(theVector2);
//if (aVector2.IsNull()) return aGEOMObject._retn(); // DY by default
//Perform the translation
- Handle(GEOM_Object) anObject = GetOperations()->Translate2D
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Translate2D
(aBasicObject, aVector1, theStep1, theNbTimes1, aVector2, theStep2, theNbTimes2);
if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn();
GEOM::GEOM_Object_var aGEOMObject;
//Get the object itself
- Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the a directon of rotation
- Handle(GEOM_Object) aVector = GetObjectImpl(theVector);
+ HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector);
//if (aVector.IsNull()) return aGEOMObject._retn(); // DZ by default
//Perform the rotation
- Handle(GEOM_Object) anObject = GetOperations()->Rotate1D(aBasicObject, aVector, theNbTimes);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Rotate1D(aBasicObject, aVector, theNbTimes);
if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn();
return GetObject(anObject);
GEOM::GEOM_Object_var aGEOMObject;
//Get the object itself
- Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the a directon of rotation
- Handle(GEOM_Object) aVector = GetObjectImpl(theVector);
+ HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector);
//if (aVector.IsNull()) return aGEOMObject._retn(); // DZ by default
//Perform the rotation
- Handle(GEOM_Object) anObject = GetOperations()->Rotate1D(aBasicObject, aVector, theAngleStep, theNbSteps);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Rotate1D(aBasicObject, aVector, theAngleStep, theNbSteps);
if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn();
return GetObject(anObject);
GEOM::GEOM_Object_var aGEOMObject;
//Get the object itself
- Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the a directon of rotation
- Handle(GEOM_Object) aVector = GetObjectImpl(theVector);
+ HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector);
//if (aVector.IsNull()) return aGEOMObject._retn(); // DZ by default
//Perform the rotation
- Handle(GEOM_Object) anObject = GetOperations()->Rotate2D
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Rotate2D
(aBasicObject, aVector, theNbObjects, theRadialStep, theNbSteps);
if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn();
GEOM::GEOM_Object_var aGEOMObject;
//Get the object itself
- Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the a directon of rotation
- Handle(GEOM_Object) aVector = GetObjectImpl(theVector);
+ HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector);
//if (aVector.IsNull()) return aGEOMObject._retn(); // DZ by default
//Perform the rotation
- Handle(GEOM_Object) anObject = GetOperations()->Rotate2D
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Rotate2D
(aBasicObject, aVector, theAngle, theNbTimes1, theStep, theNbTimes2);
if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn();
GEOM::GEOM_Object_var aGEOMObject;
//Get the object itself
- Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the a directon of rotation
- Handle(GEOM_Object) aVector = GetObjectImpl(theVector);
+ HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector);
//if (aVector.IsNull()) return aGEOMObject._retn(); // DZ by default
double anAngle = M_PI * theAngle / 180.;
//Perform the rotation
- Handle(GEOM_Object) anObject = GetOperations()->Rotate2D
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Rotate2D
(aBasicObject, aVector, anAngle, theNbTimes1, theStep, theNbTimes2);
if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn();
aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
//Get the object itself
- Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the central point of rotation
- Handle(GEOM_Object) aCentPoint = GetObjectImpl(theCentPoint);
+ HANDLE_NAMESPACE(GEOM_Object) aCentPoint = GetObjectImpl(theCentPoint);
if (aCentPoint.IsNull()) return aGEOMObject._retn();
//Get the first point
- Handle(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
if (aPoint1.IsNull()) return aGEOMObject._retn();
//Get the second point
- Handle(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
if (aPoint2.IsNull()) return aGEOMObject._retn();
//Perform the translation
GetOperations()->SetNotDone();
//Get the object itself
- Handle(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the central point of rotation
- Handle(GEOM_Object) aCentPoint = GetObjectImpl(theCentPoint);
+ HANDLE_NAMESPACE(GEOM_Object) aCentPoint = GetObjectImpl(theCentPoint);
if (aCentPoint.IsNull()) return aGEOMObject._retn();
//Get the first point
- Handle(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
if (aPoint1.IsNull()) return aGEOMObject._retn();
//Get the second point
- Handle(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
+ HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
if (aPoint2.IsNull()) return aGEOMObject._retn();
//Perform the rotation
- Handle(GEOM_Object) anObject =
+ HANDLE_NAMESPACE(GEOM_Object) anObject =
GetOperations()->RotateThreePointsCopy(aBasicObject, aCentPoint, aPoint1, aPoint2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the object itself
- Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the sample object
- Handle(GEOM_Object) aSample = GetObjectImpl(theSample);
+ HANDLE_NAMESPACE(GEOM_Object) aSample = GetObjectImpl(theSample);
if (aSample.IsNull()) return aGEOMObject._retn();
//Perform the transformation
- Handle(GEOM_Object) aResObject =
+ HANDLE_NAMESPACE(GEOM_Object) aResObject =
GetOperations()->TransformLikeOtherCopy(anObject, aSample);
if (!GetOperations()->IsDone() || aResObject.IsNull())
return aGEOMObject._retn();
aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
//Get the object itself
- Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Perform the recomputation
- Handle(GEOM_Function) aLastFunction = anObject->GetLastFunction();
+ HANDLE_NAMESPACE(GEOM_Function) aLastFunction = anObject->GetLastFunction();
if (aLastFunction.IsNull()) return aGEOMObject._retn();
GetOperations()->GetSolver()->ComputeFunction(aLastFunction);
GetOperations()->SetNotDone();
//Get the object
- Handle(GEOM_Object) anObject = GetObjectImpl(theObject);
+ HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) {
return aGEOMObject._retn();
}
//Perform the transformation
- Handle(GEOM_Object) aResObject = GetOperations()->MakeProjectionOnCylinder
+ HANDLE_NAMESPACE(GEOM_Object) aResObject = GetOperations()->MakeProjectionOnCylinder
(anObject, theRadius, theStartAngle, theAngleLength, theAngleRotation);
if (!GetOperations()->IsDone() || aResObject.IsNull()) {
//=============================================================================
GEOM_Object_i::GEOM_Object_i (PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine,
- Handle(GEOM_Object) theImpl) :
+ HANDLE_NAMESPACE(GEOM_Object) theImpl) :
SALOME::GenericObj_i( thePOA ),
GEOM_BaseObject_i( thePOA, theEngine, theImpl ),
_impl( theImpl )
{
CORBA::String_var name("");
- Handle(GEOM_Function) aMainFun = _impl->GetLastFunction();
+ HANDLE_NAMESPACE(GEOM_Function) aMainFun = _impl->GetLastFunction();
if ( aMainFun.IsNull() ) return name._retn();
const TDataStd_ListOfExtendedString& aListEntries = aMainFun->GetSubShapeReferences();
for (; anIt.More(); anIt.Next())
{
TCollection_AsciiString anEntry = anIt.Value();
- Handle(GEOM_BaseObject) anObj =
+ HANDLE_NAMESPACE(GEOM_BaseObject) anObj =
GEOM_Engine::GetEngine()->GetObject( _impl->GetDocID(), anEntry.ToCString(), false );
if ( anObj.IsNull() ) continue;
TCollection_AsciiString aSubName = anObj->GetName();
if ( aSubName.IsEmpty() ) continue;
- Handle(GEOM_Function) aFun = anObj->GetLastFunction();
+ HANDLE_NAMESPACE(GEOM_Function) aFun = anObj->GetLastFunction();
if ( aFun.IsNull() ) continue;
GEOM_ISubShape ISS( aFun );
GEOM::ListOfLong_var anIndices = new GEOM::ListOfLong;
if(!_impl->IsMainShape()) {
- Handle(GEOM_Function) aFunction = _impl->GetLastFunction(); //Get Sub-shape function (always the first (and last) one)
+ HANDLE_NAMESPACE(GEOM_Function) aFunction = _impl->GetLastFunction(); //Get Sub-shape function (always the first (and last) one)
if(aFunction.IsNull()) return anIndices._retn();
GEOM_ISubShape ISS(aFunction);
Handle(TColStd_HArray1OfInteger) anArray = ISS.GetIndices();
{
GEOM::GEOM_Object_var obj;
if(!_impl->IsMainShape()) {
- Handle(GEOM_Function) aFunction = _impl->GetFunction(1); //Get Sub-shape function (always the first (and last) one)
+ HANDLE_NAMESPACE(GEOM_Function) aFunction = _impl->GetFunction(1); //Get Sub-shape function (always the first (and last) one)
if(aFunction.IsNull()) return obj._retn();
GEOM_ISubShape ISS(aFunction);
GEOM::GEOM_Object_var shapePtr = GEOM::GEOM_Object::_narrow( other );
if ( !CORBA::is_nil( shapePtr ) ) {
CORBA::String_var entry = shapePtr->GetEntry();
- Handle(GEOM_Object) otherObject = Handle(GEOM_Object)::DownCast
+ HANDLE_NAMESPACE(GEOM_Object) otherObject = HANDLE_NAMESPACE(GEOM_Object)::DownCast
( GEOM_Engine::GetEngine()->GetObject( shapePtr->GetStudyID(), entry, false ));
if ( !otherObject.IsNull() ) {
TopoDS_Shape thisShape = _impl->GetValue();
class GEOM_I_EXPORT GEOM_Object_i : public virtual POA_GEOM::GEOM_Object, public virtual GEOM_BaseObject_i
{
public:
- GEOM_Object_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(GEOM_Object) theImpl);
+ GEOM_Object_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_Object) theImpl);
~GEOM_Object_i();
virtual GEOM::shape_type GetShapeType();
virtual bool IsShape();
- Handle(GEOM_Object) GetImpl() { return _impl; }
+ HANDLE_NAMESPACE(GEOM_Object) GetImpl() { return _impl; }
private:
- Handle(GEOM_Object) _impl;
+ HANDLE_NAMESPACE(GEOM_Object) _impl;
TopoDS_Shape _geom;
};
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer IGESPlugin_ExportDriver::Execute( TFunction_Logbook& log ) const
+Standard_Integer IGESPlugin_ExportDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
return 0;
}
-//=======================================================================
-//function : MustExecute
-//purpose :
-//=======================================================================
-Standard_Boolean IGESPlugin_ExportDriver::MustExecute( const TFunction_Logbook& ) const
-{
- return Standard_True;
-}
-
//================================================================================
/*!
* \brief Returns a name of creation operation and names and values of creation parameters
return false;
}
-IMPLEMENT_STANDARD_HANDLE( IGESPlugin_ExportDriver,GEOM_BaseDriver );
-IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ExportDriver,GEOM_BaseDriver );
+OCCT_IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ExportDriver,GEOM_BaseDriver );
// GEOM includes
#include "GEOM_BaseDriver.hxx"
-// OCCT includes
-#include <TFunction_Logbook.hxx>
-
DEFINE_STANDARD_HANDLE( IGESPlugin_ExportDriver, GEOM_BaseDriver );
class IGESPlugin_ExportDriver : public GEOM_BaseDriver
~IGESPlugin_ExportDriver() {};
static const Standard_GUID& GetID();
- virtual Standard_Integer Execute( TFunction_Logbook& log ) const;
- Standard_Boolean MustExecute( const TFunction_Logbook& ) const;
- virtual void Validate( TFunction_Logbook& ) const {}
+ virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; }
+ virtual void Validate( LOGBOOK& ) const {}
- virtual bool GetCreationInformation( std::string& theOperationName,
- std::vector<GEOM_Param>& params );
+ virtual bool GetCreationInformation( std::string& theOperationName,
+ std::vector<GEOM_Param>& params );
-DEFINE_STANDARD_RTTI( IGESPlugin_ExportDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(IGESPlugin_ExportDriver,GEOM_BaseDriver)
};
#endif // _IGESPlugin_ExportDriver_HXX
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer IGESPlugin_ImportDriver::Execute( TFunction_Logbook& log ) const
+Standard_Integer IGESPlugin_ImportDriver::Execute(LOGBOOK& log) const
{
if( Label().IsNull() ) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
aFunction->SetValue( aResShape );
- log.SetTouched( Label() );
+#if OCC_VERSION_MAJOR < 7
+ log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
-//=======================================================================
-//function : MustExecute
-//purpose :
-//=======================================================================
-Standard_Boolean IGESPlugin_ImportDriver::MustExecute( const TFunction_Logbook& ) const
-{
- return Standard_True;
-}
-
//================================================================================
/*!
* \brief Returns a name of creation operation and names and values of creation parameters
return TCollection_AsciiString();
}
-
-IMPLEMENT_STANDARD_HANDLE( IGESPlugin_ImportDriver, GEOM_BaseDriver );
-IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ImportDriver, GEOM_BaseDriver );
+OCCT_IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ImportDriver, GEOM_BaseDriver );
// GEOM includes
#include "GEOM_BaseDriver.hxx"
-// OCCT includes
-#include <TFunction_Logbook.hxx>
-
DEFINE_STANDARD_HANDLE( IGESPlugin_ImportDriver, GEOM_BaseDriver );
class IGESPlugin_ImportDriver : public GEOM_BaseDriver
~IGESPlugin_ImportDriver() {};
static const Standard_GUID& GetID();
- virtual Standard_Integer Execute( TFunction_Logbook& log ) const;
- Standard_Boolean MustExecute( const TFunction_Logbook& ) const;
- virtual void Validate( TFunction_Logbook& ) const {}
-
- virtual bool GetCreationInformation( std::string& theOperationName,
- std::vector<GEOM_Param>& params );
+ virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; }
+ virtual void Validate( LOGBOOK& ) const {}
+
+ virtual bool GetCreationInformation( std::string& theOperationName,
+ std::vector<GEOM_Param>& params );
static
TCollection_AsciiString GetValue( const TCollection_AsciiString&,
const TCollection_AsciiString&,
TCollection_AsciiString& );
-DEFINE_STANDARD_RTTI( IGESPlugin_ImportDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(IGESPlugin_ImportDriver,GEOM_BaseDriver)
};
#endif // _IGESPlugin_ImportDriver_HXX
#include <TopoDS_Face.hxx>
#include <TopoDS_Edge.hxx>
#include <TColgp_SequenceOfDir.hxx>
+#include <V3d_View.hxx>
//=================================================================================
// class : MeasureGUI_DimensionCreateTool
// SALOME includes
#include <SALOME_InteractiveObject.hxx>
-IMPLEMENT_STANDARD_HANDLE (MeasureGUI_DimensionFilter, SelectMgr_Filter)
-IMPLEMENT_STANDARD_RTTIEXT(MeasureGUI_DimensionFilter, SelectMgr_Filter)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(MeasureGUI_DimensionFilter, SelectMgr_Filter)
//=======================================================================
// function : Constructor
#ifndef MEASUREGUI_DIMENSIONFILTER_H
#define MEASUREGUI_DIMENSIONFILTER_H
+// KERNEL includes
+#include <Basics_OCCTVersion.hxx>
+
// GEOM includes
#include <GEOM_GenericObjPtr.h>
{
public:
- DEFINE_STANDARD_RTTI(MeasureGUI_DimensionFilter);
+ OCCT_DEFINE_STANDARD_RTTIEXT(MeasureGUI_DimensionFilter,SelectMgr_Filter)
public:
Standard_EXPORT MeasureGUI_DimensionFilter( const Handle(AIS_InteractiveObject)& theIO );
#include <AIS_ListOfInteractive.hxx>
#include <AIS_InteractiveObject.hxx>
#include <AIS_Dimension.hxx>
+#include <V3d_View.hxx>
#include <gp_Pln.hxx>
class OCCViewer_ViewManager;
class OCCViewer_Viewer;
class SUIT_ViewWindow;
-class Handle(V3d_View);
//=================================================================================
// class : MeasureGUI_DimensionInteractor
myDimensionInteractor->Enable();
connect( myDimensionInteractor,
- SIGNAL( InteractionFinished( Handle_AIS_InteractiveObject ) ),
+ SIGNAL( InteractionFinished( Handle(AIS_InteractiveObject) ) ),
this,
- SLOT( OnInteractionFinished( Handle_AIS_InteractiveObject ) ) );
+ SLOT( OnInteractionFinished( Handle(AIS_InteractiveObject) ) ) );
anAISContext->UpdateCurrentViewer();
}
myDimensionInteractor->Disable();
disconnect( myDimensionInteractor,
- SIGNAL( InteractionFinished( Handle_AIS_InteractiveObject ) ),
+ SIGNAL( InteractionFinished( Handle(AIS_InteractiveObject) ) ),
this,
- SLOT( OnInteractionFinished( Handle_AIS_InteractiveObject ) ) );
+ SLOT( OnInteractionFinished( Handle(AIS_InteractiveObject) ) ) );
}
myCurrentSelection = Selection_None;
#include "GEOM_AISDimension.hxx"
-IMPLEMENT_STANDARD_HANDLE (GEOM_AISLength, AIS_LengthDimension)
-IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISLength, AIS_LengthDimension)
-IMPLEMENT_STANDARD_HANDLE (GEOM_AISDiameter, AIS_DiameterDimension)
-IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISDiameter, AIS_DiameterDimension)
-IMPLEMENT_STANDARD_HANDLE (GEOM_AISAngle, AIS_AngleDimension)
-IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISAngle, AIS_AngleDimension)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISLength, AIS_LengthDimension)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISDiameter, AIS_DiameterDimension)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISAngle, AIS_AngleDimension)
/* ****************************************************************************** *
* *
#include <AIS_DiameterDimension.hxx>
#include <AIS_AngleDimension.hxx>
+#include <Basics_OCCTVersion.hxx>
+
DEFINE_STANDARD_HANDLE(GEOM_AISLength, AIS_LengthDimension)
DEFINE_STANDARD_HANDLE(GEOM_AISDiameter, AIS_DiameterDimension)
DEFINE_STANDARD_HANDLE(GEOM_AISAngle, AIS_AngleDimension)
class GEOM_AISLength : public AIS_LengthDimension
{
public:
- DEFINE_STANDARD_RTTI(GEOM_AISLength)
+
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISLength,AIS_LengthDimension)
public:
Standard_EXPORT GEOM_AISLength( const Standard_Integer theId );
class GEOM_AISDiameter : public AIS_DiameterDimension
{
public:
- DEFINE_STANDARD_RTTI(GEOM_AISDiameter)
+
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISDiameter,AIS_DiameterDimension)
public:
Standard_EXPORT GEOM_AISDiameter( const Standard_Integer theId );
class GEOM_AISAngle : public AIS_AngleDimension
{
public:
- DEFINE_STANDARD_RTTI(GEOM_AISAngle)
+
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISAngle,AIS_AngleDimension)
public:
Standard_EXPORT GEOM_AISAngle( const Standard_Integer theId );
#include <Graphic3d_AspectLine3d.hxx>
#include <Graphic3d_AspectMarker3d.hxx>
#include <Graphic3d_AspectText3d.hxx>
+#include <Graphic3d_ArrayOfPoints.hxx>
#include <Prs3d_ShadingAspect.hxx>
#include <Prs3d_Arrow.hxx>
#include <SelectMgr_Selection.hxx>
#include <StdSelect_DisplayMode.hxx>
#include <StdPrs_ShadedShape.hxx>
-#include <StdPrs_WFDeflectionShape.hxx>
+#if OCC_VERSION_MAJOR < 7
+ #include <StdPrs_WFDeflectionShape.hxx>
+#else
+ #include <StdPrs_WFShape.hxx>
+#endif
#include <TColStd_IndexedMapOfInteger.hxx>
#include <TColStd_ListIteratorOfListOfInteger.hxx>
#include <SUIT_Session.h>
#include <SUIT_ResourceMgr.h>
-IMPLEMENT_STANDARD_HANDLE (GEOM_AISShape, SALOME_AISShape)
-IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISShape, SALOME_AISShape)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISShape, SALOME_AISShape)
GEOM_AISShape::TopLevelDispMode GEOM_AISShape::myTopLevelDm = GEOM_AISShape::TopKeepCurrent;
Quantity_Color GEOM_AISShape::myTopLevelColor;
if( !isTopLev && anIsColorField && myFieldDimension == 1 )
drawField( aPrs, false, aMode == CustomHighlight );
else
+#if OCC_VERSION_MAJOR < 7
StdPrs_WFDeflectionShape::Add(aPrs,myshape,myDrawer);
+#else
+ StdPrs_WFShape::Add(aPrs,myshape,myDrawer);
+#endif
break;
}
case Shading:
myDrawer->WireAspect()->SetWidth( myOwnWidth );
else
myDrawer->WireAspect()->SetWidth( myOwnWidth + 4 );
+#if OCC_VERSION_MAJOR < 7
StdPrs_WFDeflectionShape::Add( thePrs, aSubShape, myDrawer );
+#else
+ StdPrs_WFShape::Add( thePrs, aSubShape, myDrawer );
+#endif
}
else if( myFieldDimension == 2 ||
myFieldDimension == 3 ||
#include <Standard.hxx>
#include <Standard_DefineHandle.hxx>
#include <PrsMgr_PresentationManager.hxx>
-#include <Handle_Prs3d_Presentation.hxx>
#include <TCollection_AsciiString.hxx>
#include <AIS_DisplayMode.hxx>
static Quantity_Color myTopLevelColor;
public:
- DEFINE_STANDARD_RTTI(GEOM_AISShape);
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISShape,SALOME_AISShape)
};
DEFINE_STANDARD_HANDLE(GEOM_AISShape, SALOME_AISShape)
#include "GEOM_AISTrihedron.hxx"
#include <Geom_Axis2Placement.hxx>
-IMPLEMENT_STANDARD_HANDLE(GEOM_AISTrihedron, AIS_Trihedron)
-IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISTrihedron, AIS_Trihedron)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISTrihedron, AIS_Trihedron)
/*
Class : GEOM_AISTrihedron
{
myObject = theIO;
}
-
-
-
-
-
-
-
#include <Standard_DefineHandle.hxx>
#include <TCollection_AsciiString.hxx>
-class Handle(Geom_Axis2Placement);
+class Geom_Axis2Placement;
DEFINE_STANDARD_HANDLE(GEOM_AISTrihedron, AIS_Trihedron)
Handle(SALOME_InteractiveObject) myObject;
public:
- DEFINE_STANDARD_RTTI(GEOM_AISTrihedron)
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISTrihedron,AIS_Trihedron)
};
#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
#include <Prs3d_Presentation.hxx>
#include <PrsMgr_PresentationManager3d.hxx>
-
-IMPLEMENT_STANDARD_HANDLE(GEOM_AISVector, GEOM_AISShape)
-IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISVector, GEOM_AISShape)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISVector, GEOM_AISShape)
//=======================================================================
//function : GEOM_AISVector
virtual bool isShowVectors() {return true;}
public:
- DEFINE_STANDARD_RTTI (GEOM_AISVector)
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISVector,GEOM_AISShape)
};
DEFINE_STANDARD_HANDLE(GEOM_AISVector, GEOM_AISShape)
#include "GEOM_InteractiveObject.hxx"
-IMPLEMENT_STANDARD_HANDLE (GEOM_InteractiveObject, SALOME_InteractiveObject)
-IMPLEMENT_STANDARD_RTTIEXT(GEOM_InteractiveObject, SALOME_InteractiveObject)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_InteractiveObject, SALOME_InteractiveObject)
GEOM_InteractiveObject::GEOM_InteractiveObject()
: SALOME_InteractiveObject()
std::string myFatherIOR;
public:
- DEFINE_STANDARD_RTTI(GEOM_InteractiveObject);
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_InteractiveObject,SALOME_InteractiveObject)
};
DEFINE_STANDARD_HANDLE(GEOM_InteractiveObject, SALOME_InteractiveObject)
#include <TopoDS_Shape.hxx>
#include <Prs3d_IsoAspect.hxx>
-IMPLEMENT_STANDARD_HANDLE(GEOM_TopWireframeShape, SALOME_AISShape)
-IMPLEMENT_STANDARD_RTTIEXT(GEOM_TopWireframeShape, SALOME_AISShape)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_TopWireframeShape, SALOME_AISShape)
GEOM_TopWireframeShape::GEOM_TopWireframeShape( const TopoDS_Shape& shape )
:SALOME_AISShape(shape)
Standard_EXPORT virtual void highlightSubShapes(const TColStd_IndexedMapOfInteger& aIndexMap, const Standard_Boolean aHighlight );
public:
- DEFINE_STANDARD_RTTI(GEOM_TopWireframeShape);
+ OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_TopWireframeShape,SALOME_AISShape)
};
DEFINE_STANDARD_HANDLE(GEOM_TopWireframeShape, SALOME_AISShape)
#include <QPointer>
#include <QIcon>
+// OCCT includes
+#include <TopTools_IndexedMapOfShape.hxx>
+
class GeometryGUI;
class SalomeApp_DoubleSpinBox;
class QTreeWidget;
class QTreeWidgetItem;
-class TopTools_IndexedMapOfShape;
-
class RepairGUI_InspectObjectDlg : public QDialog, public GEOMBase_Helper
{
Q_OBJECT
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer STEPPlugin_ExportDriver::Execute( TFunction_Logbook& log ) const
+Standard_Integer STEPPlugin_ExportDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
return 0;
}
-//=======================================================================
-//function : MustExecute
-//purpose :
-//=======================================================================
-Standard_Boolean STEPPlugin_ExportDriver::MustExecute( const TFunction_Logbook& ) const
-{
- return Standard_True;
-}
-
//================================================================================
/*!
* \brief Returns a name of creation operation and names and values of creation parameters
return false;
}
-IMPLEMENT_STANDARD_HANDLE( STEPPlugin_ExportDriver,GEOM_BaseDriver );
-IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ExportDriver,GEOM_BaseDriver );
+OCCT_IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ExportDriver,GEOM_BaseDriver );
// GEOM includes
#include "GEOM_BaseDriver.hxx"
-// OCCT includes
-#include <TFunction_Logbook.hxx>
-
DEFINE_STANDARD_HANDLE( STEPPlugin_ExportDriver, GEOM_BaseDriver );
class STEPPlugin_ExportDriver : public GEOM_BaseDriver
~STEPPlugin_ExportDriver() {};
static const Standard_GUID& GetID();
- virtual Standard_Integer Execute( TFunction_Logbook& log ) const;
- Standard_Boolean MustExecute( const TFunction_Logbook& ) const;
- virtual void Validate( TFunction_Logbook& ) const {}
+ virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; }
+ virtual void Validate( LOGBOOK& ) const {}
- virtual bool GetCreationInformation( std::string& theOperationName,
- std::vector<GEOM_Param>& params );
+ virtual bool GetCreationInformation( std::string& theOperationName,
+ std::vector<GEOM_Param>& params );
-DEFINE_STANDARD_RTTI( STEPPlugin_ExportDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(STEPPlugin_ExportDriver,GEOM_BaseDriver)
};
#endif // _STEPPlugin_ExportDriver_HXX
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer STEPPlugin_ImportDriver::Execute( TFunction_Logbook& log ) const
+Standard_Integer STEPPlugin_ImportDriver::Execute(LOGBOOK& log) const
{
if( Label().IsNull() ) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
aFunction->SetValue( aResShape );
- log.SetTouched( Label() );
+#if OCC_VERSION_MAJOR < 7
+ log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
-//=======================================================================
-//function : MustExecute
-//purpose :
-//=======================================================================
-Standard_Boolean STEPPlugin_ImportDriver::MustExecute( const TFunction_Logbook& ) const
-{
- return Standard_True;
-}
-
//================================================================================
/*!
* \brief Returns a name of creation operation and names and values of creation parameters
return aValue;
}
-
-IMPLEMENT_STANDARD_HANDLE( STEPPlugin_ImportDriver, GEOM_BaseDriver );
-IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ImportDriver, GEOM_BaseDriver );
+OCCT_IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ImportDriver, GEOM_BaseDriver );
// GEOM includes
#include "GEOM_BaseDriver.hxx"
-// OCCT includes
-#include <TFunction_Logbook.hxx>
-
DEFINE_STANDARD_HANDLE( STEPPlugin_ImportDriver, GEOM_BaseDriver );
class STEPPlugin_ImportDriver : public GEOM_BaseDriver
~STEPPlugin_ImportDriver() {};
static const Standard_GUID& GetID();
- virtual Standard_Integer Execute( TFunction_Logbook& log ) const;
- Standard_Boolean MustExecute( const TFunction_Logbook& ) const;
- virtual void Validate( TFunction_Logbook& ) const {}
-
- virtual bool GetCreationInformation( std::string& theOperationName,
- std::vector<GEOM_Param>& params );
-
+ virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; }
+ virtual void Validate( LOGBOOK& ) const {}
+
+ virtual bool GetCreationInformation( std::string& theOperationName,
+ std::vector<GEOM_Param>& params );
static
TCollection_AsciiString GetValue( const TCollection_AsciiString&,
- const TCollection_AsciiString&,
- TCollection_AsciiString& );
+ const TCollection_AsciiString&,
+ TCollection_AsciiString& );
-DEFINE_STANDARD_RTTI( STEPPlugin_ImportDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(STEPPlugin_ImportDriver,GEOM_BaseDriver)
};
#endif // _STEPPlugin_ImportDriver_HXX
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer STLPlugin_ExportDriver::Execute( TFunction_Logbook& log ) const
+Standard_Integer STLPlugin_ExportDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
aWriter.SetDeflection( aDeflection );
#endif
aWriter.Write( aCopyShape, aFileName.ToCString() );
- log.SetTouched( Label() );
+#if OCC_VERSION_MAJOR < 7
+ log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
catch( Standard_Failure )
return 0;
}
-//=======================================================================
-//function : MustExecute
-//purpose :
-//=======================================================================
-Standard_Boolean STLPlugin_ExportDriver::MustExecute( const TFunction_Logbook& ) const
-{
- return Standard_True;
-}
-
//================================================================================
/*!
* \brief Returns a name of creation operation and names and values of creation parameters
return false;
}
-IMPLEMENT_STANDARD_HANDLE( STLPlugin_ExportDriver,GEOM_BaseDriver );
-IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ExportDriver,GEOM_BaseDriver );
+OCCT_IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ExportDriver,GEOM_BaseDriver );
// GEOM includes
#include "GEOM_BaseDriver.hxx"
-// OCCT includes
-#include <TFunction_Logbook.hxx>
-
DEFINE_STANDARD_HANDLE( STLPlugin_ExportDriver, GEOM_BaseDriver );
class STLPlugin_ExportDriver : public GEOM_BaseDriver
~STLPlugin_ExportDriver() {};
static const Standard_GUID& GetID();
- virtual Standard_Integer Execute( TFunction_Logbook& log ) const;
- Standard_Boolean MustExecute( const TFunction_Logbook& ) const;
- virtual void Validate( TFunction_Logbook& ) const {}
+ virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; }
+ virtual void Validate( LOGBOOK& ) const {}
- virtual bool GetCreationInformation( std::string& theOperationName,
- std::vector<GEOM_Param>& params );
+ virtual bool GetCreationInformation( std::string& theOperationName,
+ std::vector<GEOM_Param>& params );
-DEFINE_STANDARD_RTTI( STLPlugin_ExportDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(STLPlugin_ExportDriver,GEOM_BaseDriver)
};
#endif // _STLPlugin_ExportDriver_HXX
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer STLPlugin_ImportDriver::Execute( TFunction_Logbook& log ) const
+Standard_Integer STLPlugin_ImportDriver::Execute(LOGBOOK& log) const
{
if( Label().IsNull() ) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
aFunction->SetValue( aShape );
- log.SetTouched( Label() );
+#if OCC_VERSION_MAJOR < 7
+ log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
-//=======================================================================
-//function : MustExecute
-//purpose :
-//=======================================================================
-Standard_Boolean STLPlugin_ImportDriver::MustExecute( const TFunction_Logbook& ) const
-{
- return Standard_True;
-}
-
//================================================================================
/*!
* \brief Returns a name of creation operation and names and values of creation parameters
return true;
}
-IMPLEMENT_STANDARD_HANDLE( STLPlugin_ImportDriver, GEOM_BaseDriver );
-IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ImportDriver, GEOM_BaseDriver );
+OCCT_IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ImportDriver, GEOM_BaseDriver );
// GEOM includes
#include "GEOM_BaseDriver.hxx"
-// OCCT includes
-#include <TFunction_Logbook.hxx>
-
DEFINE_STANDARD_HANDLE( STLPlugin_ImportDriver, GEOM_BaseDriver );
class STLPlugin_ImportDriver : public GEOM_BaseDriver
~STLPlugin_ImportDriver() {};
static const Standard_GUID& GetID();
- virtual Standard_Integer Execute( TFunction_Logbook& log ) const;
- Standard_Boolean MustExecute( const TFunction_Logbook& ) const;
- virtual void Validate( TFunction_Logbook& ) const {}
+ virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; }
+ virtual void Validate( LOGBOOK& ) const {}
- virtual bool GetCreationInformation( std::string& theOperationName,
- std::vector<GEOM_Param>& params );
+ virtual bool GetCreationInformation( std::string& theOperationName,
+ std::vector<GEOM_Param>& params );
-DEFINE_STANDARD_RTTI( STLPlugin_ImportDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(STLPlugin_ImportDriver,GEOM_BaseDriver)
};
#endif // _STLPlugin_ImportDriver_HXX
public:
// Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (ShHealOper_SplitCurve2d)
+ OCCT_DEFINE_STANDARD_RTTIEXT(ShHealOper_SplitCurve2d,ShapeUpgrade_SplitCurve2d)
};
// Definition of HANDLE object using Standard_DefineHandle.hxx
#include <ShapeExtend_Status.hxx>
#include <ShapeExtend.hxx>
-IMPLEMENT_STANDARD_HANDLE (ShHealOper_SplitCurve2d,ShapeUpgrade_SplitCurve2d)
-IMPLEMENT_STANDARD_RTTIEXT(ShHealOper_SplitCurve2d,ShapeUpgrade_SplitCurve2d)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(ShHealOper_SplitCurve2d,ShapeUpgrade_SplitCurve2d)
//=======================================================================
//function : Compute
#ifndef ShHealOper_SplitCurve2d_HeaderFile
#define ShHealOper_SplitCurve2d_HeaderFile
+#include <Basics_OCCTVersion.hxx>
+
#include <ShapeUpgrade_SplitCurve2d.hxx>
#include <TColStd_HSequenceOfReal.hxx>
#include <Standard_DefineHandle.hxx>
public:
// Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (ShHealOper_SplitCurve2d)
+ OCCT_DEFINE_STANDARD_RTTIEXT(ShHealOper_SplitCurve2d,ShapeUpgrade_SplitCurve2d)
};
// Definition of HANDLE object using Standard_DefineHandle.hxx
#include <ShapeExtend_Status.hxx>
#include <ShapeExtend.hxx>
-IMPLEMENT_STANDARD_HANDLE (ShHealOper_SplitCurve3d,ShapeUpgrade_SplitCurve3d)
-IMPLEMENT_STANDARD_RTTIEXT(ShHealOper_SplitCurve3d,ShapeUpgrade_SplitCurve3d)
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(ShHealOper_SplitCurve3d,ShapeUpgrade_SplitCurve3d)
//=======================================================================
//function : Compute
#ifndef ShHealOper_SplitCurve3d_HeaderFile
#define ShHealOper_SplitCurve3d_HeaderFile
+#include <Basics_OCCTVersion.hxx>
+
#include <ShapeUpgrade_SplitCurve3d.hxx>
#include <TColStd_HSequenceOfReal.hxx>
#include <Standard_DefineHandle.hxx>
public:
// Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (ShHealOper_SplitCurve3d)
+ OCCT_DEFINE_STANDARD_RTTIEXT(ShHealOper_SplitCurve3d,ShapeUpgrade_SplitCurve3d)
};
// Definition of HANDLE object using Standard_DefineHandle.hxx
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer VTKPlugin_ExportDriver::Execute( TFunction_Logbook& log ) const
+Standard_Integer VTKPlugin_ExportDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
return 0;
}
-//=======================================================================
-//function : MustExecute
-//purpose :
-//=======================================================================
-Standard_Boolean VTKPlugin_ExportDriver::MustExecute( const TFunction_Logbook& ) const
-{
- return Standard_True;
-}
-
//================================================================================
/*!
* \brief Returns a name of creation operation and names and values of creation parameters
return false;
}
-IMPLEMENT_STANDARD_HANDLE( VTKPlugin_ExportDriver,GEOM_BaseDriver );
-IMPLEMENT_STANDARD_RTTIEXT( VTKPlugin_ExportDriver,GEOM_BaseDriver );
+OCCT_IMPLEMENT_STANDARD_RTTIEXT( VTKPlugin_ExportDriver,GEOM_BaseDriver );
// GEOM includes
#include "GEOM_BaseDriver.hxx"
-// OCCT includes
-#include <TFunction_Logbook.hxx>
-
DEFINE_STANDARD_HANDLE( VTKPlugin_ExportDriver, GEOM_BaseDriver );
class VTKPlugin_ExportDriver : public GEOM_BaseDriver
~VTKPlugin_ExportDriver() {};
static const Standard_GUID& GetID();
- virtual Standard_Integer Execute( TFunction_Logbook& log ) const;
- Standard_Boolean MustExecute( const TFunction_Logbook& ) const;
- virtual void Validate( TFunction_Logbook& ) const {}
+ virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; }
+ virtual void Validate( LOGBOOK& ) const {}
- virtual bool GetCreationInformation( std::string& theOperationName,
- std::vector<GEOM_Param>& params );
+ virtual bool GetCreationInformation( std::string& theOperationName,
+ std::vector<GEOM_Param>& params );
-DEFINE_STANDARD_RTTI( VTKPlugin_ExportDriver )
+ OCCT_DEFINE_STANDARD_RTTIEXT(VTKPlugin_ExportDriver,GEOM_BaseDriver)
};
#endif // _VTKPlugin_ExportDriver_HXX
// OCC includes
#include <Standard_Stream.hxx>
-#include <TFunction_Logbook.hxx>
#include <StdFail_NotDone.hxx>
//=======================================================================
{
}
-Standard_Boolean XAOPlugin_Driver::MustExecute(const TFunction_Logbook&) const
-{
- return Standard_True;
-}
-
-//=======================================================================
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer XAOPlugin_Driver::Execute(TFunction_Logbook& log) const
+Standard_Integer XAOPlugin_Driver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) function = GEOM_Function::GetFunction(Label());
if (shape.IsNull()) return 0;
function->SetValue(shape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (XAOPlugin_Driver, GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT(XAOPlugin_Driver, GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT(XAOPlugin_Driver, GEOM_BaseDriver);
~XAOPlugin_Driver();
static const Standard_GUID& GetID();
- virtual Standard_Integer Execute(TFunction_Logbook& log) const;
- Standard_Boolean MustExecute(const TFunction_Logbook&) const;
- virtual void Validate(TFunction_Logbook&) const {}
+ virtual Standard_Integer Execute(LOGBOOK& log) const;
+ Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+ virtual void Validate(LOGBOOK&) const {}
- virtual bool GetCreationInformation(std::string& theOperationName,
- std::vector<GEOM_Param>& theParams);
+ virtual bool GetCreationInformation(std::string& theOperationName,
+ std::vector<GEOM_Param>& theParams);
- static int GetFileNameTag() { return 1; } // where to store file name in GEOM_Function
+ static int GetFileNameTag() { return 1; } // where to store file name in GEOM_Function
- DEFINE_STANDARD_RTTI(XAOPlugin_Driver)
+ OCCT_DEFINE_STANDARD_RTTIEXT(XAOPlugin_Driver,GEOM_BaseDriver)
};
#endif // _XAOPlugin_Driver_HXX
#include <Utils_SALOME_Exception.hxx>
// GEOM includes
-#include "GEOM_PythonDump.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOMImpl_IGroupOperations.hxx"
-#include "GEOMImpl_IShapesOperations.hxx"
-#include "GEOMImpl_IFieldOperations.hxx"
-#include "GEOM_ISubShape.hxx"
+#include <GEOM_PythonDump.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOMImpl_IGroupOperations.hxx>
+#include <GEOMImpl_IShapesOperations.hxx>
+#include <GEOMImpl_IFieldOperations.hxx>
+#include <GEOM_ISubShape.hxx>
+#include <GEOM_Object.hxx>
+#include <GEOM_Field.hxx>
#include <XAO_Geometry.hxx>
#include <XAO_BrepGeometry.hxx>
