//function : Execute
//purpose :
//=======================================================================
-Standard_Integer AdvancedEngine_DividedDiskDriver::Execute(LOGBOOK& log) const
+Standard_Integer AdvancedEngine_DividedDiskDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver);
// Methods PUBLIC
//
AdvancedEngine_DividedDiskDriver();
- virtual Standard_Integer Execute(LOGBOOK& log) const;
- virtual void Validate(LOGBOOK&) const {}
- Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+ virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_Boolean MustExecute(const Handle(TFunction_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;
- OCCT_DEFINE_STANDARD_RTTIEXT(AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver)
};
#endif // _AdvancedEngine_DividedDiskDriver_HXX
#include "AdvancedEngine_SmoothingSurfaceDriver.hxx"
#include "AdvancedEngine_ISmoothingSurface.hxx"
-#include <Basics_OCCTVersion.hxx>
-
#include <utilities.h>
#include <OpUtil.hxx>
#include <Utils_ExceptHandlers.hxx>
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer AdvancedEngine_PipeTShapeDriver::Execute(LOGBOOK& log) const
+Standard_Integer AdvancedEngine_PipeTShapeDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver);
// Methods PUBLIC
//
AdvancedEngine_PipeTShapeDriver();
- virtual Standard_Integer Execute(LOGBOOK& log) const;
- virtual void Validate(LOGBOOK&) const {}
- Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+ virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
static const Standard_GUID& GetID();
~AdvancedEngine_PipeTShapeDriver() {};
std::vector<GEOM_Param>& params);
// Type management
//
- OCCT_DEFINE_STANDARD_RTTIEXT(AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver)
private:
/*!
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer AdvancedEngine_SmoothingSurfaceDriver::Execute(LOGBOOK& log) const
+Standard_Integer AdvancedEngine_SmoothingSurfaceDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver);
// Methods PUBLIC
//
AdvancedEngine_SmoothingSurfaceDriver();
- virtual Standard_Integer Execute(LOGBOOK& log) const;
- virtual void Validate(LOGBOOK&) const {}
- Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+ virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
static const Standard_GUID& GetID();
~AdvancedEngine_SmoothingSurfaceDriver() {};
std::vector<GEOM_Param>& params);
// Type management
//
- OCCT_DEFINE_STANDARD_RTTIEXT(AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver)
private:
TopoDS_Shape MakeSmoothingSurfaceUnClosed
(const Handle(TColgp_HArray1OfPnt) &theListOfPoints,
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer BREPPlugin_ExportDriver::Execute(LOGBOOK& log) const
+Standard_Integer BREPPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
return false;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ExportDriver,GEOM_BaseDriver );
+IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ExportDriver,GEOM_BaseDriver );
~BREPPlugin_ExportDriver() {};
static const Standard_GUID& GetID();
- virtual Standard_Integer Execute(LOGBOOK& log) const;
- virtual void Validate(LOGBOOK&) const {}
- Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
+ virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
virtual bool GetCreationInformation( std::string& theOperationName,
std::vector<GEOM_Param>& params );
- OCCT_DEFINE_STANDARD_RTTIEXT(BREPPlugin_ExportDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(BREPPlugin_ExportDriver,GEOM_BaseDriver)
};
#endif // _BREPPlugin_ExportDriver_HXX
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer BREPPlugin_ImportDriver::Execute(LOGBOOK& log) const
+Standard_Integer BREPPlugin_ImportDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ImportDriver, GEOM_BaseDriver );
+IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ImportDriver, GEOM_BaseDriver );
~BREPPlugin_ImportDriver() {};
static const Standard_GUID& GetID();
- virtual Standard_Integer Execute(LOGBOOK& log) const;
- Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; }
- virtual void Validate( LOGBOOK& ) const {}
+ virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_Boolean MustExecute( const Handle(TFunction_Logbook)& ) const { return Standard_True; }
+ virtual void Validate( Handle(TFunction_Logbook)& ) const {}
virtual bool GetCreationInformation( std::string& theOperationName,
std::vector<GEOM_Param>& params );
- OCCT_DEFINE_STANDARD_RTTIEXT(BREPPlugin_ImportDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(BREPPlugin_ImportDriver,GEOM_BaseDriver)
};
#endif // _BREPPlugin_ImportDriver_HXX
#include <BlockFix_UnionFaces.hxx>
#include <BlockFix_UnionEdges.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include <ShapeUpgrade_RemoveLocations.hxx>
#include <Precision.hxx>
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(BlockFix_BlockFixAPI, MMgt_TShared);
+IMPLEMENT_STANDARD_RTTIEXT(BlockFix_BlockFixAPI, Standard_Transient);
//=======================================================================
//function : BlockFix_BlockFixAPI
#include <Standard.hxx>
#include <Standard_DefineHandle.hxx>
+#include <Standard_Transient.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, Standard_Transient);
-DEFINE_STANDARD_HANDLE(BlockFix_BlockFixAPI, MMgt_TShared);
-
-class BlockFix_BlockFixAPI : public MMgt_TShared
+class BlockFix_BlockFixAPI : public Standard_Transient
{
public:
Standard_EXPORT BlockFix_BlockFixAPI();
Standard_Integer& OptimumNbFaces();
Standard_EXPORT void Perform();
- OCCT_DEFINE_STANDARD_RTTIEXT(BlockFix_BlockFixAPI,MMgt_TShared)
+ DEFINE_STANDARD_RTTIEXT(BlockFix_BlockFixAPI, Standard_Transient)
private:
Handle(ShapeBuild_ReShape) myContext;
#include <gp_Pnt.hxx>
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification);
+IMPLEMENT_STANDARD_RTTIEXT(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification);
//=======================================================================
//function : BlockFix_PeriodicSurfaceModifier()
#include <Standard_Boolean.hxx>
#include <GeomAbs_Shape.hxx>
-#include <Basics_OCCTVersion.hxx>
-
class TopoDS_Vertex;
class TopoDS_Edge;
class TopoDS_Face;
const TopoDS_Face& NewF1,
const TopoDS_Face& NewF2);
- OCCT_DEFINE_STANDARD_RTTIEXT(BlockFix_PeriodicSurfaceModifier,BRepTools_Modification)
+ DEFINE_STANDARD_RTTIEXT(BlockFix_PeriodicSurfaceModifier,BRepTools_Modification)
private:
Standard_Real myTolerance;
#include <gp_Pnt.hxx>
#include <gp_Sphere.hxx>
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(BlockFix_SphereSpaceModifier, BRepTools_Modification);
+IMPLEMENT_STANDARD_RTTIEXT(BlockFix_SphereSpaceModifier, BRepTools_Modification);
//=======================================================================
//function : BlockFix_SphereSpaceModifier
#include <Standard_Boolean.hxx>
#include <GeomAbs_Shape.hxx>
-#include <Basics_OCCTVersion.hxx>
-
class TopoDS_Vertex;
class TopoDS_Edge;
class TopoDS_Face;
const TopoDS_Face& NewF1, const TopoDS_Face& NewF2);
Standard_EXPORT Standard_Boolean ForRotation (const TopoDS_Face& F);
- OCCT_DEFINE_STANDARD_RTTIEXT(BlockFix_SphereSpaceModifier,BRepTools_Modification)
+ DEFINE_STANDARD_RTTIEXT(BlockFix_SphereSpaceModifier,BRepTools_Modification)
private:
Standard_Real myTolerance;
#include <BlockFix_UnionFaces.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include <ShapeAnalysis_WireOrder.hxx>
#include <ShapeAnalysis_Edge.hxx>
#include "CurveCreator_Section.hxx"
#include "CurveCreator_UtilsICurve.hxx"
-#include <Basics_OCCTVersion.hxx>
-
#include <GEOMUtils.hxx>
#include <gp_Pln.hxx>
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();
-#else
- Handle(SelectBasics_SensitiveEntity) aSenEntity = aSelection->Sensitive();
-#endif
Handle(Select3D_SensitivePoint) aSenPnt = Handle(Select3D_SensitivePoint)::DownCast( aSenEntity );
#include "EntityGUI_3DSketcherDlg.h"
#include "EntityGUI_Widgets.h"
-#include <Basics_OCCTVersion.hxx>
-
#include <GEOMBase.h>
#include <GeometryGUI.h>
#include <Precision.hxx>
class AIS_Text:public AIS_InteractiveObject
{
public:
- OCCT_DEFINE_STANDARD_RTTIEXT(AIS_Text,AIS_InteractiveObject)
+ DEFINE_STANDARD_RTTIEXT(AIS_Text,AIS_InteractiveObject)
AIS_Text(){};
Graphic3d_VerticalTextAlignment aVJustification;
};
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(AIS_Text, AIS_InteractiveObject)
+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,
#include <BRepBuilderAPI_MakePolygon.hxx>
#include <BRepBuilderAPI_Transform.hxx>
-#include <AIS_TexturedShape.hxx>
+#include <AIS_Shape.hxx>
+
#include <TCollection_AsciiString.hxx>
#include <StdSelect_DisplayMode.hxx>
${CAS_TKCDF}
${CAS_TKG3d}
${CAS_TKStdL}
+ ${CAS_TKStd}
+ ${CAS_TKBin}
${KERNEL_SALOMELocalTrace}
${KERNEL_OpUtil}
GEOMSketcher
)
-IF(CAS_VERSION_STR VERSION_GREATER "7.0.0")
- LIST(APPEND _link_LIBRARIES ${CAS_TKStd} ${CAS_TKBin})
-ENDIF()
-
# --- headers ---
SET(GEOM_HEADERS
#include <GEOM_Application.hxx>
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_Application, TDocStd_Application)
+IMPLEMENT_STANDARD_RTTIEXT(GEOM_Application, TDocStd_Application)
//=======================================================================
//function : GEOM_Application
{
}
-#if OCC_VERSION_LARGE <= 0x07000000
-//=======================================================================
-//function : Formats
-//purpose :
-//=======================================================================
-
-void GEOM_Application::Formats(TColStd_SequenceOfExtendedString& Formats)
-{
- Formats.Append(TCollection_ExtendedString ("SALOME_GEOM"));
-#if OCC_VERSION_MAJOR > 6
- Formats.Append(TCollection_ExtendedString ("BinOcaf"));
-#endif
-}
-#endif
-
-
//=======================================================================
//function : ResourcesName
//purpose :
#include <Standard_DefineHandle.hxx>
#include <TColStd_SequenceOfExtendedString.hxx>
-#include <Basics_OCCTVersion.hxx>
-
class GEOM_Application : public TDocStd_Application
{
public:
Standard_EXPORT GEOM_Application();
Standard_EXPORT ~GEOM_Application();
-#if OCC_VERSION_LARGE <= 0x07000000
- Standard_EXPORT virtual void Formats(TColStd_SequenceOfExtendedString& Formats);
-#endif
Standard_EXPORT Standard_CString ResourcesName();
public:
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_Application,TDocStd_Application)
+ DEFINE_STANDARD_RTTIEXT(GEOM_Application,TDocStd_Application)
};
DEFINE_STANDARD_HANDLE(GEOM_Application, TDocStd_Application)
#include <TDataStd_Name.hxx>
#include <TDocStd_Owner.hxx>
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver);
+IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver);
//================================================================================
/*!
#include <TColStd_HSequenceOfTransient.hxx>
#include <TColStd_HArray1OfInteger.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include <string>
#include <vector>
#include <sstream>
-#if OCC_VERSION_MAJOR < 7
- #define LOGBOOK TFunction_Logbook
-#else
- #define LOGBOOK Handle(TFunction_Logbook)
-#endif
-
struct GEOM_Param
{
std::string name;
return params.back();
}
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver)
+ DEFINE_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver)
};
DEFINE_STANDARD_HANDLE (GEOM_BaseDriver,TFunction_Driver);
return _label.FindChild(FREE_LABEL);
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseObject, Standard_Transient );
+IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseObject, Standard_Transient );
int _docID;
public:
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_BaseObject,Standard_Transient)
+ DEFINE_STANDARD_RTTIEXT(GEOM_BaseObject,Standard_Transient)
};
#endif
#include "GEOM_SubShapeDriver.hxx"
#include "Sketcher_Profile.hxx"
-#include <Basics_OCCTVersion.hxx>
-
#include "utilities.h"
#include <Basics_Utils.hxx>
#include <Resource_DataMapIteratorOfDataMapOfAsciiStringAsciiString.hxx>
-#if OCC_VERSION_LARGE > 0x07000000
#include <BinDrivers.hxx>
#include <StdDrivers_DocumentRetrievalDriver.hxx>
#include <PCDM_StorageDriver.hxx>
-#endif
#include <set>
TFunction_DriverTable::Get()->AddDriver(GEOM_Object::GetSubShapeID(), new GEOM_SubShapeDriver());
_OCAFApp = new GEOM_Application();
-#if OCC_VERSION_LARGE > 0x07000000
_OCAFApp->DefineFormat("SALOME_GEOM", "GEOM Document Version 1.0", "sgd",
new StdDrivers_DocumentRetrievalDriver, 0);
BinDrivers::DefineFormat(_OCAFApp);
-#endif
_UndoLimit = 0;
}
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);
#include "GEOM_Object.hxx"
#include "GEOM_DataMapOfAsciiStringTransient.hxx"
-#include <Basics_OCCTVersion.hxx>
-
#include <TColStd_DataMapOfIntegerTransient.hxx>
#include <Resource_DataMapOfAsciiStringAsciiString.hxx>
return TDataStd_ExtStringArray::GetID();
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_Field, GEOM_BaseObject );
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_FieldStep, GEOM_BaseObject );
+IMPLEMENT_STANDARD_RTTIEXT(GEOM_Field, GEOM_BaseObject );
+IMPLEMENT_STANDARD_RTTIEXT(GEOM_FieldStep, GEOM_BaseObject );
// Returns all steps
Standard_EXPORT std::list< Handle(GEOM_FieldStep)> GetSteps();
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_Field,GEOM_BaseObject)
+ DEFINE_STANDARD_RTTIEXT(GEOM_Field,GEOM_BaseObject)
private:
// Returns GUID of CAF data array
const Standard_GUID& GetDataID();
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_FieldStep,GEOM_BaseObject)
+ DEFINE_STANDARD_RTTIEXT(GEOM_FieldStep,GEOM_BaseObject)
private:
#include <GEOM_Solver.hxx>
#include <GEOM_ISubShape.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include "utilities.h"
#include <TDF.hxx>
return reinterpret_cast<void*> ( address );
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_Function, Standard_Transient );
+IMPLEMENT_STANDARD_RTTIEXT(GEOM_Function, Standard_Transient );
#include <TDataStd_ListOfExtendedString.hxx>
#include <TopoDS_Shape.hxx>
-#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);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_Function,Standard_Transient)
+ DEFINE_STANDARD_RTTIEXT(GEOM_Function,Standard_Transient)
private:
return funs;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_Object, GEOM_BaseObject );
+IMPLEMENT_STANDARD_RTTIEXT(GEOM_Object, GEOM_BaseObject );
GetLastFunctions( const std::list< Handle(GEOM_Object) >& theObjects );
public:
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_Object,GEOM_BaseObject)
+ 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);
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(LOGBOOK& log) const
+Standard_Integer GEOM_SubShapeDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOM_SubShapeDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOM_SubShapeDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOM_SubShapeDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_SubShapeDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOM_SubShapeDriver,GEOM_BaseDriver)
};
#endif
GEOMAlgo_ShapeInfo.cxx
GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx
-Basics_OCCTVersion.hxx
-
GEOMAlgo_KindOfDef.hxx
#include <GEOMAlgo_AlgoTools.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include <gp_Pnt.hxx>
#include <gp_Pnt2d.hxx>
#include <gp_Dir2d.hxx>
(const TopoDS_Edge& aEold,
const TopoDS_Edge& aEnew,
const TopoDS_Face& aF,
-#if OCC_VERSION_LARGE > 0x06070100
- const Handle(IntTools_Context)& aCtx
-#else
- const Handle(BOPInt_Context)& aCtx
-#endif
- )
+ const Handle(IntTools_Context)& aCtx)
{
Standard_Boolean bIsClosed, bUClosed, bHasOld;
Standard_Integer iRet, aNbPoints;
return iRet;
}
//
-#if OCC_VERSION_LARGE > 0x06080000
// Try to copy PCurve from old edge to the new one.
iRet = BOPTools_AlgoTools2D::AttachExistingPCurve(aEold, aEnew, aF, aCtx);
// The PCurve is attached successfully.
return iRet;
}
-#endif
//
BOPTools_AlgoTools2D::BuildPCurveForEdgeOnFace(aEnew, aF);
aC2D=BRep_Tool::CurveOnSurface(aEnew, aF, aT1, aT2);
Standard_Boolean GEOMAlgo_AlgoTools::IsSplitToReverse
(const TopoDS_Edge& aEF1,
const TopoDS_Edge& aEF2,
-#if OCC_VERSION_LARGE > 0x06070100
- const Handle(IntTools_Context)& aContext
-#else
- const Handle(BOPInt_Context)& aContext
-#endif
- )
+ const Handle(IntTools_Context)& aContext)
{
Standard_Boolean aFlag;
Standard_Real aT1, aT2, aScPr, a, b;
(const gp_Pnt& aP1,
const TopoDS_Shape& aS,
gp_Pnt& aP2,
-#if OCC_VERSION_LARGE > 0x06070100
- const Handle(IntTools_Context)& aCtx
-#else
- const Handle(BOPInt_Context)& aCtx
-#endif
- )
+ const Handle(IntTools_Context)& aCtx)
{
Standard_Boolean bIsDone = Standard_False;
Standard_Real aT2;
const TopTools_ListOfShape& aLE,
const Standard_Real aTol,
TopTools_ListOfShape& aLESD,
-#if OCC_VERSION_LARGE > 0x06070100
- const Handle(IntTools_Context)& aCtx
-#else
- const Handle(BOPInt_Context)& aCtx
-#endif
- )
+ const Handle(IntTools_Context)& aCtx)
{
Standard_Boolean bIsDone;
Standard_Real aTol2, aD2;
(const TopTools_ListOfShape& aLE,
const Standard_Real aTol,
TopTools_IndexedDataMapOfShapeListOfShape& aMEE,
-#if OCC_VERSION_LARGE > 0x06070100
- const Handle(IntTools_Context)& aCtx
-#else
- const Handle(BOPInt_Context)& aCtx
-#endif
- )
+ const Handle(IntTools_Context)& aCtx)
{
Standard_Integer aNbE, aNbEProcessed, aNbESD, iErr;
TopTools_ListOfShape aLESD;
Standard_Integer GEOMAlgo_AlgoTools::RefineSDShapes
(GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape& aMPKLE,
const Standard_Real aTol,
-#if OCC_VERSION_LARGE > 0x06070100
- const Handle(IntTools_Context)& aCtx
-#else
- const Handle(BOPInt_Context)& aCtx
-#endif
- )
+ const Handle(IntTools_Context)& aCtx)
{
Standard_Integer i, aNbE, iErr, j, aNbEE, aNbToAdd;
TopTools_IndexedDataMapOfShapeListOfShape aMEE, aMSDE, aMEToAdd;
#ifndef _GEOMAlgo_AlgoTools_HeaderFile
#define _GEOMAlgo_AlgoTools_HeaderFile
-#include <Basics_OCCTVersion.hxx>
-
#include <Standard.hxx>
#include <Standard_Macro.hxx>
#include <Standard_Boolean.hxx>
-#if OCC_VERSION_LARGE > 0x06070100
#include <IntTools_Context.hxx>
-#else
-#include <BOPInt_Context.hxx>
-#endif
#include <Standard_Integer.hxx>
#include <gp_Pnt.hxx>
static Standard_Integer RefineSDShapes
(GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape& aMSD,
const Standard_Real aTol,
-#if OCC_VERSION_LARGE > 0x06070100
- const Handle(IntTools_Context)& aCtx
-#else
- const Handle(BOPInt_Context)& aCtx
-#endif
- ) ;
+ const Handle(IntTools_Context)& aCtx) ;
Standard_EXPORT
static Standard_Integer FindSDShapes(const TopTools_ListOfShape& aLE,
const Standard_Real aTol,
TopTools_IndexedDataMapOfShapeListOfShape& aMEE,
-#if OCC_VERSION_LARGE > 0x06070100
- const Handle(IntTools_Context)& aCtx
-#else
- const Handle(BOPInt_Context)& aCtx
-#endif
- ) ;
+ const Handle(IntTools_Context)& aCtx) ;
Standard_EXPORT
static Standard_Integer FindSDShapes(const TopoDS_Shape& aE1,
const TopTools_ListOfShape& aLE,
const Standard_Real aTol,
TopTools_ListOfShape& aLESD,
-#if OCC_VERSION_LARGE > 0x06070100
- const Handle(IntTools_Context)& aCtx
-#else
- const Handle(BOPInt_Context)& aCtx
-#endif
- ) ;
+ const Handle(IntTools_Context)& aCtx) ;
Standard_EXPORT
static void PointOnShape(const TopoDS_Shape& aS,
static Standard_Boolean ProjectPointOnShape(const gp_Pnt& aP1,
const TopoDS_Shape& aS,
gp_Pnt& aP2,
-#if OCC_VERSION_LARGE > 0x06070100
- const Handle(IntTools_Context)& aCtx
-#else
- const Handle(BOPInt_Context)& aCtx
-#endif
- ) ;
+ const Handle(IntTools_Context)& aCtx) ;
Standard_EXPORT
static void CorrectTolerances(const TopoDS_Shape& aShape,
Standard_EXPORT
static Standard_Boolean IsSplitToReverse1 (const TopoDS_Edge& aEF1,
const TopoDS_Edge& aEF2,
-#if OCC_VERSION_LARGE > 0x06070100
- const Handle(IntTools_Context)& aCtx
-#else
- const Handle(BOPInt_Context)& aCtx
-#endif
- ) ;
+ const Handle(IntTools_Context)& aCtx) ;
Standard_EXPORT
static void RefinePCurveForEdgeOnFace(const TopoDS_Edge& aE,
const TopoDS_Face& aF,
Standard_EXPORT
static Standard_Boolean IsSplitToReverse(const TopoDS_Edge& theSplit,
const TopoDS_Edge& theEdge,
-#if OCC_VERSION_LARGE > 0x06070100
- const Handle(IntTools_Context)& theCtx
-#else
- const Handle(BOPInt_Context)& theCtx
-#endif
- ) ;
+ const Handle(IntTools_Context)& theCtx) ;
Standard_EXPORT
static Standard_Boolean IsSplitToReverse (const TopoDS_Face& theFSp,
const TopoDS_Face& theFSr,
-#if OCC_VERSION_LARGE > 0x06070100
- const Handle(IntTools_Context)& theCtx
-#else
- const Handle(BOPInt_Context)& theCtx
-#endif
- ) ;
+ const Handle(IntTools_Context)& theCtx) ;
Standard_EXPORT
static Standard_Boolean IsSplitToReverse (const TopoDS_Shape& theSp,
const TopoDS_Shape& theSr,
-#if OCC_VERSION_LARGE > 0x06070100
- const Handle(IntTools_Context)& theCtx
-#else
- const Handle(BOPInt_Context)& theCtx
-#endif
- ) ;
+ const Handle(IntTools_Context)& theCtx) ;
Standard_EXPORT
static Standard_Integer BuildPCurveForEdgeOnFace (const TopoDS_Edge& aEold,
const TopoDS_Edge& aEnew,
const TopoDS_Face& aF,
-#if OCC_VERSION_LARGE > 0x06070100
- const Handle(IntTools_Context)& aCtx
-#else
- const Handle(BOPInt_Context)& aCtx
-#endif
- ) ;
+ const Handle(IntTools_Context)& aCtx) ;
//
Standard_EXPORT
//
#include <GEOMAlgo_Clsf.hxx>
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_Clsf, GEOMAlgo_HAlgo);
+IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_Clsf, GEOMAlgo_HAlgo);
//=======================================================================
//function :
Standard_EXPORT
virtual Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const;
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_Clsf,GEOMAlgo_HAlgo)
+ DEFINE_STANDARD_RTTIEXT(GEOMAlgo_Clsf,GEOMAlgo_HAlgo)
protected:
Standard_EXPORT
#include <GEOMAlgo_SurfaceTools.hxx>
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf)
+IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf)
//=======================================================================
//function :
Standard_EXPORT
virtual Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const;
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox,GEOMAlgo_Clsf)
+ DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox,GEOMAlgo_Clsf)
protected:
TopoDS_Shape myBox;
#include <Geom_Plane.hxx>
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad, GEOMAlgo_Clsf);
+IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad, GEOMAlgo_Clsf);
//=======================================================================
//function :
Standard_EXPORT
virtual Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const;
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad,GEOMAlgo_Clsf)
+ DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad,GEOMAlgo_Clsf)
protected:
#include <BRep_Builder.hxx>
#include <BRepClass3d_SolidClassifier.hxx>
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid, GEOMAlgo_Clsf)
+IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid, GEOMAlgo_Clsf)
//=======================================================================
//function :
Standard_EXPORT
virtual void CheckData() ;
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid,GEOMAlgo_Clsf)
+ DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid,GEOMAlgo_Clsf)
protected:
TopoDS_Shape myShape;
#include <GEOMAlgo_SurfaceTools.hxx>
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf);
+IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf);
//=======================================================================
//function :
Standard_EXPORT
virtual Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const;
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf,GEOMAlgo_Clsf)
+ DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf,GEOMAlgo_Clsf)
protected:
Handle(Geom_Surface) myS;
#include <GEOMAlgo_FinderShapeOn.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include <Precision.hxx>
#include <gp_Pnt.hxx>
#include <TopoDS_Shape.hxx>
#include <TopoDS_Vertex.hxx>
#include <TopTools_IndexedMapOfShape.hxx>
-
-#if OCC_VERSION_LARGE > 0x06070100
#include <IntTools_Context.hxx>
-#else
-#include <BOPInt_Context.hxx>
-#endif
//=======================================================================
//function :
//
iRet=0;
//
-#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;
}
for (; aItLE.More(); aItLE.Next()) {
const TopoDS_Shape& aE=aItLE.Value();
//
-#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
}
//
iRet=1;
//
-#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);
}
//
#include <GEOMAlgo_Gluer.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include <NCollection_UBTreeFiller.hxx>
#include <TColStd_MapIteratorOfMapOfInteger.hxx>
#include <BRepBndLib.hxx>
//
#include <IntTools_Tools.hxx>
-#if OCC_VERSION_LARGE > 0x06070100
#include <IntTools_Context.hxx>
-#else
-#include <BOPInt_Context.hxx>
-#endif
#include <BOPTools_AlgoTools.hxx>
#include <BOPTools_AlgoTools3D.hxx>
#include <BOPTools_AlgoTools2D.hxx>
// <peter@PREFEX>
//
#include <GEOMAlgo_GluerAlgo.hxx>
-#if OCC_VERSION_LARGE > 0x06070100
#include <IntTools_Context.hxx>
-#else
-#include <BOPInt_Context.hxx>
-#endif
-
//=======================================================================
//function : GEOMAlgo_GluerAlgo
//function : SetContext
//purpose :
//=======================================================================
-#if OCC_VERSION_LARGE > 0x06070100
void GEOMAlgo_GluerAlgo::SetContext(const Handle(IntTools_Context)& theContext)
-#else
-void GEOMAlgo_GluerAlgo::SetContext(const Handle(BOPInt_Context)& theContext)
-#endif
{
myContext=theContext;
}
//function : Context
//purpose :
//=======================================================================
-#if OCC_VERSION_LARGE > 0x06070100
const Handle(IntTools_Context)& GEOMAlgo_GluerAlgo::Context()
-#else
-const Handle(BOPInt_Context)& GEOMAlgo_GluerAlgo::Context()
-#endif
{
return myContext;
}
void GEOMAlgo_GluerAlgo::Perform()
{
if (myContext.IsNull()) {
-#if OCC_VERSION_LARGE > 0x06070100
myContext=new IntTools_Context;
-#else
- myContext=new BOPInt_Context;
-#endif
}
}
#ifndef _GEOMAlgo_GluerAlgo_HeaderFile
#define _GEOMAlgo_GluerAlgo_HeaderFile
-#include <Basics_OCCTVersion.hxx>
-
#include <Standard_Macro.hxx>
#include <TopoDS_Shape.hxx>
#include <Standard_Real.hxx>
#include <Standard_Boolean.hxx>
-
-#if OCC_VERSION_LARGE > 0x06070100
#include <IntTools_Context.hxx>
-#else
-#include <BOPInt_Context.hxx>
-#endif
#include <TopTools_DataMapOfShapeListOfShape.hxx>
#include <TopTools_DataMapOfShapeShape.hxx>
virtual void Clear() ;
Standard_EXPORT
-#if OCC_VERSION_LARGE > 0x06070100
void SetContext(const Handle(IntTools_Context)&) ;
-#else
- void SetContext(const Handle(BOPInt_Context)&) ;
-#endif
Standard_EXPORT
-#if OCC_VERSION_LARGE > 0x06070100
const Handle(IntTools_Context)& Context() ;
-#else
- const Handle(BOPInt_Context)& Context() ;
-#endif
Standard_EXPORT
const TopTools_DataMapOfShapeListOfShape& Images() const;
TopoDS_Shape myArgument;
Standard_Real myTolerance;
Standard_Boolean myCheckGeometry;
-#if OCC_VERSION_LARGE > 0x06070100
Handle(IntTools_Context) myContext;
-#else
- Handle(BOPInt_Context) myContext;
-#endif
TopTools_DataMapOfShapeListOfShape myImages;
TopTools_DataMapOfShapeShape myOrigins;
//
#include <GEOMAlgo_HAlgo.hxx>
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_HAlgo, MMgt_TShared);
+IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_HAlgo, Standard_Transient);
//=======================================================================
// function:
#include <Standard.hxx>
#include <Standard_DefineHandle.hxx>
#include <Standard_Integer.hxx>
-#include <MMgt_TShared.hxx>
+#include <Standard_Transient.hxx>
-#include <Basics_OCCTVersion.hxx>
-
-DEFINE_STANDARD_HANDLE(GEOMAlgo_HAlgo, MMgt_TShared);
+DEFINE_STANDARD_HANDLE(GEOMAlgo_HAlgo, Standard_Transient);
//=======================================================================
//class : GEOMAlgo_HAlgo
//purpose :
//=======================================================================
-class GEOMAlgo_HAlgo : public MMgt_TShared
+class GEOMAlgo_HAlgo : public Standard_Transient
{
public:
Standard_EXPORT
Standard_EXPORT
Standard_Integer WarningStatus() const;
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_HAlgo,MMgt_TShared)
+ DEFINE_STANDARD_RTTIEXT(GEOMAlgo_HAlgo, Standard_Transient)
protected:
Standard_EXPORT
#include <GEOMAlgo_RemoverWebs.hxx>
#include <GEOMAlgo_ShapeAlgo.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include <TopoDS_Iterator.hxx>
#include <TopoDS_Shape.hxx>
#include <TopoDS_Solid.hxx>
#include <BRepClass3d_SolidClassifier.hxx>
-#if OCC_VERSION_LARGE > 0x06070100
#include <IntTools_Context.hxx>
-#else
-#include <BOPInt_Context.hxx>
-#endif
#include <BOPAlgo_BuilderSolid.hxx>
if (!myContext.IsNull()) {
myContext.Nullify();
}
-#if OCC_VERSION_LARGE > 0x06070100
myContext=new IntTools_Context;
-#else
- myContext=new BOPInt_Context;
-#endif
//
BuildSolid();
//
aSB.SetContext(myContext);
aSB.SetShapes(aSFS);
aSB.Perform();
-#if OCC_VERSION_LARGE > 0x07010001
iErr=aSB.HasErrors();
-#else
- iErr=aSB.ErrorStatus();
-#endif
if (iErr) {
myErrorStatus=20; // SolidBuilder failed
return;
TopoDS_Solid aSd;
BRep_Builder aBB;
BOPCol_ListIteratorOfListOfShape aItLS;
-#if OCC_VERSION_LARGE > 0x06070100
Handle(IntTools_Context) aCtx=new IntTools_Context;
-#else
- Handle(BOPInt_Context) aCtx=new BOPInt_Context;
-#endif
//
aNbSI=aMSI.Extent();
for (i=1; i<=aNbSI; ++i) {
// <pkv@irinox>
//
#include <GEOMAlgo_ShapeAlgo.hxx>
-#if OCC_VERSION_LARGE > 0x06070100
#include <IntTools_Context.hxx>
-#else
-#include <BOPInt_Context.hxx>
-#endif
//=======================================================================
//function : GEOMAlgo_ShapeAlgo
//function : SetContext
//purpose :
//=======================================================================
-#if OCC_VERSION_LARGE > 0x06070100
void GEOMAlgo_ShapeAlgo::SetContext(const Handle(IntTools_Context)& theContext)
-#else
-void GEOMAlgo_ShapeAlgo::SetContext(const Handle(BOPInt_Context)& theContext)
-#endif
{
myContext=theContext;
}
//function : Context
//purpose :
//=======================================================================
-#if OCC_VERSION_LARGE > 0x06070100
const Handle(IntTools_Context)& GEOMAlgo_ShapeAlgo::Context()const
-#else
-const Handle(BOPInt_Context)& GEOMAlgo_ShapeAlgo::Context()const
-#endif
{
return myContext;
}
void GEOMAlgo_ShapeAlgo::Perform()
{
if (myContext.IsNull()) {
-#if OCC_VERSION_LARGE > 0x06070100
myContext=new IntTools_Context;
-#else
- myContext=new BOPInt_Context;
-#endif
}
}
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-// File: GEOMAlgo_ShapeAlgo.hxx
-// Created: Tue Dec 7 12:06:54 2004
-// Author: Peter KURNEV
-// <pkv@irinox>
-//
#ifndef _GEOMAlgo_ShapeAlgo_HeaderFile
#define _GEOMAlgo_ShapeAlgo_HeaderFile
-#include <Basics_OCCTVersion.hxx>
-
#include <Standard.hxx>
#include <Standard_Macro.hxx>
#include <TopoDS_Shape.hxx>
#include <Standard_Real.hxx>
-#if OCC_VERSION_LARGE > 0x06070100
- #include <IntTools_Context.hxx>
-#else
- #include <BOPInt_Context.hxx>
-#endif
+#include <IntTools_Context.hxx>
#include <GEOMAlgo_Algo.hxx>
//=======================================================================
//=======================================================================
class GEOMAlgo_ShapeAlgo : public GEOMAlgo_Algo
{
- public:
+public:
//! Sets cashed geometrical tools <br>
Standard_EXPORT
-#if OCC_VERSION_LARGE > 0x06070100
void SetContext(const Handle(IntTools_Context)& theContext) ;
-#else
- void SetContext(const Handle(BOPInt_Context)& theContext) ;
-#endif
//! Returns cashed geometrical tools <br>
Standard_EXPORT
-#if OCC_VERSION_LARGE > 0x06070100
const Handle(IntTools_Context)& Context() const;
-#else
- const Handle(BOPInt_Context)& Context() const;
-#endif
Standard_EXPORT
void SetShape(const TopoDS_Shape& aS) ;
Standard_EXPORT
virtual ~GEOMAlgo_ShapeAlgo();
-
TopoDS_Shape myShape;
Standard_Real myTolerance;
TopoDS_Shape myResult;
-#if OCC_VERSION_LARGE > 0x06070100
Handle(IntTools_Context) myContext;
-#else
- Handle(BOPInt_Context) myContext;
-#endif
};
+
#endif
//
#include <GEOMAlgo_ShellSolid.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include <Standard_Failure.hxx>
#include <gp_Pnt2d.hxx>
#include <BOPCol_DataMapOfShapeListOfShape.hxx>
#include <BOPCol_ListOfShape.hxx>
-#if OCC_VERSION_LARGE > 0x06070100
#include <IntTools_Context.hxx>
-#else
-#include <BOPInt_Context.hxx>
-#endif
#include <BOPDS_DS.hxx>
#include <BOPAlgo_Builder.hxx>
//=======================================================================
void GEOMAlgo_ShellSolidBuilder::PerformInternal(const BOPAlgo_PaveFiller& theFiller)
{
-#if OCC_VERSION_LARGE <= 0x07010000
- myErrorStatus=0;
-#endif
//
myPaveFiller=(BOPAlgo_PaveFiller*)&theFiller;
myDS=myPaveFiller->PDS();
//
// 1. CheckData
CheckData();
-#if OCC_VERSION_LARGE > 0x07010001
if (HasErrors()) {
-#else
- if (myErrorStatus) {
-#endif
return;
}
//
// 2. Prepare
Prepare();
-#if OCC_VERSION_LARGE > 0x07010001
if (HasErrors()) {
-#else
- if (myErrorStatus) {
-#endif
return;
}
//
// 3. Fill Images
// 3.1 Vertice
FillImagesVertices();
-#if OCC_VERSION_LARGE > 0x07010001
if (HasErrors()) {
-#else
- if (myErrorStatus) {
-#endif
return;
}
//
BuildResult(TopAbs_VERTEX);
-#if OCC_VERSION_LARGE > 0x07010001
if (HasErrors()) {
-#else
- if (myErrorStatus) {
-#endif
return;
}
// 3.2 Edges
FillImagesEdges();
-#if OCC_VERSION_LARGE > 0x07010001
if (HasErrors()) {
-#else
- if (myErrorStatus) {
-#endif
return;
}
//
BuildResult(TopAbs_EDGE);
-#if OCC_VERSION_LARGE > 0x07010001
if (HasErrors()) {
-#else
- if (myErrorStatus) {
-#endif
return;
}
//
// 3.3 Wires
FillImagesContainers(TopAbs_WIRE);
-#if OCC_VERSION_LARGE > 0x07010001
if (HasErrors()) {
-#else
- if (myErrorStatus) {
-#endif
return;
}
//
BuildResult(TopAbs_WIRE);
-#if OCC_VERSION_LARGE > 0x07010001
if (HasErrors()) {
-#else
- if (myErrorStatus) {
-#endif
return;
}
// 3.4 Faces
FillImagesFaces();
-#if OCC_VERSION_LARGE > 0x07010001
if (HasErrors()) {
-#else
- if (myErrorStatus) {
-#endif
return;
}
//
BuildResult(TopAbs_FACE);
-#if OCC_VERSION_LARGE > 0x07010001
if (HasErrors()) {
-#else
- if (myErrorStatus) {
-#endif
return;
}
}
//=======================================================================
void GEOMAlgo_ShellSolid::Perform()
{
-#if OCC_VERSION_LARGE <= 0x07010000
- myErrorStatus=0;
-#endif
//
try {
Standard_Integer aNbArgs, iRank, iErr, iBeg, iEnd, i, aNbSp;
myErrorStatus=10;
return;
}
-#if OCC_VERSION_LARGE > 0x07010001
if(myDSFiller->HasErrors()) {
-#else
- if(myDSFiller->ErrorStatus()) {
-#endif
myErrorStatus=11;
return;
}
return;
}
//
-#if OCC_VERSION_LARGE > 0x06070100
Handle(IntTools_Context) aCtx=myDSFiller->Context();
-#else
- Handle(BOPInt_Context) aCtx=myDSFiller->Context();
-#endif
const BOPDS_IndexRange& aRange=pDS->Range(iRank);
aRange.Indices(iBeg, iEnd);
const TopoDS_Solid& aSolid=(!iRank) ? *((TopoDS_Solid*)&aTool) : *((TopoDS_Solid*)&aObj);
GEOMAlgo_ShellSolidBuilder aSSB;
//
aSSB.PerformWithFiller(*myDSFiller);
-#if OCC_VERSION_LARGE > 0x07010001
iErr=aSSB.HasErrors();
-#else
- iErr=aSSB.ErrorStatus();
-#endif
if (iErr) {
myErrorStatus=15;
return;
#include <TopTools_ListIteratorOfListOfShape.hxx>
#include <TopTools_IndexedMapOfShape.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include <GEOMAlgo_IndexedDataMapOfShapeState.hxx>
//=======================================================================
myErrorStatus=10;
return;
}
-#if OCC_VERSION_LARGE > 0x07010001
if(myDSFiller->HasErrors()) {
-#else
- if(myDSFiller->ErrorStatus()) {
-#endif
myErrorStatus=11;
return;
}
#include <BOPTools.hxx>
-#include <Basics_OCCTVersion.hxx>
-
static
void TreatCompound(const TopoDS_Shape& aC,
BOPCol_ListOfShape& aLSX);
//=======================================================================
void GEOMAlgo_Splitter::BuildResult(const TopAbs_ShapeEnum theType)
{
-#if OCC_VERSION_LARGE <= 0x07010000
- myErrorStatus=0;
-#endif
- //
TopAbs_ShapeEnum aType;
BRep_Builder aBB;
BOPCol_MapOfShape aM;
//
#include <GEOMAlgo_VertexSolid.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include <gp_Pnt.hxx>
#include <TopAbs_ShapeEnum.hxx>
#include <BRepClass3d_SolidClassifier.hxx>
//
#include <BOPCol_ListOfShape.hxx>
-#if OCC_VERSION_LARGE > 0x06070100
#include <IntTools_Context.hxx>
-#else
-#include <BOPInt_Context.hxx>
-#endif
//
#include <BOPDS_DS.hxx>
#include <BOPDS_IndexRange.hxx>
myErrorStatus=10;
return;
}
-#if OCC_VERSION_LARGE > 0x07010001
if(myDSFiller->HasErrors()) {
-#else
- if(myDSFiller->ErrorStatus()) {
-#endif
myErrorStatus=11;
return;
}
const TopoDS_Shape& aTool=aLS.Last();
const TopoDS_Solid& aSolid=(myRank==0) ? TopoDS::Solid(aTool) : TopoDS::Solid(aObj);
//
-#if OCC_VERSION_LARGE > 0x06070100
Handle(IntTools_Context) aCtx=myDSFiller->Context();
-#else
- Handle(BOPInt_Context) aCtx=myDSFiller->Context();
-#endif
BRepClass3d_SolidClassifier& aSC=aCtx->SolidClassifier(aSolid);
//
aNbRanges=aDS.NbRanges();
//
#include <GEOMAlgo_WireSolid.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include <Standard_Failure.hxx>
#include <TopAbs_ShapeEnum.hxx>
#include <BOPDS_ListOfPaveBlock.hxx>
#include <BOPDS_PaveBlock.hxx>
#include <TopoDS_Solid.hxx>
-#if OCC_VERSION_LARGE > 0x06070100
#include <IntTools_Context.hxx>
-#else
-#include <BOPInt_Context.hxx>
-#endif
#include <BRepClass3d_SolidClassifier.hxx>
#include <BRep_Tool.hxx>
#include <BOPTools_AlgoTools.hxx>
-#include <Basics_OCCTVersion.hxx>
-
//=======================================================================
//function : GEOMAlgo_WireSolid
//purpose :
myErrorStatus=10;
return;
}
-#if OCC_VERSION_LARGE > 0x07010001
if(myDSFiller->HasErrors()) {
-#else
- if(myDSFiller->ErrorStatus()) {
-#endif
myErrorStatus=11;
return;
}
const TopoDS_Solid& aSolid=(iRank==0) ? *((TopoDS_Solid*)&aTool) :
*((TopoDS_Solid*)&aObj);
//
-#if OCC_VERSION_LARGE > 0x06070100
Handle(IntTools_Context) aCtx=myDSFiller->Context();
-#else
- Handle(BOPInt_Context) aCtx=myDSFiller->Context();
-#endif
//BRepClass3d_SolidClassifier& aSC=aCtx->SolidClassifier(aSolid);
//
const BOPDS_IndexRange& aRange=pDS->Range(iRank);
#include <AIS_InteractiveObject.hxx>
#include <SelectMgr_EntityOwner.hxx>
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_OCCFilter, SelectMgr_Filter)
+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:
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_OCCFilter,SelectMgr_Filter)
+ DEFINE_STANDARD_RTTIEXT(GEOM_OCCFilter,SelectMgr_Filter)
};
#include "GEOMGUI_OCCSelector.h"
#include "GEOM_Annotation.hxx"
-#include <Basics_OCCTVersion.hxx>
-
#include <LightApp_DataSubOwner.h>
#include <OCCViewer_ViewModel.h>
Handle(SelectMgr_Selection) sel = theObj->Selection( m );
for ( sel->Init(); sel->More(); sel->Next() ) {
-#if OCC_VERSION_LARGE > 0x06080100
const Handle(SelectMgr_SensitiveEntity) aHSenEntity = sel->Sensitive();
if( aHSenEntity.IsNull() )
continue;
Handle(SelectBasics_SensitiveEntity) entity = aHSenEntity->BaseSensitive();
-#else
- Handle(SelectBasics_SensitiveEntity) entity = sel->Sensitive();
-#endif
if ( entity.IsNull() )
continue;
#include <SUIT_ViewManager.h>
#include <SUIT_ResourceMgr.h>
-#include <Basics_OCCTVersion.hxx>
-
#include <SalomeApp_Study.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <AIS_AngleDimension.hxx>
#include <AIS_ListIteratorOfListOfInteractive.hxx>
#include <Aspect_PolygonOffsetMode.hxx>
-#if OCC_VERSION_MAJOR < 7
- #include <Aspect_ColorScale.hxx>
-#endif
#include <Prs3d_IsoAspect.hxx>
#include <Prs3d_PointAspect.hxx>
#include <StdSelect_TypeOfEdge.hxx>
#include <TopoDS.hxx>
#include <NCollection_DataMap.hxx>
#include <NCollection_Map.hxx>
+#include <Graphic3d_Texture2Dmanual.hxx>
#include <Prs3d_ShadingAspect.hxx>
if ( aAISShape.IsNull() )
continue;
-#ifdef USE_TEXTURED_SHAPE
- const Handle(Image_PixMap)& aPixmap = aAISShape->TexturePixMap();
+ const Handle(Graphic3d_TextureMap)& aTexture = aAISShape->Attributes()->ShadingAspect()->Aspect()->TextureMap();
+ if ( aTexture.IsNull() )
+ continue;
+
+ const Handle(Image_PixMap)& aPixmap = aTexture->GetImage();
if ( aPixmap.IsNull() )
continue;
aPixmapUsersMap.UnBind( aPixmap );
aPixmapCacheMap.remove( aPixmapCacheMap.key( aPixmap ) );
}
-#endif
}
}
myViewFrame = 0;
-#if OCC_VERSION_MAJOR >= 7
myColorScale = new AIS_ColorScale;
myColorScale->SetZLayer (Graphic3d_ZLayerId_TopOSD);
myColorScale->SetTransformPersistence (
Graphic3d_TransformPers::FromDeprecatedParams(Graphic3d_TMF_2d, gp_Pnt (-1,-1,0)));
-#endif
myFieldDataType = GEOM::FDT_Double;
myFieldDimension = 0;
AISShape->SetLabelColor( qColorFromResources( "label_color", QColor( 255, 255, 255 ) ) );
// set display mode
- AISShape->SetDisplayMode( HasDisplayMode() ?
- // predefined display mode, manually set to displayer via GEOM_Displayer::SetDisplayMode() function
- GetDisplayMode() :
- // display mode from properties
- propMap.value( GEOM::propertyName( GEOM::DisplayMode ) ).toInt() );
+ int displayMode = HasDisplayMode() ?
+ // predefined display mode, manually set to displayer via GEOM_Displayer::SetDisplayMode() function
+ GetDisplayMode() :
+ // display mode from properties
+ propMap.value( GEOM::propertyName( GEOM::DisplayMode ) ).toInt();
+ AISShape->SetDisplayMode( displayMode );
// - face boundaries color and line width
anAspect = AISShape->Attributes()->FaceBoundaryAspect();
aImagePath = propMap.value( GEOM::propertyName( GEOM::Texture ) ).toString();
}
-#ifdef USE_TEXTURED_SHAPE
Handle(Image_PixMap) aPixmap;
if ( !aImagePath.isEmpty() )
aPixmap = cacheTextureFor( aImagePath, AISShape );
// apply image to shape
if ( !aPixmap.IsNull() ) {
- AISShape->SetTexturePixMap( aPixmap );
- AISShape->SetTextureMapOn();
- AISShape->DisableTextureModulate();
- }
- else {
- AISShape->SetTextureMapOff();
+ AISShape->Attributes()->ShadingAspect()->Aspect()->SetTextureMap( new Graphic3d_Texture2Dmanual( aPixmap ) );
}
-#endif
+ if ( displayMode == GEOM_AISShape::TexturedShape )
+ AISShape->Attributes()->ShadingAspect()->Aspect()->SetTextureMapOn();
+ else
+ AISShape->Attributes()->ShadingAspect()->Aspect()->SetTextureMapOff();
// set line width
AISShape->SetWidth( HasWidth() ?
{
QColor aQColor;
Quantity_Color aColor;
-#if OCC_VERSION_MAJOR < 7
- if( FindColor( aVariant.toDouble(), theFieldStepRangeMin, theFieldStepRangeMax, anIsBoolean ? 2 : aNbIntervals, aColor ) )
-#else
if( AIS_ColorScale::FindColor( aVariant.toDouble(), theFieldStepRangeMin, theFieldStepRangeMax, anIsBoolean ? 2 : aNbIntervals, aColor ) )
-#endif
aQColor = QColor::fromRgbF( aColor.Red(), aColor.Green(), aColor.Blue() );
aResultList << aQColor;
}
return aResultList;
}
-#if OCC_VERSION_MAJOR < 7
-// Note: the method is copied from Aspect_ColorScale class
-Standard_Integer GEOM_Displayer::HueFromValue( const Standard_Integer aValue,
- const Standard_Integer aMin,
- const Standard_Integer aMax )
-{
- Standard_Integer minLimit( 0 ), maxLimit( 230 );
-
- Standard_Integer aHue = maxLimit;
- if ( aMin != aMax )
- aHue = (Standard_Integer)( maxLimit - ( maxLimit - minLimit ) * ( aValue - aMin ) / ( aMax - aMin ) );
-
- aHue = Min( Max( minLimit, aHue ), maxLimit );
-
- return aHue;
-}
-
-// Note: the method is copied from Aspect_ColorScale class
-Standard_Boolean GEOM_Displayer::FindColor( const Standard_Real aValue,
- const Standard_Real aMin,
- const Standard_Real aMax,
- const Standard_Integer ColorsCount,
- Quantity_Color& aColor )
-{
- if( aValue<aMin || aValue>aMax || aMax<aMin )
- return Standard_False;
-
- else
- {
- Standard_Real IntervNumber = 0;
- if( aValue<aMin )
- IntervNumber = 0;
- else if( aValue>aMax )
- IntervNumber = ColorsCount-1;
- else if( Abs( aMax-aMin ) > Precision::Approximation() )
- IntervNumber = Floor( Standard_Real( ColorsCount ) * ( aValue - aMin ) / ( aMax - aMin ) ); // 'Ceiling' replaced with 'Floor'
-
- Standard_Integer Interv = Standard_Integer( IntervNumber );
-
- aColor = Quantity_Color( HueFromValue( Interv, 0, ColorsCount - 1 ), 1.0, 1.0, Quantity_TOC_HLS );
-
- return Standard_True;
- }
-}
-#endif
-
void GEOM_Displayer::UpdateColorScale( const bool theIsRedisplayFieldSteps, const bool updateViewer )
{
SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>( myApp->activeStudy() );
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() )
- {
- myColorScale->SetXPosition( anXPos );
- myColorScale->SetYPosition( anYPos );
- myColorScale->SetWidth( aWidth );
- myColorScale->SetHeight( aHeight );
-#else
- Standard_Integer aWinWidth = 0, aWinHeight = 0;
- aView->Window()->Size (aWinWidth, aWinHeight);
-
- myColorScale->SetPosition (aWinWidth*anXPos, aWinHeight*anYPos);
- //myColorScale->SetBreadth (aWinWidth); // ???
- myColorScale->SetBreadth (aWinWidth*aWidth); // ???
- myColorScale->SetHeight (aWinHeight*aHeight);
-#endif
-
- myColorScale->SetRange( aColorScaleMin, aColorScaleMax );
- myColorScale->SetNumberOfIntervals( anIsBoolean ? 2 : aNbIntervals );
-
- myColorScale->SetTextHeight( aTextHeight );
- myColorScale->SetTitle( aColorScaleTitle );
-
-#if OCC_VERSION_MAJOR < 7
- }
- if( !aView->ColorScaleIsDisplayed() )
- aView->ColorScaleDisplay();
- }
- else
- if( aView->ColorScaleIsDisplayed() )
- aView->ColorScaleErase();
-#else
+
+ Standard_Integer aWinWidth = 0, aWinHeight = 0;
+ aView->Window()->Size (aWinWidth, aWinHeight);
+
+ myColorScale->SetPosition (aWinWidth*anXPos, aWinHeight*anYPos);
+ //myColorScale->SetBreadth (aWinWidth); // ???
+ myColorScale->SetBreadth (aWinWidth*aWidth); // ???
+ myColorScale->SetHeight (aWinHeight*aHeight);
+
+ myColorScale->SetRange( aColorScaleMin, aColorScaleMax );
+ myColorScale->SetNumberOfIntervals( anIsBoolean ? 2 : aNbIntervals );
+
+ myColorScale->SetTextHeight( aTextHeight );
+ myColorScale->SetTitle( aColorScaleTitle );
+
if( !aViewModel->getAISContext()->IsDisplayed( myColorScale ) )
aViewModel->getAISContext()->Display( myColorScale, Standard_True);
}
- else
+ else {
if( aViewModel->getAISContext()->IsDisplayed( myColorScale ) )
aViewModel->getAISContext()->Erase( myColorScale, Standard_True );
-#endif
-
+ }
+
if( theIsRedisplayFieldSteps )
{
_PTR(Study) aStudyDS = aStudy->studyDS();
#include <LightApp_Displayer.h>
#include <LightApp_Study.h>
#include <Aspect_TypeOfMarker.hxx>
-#if OCC_VERSION_MAJOR >= 7
- #include <AIS_ColorScale.hxx>
-#endif
+#include <AIS_ColorScale.hxx>
#include <TCollection_AsciiString.hxx>
#include <TColStd_MapOfInteger.hxx>
-#include <Basics_OCCTVersion.hxx>
#include <QList>
#include <list>
double& theFieldStepRangeMin,
double& theFieldStepRangeMax );
-#if OCC_VERSION_MAJOR < 7
- // Note: the method is copied from Aspect_ColorScale class
- static Standard_Integer HueFromValue( const Standard_Integer aValue,
- const Standard_Integer aMin,
- const Standard_Integer aMax );
-
- // Note: the method is copied from Aspect_ColorScale class
- static Standard_Boolean FindColor( const Standard_Real aValue,
- const Standard_Real aMin,
- const Standard_Real aMax,
- const Standard_Integer ColorsCount,
- Quantity_Color& aColor );
-#endif
-
protected:
Handle(SALOME_InteractiveObject) myIO;
TopoDS_Shape myShape;
std::string myTexture;
int myType;
SALOME_View* myViewFrame;
-#if OCC_VERSION_MAJOR >= 7
Handle(AIS_ColorScale) myColorScale;
-#endif
int myUpdateColorScale; // IPAL54049
// Attributes
#include <SALOMEDS_SObject.hxx>
-#include <Basics_OCCTVersion.hxx>
#include <QtxFontEdit.h>
// External includes
#include "GEOM_GEOMGUI.hxx"
-#include <Basics_OCCTVersion.hxx>
-
#include <SalomeApp_Module.h>
#include <GEOM_Client.hxx>
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_3DSketcherDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_3DSketcherDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMImpl_3DSketcherDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT(GEOMImpl_3DSketcherDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_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);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_3DSketcherDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_3DSketcherDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_ArcDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_ArcDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArcDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArcDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_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);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ArcDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_ArcDriver,GEOM_BaseDriver)
};
#endif
#include "Archimede_VolumeSection.hxx"
-#include <Basics_OCCTVersion.hxx>
-
#include <stdio.h>
#include <BRepBuilderAPI_MakeFace.hxx>
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_ArchimedeDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_ArchimedeDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArchimedeDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArchimedeDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_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);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ArchimedeDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_ArchimedeDriver,GEOM_BaseDriver)
};
#endif
#include "utilities.h"
-#include <Basics_OCCTVersion.hxx>
-
#include <BRep_Tool.hxx>
#include <BRep_TFace.hxx>
#include <BRep_Builder.hxx>
if (!theResult.IsNull()) {
// try to deal with result of BRepBuilderAPI_MakeFace + ShHealOper_ShapeProcess
-#if OCC_VERSION_LARGE >= 0x06080000
#ifdef MAKE_FACE_PCURVES_FIX_TOLERANCE
// check and fix pcurves, if necessary
Standard_Real aT, aTolE, aD, aDMax;
for (; aDMETolIt.More(); aDMETolIt.Next()) {
sat.LimitTolerance(aDMETolIt.Key(), aDMETolIt.Value());
}
-#endif
#endif
}
else {
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_BlockDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_BlockDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BlockDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BlockDriver,GEOM_BaseDriver);
public:
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 Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_BlockDriver() {};
const Standard_Integer theNbIterV,
TopoDS_Shape& theResult) const;
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_BlockDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_BlockDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_BooleanDriver::Execute(Handle(TFunction_Logbook)& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aList2.Append(aShape2);
aCSI.SetArguments(aList1);
aCSI.Perform();
-#if OCC_VERSION_LARGE > 0x07010001
if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0)
-#else
- if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0)
-#endif
StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected");
aCSI.SetArguments(aList2);
aCSI.Perform();
-#if OCC_VERSION_LARGE > 0x07010001
if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0)
-#else
- if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0)
-#endif
StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected");
}
aList1.Append(aShape);
aCSI.SetArguments(aList1);
aCSI.Perform();
-#if OCC_VERSION_LARGE > 0x07010001
if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) {
-#else
- if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) {
-#endif
StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected");
}
}
aList2.Append(aShape2);
aCSI.SetArguments(aList2);
aCSI.Perform();
-#if OCC_VERSION_LARGE > 0x07010001
if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) {
-#else
- if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) {
-#endif
StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected");
}
}
aList1.Append(aShape);
aCSI.SetArguments(aList1);
aCSI.Perform();
-#if OCC_VERSION_LARGE > 0x07010001
if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) {
-#else
- if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) {
-#endif
StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected");
}
}
aList2.Append(aTool);
aCSI.SetArguments(aList2);
aCSI.Perform();
-#if OCC_VERSION_LARGE > 0x07010001
if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) {
-#else
- if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) {
-#endif
StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected");
}
}
aFunction->SetValue(aShape);
-#if OCC_VERSION_MAJOR < 7
- log.SetTouched(Label());
-#else
log->SetTouched(Label());
-#endif
return 1;
}
// This allows to avoid adding empty compounds,
// resulting from COMMON on two non-intersecting shapes.
if (aStepResult.ShapeType() == TopAbs_COMPOUND) {
-#if OCC_VERSION_MAJOR >= 7
if ((aValue1.ShapeType() == TopAbs_FACE || aValue1.ShapeType() == TopAbs_SHELL) &&
(aValue2.ShapeType() == TopAbs_FACE || aValue2.ShapeType() == TopAbs_SHELL)) {
aStepResult = makeCompoundShellFromFaces(aStepResult);
}
-#endif
TopoDS_Iterator aCompIter (aStepResult);
for (; aCompIter.More(); aCompIter.Next()) {
// add shape in a result
// This allows to avoid adding empty compounds,
// resulting from CUT of parts
if (aCut.ShapeType() == TopAbs_COMPOUND) {
-#if OCC_VERSION_MAJOR >= 7
if (itSub1.Value().ShapeType() == TopAbs_FACE ||
itSub1.Value().ShapeType() == TopAbs_SHELL) {
aCut = makeCompoundShellFromFaces(aCut);
}
-#endif
TopoDS_Iterator aCompIter (aCut);
for (; aCompIter.More(); aCompIter.Next()) {
// add shape in a result
// perform FUSE operation
else if (theType == BOOLEAN_FUSE) {
-#if OCC_VERSION_MAJOR >= 7
Standard_Boolean isFaces = Standard_False;
TopTools_ListOfShape listShape1, listShape2;
GEOMUtils::AddSimpleShapes(theShape1, listShape1);
}
}
}
-#endif
// Perform
BRepAlgoAPI_Fuse BO (theShape1, theShape2);
StdFail_NotDone::Raise("Fuse operation can not be performed on the given shapes");
}
aShape = BO.Shape();
-#if OCC_VERSION_MAJOR >= 7
if (isFaces)
aShape = makeCompoundShellFromFaces(aShape);
-#endif
}
// perform SECTION operation
return true;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BooleanDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BooleanDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_BooleanDriver() {};
TopoDS_Shape makeCompoundShellFromFaces(const TopoDS_Shape theShape) const;
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_BooleanDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_BooleanDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_BoxDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_BoxDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BoxDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BoxDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_BoxDriver() {};
bool GetCreationInformation(std::string& theOperationNameName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_BoxDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_BoxDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_ChamferDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_ChamferDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ChamferDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ChamferDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_ChamferDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ChamferDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_ChamferDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_CircleDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_CircleDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CircleDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CircleDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_CircleDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_CircleDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_CircleDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_ConeDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_ConeDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ConeDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ConeDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_ConeDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ConeDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_ConeDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_CopyDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_CopyDriver::Execute(Handle(TFunction_Logbook)& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aFunction->SetValue(aCopy);
-#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(LOGBOOK& log) const
+Standard_Integer GEOMImpl_CopyDriver::transferData(Handle(TFunction_Logbook)& log) const
{
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
GEOMImpl_ITransferData aTD (aFunction);
return Standard_True;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CopyDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CopyDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_CopyDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_CopyDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_CopyDriver,GEOM_BaseDriver)
private:
- Standard_Integer transferData(LOGBOOK& log) const;
+ Standard_Integer transferData(Handle(TFunction_Logbook)& log) const;
Standard_Boolean getInPlace
(const TopoDS_Shape &theSourceShape,
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_CylinderDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_CylinderDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CylinderDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CylinderDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_CylinderDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_CylinderDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_CylinderDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_DiskDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_DiskDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_DiskDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_DiskDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_DiskDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_DiskDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_DiskDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_EllipseDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_EllipseDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_EllipseDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_EllipseDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_EllipseDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_EllipseDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_EllipseDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_ExportDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_ExportDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ExportDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ExportDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_ExportDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ExportDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_ExportDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_FaceDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_FaceDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FaceDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FaceDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_FaceDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_FaceDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_FaceDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_FieldDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_FieldDriver::Execute(Handle(TFunction_Logbook)& log) const
{
return 0;
}
return true;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FieldDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FieldDriver,GEOM_BaseDriver);
{
public:
Standard_EXPORT GEOMImpl_FieldDriver();
- 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 Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_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);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_FieldDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_FieldDriver,GEOM_BaseDriver)
};
#endif
#include "GEOMImpl_Fillet1d.hxx"
-#include <Basics_OCCTVersion.hxx>
-
#include <BRep_Tool.hxx>
#include <BRepAdaptor_Curve.hxx>
#include <BRepBuilderAPI_MakeEdge.hxx>
for(a = anInter.NbSegments(); a > 0; a--)
{
// Porting to DEV version of OCCT 10.02.2017 BEGIN
-#if OCC_VERSION_LARGE > 0x07010000
Standard_NotImplemented::Raise("The treatment of tangential intersection is not implemented");
-#else
- // This piece of code seems never worked, because:
- // 1. In case of two curves intersection
- // method Segment with TWO output curves HAS TO be used.
- // 2. Method Segment with ONE output curve (as below) just raises
- // Standard_NotImplemented exception since 05.03.2012 (at least)
- // and that is why has been eliminated 03.02.2017.
- anInter.Segment(a, aCurve);
- aPoint = aCurve->Value(aCurve->FirstParameter());
- if (aPoint.Distance(theStart) < aTol)
- if (!theStartConnected)
- return Standard_True;
- if (aPoint.Distance(theEnd) < aTol)
- return Standard_True;
- if (gp_Vec2d(aPoint, theStart).IsOpposite(gp_Vec2d(aPoint, theEnd), anAngTol))
- return Standard_True;
- aPoint = aCurve->Value(aCurve->LastParameter());
- if (aPoint.Distance(theStart) < aTol)
- if (!theStartConnected)
- return Standard_True;
- if (aPoint.Distance(theEnd) < aTol)
- return Standard_True;
- if (gp_Vec2d(aPoint, theStart).IsOpposite(gp_Vec2d(aPoint, theEnd), anAngTol))
- return Standard_True;
-#endif
// Porting to DEV version of OCCT 10.02.2017 END
}
return Standard_False;
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_Fillet1dDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_Fillet1dDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet1dDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet1dDriver,GEOM_BaseDriver);
Standard_EXPORT static const Standard_GUID& GetID();
- 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 Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_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;
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_Fillet1dDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_Fillet1dDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_Fillet2dDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_Fillet2dDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet2dDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet2dDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_Fillet2dDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_Fillet2dDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_Fillet2dDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_FilletDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_FilletDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FilletDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FilletDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_FilletDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_FilletDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_FilletDriver,GEOM_BaseDriver)
};
#endif
#include <GEOM_Function.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include <BRepAlgo.hxx>
#include <BRepBuilderAPI_Copy.hxx>
#include <BRepBuilderAPI_MakeFace.hxx>
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_FillingDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_FillingDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FillingDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FillingDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_FillingDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_FillingDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_FillingDriver,GEOM_BaseDriver)
};
#endif
#include "GEOMAlgo_CoupleOfShapes.hxx"
#include "GEOMAlgo_ListOfCoupleOfShapes.hxx"
-#include <Basics_OCCTVersion.hxx>
-
#include "utilities.h"
#include <BRep_Builder.hxx>
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_GlueDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_GlueDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_GlueDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_GlueDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_GlueDriver() {};
const TopTools_MapOfShape& theShapesList,
const Standard_Boolean doGlueAllEdges);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_GlueDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_GlueDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_HealingDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_HealingDriver::Execute(Handle(TFunction_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();
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_HealingDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_HealingDriver,GEOM_BaseDriver);
Standard_EXPORT static const Standard_GUID& GetID();
- 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 Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_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);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_HealingDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_HealingDriver,GEOM_BaseDriver)
private:
Standard_Boolean ShapeProcess ( GEOMImpl_IHealing*, const TopoDS_Shape&, TopoDS_Shape& ) const;
#include <Standard_Stream.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include <GEOMImpl_I3DPrimOperations.hxx>
#include "utilities.h"
#include <GEOMImpl_IBasicOperations.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include "utilities.h"
#include <OpUtil.hxx>
#include <Utils_ExceptHandlers.hxx>
#include <GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx>
#include <BlockFix_CheckTool.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include "utilities.h"
#include <OpUtil.hxx>
#include <Utils_ExceptHandlers.hxx>
#include <GEOMImpl_PartitionDriver.hxx>
#include <GEOMImpl_IPartition.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include <TDF_Tool.hxx>
#include "utilities.h"
#include "GEOMImpl_IIsoline.hxx"
#include "GEOMImpl_PolylineDumper.hxx"
-#include <Basics_OCCTVersion.hxx>
-
#include "utilities.h"
#include <TDF_Tool.hxx>
// Compute the isoline curve
try {
-#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
-#endif
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Polyline driver failed");
return NULL;
//Compute the isoline curve
try {
-#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
-#endif
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Polyline driver failed");
return NULL;
#include <ShHealOper_ModifStats.hxx>
#include <ShHealOper_ShapeProcess.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include <utilities.h>
#include <OpUtil.hxx>
#include <Utils_ExceptHandlers.hxx>
#include <GEOM_PythonDump.hxx>
#include "GEOM_ISubShape.hxx"
-#include <Basics_OCCTVersion.hxx>
-
#include "utilities.h"
#include <OpUtil.hxx>
#include <Utils_ExceptHandlers.hxx>
#include "GEOM_Object.hxx"
#include "GEOM_Field.hxx"
-#include <Basics_OCCTVersion.hxx>
-
#include "Utils_SALOME_Exception.hxx"
#include <TDocStd_Document.hxx>
#include <GEOM_Function.hxx>
#include <GEOM_PythonDump.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include "utilities.h"
#include <OpUtil.hxx>
#include <Utils_ExceptHandlers.hxx>
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-#include <Basics_OCCTVersion.hxx>
-
#include <GEOMImpl_IMeasureOperations.hxx>
#include <GEOMImpl_IMeasure.hxx>
#include <GEOMImpl_MeasureDriver.hxx>
#include <BOPCol_ListOfShape.hxx>
#include <BOPDS_DS.hxx>
#include <BOPDS_MapOfPassKey.hxx>
-#if OCC_VERSION_LARGE > 0x07010000
#include <BOPDS_MapOfPair.hxx>
#include <BOPDS_Pair.hxx>
-#endif
#include <BRepBndLib.hxx>
#include <BRepBuilderAPI_Copy.hxx>
#include <BRepCheck_ListIteratorOfListOfStatus.hxx>
#include <BRepClass_FaceClassifier.hxx>
#include <BRepExtrema_DistShapeShape.hxx>
#include <BRepExtrema_ShapeProximity.hxx>
-#if OCC_VERSION_LARGE > 0x06090000
#include <BRepExtrema_SelfIntersection.hxx>
#include <BRepExtrema_MapOfIntegerPackedMapOfInteger.hxx>
-#endif
#include <BRepGProp.hxx>
#include <BRepTools.hxx>
#include <BRep_Tool.hxx>
// 1. Launch the checker
aCSI.Perform();
-#if OCC_VERSION_LARGE > 0x07010001
Standard_Boolean iErr = aCSI.HasErrors();
-#else
- Standard_Integer iErr = aCSI.ErrorStatus();
-#endif
//
Standard_Integer aNbS, n1, n2;
-#if OCC_VERSION_LARGE > 0x07010000
BOPDS_MapIteratorOfMapOfPair aItMPK;
-#else
- BOPDS_MapIteratorMapOfPassKey aItMPK;
-#endif
//
// 2. Take the shapes from DS
const BOPDS_DS& aDS = aCSI.DS();
aNbS=aDS.NbShapes();
//
// 3. Get the pairs of interfered shapes
-#if OCC_VERSION_LARGE > 0x07010000
const BOPDS_MapOfPair& aMPK=aDS.Interferences();
-#else
- const BOPDS_MapOfPassKey& aMPK=aDS.Interferences();
-#endif
aItMPK.Initialize(aMPK);
for (; aItMPK.More(); aItMPK.Next()) {
-#if OCC_VERSION_LARGE > 0x07010000
const BOPDS_Pair& aPK=aItMPK.Value();
aPK.Indices(n1, n2);
-#else
- const BOPDS_PassKey& aPK=aItMPK.Value();
- aPK.Ids(n1, n2);
-#endif
//
if (n1 > aNbS || n2 > aNbS){
return false; // Error
TopTools_IndexedMapOfShape anIndices;
TopExp::MapShapes(aScopy, anIndices);
-#if OCC_VERSION_LARGE > 0x06090000
// Checker of fast interferences
BRepExtrema_SelfIntersection aTool(aScopy, (theTolerance <= 0.) ? 0.0 : theTolerance);
if (aTool.IsDone())
SetErrorCode(OK);
-#endif
return theIntersections->IsEmpty();
}
aBSP.Perform();
// 2. Get sets of IDs of overlapped faces
-#if OCC_VERSION_LARGE > 0x06090000
for (BRepExtrema_MapOfIntegerPackedMapOfInteger::Iterator anIt1 (aBSP.OverlapSubShapes1()); anIt1.More(); anIt1.Next())
-#else
- for (BRepExtrema_OverlappedSubShapes::Iterator anIt1 (aBSP.OverlapSubShapes1()); anIt1.More(); anIt1.Next())
-#endif
{
const TopoDS_Shape& aS1 = aBSP.GetSubShape1(anIt1.Key());
theIntersections1->Append(anIndices1.FindIndex(aS1));
}
-#if OCC_VERSION_LARGE > 0x06090000
for (BRepExtrema_MapOfIntegerPackedMapOfInteger::Iterator anIt2 (aBSP.OverlapSubShapes2()); anIt2.More(); anIt2.Next())
-#else
- for (BRepExtrema_OverlappedSubShapes::Iterator anIt2 (aBSP.OverlapSubShapes2()); anIt2.More(); anIt2.Next())
-#endif
{
const TopoDS_Shape& aS2 = aBSP.GetSubShape2(anIt2.Key());
theIntersections2->Append(anIndices2.FindIndex(aS2));
#include <GEOM_Function.hxx>
#include <GEOM_PythonDump.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include "utilities.h"
#include <OpUtil.hxx>
#include <Utils_ExceptHandlers.hxx>
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_ImportDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_ImportDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ImportDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ImportDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_ImportDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ImportDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_ImportDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_LineDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_LineDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_LineDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_LineDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_LineDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_LineDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_LineDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_MarkerDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_MarkerDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MarkerDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MarkerDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_MarkerDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_MarkerDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_MarkerDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_MeasureDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_MeasureDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MeasureDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MeasureDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_MeasureDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_MeasureDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_MeasureDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_MirrorDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_MirrorDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MirrorDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MirrorDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_MirrorDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_MirrorDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_MirrorDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_OffsetDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_OffsetDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_OffsetDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_OffsetDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_OffsetDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_OffsetDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_OffsetDriver,GEOM_BaseDriver)
};
#endif
#include <Standard_NullObject.hxx>
#include <StdFail_NotDone.hxx>
#include <BOPAlgo_CheckerSI.hxx>
-#if OCC_VERSION_LARGE > 0x07010001
#include <BOPAlgo_Alerts.hxx>
-#endif
#include <BOPCol_IndexedDataMapOfShapeListOfShape.hxx>
#include <BOPCol_ListOfShape.hxx>
#include <BOPDS_DS.hxx>
aCSI.SetLevelOfCheck(BOP_SELF_INTERSECTIONS_LEVEL);
aCSI.SetArguments(aList);
aCSI.Perform();
-#if OCC_VERSION_LARGE > 0x07010001
if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) {
-#else
- if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) {
-#endif
StdFail_NotDone::Raise("Partition operation will not be performed, because argument shape is self-intersected");
}
}
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_PartitionDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_PartitionDriver::Execute(Handle(TFunction_Logbook)& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aShape = PS.Shape();
if (aShape.IsNull()) {
// Mantis issue 22009
-#if OCC_VERSION_LARGE > 0x07010001
if (PS.HasError(STANDARD_TYPE(BOPAlgo_AlertTooFewArguments)) && PS.Tools().Extent() == 0 && PS.Arguments().Extent() == 1)
-#else
- if (PS.ErrorStatus() == 100 && PS.Tools().Extent() == 0 && PS.Arguments().Extent() == 1)
-#endif
aShape = PS.Arguments().First();
else
return 0;
}
}
-#if OCC_VERSION_MAJOR < 7
- log.SetTouched(Label());
-#else
log->SetTouched(Label());
-#endif
return 1;
}
return true;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PartitionDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PartitionDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_PartitionDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PartitionDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_PartitionDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_PipeDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_PipeDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipeDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipeDriver,GEOM_BaseDriver);
public:
Standard_EXPORT GEOMImpl_PipeDriver();
- 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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)& log) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_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);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PipeDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_PipeDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_PipePathDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_PipePathDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipePathDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipePathDriver,GEOM_BaseDriver);
public:
Standard_EXPORT GEOMImpl_PipePathDriver();
- 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 Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_PipePathDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PipePathDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_PipePathDriver,GEOM_BaseDriver)
};
#endif
#include <GEOMUtils.hxx>
-#include <Basics_OCCTVersion.hxx>
-
// OCCT Includes
#include <BRepBuilderAPI_MakeFace.hxx>
#include <BRep_Tool.hxx>
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_PlaneDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_PlaneDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PlaneDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PlaneDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_PlaneDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PlaneDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_PlaneDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_PointDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_PointDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PointDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PointDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_PointDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PointDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_PointDriver,GEOM_BaseDriver)
};
#endif
//function : MakePolyline2D
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_PolylineDriver::MakePolyline2D(LOGBOOK& log) const
+Standard_Integer GEOMImpl_PolylineDriver::MakePolyline2D(Handle(TFunction_Logbook)& log) const
{
if (Label().IsNull()) {
return 0;
}
aFunction->SetValue(aShape);
-#if OCC_VERSION_MAJOR < 7
- log.SetTouched(Label());
-#else
log->SetTouched(Label());
-#endif
return 1;
}
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_PolylineDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_PolylineDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PolylineDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PolylineDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_PolylineDriver() {};
std::vector<GEOM_Param>& params);
private:
- Standard_Integer MakePolyline2D(LOGBOOK& log) const;
+ Standard_Integer MakePolyline2D(Handle(TFunction_Logbook)& log) const;
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PolylineDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_PolylineDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_PositionDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_PositionDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PositionDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PositionDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_PositionDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PositionDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_PositionDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_PrismDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_PrismDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PrismDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PrismDriver,GEOM_BaseDriver);
Standard_EXPORT GEOMImpl_PrismDriver();
Standard_EXPORT ~GEOMImpl_PrismDriver() {};
- 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 Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate (Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute (const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PrismDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_PrismDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_ProjectionDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_ProjectionDriver::Execute(Handle(TFunction_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
} 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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ProjectionDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ProjectionDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_ProjectionDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ProjectionDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_ProjectionDriver,GEOM_BaseDriver)
private:
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_RevolutionDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_RevolutionDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RevolutionDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RevolutionDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_RevolutionDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_RevolutionDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_RevolutionDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_RotateDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_RotateDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RotateDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RotateDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_RotateDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_RotateDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_RotateDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_ScaleDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_ScaleDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ScaleDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ScaleDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_ScaleDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ScaleDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_ScaleDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_ShapeDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_ShapeDriver::Execute(Handle(TFunction_Logbook)& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
aMV.SetArguments(aLS);
aMV.SetIntersect(aCI.GetIsIntersect());
aMV.Perform();
-#if OCC_VERSION_LARGE > 0x07010001
if (aMV.HasErrors()) return 0;
-#else
- if (aMV.ErrorStatus()) return 0;
-#endif
aShape = aMV.Shape();
}
aFunction->SetValue(aShape);
-#if OCC_VERSION_MAJOR < 7
- log.SetTouched(Label());
-#else
log->SetTouched(Label());
-#endif
if (!aWarning.IsEmpty())
Standard_Failure::Raise(aWarning.ToCString());
return true;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ShapeDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ShapeDriver,GEOM_BaseDriver);
//modified by NIZNHY-PKV Wed Dec 28 13:48:31 2011f
#include <TopoDS_Iterator.hxx>
Standard_EXPORT GEOMImpl_ShapeDriver();
Standard_EXPORT ~GEOMImpl_ShapeDriver() {};
- 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 Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ShapeDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_ShapeDriver,GEOM_BaseDriver)
private:
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_SketcherDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_SketcherDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SketcherDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SketcherDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_SketcherDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_SketcherDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_SketcherDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_SphereDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_SphereDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SphereDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SphereDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_SphereDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_SphereDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_SphereDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_SplineDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_SplineDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SplineDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SplineDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_SplineDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_SplineDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_SplineDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_ThruSectionsDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_ThruSectionsDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ThruSectionsDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ThruSectionsDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_ThruSectionsDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ThruSectionsDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_ThruSectionsDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_TorusDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_TorusDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TorusDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TorusDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_TorusDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_TorusDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_TorusDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_TranslateDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_TranslateDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TranslateDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TranslateDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_TranslateDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_TranslateDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_TranslateDriver,GEOM_BaseDriver)
};
#endif
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_VectorDriver::Execute(LOGBOOK& log) const
+Standard_Integer GEOMImpl_VectorDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_VectorDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_VectorDriver,GEOM_BaseDriver);
public:
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 virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {}
+ Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
Standard_EXPORT static const Standard_GUID& GetID();
Standard_EXPORT ~GEOMImpl_VectorDriver() {};
bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& params);
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_VectorDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(GEOMImpl_VectorDriver,GEOM_BaseDriver)
};
#include <DependencyTree_Selector.h>
#endif
-#include <Basics_OCCTVersion.hxx>
-
#include <SALOME_ListIO.hxx>
#include <SALOMEDS_SObject.hxx>
#include <GEOM_Constants.h>
#include <GEOM_Displayer.h>
-#include <Basics_OCCTVersion.hxx>
-
#include <QtxComboBox.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <GEOMUtils.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include <OpUtil.hxx>
#include <Utils_ExceptHandlers.hxx>
#include <sstream>
#include <algorithm>
-#if OCC_VERSION_LARGE >= 0x07010000
#include <V3d_Coordinate.hxx>
-#endif
#include <Standard_Failure.hxx>
#include <Standard_NullObject.hxx>
#include <GEOMUtils_HTrsfCurve2d.hxx>
namespace GEOMUtils {
- OCCT_IMPLEMENT_STANDARD_RTTIEXT(HTrsfCurve2d, Adaptor2d_HCurve2d);
+ IMPLEMENT_STANDARD_RTTIEXT(HTrsfCurve2d, Adaptor2d_HCurve2d);
}
//=======================================================================
public:
- OCCT_DEFINE_STANDARD_RTTIEXT(HTrsfCurve2d,Adaptor2d_HCurve2d)
+ 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;
#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_NAMESPACE(GEOM_BaseObject) theImpl)
+ Handle(::GEOM_BaseObject) theImpl)
: SALOME::GenericObj_i( thePOA ), _engine(theEngine), _impl(theImpl)
{
}
TCollection_AsciiString anEntry;
for (int i = 1; i<=aLength; i++) {
- HANDLE_NAMESPACE(GEOM_BaseObject) anObj = HANDLE_NAMESPACE(GEOM_BaseObject)::DownCast(aSeq->Value(i));
+ Handle(::GEOM_BaseObject) anObj = Handle(::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_NAMESPACE(GEOM_BaseObject) anObj = HANDLE_NAMESPACE(GEOM_BaseObject)::DownCast(aSeq->Value(i));
+ Handle(::GEOM_BaseObject) anObj = Handle(::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_NAMESPACE(GEOM_BaseDriver) driver =
- HANDLE_NAMESPACE(GEOM_BaseDriver)::DownCast( _impl->GetCreationDriver( i ));
+ Handle(::GEOM_BaseDriver) driver =
+ Handle(::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_NAMESPACE(GEOM_BaseObject) theImpl);
+ GEOM_BaseObject_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_BaseObject) theImpl);
~GEOM_BaseObject_i();
virtual char* GetEntry();
virtual GEOM::CreationInformationSeq* GetCreationInformation();
- HANDLE_NAMESPACE(GEOM_BaseObject) GetImpl() { return _impl; }
+ Handle(::GEOM_BaseObject) GetImpl() { return _impl; }
protected:
private:
- HANDLE_NAMESPACE(GEOM_BaseObject) _impl;
+ Handle(::GEOM_BaseObject) _impl;
};
#endif
GEOM_Field_i::GEOM_Field_i (PortableServer::POA_ptr thePOA,
GEOM::GEOM_Gen_ptr theEngine,
- HANDLE_NAMESPACE(GEOM_Field) theImpl):
+ Handle(::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_NAMESPACE(GEOM_Object) shape = _impl->GetShape();
+ Handle(::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_NAMESPACE(GEOM_FieldStep) step = _impl->AddStep( stepID, stamp );
+ Handle(::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_NAMESPACE(GEOM_FieldStep)> stepList = _impl->GetSteps();
- std::list< HANDLE_NAMESPACE(GEOM_FieldStep)>::iterator stp = stepList.begin();
+ std::list< Handle(::GEOM_FieldStep)> stepList = _impl->GetSteps();
+ std::list< Handle(::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_NAMESPACE(GEOM_FieldStep) step = _impl->GetStep(stepID);
+ Handle(::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_NAMESPACE(GEOM_FieldStep) theImpl):
+ Handle(::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_NAMESPACE(GEOM_Field) field = _impl->GetField();
+ Handle(::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_NAMESPACE(GEOM_FieldStep) theImpl):
+GEOM_BoolFieldStep_i::GEOM_BoolFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::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_NAMESPACE(GEOM_FieldStep) theImpl):
+GEOM_IntFieldStep_i::GEOM_IntFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::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_NAMESPACE(GEOM_FieldStep) theImpl):
+GEOM_DoubleFieldStep_i::GEOM_DoubleFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::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_NAMESPACE(GEOM_FieldStep) theImpl):
+GEOM_StringFieldStep_i::GEOM_StringFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::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_NAMESPACE(GEOM_Field) theImpl);
+ GEOM_Field_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_Field) theImpl);
~GEOM_Field_i();
virtual GEOM::GEOM_Object_ptr GetShape();
private:
- HANDLE_NAMESPACE(GEOM_Field) _impl;
+ Handle(::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_NAMESPACE(GEOM_FieldStep) theImpl);
+ GEOM_FieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_FieldStep) theImpl);
~GEOM_FieldStep_i();
virtual void SetStamp(::CORBA::Long stamp);
protected:
- HANDLE_NAMESPACE(GEOM_FieldStep) _impl;
+ Handle(::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_NAMESPACE(GEOM_FieldStep) theImpl);
+ GEOM_BoolFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::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_NAMESPACE(GEOM_FieldStep) theImpl);
+ GEOM_IntFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::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_NAMESPACE(GEOM_FieldStep) theImpl);
+ GEOM_DoubleFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::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_NAMESPACE(GEOM_FieldStep) theImpl);
+ GEOM_StringFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_FieldStep) theImpl);
virtual ::CORBA::Boolean SetValues(const ::GEOM::string_array& strValues);
virtual GEOM::string_array* GetValues();
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-// File : GEOM_GEOM_I.hxx
-// Author : Alexander A. BORODIN
-// Module : GEOM
-//
-#ifndef _GEOM_GEOM_I_HXX_
-#define _GEOM_GEOM_I_HXX_
+#ifndef GEOM_GEOM_I_HXX
+#define GEOM_GEOM_I_HXX
#ifdef WIN32
#if defined GEOM_I_EXPORTS || defined GEOMEngine_EXPORTS
#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_
+#endif // GEOM_GEOM_I_HXX
{
SALOMEDS::Study_var aStudy = theSObject->GetStudy();
- HANDLE_NAMESPACE(GEOM_BaseObject) anObject =
+ Handle(::GEOM_BaseObject) anObject =
_impl->GetObject(aStudy->StudyId(), aLocalPersistentID);
if ( !anObject.IsNull() )
{
{
// recieve current TopoDS shape
CORBA::String_var entry = aShape->GetEntry();
- HANDLE_NAMESPACE(GEOM_Object) aGShape = HANDLE_NAMESPACE(GEOM_Object)::DownCast
+ Handle(::GEOM_Object) aGShape = Handle(::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_NAMESPACE(GEOM_BaseObject) anObj = _impl->GetObject( aMainSh->GetStudyID(), entry );
+ Handle(::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_NAMESPACE(GEOM_Object) aMainShape = _impl->GetObject(theMainShape->GetStudyID(), entry);
+ //Handle(::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_NAMESPACE(GEOM_Object) HGrObj = _impl->GetObject(GrObj->GetStudyID(), GrEntry);
+ //Handle(::GEOM_Object) HGrObj = _impl->GetObject(GrObj->GetStudyID(), GrEntry);
// add named objects
- //HANDLE_NAMESPACE(GEOM_Object) anObj;
+ //Handle(::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_NAMESPACE(GEOM_Function) aFunction = anObj->AddFunction(GEOM_Object::GetSubShapeID(), 1);
+ //Handle(::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_NAMESPACE(GEOM_Object) aMainShape = HANDLE_NAMESPACE(GEOM_Object)::DownCast
+ Handle(::GEOM_Object) aMainShape = Handle(::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;
TCollection_AsciiString aNameWithExt("");
SALOMEDS::Study_var study = theComponent->GetStudy();
-#if OCC_VERSION_MAJOR > 6
// Get the file name.
int i;
int aLength = aSeq->length();
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);
//Create a new GEOM_Object
- HANDLE_NAMESPACE(GEOM_Object) anObj = _impl->AddObject(aNewSO->GetStudy()->StudyId(), theObjectID);
- HANDLE_NAMESPACE(GEOM_Function) aFunction = anObj->AddFunction(GEOMImpl_CopyDriver::GetID(), COPY_WITHOUT_REF);
+ Handle(::GEOM_Object) anObj = _impl->AddObject(aNewSO->GetStudy()->StudyId(), theObjectID);
+ Handle(::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_NAMESPACE(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry);
- HANDLE_NAMESPACE(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction();
+ Handle(::GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry);
+ Handle(::GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction();
anArgOTrsfFun->SetDescription("");
aSubO = aShapesOp->GetInPlace(theObject, anArgOTrsf);
}
/*
- HANDLE_NAMESPACE(GEOM_Function) anOFun = theObject->GetLastFunction();
+ Handle(::GEOM_Function) anOFun = theObject->GetLastFunction();
if (!anOFun.IsNull()) {
CORBA::String_var entryArg = anArgO->GetEntry();
- HANDLE_NAMESPACE(GEOM_Object) anArgOImpl = _impl->GetObject(anArgO->GetStudyID(), entryArg);
+ Handle(::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_NAMESPACE(GEOM_Function) anArgOMultiFun = anArgOMulti->GetLastFunction();
+ Handle(::GEOM_Function) anArgOMultiFun = anArgOMulti->GetLastFunction();
anArgOMultiFun->SetDescription("");
aSubO = aShapesOp->GetInPlace(theObject, anArgOMulti);
}
aResParts->length(nb);
if (nb > 0)
{
- HANDLE_NAMESPACE(GEOM_BaseObject) aMainObj = _impl->GetObject(theObject->GetStudyID(), theObject->GetEntry());
- HANDLE_NAMESPACE(GEOM_Function) aFunction = aMainObj->GetLastFunction();
+ Handle(::GEOM_BaseObject) aMainObj = _impl->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+ Handle(::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_NAMESPACE(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anEntry);
- HANDLE_NAMESPACE(GEOM_Function) anObjFun = aGeomObj->GetLastFunction();
+ Handle(::GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anEntry);
+ Handle(::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_NAMESPACE(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anObj->GetEntry());
+ Handle(::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_NAMESPACE(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry);
- HANDLE_NAMESPACE(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction();
+ Handle(::GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry);
+ Handle(::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_NAMESPACE(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry);
- HANDLE_NAMESPACE(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction();
+ Handle(::GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry);
+ Handle(::GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction();
anArgOTrsfFun->SetDescription("");
aSubO = aShapesOp->GetInPlace(theObject, anArgOTrsf);
}
aResParts->length(nb);
if (nb > 0)
{
- HANDLE_NAMESPACE(GEOM_BaseObject) aMainObj = _impl->GetObject(theObject->GetStudyID(), theObject->GetEntry());
- HANDLE_NAMESPACE(GEOM_Function) aFunction = aMainObj->GetLastFunction();
+ Handle(::GEOM_BaseObject) aMainObj = _impl->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+ Handle(::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_NAMESPACE(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anEntry);
- HANDLE_NAMESPACE(GEOM_Function) anObjFun = aGeomObj->GetLastFunction();
+ Handle(::GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anEntry);
+ Handle(::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_NAMESPACE(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anObj->GetEntry());
+ Handle(::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_NAMESPACE(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry);
- HANDLE_NAMESPACE(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction();
+ Handle(::GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry);
+ Handle(::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_NAMESPACE(GEOM_Object) aMainShape = HANDLE_NAMESPACE(GEOM_Object)::DownCast
+ Handle(::GEOM_Object) aMainShape = Handle(::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_NAMESPACE(GEOM_Object) anObject = _impl->AddSubShape(aMainShape, anArray, true);
+ Handle(::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_NAMESPACE(GEOM_BaseObject) anObject = _impl->GetObject(theObject->GetStudyID(), anEntry, false);
+ Handle(::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_NAMESPACE(GEOM_BaseObject) handle_object = _impl->GetObject(theStudyID, (char*)theEntry);
+ Handle(::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_NAMESPACE(GEOM_Field)::DownCast( handle_object ));
+ servant = new GEOM_Field_i (_poa, engine, Handle(::GEOM_Field)::DownCast( handle_object ));
break;
}
case GEOM_FIELD_STEP: {
- HANDLE_NAMESPACE(GEOM_FieldStep) step = HANDLE_NAMESPACE(GEOM_FieldStep)::DownCast( handle_object );
- HANDLE_NAMESPACE(GEOM_Field) field = step->GetField();
+ Handle(::GEOM_FieldStep) step = Handle(::GEOM_FieldStep)::DownCast( handle_object );
+ Handle(::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_NAMESPACE(GEOM_Object)::DownCast( handle_object ));
+ servant = new GEOM_Object_i (_poa, engine, Handle(::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_NAMESPACE(GEOM_Function) aFunction;
+ Handle(::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_NAMESPACE(GEOM_Function) aFunction;
+ Handle(::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_NAMESPACE(GEOM_BaseObject) handle_object = _impl->GetObject( theStudy->StudyId(), (*it).c_str(), false);
+ Handle(::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_NAMESPACE(GEOM_BaseObject) handle_object = _impl->GetObject( theStudy->StudyId(), aSelectedEntry.c_str(), false);
+ Handle(::GEOM_BaseObject) handle_object = _impl->GetObject( theStudy->StudyId(), aSelectedEntry.c_str(), false);
if ( handle_object.IsNull() )
return;
- HANDLE_NAMESPACE(GEOM_Function) aShapeFun = handle_object->GetFunction(1);
+ Handle(::GEOM_Function) aShapeFun = handle_object->GetFunction(1);
if ( aShapeFun.IsNull() || !aShapeFun->HasSubShapeReferences() )
return;
GetOperations()->SetNotDone();
//Create the Box
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeBoxDXDYDZ(theDX, theDY, theDZ);
+ Handle(::GEOM_Object) anObject = GetOperations()->MakeBoxDXDYDZ(theDX, theDY, theDZ);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
//Set a not done flag
GetOperations()->SetNotDone();
- HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
- HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
+ Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
+ Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
if (aPnt1.IsNull() || aPnt2.IsNull()) return aGEOMObject._retn();
//Create the Box
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeBoxTwoPnt(aPnt1, aPnt2);
+ Handle(::GEOM_Object) anObject = GetOperations()->MakeBoxTwoPnt(aPnt1, aPnt2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
return aGEOMObject._retn();
//Create the Face
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeFaceHW(theH, theW, theOrientation);
+ Handle(::GEOM_Object) anObject = GetOperations()->MakeFaceHW(theH, theW, theOrientation);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference object
- HANDLE_NAMESPACE(GEOM_Object) anObj = GetObjectImpl(theObj);
+ Handle(::GEOM_Object) anObj = GetObjectImpl(theObj);
if (anObj.IsNull())
return aGEOMObject._retn();
//Create the Face
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeFaceObjHW(anObj, theH, theW);
+ Handle(::GEOM_Object) anObject = GetOperations()->MakeFaceObjHW(anObj, theH, theW);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt);
- HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec);
+ Handle(::GEOM_Object) aPnt = GetObjectImpl(thePnt);
+ Handle(::GEOM_Object) aVec = GetObjectImpl(theVec);
if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn();
// Make Disk
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeDiskPntVecR(aPnt, aVec, theR);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
- HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
- HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
+ Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
+ Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
+ Handle(::GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn();
// Make Disk
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeDiskThreePnt(aPnt1, aPnt2, aPnt3);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
return aGEOMObject._retn();
//Create the Face
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeDiskR(theR, theOrientation);
+ Handle(::GEOM_Object) anObject = GetOperations()->MakeDiskR(theR, theOrientation);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Create the Cylinder
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeCylinderRH(theR, theH);
+ Handle(::GEOM_Object) anObject = GetOperations()->MakeCylinderRH(theR, theH);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Create the Cylinder
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeCylinderRHA(theR, theH, theA);
+ Handle(::GEOM_Object) anObject = GetOperations()->MakeCylinderRHA(theR, theH, theA);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt);
- HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec);
+ Handle(::GEOM_Object) aPnt = GetObjectImpl(thePnt);
+ Handle(::GEOM_Object) aVec = GetObjectImpl(theVec);
if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn();
//Create the Cylinder
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeCylinderPntVecRH(aPnt, aVec, theR, theH);
+ Handle(::GEOM_Object) anObject = GetOperations()->MakeCylinderPntVecRH(aPnt, aVec, theR, theH);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt);
- HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec);
+ Handle(::GEOM_Object) aPnt = GetObjectImpl(thePnt);
+ Handle(::GEOM_Object) aVec = GetObjectImpl(theVec);
if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn();
//Create the Cylinder
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeCylinderPntVecRHA(aPnt, aVec, theR, theH, theA);
+ Handle(::GEOM_Object) anObject = GetOperations()->MakeCylinderPntVecRHA(aPnt, aVec, theR, theH, theA);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Create the Cone
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeConeR1R2H(theR1, theR2, theH);
+ Handle(::GEOM_Object) anObject = GetOperations()->MakeConeR1R2H(theR1, theR2, theH);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt);
- HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec);
+ Handle(::GEOM_Object) aPnt = GetObjectImpl(thePnt);
+ Handle(::GEOM_Object) aVec = GetObjectImpl(theVec);
if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn();
//Create the Cone
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeConePntVecR1R2H(aPnt, aVec, theR1, theR2, theH);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Create the Cone
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeSphereR(theR);
+ Handle(::GEOM_Object) anObject = GetOperations()->MakeSphereR(theR);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference point
- HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt);
+ Handle(::GEOM_Object) aPnt = GetObjectImpl(thePnt);
if (aPnt.IsNull()) return aGEOMObject._retn();
//Create the Sphere
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeSpherePntR(aPnt, theR);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
// Make Torus
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeTorusRR(theRMajor, theRMinor);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt);
- HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec);
+ Handle(::GEOM_Object) aPnt = GetObjectImpl(thePnt);
+ Handle(::GEOM_Object) aVec = GetObjectImpl(theVec);
if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn();
// Make Torus
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeTorusPntVecRR(aPnt, aVec, theRMajor, theRMinor);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
- HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec);
+ Handle(::GEOM_Object) aBase = GetObjectImpl(theBase);
+ Handle(::GEOM_Object) aVec = GetObjectImpl(theVec);
if (aBase.IsNull() || aVec.IsNull()) return aGEOMObject._retn();
//Create the Prism
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakePrismVecH(aBase, aVec, theH);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
- HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec);
+ Handle(::GEOM_Object) aBase = GetObjectImpl(theBase);
+ Handle(::GEOM_Object) aVec = GetObjectImpl(theVec);
if (aBase.IsNull() || aVec.IsNull()) return aGEOMObject._retn();
//Create the Prism
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakePrismVecH2Ways(aBase, aVec, theH);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
- HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec);
+ Handle(::GEOM_Object) aBase = GetObjectImpl(theBase);
+ Handle(::GEOM_Object) aVec = GetObjectImpl(theVec);
if (aBase.IsNull() || aVec.IsNull()) return aGEOMObject._retn();
//Create the Prism
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakePrismVecH(aBase, aVec, theH, theScaleFactor);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
- HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
- HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
+ Handle(::GEOM_Object) aBase = GetObjectImpl(theBase);
+ Handle(::GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
+ Handle(::GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
if (aBase.IsNull() || aPoint1.IsNull() || aPoint2.IsNull())
return aGEOMObject._retn();
//Create the Prism
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakePrismTwoPnt(aBase, aPoint1, aPoint2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
- HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
- HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
+ Handle(::GEOM_Object) aBase = GetObjectImpl(theBase);
+ Handle(::GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
+ Handle(::GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
if (aBase.IsNull() || aPoint1.IsNull() || aPoint2.IsNull())
return aGEOMObject._retn();
//Create the Prism
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakePrismTwoPnt2Ways(aBase, aPoint1, aPoint2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
- HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
- HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
+ Handle(::GEOM_Object) aBase = GetObjectImpl(theBase);
+ Handle(::GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
+ Handle(::GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
if (aBase.IsNull() || aPoint1.IsNull() || aPoint2.IsNull())
return aGEOMObject._retn();
//Create the Prism
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakePrismTwoPnt(aBase, aPoint1, aPoint2, theScaleFactor);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
+ Handle(::GEOM_Object) aBase = GetObjectImpl(theBase);
if (aBase.IsNull()) return aGEOMObject._retn();
//Create the Prism
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakePrismDXDYDZ(aBase, theDX, theDY, theDZ);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
+ Handle(::GEOM_Object) aBase = GetObjectImpl(theBase);
if (aBase.IsNull()) return aGEOMObject._retn();
//Create the Prism
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakePrismDXDYDZ2Ways(aBase, theDX, theDY, theDZ);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
+ Handle(::GEOM_Object) aBase = GetObjectImpl(theBase);
if (aBase.IsNull()) return aGEOMObject._retn();
//Create the Prism
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) aInit = GetObjectImpl(theInitShape);
- HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
+ Handle(::GEOM_Object) aInit = GetObjectImpl(theInitShape);
+ Handle(::GEOM_Object) aBase = GetObjectImpl(theBase);
if (aBase.IsNull() || aInit.IsNull()) return aGEOMObject._retn();
//Create the Prism
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeDraftPrism(aInit, aBase, theHeight, theAngle, theFuse, theInvert);
+ Handle(::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_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
- HANDLE_NAMESPACE(GEOM_Object) aPath = GetObjectImpl(thePath);
+ Handle(::GEOM_Object) aBase = GetObjectImpl(theBase);
+ Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
- HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis);
+ Handle(::GEOM_Object) aBase = GetObjectImpl(theBase);
+ Handle(::GEOM_Object) anAxis = GetObjectImpl(theAxis);
if (aBase.IsNull() || anAxis.IsNull()) return aGEOMObject._retn();
//Create the Revolution
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeRevolutionAxisAngle(aBase, anAxis, theAngle);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
- HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis);
+ Handle(::GEOM_Object) aBase = GetObjectImpl(theBase);
+ Handle(::GEOM_Object) anAxis = GetObjectImpl(theAxis);
if (aBase.IsNull() || anAxis.IsNull()) return aGEOMObject._retn();
//Create the Revolution
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) > aShapes;
+ std::list< Handle(::GEOM_Object) > aShapes;
if (! GetListOfObjectsImpl( theContours, aShapes ))
return aGEOMObject._retn();
}
//Create the Solid
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeFilling
+ Handle(::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_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theSeqSections[ind]);
+ Handle(::GEOM_Object) aSh = GetObjectImpl(theSeqSections[ind]);
if (!aSh.IsNull())
aSeqSections->Append(aSh);
}
return aGEOMObject._retn();
// Make shell or solid
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) aPath = GetObjectImpl(thePath);
+ Handle(::GEOM_Object) aPath = GetObjectImpl(thePath);
if (aPath.IsNull())
return aSeq._retn();
for (ind = 0; ind < aNbBases; ind++) {
- HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBases[ind]);
+ Handle(::GEOM_Object) aBase = GetObjectImpl(theBases[ind]);
if (aBase.IsNull())
continue;
if (aNbLocs)
{
- HANDLE_NAMESPACE(GEOM_Object) aLoc = GetObjectImpl(theLocations[ind]);
+ Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
if (aNbLocs && aNbBases != aNbLocs)
return aSeq._retn();
- HANDLE_NAMESPACE(GEOM_Object) aPath = GetObjectImpl(thePath);
+ Handle(::GEOM_Object) aPath = GetObjectImpl(thePath);
if (aPath.IsNull())
return aSeq._retn();
for (ind = 0; ind < aNbBases; ind++) {
- HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBases[ind]);
+ Handle(::GEOM_Object) aBase = GetObjectImpl(theBases[ind]);
if (aBase.IsNull())
continue;
if (aNbLocs) {
- HANDLE_NAMESPACE(GEOM_Object) aLoc = GetObjectImpl(theLocations[ind]);
+ Handle(::GEOM_Object) aLoc = GetObjectImpl(theLocations[ind]);
if (aLoc.IsNull())
continue;
aSeqLocations->Append(aLoc);
aSeqBases->Append(aBase);
if (aNbSubBases >= aNbBases) {
- HANDLE_NAMESPACE(GEOM_Object) aSubBase = GetObjectImpl(theSubBases[ind]);
+ Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
return aSeq._retn();
for (ind = 0; ind < aNbBases; ind++) {
- HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBases[ind]);
+ Handle(::GEOM_Object) aBase = GetObjectImpl(theBases[ind]);
if (aBase.IsNull())
continue;
if (aNbLocs) {
- HANDLE_NAMESPACE(GEOM_Object) aLoc = GetObjectImpl(theLocations[ind]);
+ Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase);
- HANDLE_NAMESPACE(GEOM_Object) aPath = GetObjectImpl(thePath);
- HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec);
+ Handle(::GEOM_Object) aBase = GetObjectImpl(theBase);
+ Handle(::GEOM_Object) aPath = GetObjectImpl(thePath);
+ Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
//Get the basic object
- HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
// Get faces IDs.
//Create the thickened shape
if (doCopy)
{
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeThickening(
+ Handle(::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_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) aBase1 = GetObjectImpl(theBase1);
- HANDLE_NAMESPACE(GEOM_Object) aBase2 = GetObjectImpl(theBase2);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aBase1 = GetObjectImpl(theBase1);
+ Handle(::GEOM_Object) aBase2 = GetObjectImpl(theBase2);
if (aShape.IsNull() || aBase1.IsNull() || aBase2.IsNull()) return aGEOMObject._retn();
// Create the Path
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->RestorePath(aShape, aBase1, aBase2);
+ Handle(::GEOM_Object) anObject = GetOperations()->RestorePath(aShape, aBase1, aBase2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
// Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::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_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase1[ind]);
+ Handle(::GEOM_Object) aBase = GetObjectImpl(theBase1[ind]);
if (!aBase.IsNull())
aSeqBases1->Append(aBase);
}
for (ind = 0; ind < aNbBases2; ind++) {
- HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase2[ind]);
+ Handle(::GEOM_Object) aBase = GetObjectImpl(theBase2[ind]);
if (!aBase.IsNull())
aSeqBases2->Append(aBase);
}
return aGEOMObject._retn();
// Create the Path
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->RestorePath(aShape, aSeqBases1, aSeqBases2);
+ Handle(::GEOM_Object) anObject = GetOperations()->RestorePath(aShape, aSeqBases1, aSeqBases2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Create the point
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakePointXYZ(theX, theY, theZ);
+ Handle(::GEOM_Object) anObject = GetOperations()->MakePointXYZ(theX, theY, theZ);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference point
- HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theReference);
+ Handle(::GEOM_Object) aReference = GetObjectImpl(theReference);
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the point
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakePointWithReference(aReference, theX, theY, theZ);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Lines
- HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(theLine1);
- HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theLine2);
+ Handle(::GEOM_Object) aRef1 = GetObjectImpl(theLine1);
+ Handle(::GEOM_Object) aRef2 = GetObjectImpl(theLine2);
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the point
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakePointOnLinesIntersection(aRef1, aRef2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference curve
- HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theCurve);
+ Handle(::GEOM_Object) aReference = GetObjectImpl(theCurve);
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the point
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakePointOnCurve
+ Handle(::GEOM_Object) anObject = GetOperations()->MakePointOnCurve
(aReference, theParameter, takeOrientationIntoAccount);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference curve
- HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theCurve);
+ Handle(::GEOM_Object) aReference = GetObjectImpl(theCurve);
if (aReference.IsNull()) return aGEOMObject._retn();
//Get the reference point (can be NULL)
- HANDLE_NAMESPACE(GEOM_Object) aRefPoint;
+ Handle(::GEOM_Object) aRefPoint;
if (!CORBA::is_nil(theStartPoint)) {
aRefPoint = GetObjectImpl(theStartPoint);
}
//Create the point
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakePointOnCurveByLength(aReference, theLength, aRefPoint);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference curve
- HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theCurve);
+ Handle(::GEOM_Object) aReference = GetObjectImpl(theCurve);
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the point
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakePointOnCurveByCoord(aReference, theXParameter,
theYParameter, theZParameter);
if (!GetOperations()->IsDone() || anObject.IsNull())
GetOperations()->SetNotDone();
//Get the reference surface
- HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theSurface);
+ Handle(::GEOM_Object) aReference = GetObjectImpl(theSurface);
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the point
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakePointOnSurface(aReference, theUParameter, theVParameter);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference surface
- HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theSurface);
+ Handle(::GEOM_Object) aReference = GetObjectImpl(theSurface);
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the point
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakePointOnSurfaceByCoord(aReference, theXParameter,
theYParameter, theZParameter);
if (!GetOperations()->IsDone() || anObject.IsNull())
GetOperations()->SetNotDone();
//Get the reference face
- HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theFace);
+ Handle(::GEOM_Object) aReference = GetObjectImpl(theFace);
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the point
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakePointOnFace(aReference);
+ Handle(::GEOM_Object) anObject = GetOperations()->MakePointOnFace(aReference);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference curve
- HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theCurve);
+ Handle(::GEOM_Object) aReference = GetObjectImpl(theCurve);
if (aReference.IsNull()) return aGEOMObject._retn();
//Create the vector
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeTangentOnCurve(aReference, theParameter);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
//Create the Vector
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeVectorDXDYDZ(theDX, theDY, theDZ);
+ Handle(::GEOM_Object) anObject = GetOperations()->MakeVectorDXDYDZ(theDX, theDY, theDZ);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(thePnt1);
- HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(thePnt2);
+ Handle(::GEOM_Object) aRef1 = GetObjectImpl(thePnt1);
+ Handle(::GEOM_Object) aRef2 = GetObjectImpl(thePnt2);
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the vector
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeVectorTwoPnt(aRef1, aRef2);
+ Handle(::GEOM_Object) anObject = GetOperations()->MakeVectorTwoPnt(aRef1, aRef2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(thePnt);
- HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theDir);
+ Handle(::GEOM_Object) aRef1 = GetObjectImpl(thePnt);
+ Handle(::GEOM_Object) aRef2 = GetObjectImpl(theDir);
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the Line
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeLine(aRef1, aRef2);
+ Handle(::GEOM_Object) anObject = GetOperations()->MakeLine(aRef1, aRef2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(thePnt1);
- HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(thePnt2);
+ Handle(::GEOM_Object) aRef1 = GetObjectImpl(thePnt1);
+ Handle(::GEOM_Object) aRef2 = GetObjectImpl(thePnt2);
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the Line
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeLineTwoPnt(aRef1, aRef2);
+ Handle(::GEOM_Object) anObject = GetOperations()->MakeLineTwoPnt(aRef1, aRef2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(theFace1);
- HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theFace2);
+ Handle(::GEOM_Object) aRef1 = GetObjectImpl(theFace1);
+ Handle(::GEOM_Object) aRef2 = GetObjectImpl(theFace2);
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the Line
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeLineTwoFaces(aRef1, aRef2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the references
- HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(thePnt);
- HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theVec);
+ Handle(::GEOM_Object) aRef1 = GetObjectImpl(thePnt);
+ Handle(::GEOM_Object) aRef2 = GetObjectImpl(theVec);
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the plane
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakePlanePntVec(aRef1, aRef2, theTrimSize);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(thePnt1);
- HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(thePnt2);
- HANDLE_NAMESPACE(GEOM_Object) aRef3 = GetObjectImpl(thePnt3);
+ Handle(::GEOM_Object) aRef1 = GetObjectImpl(thePnt1);
+ Handle(::GEOM_Object) aRef2 = GetObjectImpl(thePnt2);
+ Handle(::GEOM_Object) aRef3 = GetObjectImpl(thePnt3);
if (aRef1.IsNull() || aRef2.IsNull() || aRef3.IsNull())
return aGEOMObject._retn();
//Create the plane
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakePlaneThreePnt(aRef1, aRef2, aRef3, theTrimSize);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference face
- HANDLE_NAMESPACE(GEOM_Object) aRef = GetObjectImpl(theFace);
+ Handle(::GEOM_Object) aRef = GetObjectImpl(theFace);
if (aRef.IsNull()) return aGEOMObject._retn();
//Create the plane
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakePlaneFace(aRef, theTrimSize);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the references
- HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(theVec1);
- HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theVec2);
+ Handle(::GEOM_Object) aRef1 = GetObjectImpl(theVec1);
+ Handle(::GEOM_Object) aRef2 = GetObjectImpl(theVec2);
if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn();
//Create the plane
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakePlane2Vec(aRef1, aRef2, theTrimSize);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the references
- HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(theLCS);
+ Handle(::GEOM_Object) aRef1 = GetObjectImpl(theLCS);
//Create the plane
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakePlaneLCS(aRef1, theTrimSize, theOrientation);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Create the point
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeMarker(theOX , theOY , theOZ,
+ Handle(::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_NAMESPACE(GEOM_Object) aRef = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aRef = GetObjectImpl(theShape);
if (aRef.IsNull()) return aGEOMObject._retn();
//Create the point
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeMarkerFromShape(aRef);
+ Handle(::GEOM_Object) anObject = GetOperations()->MakeMarkerFromShape(aRef);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the referenced objects
- HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(theOrigin);
- HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theXVec);
- HANDLE_NAMESPACE(GEOM_Object) aRef3 = GetObjectImpl(theYVec);
+ Handle(::GEOM_Object) aRef1 = GetObjectImpl(theOrigin);
+ Handle(::GEOM_Object) aRef2 = GetObjectImpl(theXVec);
+ Handle(::GEOM_Object) aRef3 = GetObjectImpl(theYVec);
if (aRef1.IsNull() || aRef2.IsNull() || aRef3.IsNull()) return aGEOMObject._retn();
//Create the point
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeMarkerPntTwoVec(aRef1,
+ Handle(::GEOM_Object) anObject = GetOperations()->MakeMarkerPntTwoVec(aRef1,
aRef2,
aRef3);
if (!GetOperations()->IsDone() || anObject.IsNull())
GetOperations()->SetNotDone();
//Get the reference face
- HANDLE_NAMESPACE(GEOM_Object) aRef = GetObjectImpl(theFace);
+ Handle(::GEOM_Object) aRef = GetObjectImpl(theFace);
if (aRef.IsNull()) return aGEOMObject._retn();
//Create the plane
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeTangentPlaneOnFace(aRef, theParameterU,theParameterV,theTrimSize);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference edges
- 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);
+ Handle(::GEOM_Object) anEdge1 = GetObjectImpl(theEdge1);
+ Handle(::GEOM_Object) anEdge2 = GetObjectImpl(theEdge2);
+ Handle(::GEOM_Object) anEdge3 = GetObjectImpl(theEdge3);
+ Handle(::GEOM_Object) anEdge4 = GetObjectImpl(theEdge4);
if (anEdge1.IsNull() || anEdge2.IsNull() ||
anEdge3.IsNull() || anEdge4.IsNull()) return aGEOMObject._retn();
//Create the Face
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeQuad(anEdge1, anEdge2, anEdge3, anEdge4);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference edges
- HANDLE_NAMESPACE(GEOM_Object) anEdge1 = GetObjectImpl(theEdge1);
- HANDLE_NAMESPACE(GEOM_Object) anEdge2 = GetObjectImpl(theEdge2);
+ Handle(::GEOM_Object) anEdge1 = GetObjectImpl(theEdge1);
+ Handle(::GEOM_Object) anEdge2 = GetObjectImpl(theEdge2);
if (anEdge1.IsNull() || anEdge2.IsNull()) return aGEOMObject._retn();
//Create the Face
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeQuad2Edges(anEdge1, anEdge2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- 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);
+ Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
+ Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
+ Handle(::GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
+ Handle(::GEOM_Object) aPnt4 = GetObjectImpl(thePnt4);
if (aPnt1.IsNull() || aPnt2.IsNull() ||
aPnt3.IsNull() || aPnt4.IsNull()) return aGEOMObject._retn();
//Create the Face
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeQuad4Vertices(aPnt1, aPnt2, aPnt3, aPnt4);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Faces
- 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);
+ 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);
if (anFace1.IsNull() || anFace2.IsNull() ||
anFace3.IsNull() || anFace4.IsNull() ||
anFace5.IsNull() || anFace6.IsNull()) return aGEOMObject._retn();
//Create the Face
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeHexa
+ Handle(::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_NAMESPACE(GEOM_Object) anFace1 = GetObjectImpl(theFace1);
- HANDLE_NAMESPACE(GEOM_Object) anFace2 = GetObjectImpl(theFace2);
+ Handle(::GEOM_Object) anFace1 = GetObjectImpl(theFace1);
+ Handle(::GEOM_Object) anFace2 = GetObjectImpl(theFace2);
if (anFace1.IsNull() || anFace2.IsNull()) return aGEOMObject._retn();
//Create the Face
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeHexa2Faces(anFace1, anFace2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Compound
- HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound);
+ Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound);
if (aCompound.IsNull()) return aGEOMObject._retn();
//Create the Blocks Compound
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeBlockCompound(aCompound);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aGEOMObject._retn();
//Create the Point
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint);
if (aShape.IsNull() || aPoint.IsNull()) return aGEOMObject._retn();
// Create the Point
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->GetVertexNearPoint(aShape, aPoint);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
- HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
+ Handle(::GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
if (aShape.IsNull() ||
aPoint1.IsNull() || aPoint2.IsNull()) return aGEOMObject._retn();
//Create the Point
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->GetEdge(aShape, aPoint1, aPoint2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint);
if (aShape.IsNull() || aPoint.IsNull()) return aGEOMObject._retn();
//Create the Edge
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->GetEdgeNearPoint(aShape, aPoint);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Objects
- 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);
+ 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);
if (aShape.IsNull() ||
aPoint1.IsNull() || aPoint2.IsNull() ||
aPoint3.IsNull() || aPoint4.IsNull()) return aGEOMObject._retn();
//Create the Face
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) anEdge1 = GetObjectImpl(theEdge1);
- HANDLE_NAMESPACE(GEOM_Object) anEdge2 = GetObjectImpl(theEdge2);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) anEdge1 = GetObjectImpl(theEdge1);
+ Handle(::GEOM_Object) anEdge2 = GetObjectImpl(theEdge2);
if (aShape.IsNull() ||
anEdge1.IsNull() || anEdge2.IsNull()) return aGEOMObject._retn();
//Create the Face
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->GetFaceByEdges(aShape, anEdge1, anEdge2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aFace = GetObjectImpl(theFace);
if (aShape.IsNull() || aFace.IsNull()) return aGEOMObject._retn();
//Create the Face
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->GetOppositeFace(aShape, aFace);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint);
if (aShape.IsNull() || aPoint.IsNull()) return aGEOMObject._retn();
//Create the Face
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->GetFaceNearPoint(aShape, aPoint);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aVector = GetObjectImpl(theVector);
if (aShape.IsNull() || aVector.IsNull()) return aGEOMObject._retn();
//Create the Face
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->GetFaceByNormale(aShape, aVector);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
// Get the reference Objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint);
if (aShape.IsNull() || aPoint.IsNull()) return aGEOMObject._retn();
// Create the Shape
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->GetShapesNearPoint(aShape, aPoint, theShapeType, theTolerance);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Compound
- HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound);
+ Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference Compound
- HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound);
+ Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound);
if (aCompound.IsNull()) return isComp;
//Check
GetOperations()->SetNotDone();
//Get the reference Compound
- HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound);
+ Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound);
if (aCompound.IsNull()) return isComp;
//Check
const GEOM::GEOM_IBlocksOperations::BCErrors& theErrors)
{
//Get the reference Compound
- HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound);
+ Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound);
if (aCompound.IsNull()) return NULL;
// Convert the errors sequence
GetOperations()->SetNotDone();
//Get the reference Objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aGEOMObject._retn();
//Get the result
- HANDLE_NAMESPACE(GEOM_Object) aFaces;
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) aFaces;
+ Handle(::GEOM_Object) anObject =
GetOperations()->GetNonBlocks(aShape, theToleranceC1, aFaces);
if (!GetOperations()->IsDone())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aGEOMObject._retn();
//Get the result
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->RemoveExtraEdges(aShape, theOptimumNbFaces);
+ Handle(::GEOM_Object) anObject = GetOperations()->RemoveExtraEdges(aShape, theOptimumNbFaces);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aGEOMObject._retn();
//Get the result
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->UnionFaces(aShape);
+ Handle(::GEOM_Object) anObject = GetOperations()->UnionFaces(aShape);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Objects
- HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound);
+ Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound);
if (aCompound.IsNull()) return aGEOMObject._retn();
//Get the result
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->CheckAndImprove(aCompound);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Objects
- HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound);
- HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint);
+ Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound);
+ Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint);
if (aCompound.IsNull() || aPoint.IsNull()) return aGEOMObject._retn();
//Get the block
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->GetBlockNearPoint(aCompound, aPoint);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Compound
- HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound);
+ Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound);
if (aCompound.IsNull()) return aGEOMObject._retn();
//Get the parts
aLen = theParts.length();
for (ind = 0; ind < aLen; ind++) {
- HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theParts[ind]);
+ Handle(::GEOM_Object) aSh = GetObjectImpl(theParts[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aParts->Append(aSh);
}
//Get the Block
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->GetBlockByParts(aCompound, aParts);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference Compound
- HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound);
+ Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound);
if (aCompound.IsNull()) return aSeq._retn();
//Get the parts
aLen = theParts.length();
for (ind = 0; ind < aLen; ind++) {
- HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theParts[ind]);
+ Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the object itself and the vector of translation
- HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theBlock);
+ Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theBlock);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Perform the transformation
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeMultiTransformation1D
+ Handle(::GEOM_Object) anObject = GetOperations()->MakeMultiTransformation1D
(aBasicObject, theDirFace1, theDirFace2, theNbTimes);
if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the object itself
- HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theBlock);
+ Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theBlock);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Perform the transformation
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeMultiTransformation2D
+ Handle(::GEOM_Object) anObject = GetOperations()->MakeMultiTransformation2D
(aBasicObject,
theDirFace1U, theDirFace2U, theNbTimesU,
theDirFace1V, theDirFace2V, theNbTimesV);
GetOperations()->SetNotDone();
//Get the reference Shape
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference shapes
- HANDLE_NAMESPACE(GEOM_Object) aSh1 = GetObjectImpl(theShape1);
- HANDLE_NAMESPACE(GEOM_Object) aSh2 = GetObjectImpl(theShape2);
+ Handle(::GEOM_Object) aSh1 = GetObjectImpl(theShape1);
+ Handle(::GEOM_Object) aSh2 = GetObjectImpl(theShape2);
if (aSh1.IsNull() || aSh2.IsNull()) return aGEOMObject._retn();
// Make Boolean
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeBoolean(aSh1, aSh2, theOp, IsCheckSelfInte);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference shapes
- HANDLE_NAMESPACE(GEOM_Object) aSh1 = GetObjectImpl(theShape1);
- HANDLE_NAMESPACE(GEOM_Object) aSh2 = GetObjectImpl(theShape2);
+ Handle(::GEOM_Object) aSh1 = GetObjectImpl(theShape1);
+ Handle(::GEOM_Object) aSh2 = GetObjectImpl(theShape2);
if (aSh1.IsNull() || aSh2.IsNull()) return aGEOMObject._retn();
// Make Boolean
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeFuse
+ Handle(::GEOM_Object) anObject = GetOperations()->MakeFuse
(aSh1, aSh2, IsCheckSelfInte, IsRmExtraEdges);
if (!GetOperations()->IsDone() || anObject.IsNull())
}
// Make fusion
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeFuseList(aShapes, IsCheckSelfInte, IsRmExtraEdges);
if (!GetOperations()->IsDone() || anObject.IsNull())
}
// Make fusion
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeCommonList(aShapes, IsCheckSelfInte);
if (!GetOperations()->IsDone() || anObject.IsNull())
//Set a not done flag
GetOperations()->SetNotDone();
- HANDLE_NAMESPACE(GEOM_Object) aMainShape = GetObjectImpl(theMainShape);
+ Handle(::GEOM_Object) aMainShape = GetObjectImpl(theMainShape);
if (aMainShape.IsNull()) {
return aGEOMObject._retn();
}
// Make fusion
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeCutList(aMainShape, aShapes, IsCheckSelfInte);
if (!GetOperations()->IsDone() || anObject.IsNull())
}
// Make Partition
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakePartition(aShapes, aTools, aKeepIns, aRemIns,
theLimit, theRemoveWebs, aMaterials,
theKeepNonlimitShapes,
}
// Make Partition
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakePartition(aShapes, aTools, aKeepIns, aRemIns,
theLimit, theRemoveWebs, aMaterials,
theKeepNonlimitShapes,
GetOperations()->SetNotDone();
//Get the reference shapes
- HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) aPl = GetObjectImpl(thePlane);
+ Handle(::GEOM_Object) aSh = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aPl = GetObjectImpl(thePlane);
if (aSh.IsNull() || aPl.IsNull()) return aGEOMObject._retn();
// Make Half Partition
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) aPnt, aVec;
+ Handle(::GEOM_Object) aPnt, aVec;
if (!CORBA::is_nil(thePnt)) {
aPnt = GetObjectImpl(thePnt);
if (aPnt.IsNull()) return aGEOMObject._retn();
}
// Make Circle
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeCirclePntVecR(aPnt, aVec, theR);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
- HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
- HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
+ Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
+ Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
+ Handle(::GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn();
// Make Circle
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeCircleThreePnt(aPnt1, aPnt2, aPnt3);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
- HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
- HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
+ Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
+ Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
+ Handle(::GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn();
// Make Circle
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeCircleCenter2Pnt(aPnt1, aPnt2, aPnt3);
+ Handle(::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_NAMESPACE(GEOM_Object) aPnt, aVec, aVecMaj;
+ Handle(::GEOM_Object) aPnt, aVec, aVecMaj;
if (!CORBA::is_nil(thePnt)) {
aPnt = GetObjectImpl(thePnt);
if (aPnt.IsNull()) return aGEOMObject._retn();
}
// Make Ellipse
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) aPnt, aVec, aVecMaj;
+ Handle(::GEOM_Object) aPnt, aVec, aVecMaj;
if (!CORBA::is_nil(thePnt)) {
aPnt = GetObjectImpl(thePnt);
if (aPnt.IsNull()) return aGEOMObject._retn();
}
// Make Ellipse
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
- HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
- HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
+ Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
+ Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
+ Handle(::GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn();
// Make Arc
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeArc(aPnt1, aPnt2, aPnt3);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
- HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
- HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
+ Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
+ Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
+ Handle(::GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn();
// Make ArcCenter
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeArcCenter(aPnt1, aPnt2, aPnt3,theSense);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference points
- HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
- HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
- HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
+ Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
+ Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
+ Handle(::GEOM_Object) aPnt3 = GetObjectImpl(thePnt3);
if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn();
// Make Arc
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object)> aPoints;
+ std::list<Handle(::GEOM_Object)> aPoints;
for (; ind < aLen; ind++) {
- HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]);
+ Handle(::GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]);
if (aPnt.IsNull()) return aGEOMObject._retn();
aPoints.push_back(aPnt);
}
// Make Polyline
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object)> aPoints;
+ std::list<Handle(::GEOM_Object)> aPoints;
for (; ind < aLen; ind++) {
- HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]);
+ Handle(::GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]);
if (aPnt.IsNull()) return aGEOMObject._retn();
aPoints.push_back(aPnt);
}
// Make Bezier curve
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object)> aPoints;
+ std::list<Handle(::GEOM_Object)> aPoints;
for (; ind < aLen; ind++) {
- HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]);
+ Handle(::GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]);
if (aPnt.IsNull()) return aGEOMObject._retn();
aPoints.push_back(aPnt);
}
// Make Polyline
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object)> aPoints;
+ std::list<Handle(::GEOM_Object)> aPoints;
for (; ind < aLen; ind++) {
- HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]);
+ Handle(::GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]);
if (aPnt.IsNull()) return aGEOMObject._retn();
aPoints.push_back(aPnt);
}
//Get the reference vectors
- HANDLE_NAMESPACE(GEOM_Object) aVec1 = GetObjectImpl(theFirstVec);
- HANDLE_NAMESPACE(GEOM_Object) aVec2 = GetObjectImpl(theLastVec);
+ Handle(::GEOM_Object) aVec1 = GetObjectImpl(theFirstVec);
+ Handle(::GEOM_Object) aVec2 = GetObjectImpl(theLastVec);
if (aVec1.IsNull() || aVec2.IsNull()) return aGEOMObject._retn();
// Make Polyline
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeSplineInterpolWithTangents(aPoints, aVec1, aVec2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
}
// Make Polyline
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeCurveParametric(thexExpr, theyExpr, thezExpr,
theParamMin, theParamMax,
theParamStep, aType);
}
// Make Polyline
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeCurveParametric(thexExpr, theyExpr, thezExpr,
theParamMin, theParamMax,
0.0, aType, theParamNbStep, true);
//Set a not done flag
GetOperations()->SetNotDone();
- HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace);
+ Handle(::GEOM_Object) aFace = GetObjectImpl(theFace);
// Make isoline
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeIsoline(aFace, IsUIsoline, theParameter);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
aWorkingPlane.push_back(theWorkingPlane[ind]);
// Make Sketcher
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) aWorkingPlane = GetObjectImpl(theWorkingPlane);
+ Handle(::GEOM_Object) aWorkingPlane = GetObjectImpl(theWorkingPlane);
// Make Sketcher
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeSketcherOnPlane(theCommand, aWorkingPlane);
if (!GetOperations()->IsDone() || anObject.IsNull())
return GEOM::GEOM_Object::_nil();
GetOperations()->SetNotDone();
// Make 3D Sketcher
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Make3DSketcherCommand(theCommand);
+ Handle(::GEOM_Object) anObject = GetOperations()->Make3DSketcherCommand(theCommand);
if (!GetOperations()->IsDone() || anObject.IsNull())
return GEOM::GEOM_Object::_nil();
aCoords.push_back(theCoordinates[ind]);
// Make Sketcher
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->Make3DSketcher(aCoords);
if (!GetOperations()->IsDone() || anObject.IsNull())
return GEOM::GEOM_Object::_nil();
}
// Make Polyline
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakePolyline2D
+ Handle(::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_NAMESPACE(GEOM_Object) aWorkingPlane =
+ Handle(::GEOM_Object) aWorkingPlane =
GetObjectImpl(theWorkingPlane);
ConvertListListDouble(theCoordsList, aCoords);
// Make Polyline
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakePolyline2DOnPlane
+ Handle(::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_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl( theShape );
- HANDLE_NAMESPACE(GEOM_Field) aFieldRef = GetOperations()->CreateField( aShapeRef,
+ Handle(::GEOM_Object) aShapeRef = GetObjectImpl( theShape );
+ Handle(::GEOM_Field) aFieldRef = GetOperations()->CreateField( aShapeRef,
theName,
(int) theType,
theDimension,
CORBA::Long GEOM_IFieldOperations_i::CountFields( GEOM::GEOM_Object_ptr shape)
{
- HANDLE_NAMESPACE(GEOM_Object) go = GetObjectImpl( shape );
+ Handle(::GEOM_Object) go = GetObjectImpl( shape );
return ( CORBA::Long) GetOperations()->CountFields( go );
}
{
GEOM::ListOfFields_var fields = new GEOM::ListOfFields;
- HANDLE_NAMESPACE(GEOM_Object) go = GetObjectImpl( shape );
+ Handle(::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_NAMESPACE(GEOM_Field) f = HANDLE_NAMESPACE(GEOM_Field)::DownCast( seq->Value( i ));
+ Handle(::GEOM_Field) f = Handle(::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_NAMESPACE(GEOM_Object) go = GetObjectImpl( shape );
+ Handle(::GEOM_Object) go = GetObjectImpl( shape );
- HANDLE_NAMESPACE(GEOM_Field) f = GetOperations()->GetField( go, name );
+ Handle(::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_NAMESPACE(GEOM_Object) go = GetObjectImpl( shape );
+ Handle(::GEOM_Object) go = GetObjectImpl( shape );
return GEOM_Field::GetNbSubShapes( go, fieldDim );
}
if (theShapeType < 0) return aGEOMObject._retn();
//Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theMainShape);
+ Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theMainShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Create the Fillet
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->CreateGroup(aShapeRef, (TopAbs_ShapeEnum)theShapeType);
+ Handle(::GEOM_Object) anObject = GetOperations()->CreateGroup(aShapeRef, (TopAbs_ShapeEnum)theShapeType);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference group
- HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
+ Handle(::GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
if (aGroupRef.IsNull()) return;
GetOperations()->AddObject(aGroupRef, theSubShapeId);
GetOperations()->SetNotDone();
//Get the reference group
- HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
+ Handle(::GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
if (aGroupRef.IsNull()) return;
GetOperations()->RemoveObject(aGroupRef, theSubShapeId);
GetOperations()->SetNotDone();
//Get the reference group
- HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
+ Handle(::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_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]);
+ Handle(::GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]);
if (aSh.IsNull()) return;
aSubShapes->Append(aSh);
}
GetOperations()->SetNotDone();
//Get the reference group
- HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
+ Handle(::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_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]);
+ Handle(::GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]);
if (aSh.IsNull()) return;
aSubShapes->Append(aSh);
}
GetOperations()->SetNotDone();
//Get the reference group
- HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
+ Handle(::GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
if (aGroupRef.IsNull()) return;
//Get sub-shape to add
GetOperations()->SetNotDone();
//Get the reference group
- HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
+ Handle(::GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
if (aGroupRef.IsNull()) return;
//Get sub-shape to remove
GetOperations()->SetNotDone();
//Get the reference groups
- HANDLE_NAMESPACE(GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1);
- HANDLE_NAMESPACE(GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2);
+ Handle(::GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1);
+ Handle(::GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2);
if (aGroupRef1.IsNull() || aGroupRef2.IsNull()) return aGEOMObject._retn();
//Perform the operation
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->UnionGroups(aGroupRef1, aGroupRef2);
+ Handle(::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_NAMESPACE(GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1);
- HANDLE_NAMESPACE(GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2);
+ Handle(::GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1);
+ Handle(::GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2);
if (aGroupRef1.IsNull() || aGroupRef2.IsNull()) return aGEOMObject._retn();
//Perform the operation
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->IntersectGroups(aGroupRef1, aGroupRef2);
+ Handle(::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_NAMESPACE(GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1);
- HANDLE_NAMESPACE(GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2);
+ Handle(::GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1);
+ Handle(::GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2);
if (aGroupRef1.IsNull() || aGroupRef2.IsNull()) return aGEOMObject._retn();
//Perform the operation
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->CutGroups(aGroupRef1, aGroupRef2);
+ Handle(::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_NAMESPACE(GEOM_Object) aGr = GetObjectImpl(theGList[ind]);
+ Handle(::GEOM_Object) aGr = GetObjectImpl(theGList[ind]);
if (aGr.IsNull()) return aGEOMObject._retn();
aGroups->Append(aGr);
}
//Perform the operation
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->UnionListOfGroups(aGroups);
+ Handle(::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_NAMESPACE(GEOM_Object) aGr = GetObjectImpl(theGList[ind]);
+ Handle(::GEOM_Object) aGr = GetObjectImpl(theGList[ind]);
if (aGr.IsNull()) return aGEOMObject._retn();
aGroups->Append(aGr);
}
//Perform the operation
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->IntersectListOfGroups(aGroups);
+ Handle(::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_NAMESPACE(GEOM_Object) aGr = GetObjectImpl(theGList1[ind]);
+ Handle(::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_NAMESPACE(GEOM_Object) aGr = GetObjectImpl(theGList2[ind]);
+ Handle(::GEOM_Object) aGr = GetObjectImpl(theGList2[ind]);
if (aGr.IsNull()) return aGEOMObject._retn();
aGroups2->Append(aGr);
}
//Perform the operation
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->CutListOfGroups(aGroups1, aGroups2);
+ Handle(::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_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
+ Handle(::GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
if (aGroupRef.IsNull()) return -1;
return GetOperations()->GetType(aGroupRef);
GetOperations()->SetNotDone();
//Get the reference group
- HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
+ Handle(::GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
if (aGroupRef.IsNull()) return aGEOMObject._retn();
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->GetMainShape(aGroupRef);
+ Handle(::GEOM_Object) anObject = GetOperations()->GetMainShape(aGroupRef);
if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn();
return GetObject(anObject);
GetOperations()->SetNotDone();
//Get the reference group
- HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
+ Handle(::GEOM_Object) aGroupRef = GetObjectImpl(theGroup);
if (aGroupRef.IsNull()) return aList._retn();
aList = new GEOM::ListOfLong;
// return aGEOMObject._retn();
// Get the object itself
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull())
return aGEOMObject._retn();
// Perform
- HANDLE_NAMESPACE(GEOM_Object) aNewObject = GetOperations()->ShapeProcess( anObject,
+ Handle(::GEOM_Object) aNewObject = GetOperations()->ShapeProcess( anObject,
ConvertStringArray( theOperations ), ConvertStringArray( theParams ),
ConvertStringArray( theValues ) );
if ( !GetOperations()->IsDone() || aNewObject.IsNull() )
GetOperations()->SetNotDone();
// Get the object itself
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
+ Handle(::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_NAMESPACE(GEOM_Object) aNewObject =
+ Handle(::GEOM_Object) aNewObject =
GetOperations()->SuppressFaces( anObject, Convert( theFaces ) );
if (!GetOperations()->IsDone() || aNewObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
// Get the object itself
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull())
return aGEOMObject._retn();
// Perform
- HANDLE_NAMESPACE(GEOM_Object) aNewObject =
+ Handle(::GEOM_Object) aNewObject =
GetOperations()->CloseContour( anObject, Convert( theWires ), isCommonVertex );
if (!GetOperations()->IsDone() || aNewObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
// Get the object itself
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
+ Handle(::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_NAMESPACE(GEOM_Object) aNewObject =
+ Handle(::GEOM_Object) aNewObject =
GetOperations()->RemoveIntWires( anObject, Convert( theWires ) );
if (!GetOperations()->IsDone() || aNewObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
// Get the object itself
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
+ Handle(::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_NAMESPACE(GEOM_Object) aNewObject =
+ Handle(::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_NAMESPACE(GEOM_Object) > aShapes;
+ std::list< Handle(::GEOM_Object) > aShapes;
if (! GetListOfObjectsImpl( theObjects, aShapes ))
return aGEOMObject._retn();
// Perform
- HANDLE_NAMESPACE(GEOM_Object) aNewObject = GetOperations()->Sew( aShapes, theTolerance, false );
+ Handle(::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_NAMESPACE(GEOM_Object) > aShapes;
+ std::list< Handle(::GEOM_Object) > aShapes;
if (! GetListOfObjectsImpl( theObjects, aShapes ))
return aGEOMObject._retn();
// Perform
- HANDLE_NAMESPACE(GEOM_Object) aNewObject = GetOperations()->Sew( aShapes, theTolerance, true );
+ Handle(::GEOM_Object) aNewObject = GetOperations()->Sew( aShapes, theTolerance, true );
if (!GetOperations()->IsDone() || aNewObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
// Get the objects
- std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes;
+ std::list< Handle(::GEOM_Object) > aShapes;
if (! GetListOfObjectsImpl( theSolids, aShapes ))
return aGEOMObject._retn();
// Perform
- HANDLE_NAMESPACE(GEOM_Object) aNewObject = GetOperations()->RemoveInternalFaces(aShapes);
+ Handle(::GEOM_Object) aNewObject = GetOperations()->RemoveInternalFaces(aShapes);
if (!GetOperations()->IsDone() || aNewObject.IsNull())
return aGEOMObject._retn();
return aGEOMObject._retn();
// Get the object itself
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull())
return aGEOMObject._retn();
// Perform
- HANDLE_NAMESPACE(GEOM_Object) aNewObject =
+ Handle(::GEOM_Object) aNewObject =
GetOperations()->DivideEdge( anObject, theIndex, theValue, isByParameter );
if (!GetOperations()->IsDone() || aNewObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
// Get the object itself
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull())
return aGEOMObject._retn();
// Get the points
- std::list< HANDLE_NAMESPACE(GEOM_Object) > aPoints;
+ std::list< Handle(::GEOM_Object) > aPoints;
if (! GetListOfObjectsImpl( thePoints, aPoints ))
return aGEOMObject._retn();
// Perform
- HANDLE_NAMESPACE(GEOM_Object) aNewObject =
+ Handle(::GEOM_Object) aNewObject =
GetOperations()->DivideEdgeByPoint( anObject, theIndex, aPoints );
if (!GetOperations()->IsDone() || aNewObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aWire = GetObjectImpl(theWire);
+ Handle(::GEOM_Object) aWire = GetObjectImpl(theWire);
if (aWire.IsNull()) return aGEOMObject._retn();
int ind, aLen;
- std::list<HANDLE_NAMESPACE(GEOM_Object)> aVerts;
+ std::list<Handle(::GEOM_Object)> aVerts;
//Get the shapes
aLen = theVertices.length();
for (ind = 0; ind < aLen; ind++) {
- HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theVertices[ind]);
+ Handle(::GEOM_Object) aSh = GetObjectImpl(theVertices[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aVerts.push_back(aSh);
}
//Perform operation
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObjects[i]);
+ Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aClosed->Value(i)));
+ (*theClosedWires)[i-1] = GetObject(Handle(::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_NAMESPACE(GEOM_Object)::DownCast(anOpen->Value(i)));
+ (*theOpenWires)[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(anOpen->Value(i)));
return true;
}
aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
// Get the object itself
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull())
return aGEOMObject._retn();
// Perform
-// HANDLE_NAMESPACE(GEOM_Object) aNewObject =
+// Handle(::GEOM_Object) aNewObject =
GetOperations()->ChangeOrientation( anObject );
// if (!GetOperations()->IsDone() || aNewObject.IsNull())
// return aGEOMObject._retn();
GetOperations()->SetNotDone();
// Get the object itself
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull())
return aGEOMObject._retn();
// Perform
- HANDLE_NAMESPACE(GEOM_Object) aNewObject =
+ Handle(::GEOM_Object) aNewObject =
GetOperations()->ChangeOrientationCopy( anObject );
if (!GetOperations()->IsDone() || aNewObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
// Get the object itself
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull())
return aGEOMObject._retn();
// Perform
- HANDLE_NAMESPACE(GEOM_Object) aNewObject =
+ Handle(::GEOM_Object) aNewObject =
GetOperations()->LimitTolerance(anObject, theTolerance);
if (!GetOperations()->IsDone() || aNewObject.IsNull())
return aGEOMObject._retn();
#include "GEOM_BaseObject.hxx"
#include "GEOMImpl_Types.hxx"
-#include <Basics_OCCTVersion.hxx>
-
#include <TColStd_HSequenceOfAsciiString.hxx>
-
#include <TColStd_HArray1OfByte.hxx>
//=============================================================================
GetOperations()->SetNotDone();
//Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) anOriginal = GetObjectImpl(theOriginal);
+ Handle(::GEOM_Object) anOriginal = GetObjectImpl(theOriginal);
if (anOriginal.IsNull()) return aGEOMObject._retn();
//Create the copy
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeCopy(anOriginal);
+ Handle(::GEOM_Object) anObject = GetOperations()->MakeCopy(anOriginal);
if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) anOriginal = GetObjectImpl(theOriginal);
+ Handle(::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_NAMESPACE(GEOM_BaseObject)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetBaseObject(Handle(::GEOM_BaseObject)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
char* buf = (char*)theStream.NP_data();
std::istringstream aStream (buf);
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->RestoreShape(aStream);
+ Handle(::GEOM_Object) anObject = GetOperations()->RestoreShape(aStream);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
}
//Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) aShapeFrom = GetObjectImpl(theObjectFrom);
- HANDLE_NAMESPACE(GEOM_Object) aShapeTo = GetObjectImpl(theObjectTo);
+ Handle(::GEOM_Object) aShapeFrom = GetObjectImpl(theObjectFrom);
+ Handle(::GEOM_Object) aShapeTo = GetObjectImpl(theObjectTo);
if (aShapeFrom.IsNull() || aShapeTo.IsNull())
{
GEOM::GEOM_Object_var aGEOMObject;
//Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Create the Fillet
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference edges
}
//Create the Fillet
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference edges
}
//Create the Fillet
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference faces
}
//Create the Fillet
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference faces
}
//Create the Fillet
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference vertex
}
//Create the Fillet
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference vertex
}
//Create the Fillet
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Create the Chamfer
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Create the Chamfer
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Create the Chamfer
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference faces
}
//Create the Chamfer
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference faces
}
//Create the Chamfer
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference edges
}
//Create the Chamfer
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Get the reference edges
}
//Create the Chamfer
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape);
if (aShapeRef.IsNull()) return aGEOMObject._retn();
//Create the Archimede
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeArchimede
+ Handle(::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_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape);
+ Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape);
+ Handle(::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_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if (!aShape.IsNull()) {
Handle(TColStd_HSequenceOfInteger) anIntegers = new TColStd_HSequenceOfInteger;
Zz = Xx = 1.;
//Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return;
// Get shape parameters
GetOperations()->SetNotDone();
//Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aGEOMObject._retn();
// Make Point - centre of mass of theShape
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->GetCentreOfMass(aShape);
+ Handle(::GEOM_Object) anObject = GetOperations()->GetCentreOfMass(aShape);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if ( aShape.IsNull() ) return aGEOMObject._retn();
// Get vertex by index
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->GetVertexByIndex(aShape, theIndex);
+ Handle(::GEOM_Object) anObject = GetOperations()->GetVertexByIndex(aShape, theIndex);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace);
+ Handle(::GEOM_Object) aFace = GetObjectImpl(theFace);
if (aFace.IsNull()) return aGEOMObject._retn();
// Get the OptionalPoint (can be not defined)
- HANDLE_NAMESPACE(GEOM_Object) anOptionalPoint = GetObjectImpl(theOptionalPoint);
+ Handle(::GEOM_Object) anOptionalPoint = GetObjectImpl(theOptionalPoint);
// Make Vector - normal to theFace (in point theOptionalPoint if the face is not planar)
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->GetNormal(aFace, anOptionalPoint);
+ Handle(::GEOM_Object) anObject = GetOperations()->GetNormal(aFace, anOptionalPoint);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return;
// Get shape parameters
GetOperations()->SetNotDone();
//Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return;
// Get shape parameters
GetOperations()->SetNotDone();
//Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return;
// Get shape parameters
GetOperations()->SetNotDone();
//Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aGEOMObject._retn();
// Make Box - bounding box of theShape
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->GetBoundingBox(aShape, precise);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return;
// Get shape parameters
}
//Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull())
{
}
//Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull())
{
const GEOM::GEOM_IMeasureOperations::ShapeErrors &theErrors)
{
//Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) {
return NULL;
GEOM::ListOfLong_var anIntegersArray = new GEOM::ListOfLong();
// Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if (!aShape.IsNull()) {
GEOMImpl_IMeasureOperations::SICheckLevel aCheckLevel;
GEOM::ListOfLong_var anIntegersArray = new GEOM::ListOfLong();
// Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if (!aShape.IsNull()) {
Handle(TColStd_HSequenceOfInteger) anIntegers = new TColStd_HSequenceOfInteger;
GetOperations()->SetNotDone();
// Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
bool isGood = false;
if (!aShape.IsNull()) {
GEOM::ListOfLong_var anIntegersArray2 = new GEOM::ListOfLong();
// Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1);
- HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2);
+ Handle(::GEOM_Object) aShape1 = GetObjectImpl(theShape1);
+ Handle(::GEOM_Object) aShape2 = GetObjectImpl(theShape2);
if (!aShape1.IsNull() && !aShape2.IsNull()) {
Handle(TColStd_HSequenceOfInteger) anIntegers1 = new TColStd_HSequenceOfInteger;
GetOperations()->SetNotDone();
//Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::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_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::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_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::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_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1);
- HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2);
+ Handle(::GEOM_Object) aShape1 = GetObjectImpl(theShape1);
+ Handle(::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_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1);
- HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2);
+ Handle(::GEOM_Object) aShape1 = GetObjectImpl(theShape1);
+ Handle(::GEOM_Object) aShape2 = GetObjectImpl(theShape2);
if (!aShape1.IsNull() && !aShape2.IsNull()) {
Handle(TColStd_HSequenceOfReal) aDoubles = new TColStd_HSequenceOfReal;
GetOperations()->SetNotDone();
//Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull())
return;
GetOperations()->SetNotDone();
//Get the reference shapes
- HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1);
- HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2);
+ Handle(::GEOM_Object) aShape1 = GetObjectImpl(theShape1);
+ Handle(::GEOM_Object) aShape2 = GetObjectImpl(theShape2);
if (aShape1.IsNull() || aShape2.IsNull()) return -1.0;
// Get the angle
GetOperations()->SetNotDone();
//Get the reference shapes
- HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1);
- HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2);
+ Handle(::GEOM_Object) aShape1 = GetObjectImpl(theShape1);
+ Handle(::GEOM_Object) aShape2 = GetObjectImpl(theShape2);
if (aShape1.IsNull() || aShape2.IsNull()) return -1.0;
// Get the angle
GetOperations()->SetNotDone();
//Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theCurve);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theCurve);
if(aShape.IsNull()) return -1.0;
return GetOperations()->CurveCurvatureByParam(aShape,theParam);
GetOperations()->SetNotDone();
//Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theCurve);
- HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theCurve);
+ Handle(::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_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theSurf);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theSurf);
if(aShape.IsNull()) return -1.0;
return GetOperations()->MaxSurfaceCurvatureByParam(aShape,theUParam,theVParam);
GetOperations()->SetNotDone();
//Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theSurf);
- HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theSurf);
+ Handle(::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_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theSurf);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theSurf);
if (aShape.IsNull()) return -1.0;
return GetOperations()->MinSurfaceCurvatureByParam(aShape,theUParam,theVParam);
GetOperations()->SetNotDone();
//Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theSurf);
- HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theSurf);
+ Handle(::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_NAMESPACE(GEOM_BaseObject) theObject)
+GEOM_IOperations_i::GetBaseObject(Handle(::GEOM_BaseObject) theObject)
{
GEOM::GEOM_BaseObject_var GO;
if (theObject.IsNull()) return GO._retn();
* GetObjectImpl
*/
//=============================================================================
-HANDLE_NAMESPACE(GEOM_BaseObject)
+Handle(::GEOM_BaseObject)
GEOM_IOperations_i::GetBaseObjectImpl(GEOM::GEOM_BaseObject_ptr theObject)
{
- HANDLE_NAMESPACE(GEOM_BaseObject) anImpl;
+ Handle(::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_NAMESPACE(GEOM_Object) theObject)
+GEOM::GEOM_Object_ptr GEOM_IOperations_i::GetObject(Handle(::GEOM_Object) theObject)
{
return GEOM::GEOM_Object::_narrow( GetBaseObject( theObject ));
}
* GetObjectImpl
*/
//=============================================================================
-HANDLE_NAMESPACE(GEOM_Object) GEOM_IOperations_i::GetObjectImpl(GEOM::GEOM_Object_ptr theObject)
+Handle(::GEOM_Object) GEOM_IOperations_i::GetObjectImpl(GEOM::GEOM_Object_ptr theObject)
{
- return HANDLE_NAMESPACE(GEOM_Object)::DownCast( GetBaseObjectImpl( theObject ));
+ return Handle(::GEOM_Object)::DownCast( GetBaseObjectImpl( theObject ));
}
//=============================================================================
int aNbObj = theObjects.length();
for (i = 0; i < aNbObj; i++) {
- HANDLE_NAMESPACE(GEOM_Object) anObj = GetObjectImpl(theObjects[i]);
+ Handle(::GEOM_Object) anObj = GetObjectImpl(theObjects[i]);
if (anObj.IsNull()) {
aResult.Nullify();
//=======================================================================
bool GEOM_IOperations_i::GetListOfObjectsImpl(const GEOM::ListOfGO& theObjects,
- std::list< HANDLE_NAMESPACE(GEOM_Object) >& theList)
+ std::list< Handle(::GEOM_Object) >& theList)
{
int i;
int aNbObj = theObjects.length();
for (i = 0; i < aNbObj; i++) {
- HANDLE_NAMESPACE(GEOM_Object) anObj = GetObjectImpl(theObjects[i]);
+ Handle(::GEOM_Object) anObj = GetObjectImpl(theObjects[i]);
if (anObj.IsNull())
return false;
virtual CORBA::Long GetStudyID();
- 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 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 void StartOperation();
Handle(TColStd_HSequenceOfTransient)
GetListOfObjectsImpl(const GEOM::ListOfGO& theObjects);
bool GetListOfObjectsImpl(const GEOM::ListOfGO& theObjects,
- std::list< HANDLE_NAMESPACE(GEOM_Object) >& theList);
+ std::list< Handle(::GEOM_Object) >& theList);
Handle(TColStd_HArray1OfExtendedString)
ConvertStringArray(const GEOM::string_array &theInArray);
GetOperations()->SetNotDone();
//Get the reference points
- HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
- HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
+ Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1);
+ Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2);
if (aPnt1.IsNull() || aPnt2.IsNull()) return aGEOMObject._retn();
//Create the Edge
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeEdge(aPnt1, aPnt2);
+ Handle(::GEOM_Object) anObject = GetOperations()->MakeEdge(aPnt1, aPnt2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference curve
- HANDLE_NAMESPACE(GEOM_Object) aRefCurve = GetObjectImpl(theCurve);
+ Handle(::GEOM_Object) aRefCurve = GetObjectImpl(theCurve);
if (aRefCurve.IsNull()) return aGEOMObject._retn();
//Get the reference point (can be NULL)
- HANDLE_NAMESPACE(GEOM_Object) aRefPoint;
+ Handle(::GEOM_Object) aRefPoint;
if (!CORBA::is_nil(theStartPoint)) {
aRefPoint = GetObjectImpl(theStartPoint);
}
//Create the point
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeEdgeOnCurveByLength(aRefCurve, theLength, aRefPoint);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the source wire
- HANDLE_NAMESPACE(GEOM_Object) aWire = GetObjectImpl(theWire);
+ Handle(::GEOM_Object) aWire = GetObjectImpl(theWire);
if (aWire.IsNull()) return aGEOMObject._retn();
//Create the Edge
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeEdgeWire(aWire, theLinearTolerance, theAngularTolerance);
+ Handle(::GEOM_Object) anObject = GetOperations()->MakeEdgeWire(aWire, theLinearTolerance, theAngularTolerance);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
int ind, aLen;
- std::list<HANDLE_NAMESPACE(GEOM_Object)> aShapes;
+ std::list<Handle(::GEOM_Object)> aShapes;
//Get the shapes
aLen = theEdgesAndWires.length();
for (ind = 0; ind < aLen; ind++) {
- HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theEdgesAndWires[ind]);
+ Handle(::GEOM_Object) aSh = GetObjectImpl(theEdgesAndWires[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aShapes.push_back(aSh);
}
// Make Solid
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeWire(aShapes, theTolerance);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference wire
- HANDLE_NAMESPACE(GEOM_Object) aWire = GetObjectImpl(theWire);
+ Handle(::GEOM_Object) aWire = GetObjectImpl(theWire);
if (aWire.IsNull()) return aGEOMObject._retn();
//Create the Face
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeFace(aWire, isPlanarWanted);
+ Handle(::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_NAMESPACE(GEOM_Object)> aShapes;
+ std::list<Handle(::GEOM_Object)> aShapes;
//Get the shapes
aLen = theWires.length();
for (ind = 0; ind < aLen; ind++) {
- HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theWires[ind]);
+ Handle(::GEOM_Object) aSh = GetObjectImpl(theWires[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aShapes.push_back(aSh);
}
// Make Face
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeFaceWires(aShapes, isPlanarWanted);
//if (!GetOperations()->IsDone() || anObject.IsNull())
// enable warning status
GetOperations()->SetNotDone();
//Get the reference face and wire
- HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace);
- HANDLE_NAMESPACE(GEOM_Object) aWire = GetObjectImpl(theWire);
+ Handle(::GEOM_Object) aFace = GetObjectImpl(theFace);
+ Handle(::GEOM_Object) aWire = GetObjectImpl(theWire);
if (aFace.IsNull() || aWire.IsNull()) {
return aGEOMObject._retn();
}
//Create the Face
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeFaceFromSurface(aFace, aWire);
if (anObject.IsNull()) {
GetOperations()->SetNotDone();
//Get the shapes
- std::list<HANDLE_NAMESPACE(GEOM_Object)> aConstraints;
+ std::list<Handle(::GEOM_Object)> aConstraints;
for( int ind = 0; ind < theConstraints.length(); ind++ ) {
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl( theConstraints[ind] );
+ Handle(::GEOM_Object) anObject = GetObjectImpl( theConstraints[ind] );
aConstraints.push_back(anObject);
}
// Make Face
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeFaceWithConstraints( aConstraints );
// enable warning status
GetOperations()->SetNotDone();
int ind, aLen;
- std::list<HANDLE_NAMESPACE(GEOM_Object)> aShapes;
+ std::list<Handle(::GEOM_Object)> aShapes;
//Get the shapes
aLen = theFacesAndShells.length();
for (ind = 0; ind < aLen; ind++) {
- HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theFacesAndShells[ind]);
+ Handle(::GEOM_Object) aSh = GetObjectImpl(theFacesAndShells[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aShapes.push_back(aSh);
}
// Make Solid
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeShell(aShapes);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aShell = GetObjectImpl(theShell);
+ Handle(::GEOM_Object) aShell = GetObjectImpl(theShell);
if (aShell.IsNull()) return aGEOMObject._retn();
- std::list<HANDLE_NAMESPACE(GEOM_Object)> aShapes;
+ std::list<Handle(::GEOM_Object)> aShapes;
aShapes.push_back(aShell);
//Create the Solid
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeSolidShells(aShapes);
+ Handle(::GEOM_Object) anObject = GetOperations()->MakeSolidShells(aShapes);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
int ind, aLen;
- std::list<HANDLE_NAMESPACE(GEOM_Object)> aShapes;
+ std::list<Handle(::GEOM_Object)> aShapes;
//Get the shapes
aLen = theShells.length();
for (ind = 0; ind < aLen; ind++) {
- HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theShells[ind]);
+ Handle(::GEOM_Object) aSh = GetObjectImpl(theShells[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aShapes.push_back(aSh);
}
// Make Solid
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeSolidShells(aShapes);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
int ind, aLen;
- std::list<HANDLE_NAMESPACE(GEOM_Object)> aShapes;
+ std::list<Handle(::GEOM_Object)> aShapes;
//Get the shapes
aLen = theShapes.length();
for (ind = 0; ind < aLen; ind++) {
- HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theShapes[ind]);
+ Handle(::GEOM_Object) aSh = GetObjectImpl(theShapes[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aShapes.push_back(aSh);
}
// Make Solid
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeCompound(aShapes);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
int ind, aLen;
- std::list<HANDLE_NAMESPACE(GEOM_Object)> aShapes;
+ std::list<Handle(::GEOM_Object)> aShapes;
//Get the shapes
aLen = theFacesOrShells.length();
for (ind = 0; ind < aLen; ind++) {
- ::HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theFacesOrShells[ind]);
+ ::Handle(::GEOM_Object) aSh = GetObjectImpl(theFacesOrShells[ind]);
if (aSh.IsNull()) return aGEOMObject._retn();
aShapes.push_back(aSh);
}
// Make Solid
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeSolidFromConnectedFaces(aShapes, isIntersect);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes;
+ std::list< Handle(::GEOM_Object) > aShapes;
if (! GetListOfObjectsImpl( theShapes, aShapes ))
return aGEOMObject._retn();
//Perform the gluing
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) > aShapes;
+ std::list< Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference objects
- std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes;
+ std::list< Handle(::GEOM_Object) > aShapes;
if (! GetListOfObjectsImpl( theShapes, aShapes ))
return aGEOMObject._retn();
//Get the shapes
- std::list<HANDLE_NAMESPACE(GEOM_Object)> aFaces;
+ std::list<Handle(::GEOM_Object)> aFaces;
if (! GetListOfObjectsImpl( theFaces, aFaces ))
return aGEOMObject._retn();
//Perform the gluing
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeGlueFacesByList(aShapes, theTolerance, aFaces,
doKeepNonSolids, doGlueAllEdges);
//if (!GetOperations()->IsDone() || anObject.IsNull())
GetOperations()->SetNotDone();
//Get the reference objects
- std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes;
+ std::list< Handle(::GEOM_Object) > aShapes;
if (! GetListOfObjectsImpl( theShapes, aShapes ))
return aGEOMObject._retn();
//Perform the gluing
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeGlueEdges(aShapes, theTolerance);
//if (!GetOperations()->IsDone() || anObject.IsNull())
// to allow warning
GetOperations()->SetNotDone();
//Get the reference objects
- std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes;
+ std::list< Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference objects
- std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes;
+ std::list< Handle(::GEOM_Object) > aShapes;
if (! GetListOfObjectsImpl( theShapes, aShapes ))
return aGEOMObject._retn();
//Get the shapes
- std::list<HANDLE_NAMESPACE(GEOM_Object)> anEdges;
+ std::list<Handle(::GEOM_Object)> anEdges;
if (! GetListOfObjectsImpl( theEdges, anEdges ))
return aGEOMObject._retn();
//Perform the gluing
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->MakeGlueEdgesByList(aShapes, theTolerance, anEdges);
//if (!GetOperations()->IsDone() || anObject.IsNull())
// to allow warning
{
GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
{
GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
{
GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
{
GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
{
GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong;
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aSeq._retn();
Handle(TColStd_HSequenceOfInteger) aHSeq =
{
GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong;
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aSeq._retn();
Handle(TColStd_HSequenceOfInteger) aHSeq =
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theMainShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theMainShape);
if (aShape.IsNull()) return aGEOMObject._retn();
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->GetSubShape(aShape, theID);
+ Handle(::GEOM_Object) anObject = GetOperations()->GetSubShape(aShape, theID);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
if (theIndices.length() < 1)
return aSeq._retn();
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theMainShape);
+ Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i+1)));
+ aSeq[i] = GetObject(Handle(::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_NAMESPACE(GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape);
- HANDLE_NAMESPACE(GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape);
+ Handle(::GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape);
+ Handle(::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_NAMESPACE(GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape);
+ Handle(::GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape);
if (aMainShapeRef.IsNull()) return aSeq._retn();
//Get the subshapes
- std::list<HANDLE_NAMESPACE(GEOM_Object)> aShapes;
+ std::list<Handle(::GEOM_Object)> aShapes;
int aLen = theSubShapes.length();
for (int ind = 0; ind < aLen; ind++) {
- HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]);
+ Handle(::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_NAMESPACE(GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape);
- HANDLE_NAMESPACE(GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape);
+ Handle(::GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape);
+ Handle(::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_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return NULL;
// Get shape parameters
GEOM::GEOM_Object_ptr theObject,
const CORBA::Long theObjectIndex)
{
- HANDLE_NAMESPACE(GEOM_Object) aSubObject = GetObjectImpl( theSubObject );
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl( theObject );
+ Handle(::GEOM_Object) aSubObject = GetObjectImpl( theSubObject );
+ Handle(::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_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return -1;
CORBA::Long aNb = GetOperations()->NumberOfSubShapes(aShape, theShapeType);
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aGEOMObject._retn();
//Create the Solid
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->ReverseShape(aShape);
+ Handle(::GEOM_Object) anObject = GetOperations()->ReverseShape(aShape);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong;
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
if (aShape.IsNull()) return aSeq._retn();
Handle(TColStd_HSequenceOfInteger) aHSeq =
GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
- HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1);
- HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2);
+ Handle(::GEOM_Object) aShape1 = GetObjectImpl(theShape1);
+ Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
//Get the shapes
- std::list<HANDLE_NAMESPACE(GEOM_Object)> aShapes;
+ std::list<Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) anAx1 = GetObjectImpl(theAx1);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) anAx1 = GetObjectImpl(theAx1);
- HANDLE_NAMESPACE(GEOM_Object) anPnt = GetObjectImpl(thePnt);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) anAx1 = GetObjectImpl(theAx1);
+ Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis);
- HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) anAxis = GetObjectImpl(theAxis);
+ Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) aCenter = GetObjectImpl(theCenter);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference objects
- 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);
+ 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);
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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) anAx1 = GetObjectImpl(theAx1);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) anAx1 = GetObjectImpl(theAx1);
if (aShape.IsNull() || anAx1.IsNull()) return aSeq._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) anAx1 = GetObjectImpl(theAx1);
- HANDLE_NAMESPACE(GEOM_Object) anPnt = GetObjectImpl(thePnt);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) anAx1 = GetObjectImpl(theAx1);
+ Handle(::GEOM_Object) anPnt = GetObjectImpl(thePnt);
if (aShape.IsNull() || anAx1.IsNull() || anPnt.IsNull()) return aSeq._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) anAxis = GetObjectImpl(theAxis);
if (aShape.IsNull() || anAxis.IsNull()) return aSeq._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis);
- HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) anAxis = GetObjectImpl(theAxis);
+ Handle(::GEOM_Object) aPnt = GetObjectImpl(thePnt);
if (aShape.IsNull() || anAxis.IsNull() || aPnt.IsNull()) return aSeq._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) aCenter = GetObjectImpl(theCenter);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aCenter = GetObjectImpl(theCenter);
if (aShape.IsNull() || aCenter.IsNull()) return aSeq._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- 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);
+ 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);
if (aShape.IsNull() ||
aTopLeftPoint.IsNull() ||
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) aBox = GetObjectImpl(theBox);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) aBox = GetObjectImpl(theBox);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aBox = GetObjectImpl(theBox);
if (aShape.IsNull() || aBox.IsNull() )
return aSeq._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i)));
return aSeq._retn();
}
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape);
if (aShape.IsNull() || aCheckShape.IsNull() )
return aGEOMObject._retn();
//Get Shapes On Shape
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->GetShapesOnShapeAsCompound
+ Handle(::GEOM_Object) anObject = GetOperations()->GetShapesOnShapeAsCompound
(aCheckShape,aShape, theShapeType,ShapeState(theState));
if (anObject.IsNull())
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape);
if (aShape.IsNull() || aCheckShape.IsNull() )
return aSeq._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere);
- HANDLE_NAMESPACE(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat);
+ Handle(::GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere);
+ Handle(::GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat);
if (aShapeWhere.IsNull() ||
aShapeWhat.IsNull()) return aGEOMObject._retn();
//Get Shapes in place of aShapeWhat
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->GetInPlace(aShapeWhere, aShapeWhat);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere);
- HANDLE_NAMESPACE(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat);
+ Handle(::GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere);
+ Handle(::GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat);
if (aShapeWhere.IsNull() ||
aShapeWhat.IsNull()) return aGEOMObject._retn();
//Get Shapes in place of aShapeWhat
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->GetInPlaceOld(aShapeWhere, aShapeWhat);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere);
- HANDLE_NAMESPACE(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat);
+ Handle(::GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere);
+ Handle(::GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat);
if (aShapeWhere.IsNull() ||
aShapeWhat.IsNull()) return aGEOMObject._retn();
//Get Shapes in place of aShapeWhat
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->GetInPlaceByHistory(aShapeWhere, aShapeWhat);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere);
- HANDLE_NAMESPACE(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat);
+ Handle(::GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere);
+ Handle(::GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat);
if (aShapeWhere.IsNull() ||
aShapeWhat.IsNull()) return aGEOMObject._retn();
//Get Shapes in place of aShapeWhat
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere);
- HANDLE_NAMESPACE(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat);
+ Handle(::GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere);
+ Handle(::GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat);
if (aShapeWhere.IsNull() ||
aShapeWhat.IsNull()) return aSeq._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) anEdge = GetObjectImpl(theEdge);
+ Handle(::GEOM_Object) anEdge = GetObjectImpl(theEdge);
if (anEdge.IsNull()) {
return aGEOMObject._retn();
}
//Get Shapes in place of aShapeWhat
- HANDLE_NAMESPACE(GEOM_Object) aNewEdge =
+ Handle(::GEOM_Object) aNewEdge =
GetOperations()->ExtendEdge(anEdge, theMin, theMax);
if (!GetOperations()->IsDone() || aNewEdge.IsNull()) {
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace);
+ Handle(::GEOM_Object) aFace = GetObjectImpl(theFace);
if (aFace.IsNull()) {
return aGEOMObject._retn();
}
//Get Shapes in place of aShapeWhat
- HANDLE_NAMESPACE(GEOM_Object) aNewFace =
+ Handle(::GEOM_Object) aNewFace =
GetOperations()->ExtendFace(aFace, theUMin, theUMax, theVMin, theVMax);
if (!GetOperations()->IsDone() || aNewFace.IsNull()) {
GetOperations()->SetNotDone();
//Get the reference object
- HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace);
+ Handle(::GEOM_Object) aFace = GetObjectImpl(theFace);
if (aFace.IsNull()) {
return aGEOMObject._retn();
}
//Get Shapes in place of aShapeWhat
- HANDLE_NAMESPACE(GEOM_Object) aNewFace = GetOperations()->MakeSurfaceFromFace(aFace);
+ Handle(::GEOM_Object) aNewFace = GetOperations()->MakeSurfaceFromFace(aFace);
if (!GetOperations()->IsDone() || aNewFace.IsNull()) {
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
- HANDLE_NAMESPACE(GEOM_Object) aStartPoint = GetObjectImpl(theStartPoint);
+ Handle(::GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i)));
}
return aSeq._retn();
GetOperations()->SetNotDone();
//Get the reference objects
- HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(::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_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i)));
}
return aSeq._retn();
aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
//Get the object itself
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the first point of translation
- HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
+ Handle(::GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
if (aPoint1.IsNull()) return aGEOMObject._retn();
//Get the second point of translation
- HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
+ Handle(::GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
if (aPoint2.IsNull()) return aGEOMObject._retn();
//Perform the translation
GetOperations()->SetNotDone();
//Get the object itself
- HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the first point of translation
- HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
+ Handle(::GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
if (aPoint1.IsNull()) return aGEOMObject._retn();
//Get the second point of translation
- HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
+ Handle(::GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
if (aPoint2.IsNull()) return aGEOMObject._retn();
//Create the translated shape
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Perform the translation
GetOperations()->SetNotDone();
//Get the object itself
- HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Create the translated shape
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the vector of translation
- HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector);
+ Handle(::GEOM_Object) aVector = GetObjectImpl(theVector);
if (aVector.IsNull()) return aGEOMObject._retn();
//Perform the translation
GetOperations()->SetNotDone();
//Get the object itself
- HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the vector of translation
- HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector);
+ Handle(::GEOM_Object) aVector = GetObjectImpl(theVector);
if (aVector.IsNull()) return aGEOMObject._retn();
//Perform the translation
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->TranslateVectorCopy(aBasicObject, aVector);
+ Handle(::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_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the vector of translation
- HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector);
+ Handle(::GEOM_Object) aVector = GetObjectImpl(theVector);
if (aVector.IsNull()) return aGEOMObject._retn();
//Perform the translation
if (theCopy) {
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->
+ Handle(::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_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the axis of revolution
- HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis);
+ Handle(::GEOM_Object) anAxis = GetObjectImpl(theAxis);
if (anAxis.IsNull()) return aGEOMObject._retn();
//Perform the rotation
GetOperations()->SetNotDone();
//Get the object itself
- HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the axis of rotation
- HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis);
+ Handle(::GEOM_Object) anAxis = GetObjectImpl(theAxis);
if (anAxis.IsNull()) return aGEOMObject._retn();
//Perform the rotation
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->RotateCopy(aBasicObject, anAxis, theAngle);
+ Handle(::GEOM_Object) anObject = GetOperations()->RotateCopy(aBasicObject, anAxis, theAngle);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
}
//Get the object itself
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the plane
- HANDLE_NAMESPACE(GEOM_Object) aPlane = GetObjectImpl(thePlane);
+ Handle(::GEOM_Object) aPlane = GetObjectImpl(thePlane);
if (aPlane.IsNull()) return aGEOMObject._retn();
//Perform the mirror
GetOperations()->SetNotDone();
//Get the object itself
- HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the vector of translation
- HANDLE_NAMESPACE(GEOM_Object) aPlane = GetObjectImpl(thePlane);
+ Handle(::GEOM_Object) aPlane = GetObjectImpl(thePlane);
if (aPlane.IsNull()) return aGEOMObject._retn();
//Perform the mirror
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MirrorPlaneCopy(aBasicObject, aPlane);
+ Handle(::GEOM_Object) anObject = GetOperations()->MirrorPlaneCopy(aBasicObject, aPlane);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
}
//Get the object itself
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the axis
- HANDLE_NAMESPACE(GEOM_Object) aAxis = GetObjectImpl(theAxis);
+ Handle(::GEOM_Object) aAxis = GetObjectImpl(theAxis);
if (aAxis.IsNull()) return aGEOMObject._retn();
//Perform the mirror
GetOperations()->SetNotDone();
//Get the object itself
- HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the vector of translation
- HANDLE_NAMESPACE(GEOM_Object) aAxis = GetObjectImpl(theAxis);
+ Handle(::GEOM_Object) aAxis = GetObjectImpl(theAxis);
if (aAxis.IsNull()) return aGEOMObject._retn();
//Perform the mirror
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MirrorAxisCopy(aBasicObject, aAxis);
+ Handle(::GEOM_Object) anObject = GetOperations()->MirrorAxisCopy(aBasicObject, aAxis);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
}
//Get the object itself
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the point
- HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint);
+ Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint);
if (aPoint.IsNull()) return aGEOMObject._retn();
//Perform the mirror
GetOperations()->SetNotDone();
//Get the object itself
- HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the vector of translation
- HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint);
+ Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint);
if (aPoint.IsNull()) return aGEOMObject._retn();
//Perform the mirror
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MirrorPointCopy(aBasicObject, aPoint);
+ Handle(::GEOM_Object) anObject = GetOperations()->MirrorPointCopy(aBasicObject, aPoint);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
}
//Get the basic object
- HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Create the offset shape
GetOperations()->SetNotDone();
//Get the basic object
- HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Create the offset shape
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->OffsetShapeCopy(aBasicObject, theOffset);
+ Handle(::GEOM_Object) anObject = GetOperations()->OffsetShapeCopy(aBasicObject, theOffset);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the input objects
- HANDLE_NAMESPACE(GEOM_Object) aSource = GetObjectImpl(theSource);
- HANDLE_NAMESPACE(GEOM_Object) aTarget = GetObjectImpl(theTarget);
+ Handle(::GEOM_Object) aSource = GetObjectImpl(theSource);
+ Handle(::GEOM_Object) aTarget = GetObjectImpl(theTarget);
if (aSource.IsNull() || aTarget.IsNull()) return aGEOMObject._retn();
//Create the projection
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->ProjectShapeCopy(aSource, aTarget);
+ Handle(::GEOM_Object) anObject = GetOperations()->ProjectShapeCopy(aSource, aTarget);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the reference shape
- HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint);
- HANDLE_NAMESPACE(GEOM_Object) aWire = GetObjectImpl(theWire);
+ Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint);
+ Handle(::GEOM_Object) aWire = GetObjectImpl(theWire);
if (aPoint.IsNull() || aWire.IsNull()) {
return -1.0;
}
- HANDLE_NAMESPACE(GEOM_Object) aPointOnEdge;
+ Handle(::GEOM_Object) aPointOnEdge;
Standard_Integer anEdgeIndex;
CORBA::Double aResult = GetOperations()->ProjectPointOnWire
(aPoint, aWire, aPointOnEdge, anEdgeIndex);
}
//Get the object itself
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the point
- HANDLE_NAMESPACE(GEOM_Object) aPoint;
+ Handle(::GEOM_Object) aPoint;
if (!thePoint->_is_nil()) {
aPoint = GetObjectImpl(thePoint);
if (aPoint.IsNull()) return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the basic object
- HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the point
- HANDLE_NAMESPACE(GEOM_Object) aPoint;
+ Handle(::GEOM_Object) aPoint;
if (!thePoint->_is_nil()) {
aPoint = GetObjectImpl(thePoint);
if (aPoint.IsNull()) return aGEOMObject._retn();
}
//Perform the scale
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->ScaleShapeCopy(aBasicObject, aPoint, theFactor);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
}
//Get the object itself
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the point
- HANDLE_NAMESPACE(GEOM_Object) aPoint;
+ Handle(::GEOM_Object) aPoint;
if (!thePoint->_is_nil()) {
aPoint = GetObjectImpl(thePoint);
if (aPoint.IsNull()) return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the basic object
- HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the point
- HANDLE_NAMESPACE(GEOM_Object) aPoint;
+ Handle(::GEOM_Object) aPoint;
if (!thePoint->_is_nil()) {
aPoint = GetObjectImpl(thePoint);
if (aPoint.IsNull()) return aGEOMObject._retn();
}
//Perform the scale
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->ScaleShapeAlongAxes
+ Handle(::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_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the Start LCS (may be NULL for positioning from global LCS)
- HANDLE_NAMESPACE(GEOM_Object) aStartLCS;
+ Handle(::GEOM_Object) aStartLCS;
if (!CORBA::is_nil(theStartLCS)) {
aStartLCS = GetObjectImpl(theStartLCS);
if (aStartLCS.IsNull()) return aGEOMObject._retn();
}
//Get the End LCS
- HANDLE_NAMESPACE(GEOM_Object) aEndLCS = GetObjectImpl(theEndLCS);
+ Handle(::GEOM_Object) aEndLCS = GetObjectImpl(theEndLCS);
if (aEndLCS.IsNull()) return aGEOMObject._retn();
//Perform the Position
GetOperations()->SetNotDone();
//Get the basic object
- HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the Start LCS (may be NULL for positioning from global LCS)
- HANDLE_NAMESPACE(GEOM_Object) aStartLCS;
+ Handle(::GEOM_Object) aStartLCS;
if (!CORBA::is_nil(theStartLCS)) {
aStartLCS = GetObjectImpl(theStartLCS);
if (aStartLCS.IsNull()) return aGEOMObject._retn();
}
//Get the End LCS
- HANDLE_NAMESPACE(GEOM_Object) aEndLCS = GetObjectImpl(theEndLCS);
+ Handle(::GEOM_Object) aEndLCS = GetObjectImpl(theEndLCS);
if (aEndLCS.IsNull()) return aGEOMObject._retn();
//Perform the position
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->PositionShapeCopy(aBasicObject, aStartLCS, aEndLCS);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the basic object
- HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the path object
- HANDLE_NAMESPACE(GEOM_Object) aPathObject = GetObjectImpl(thePath);
+ Handle(::GEOM_Object) aPathObject = GetObjectImpl(thePath);
if (aPathObject.IsNull()) return aGEOMObject._retn();
//Perform the position
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the vector of translation
- HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector);
+ Handle(::GEOM_Object) aVector = GetObjectImpl(theVector);
//if (aVector.IsNull()) return aGEOMObject._retn(); // DX by default
//Perform the translation
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::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_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the vector1 of translation
- HANDLE_NAMESPACE(GEOM_Object) aVector1 = GetObjectImpl(theVector1);
+ Handle(::GEOM_Object) aVector1 = GetObjectImpl(theVector1);
//if (aVector1.IsNull()) return aGEOMObject._retn(); // DX by default
//Get the vector2 of translation
- HANDLE_NAMESPACE(GEOM_Object) aVector2 = GetObjectImpl(theVector2);
+ Handle(::GEOM_Object) aVector2 = GetObjectImpl(theVector2);
//if (aVector2.IsNull()) return aGEOMObject._retn(); // DY by default
//Perform the translation
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Translate2D
+ Handle(::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_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the a directon of rotation
- HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector);
+ Handle(::GEOM_Object) aVector = GetObjectImpl(theVector);
//if (aVector.IsNull()) return aGEOMObject._retn(); // DZ by default
//Perform the rotation
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Rotate1D(aBasicObject, aVector, theNbTimes);
+ Handle(::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_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the a directon of rotation
- HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector);
+ Handle(::GEOM_Object) aVector = GetObjectImpl(theVector);
//if (aVector.IsNull()) return aGEOMObject._retn(); // DZ by default
//Perform the rotation
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Rotate1D(aBasicObject, aVector, theAngleStep, theNbSteps);
+ Handle(::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_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the a directon of rotation
- HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector);
+ Handle(::GEOM_Object) aVector = GetObjectImpl(theVector);
//if (aVector.IsNull()) return aGEOMObject._retn(); // DZ by default
//Perform the rotation
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Rotate2D
+ Handle(::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_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the a directon of rotation
- HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector);
+ Handle(::GEOM_Object) aVector = GetObjectImpl(theVector);
//if (aVector.IsNull()) return aGEOMObject._retn(); // DZ by default
//Perform the rotation
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Rotate2D
+ Handle(::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_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the a directon of rotation
- HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector);
+ Handle(::GEOM_Object) aVector = GetObjectImpl(theVector);
//if (aVector.IsNull()) return aGEOMObject._retn(); // DZ by default
double anAngle = M_PI * theAngle / 180.;
//Perform the rotation
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Rotate2D
+ Handle(::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_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the central point of rotation
- HANDLE_NAMESPACE(GEOM_Object) aCentPoint = GetObjectImpl(theCentPoint);
+ Handle(::GEOM_Object) aCentPoint = GetObjectImpl(theCentPoint);
if (aCentPoint.IsNull()) return aGEOMObject._retn();
//Get the first point
- HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
+ Handle(::GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
if (aPoint1.IsNull()) return aGEOMObject._retn();
//Get the second point
- HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
+ Handle(::GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
if (aPoint2.IsNull()) return aGEOMObject._retn();
//Perform the translation
GetOperations()->SetNotDone();
//Get the object itself
- HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject);
if (aBasicObject.IsNull()) return aGEOMObject._retn();
//Get the central point of rotation
- HANDLE_NAMESPACE(GEOM_Object) aCentPoint = GetObjectImpl(theCentPoint);
+ Handle(::GEOM_Object) aCentPoint = GetObjectImpl(theCentPoint);
if (aCentPoint.IsNull()) return aGEOMObject._retn();
//Get the first point
- HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
+ Handle(::GEOM_Object) aPoint1 = GetObjectImpl(thePoint1);
if (aPoint1.IsNull()) return aGEOMObject._retn();
//Get the second point
- HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
+ Handle(::GEOM_Object) aPoint2 = GetObjectImpl(thePoint2);
if (aPoint2.IsNull()) return aGEOMObject._retn();
//Perform the rotation
- HANDLE_NAMESPACE(GEOM_Object) anObject =
+ Handle(::GEOM_Object) anObject =
GetOperations()->RotateThreePointsCopy(aBasicObject, aCentPoint, aPoint1, aPoint2);
if (!GetOperations()->IsDone() || anObject.IsNull())
return aGEOMObject._retn();
GetOperations()->SetNotDone();
//Get the object itself
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Get the sample object
- HANDLE_NAMESPACE(GEOM_Object) aSample = GetObjectImpl(theSample);
+ Handle(::GEOM_Object) aSample = GetObjectImpl(theSample);
if (aSample.IsNull()) return aGEOMObject._retn();
//Perform the transformation
- HANDLE_NAMESPACE(GEOM_Object) aResObject =
+ Handle(::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_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) return aGEOMObject._retn();
//Perform the recomputation
- HANDLE_NAMESPACE(GEOM_Function) aLastFunction = anObject->GetLastFunction();
+ Handle(::GEOM_Function) aLastFunction = anObject->GetLastFunction();
if (aLastFunction.IsNull()) return aGEOMObject._retn();
GetOperations()->GetSolver()->ComputeFunction(aLastFunction);
GetOperations()->SetNotDone();
//Get the object
- HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject);
+ Handle(::GEOM_Object) anObject = GetObjectImpl(theObject);
if (anObject.IsNull()) {
return aGEOMObject._retn();
}
//Perform the transformation
- HANDLE_NAMESPACE(GEOM_Object) aResObject = GetOperations()->MakeProjectionOnCylinder
+ Handle(::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_NAMESPACE(GEOM_Object) theImpl) :
+ Handle(::GEOM_Object) theImpl) :
SALOME::GenericObj_i( thePOA ),
GEOM_BaseObject_i( thePOA, theEngine, theImpl ),
_impl( theImpl )
{
CORBA::String_var name("");
- HANDLE_NAMESPACE(GEOM_Function) aMainFun = _impl->GetLastFunction();
+ Handle(::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_NAMESPACE(GEOM_BaseObject) anObj =
+ Handle(::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_NAMESPACE(GEOM_Function) aFun = anObj->GetLastFunction();
+ Handle(::GEOM_Function) aFun = anObj->GetLastFunction();
if ( aFun.IsNull() ) continue;
GEOM_ISubShape ISS( aFun );
GEOM::ListOfLong_var anIndices = new GEOM::ListOfLong;
if(!_impl->IsMainShape()) {
- HANDLE_NAMESPACE(GEOM_Function) aFunction = _impl->GetLastFunction(); //Get Sub-shape function (always the first (and last) one)
+ Handle(::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_NAMESPACE(GEOM_Function) aFunction = _impl->GetFunction(1); //Get Sub-shape function (always the first (and last) one)
+ Handle(::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_NAMESPACE(GEOM_Object) otherObject = HANDLE_NAMESPACE(GEOM_Object)::DownCast
+ Handle(::GEOM_Object) otherObject = Handle(::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_NAMESPACE(GEOM_Object) theImpl);
+ GEOM_Object_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_Object) theImpl);
~GEOM_Object_i();
virtual GEOM::shape_type GetShapeType();
virtual bool IsShape();
- HANDLE_NAMESPACE(GEOM_Object) GetImpl() { return _impl; }
+ Handle(::GEOM_Object) GetImpl() { return _impl; }
private:
- HANDLE_NAMESPACE(GEOM_Object) _impl;
+ Handle(::GEOM_Object) _impl;
TopoDS_Shape _geom;
};
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer IGESPlugin_ExportDriver::Execute(LOGBOOK& log) const
+Standard_Integer IGESPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
return false;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ExportDriver,GEOM_BaseDriver );
+IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ExportDriver,GEOM_BaseDriver );
~IGESPlugin_ExportDriver() {};
static const Standard_GUID& GetID();
- virtual Standard_Integer Execute(LOGBOOK& log) const;
- Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; }
- virtual void Validate( LOGBOOK& ) const {}
+ virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_Boolean MustExecute( const Handle(TFunction_Logbook)& ) const { return Standard_True; }
+ virtual void Validate( Handle(TFunction_Logbook)& ) const {}
virtual bool GetCreationInformation( std::string& theOperationName,
std::vector<GEOM_Param>& params );
- OCCT_DEFINE_STANDARD_RTTIEXT(IGESPlugin_ExportDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(IGESPlugin_ExportDriver,GEOM_BaseDriver)
};
#endif // _IGESPlugin_ExportDriver_HXX
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer IGESPlugin_ImportDriver::Execute(LOGBOOK& log) const
+Standard_Integer IGESPlugin_ImportDriver::Execute(Handle(TFunction_Logbook)& log) const
{
if( Label().IsNull() ) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
aFunction->SetValue( aResShape );
-#if OCC_VERSION_MAJOR < 7
- log.SetTouched(Label());
-#else
log->SetTouched(Label());
-#endif
return 1;
}
return TCollection_AsciiString();
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ImportDriver, GEOM_BaseDriver );
+IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ImportDriver, GEOM_BaseDriver );
~IGESPlugin_ImportDriver() {};
static const Standard_GUID& GetID();
- virtual Standard_Integer Execute(LOGBOOK& log) const;
- Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; }
- virtual void Validate( LOGBOOK& ) const {}
+ virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_Boolean MustExecute( const Handle(TFunction_Logbook)& ) const { return Standard_True; }
+ virtual void Validate( Handle(TFunction_Logbook)& ) const {}
virtual bool GetCreationInformation( std::string& theOperationName,
std::vector<GEOM_Param>& params );
const TCollection_AsciiString&,
TCollection_AsciiString& );
- OCCT_DEFINE_STANDARD_RTTIEXT(IGESPlugin_ImportDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(IGESPlugin_ImportDriver,GEOM_BaseDriver)
};
#endif // _IGESPlugin_ImportDriver_HXX
#include <GEOMBase.h>
#include <GeometryGUI.h>
-#include <Basics_OCCTVersion.hxx>
-
#include <SUIT_Session.h>
#include <SUIT_Desktop.h>
#include <SUIT_ResourceMgr.h>
// SALOME includes
#include <SALOME_InteractiveObject.hxx>
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(MeasureGUI_DimensionFilter, SelectMgr_Filter)
+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:
- OCCT_DEFINE_STANDARD_RTTIEXT(MeasureGUI_DimensionFilter,SelectMgr_Filter)
+ DEFINE_STANDARD_RTTIEXT(MeasureGUI_DimensionFilter,SelectMgr_Filter)
public:
Standard_EXPORT MeasureGUI_DimensionFilter( const Handle(AIS_InteractiveObject)& theIO );
#include <Geom_Line.hxx>
#include <Geom_Plane.hxx>
#include <NCollection_Sequence.hxx>
-
-#if OCC_VERSION_LARGE >= 0x07010000
#include <Quantity_Length.hxx>
-#endif
//=================================================================================
// function : Constructor
#include "GEOM_AISDimension.hxx"
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISLength, AIS_LengthDimension)
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISDiameter, AIS_DiameterDimension)
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISAngle, AIS_AngleDimension)
+IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISLength, AIS_LengthDimension)
+IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISDiameter, AIS_DiameterDimension)
+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)
{
public:
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISLength,AIS_LengthDimension)
+ DEFINE_STANDARD_RTTIEXT(GEOM_AISLength,AIS_LengthDimension)
public:
Standard_EXPORT GEOM_AISLength( const Standard_Integer theId );
{
public:
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISDiameter,AIS_DiameterDimension)
+ DEFINE_STANDARD_RTTIEXT(GEOM_AISDiameter,AIS_DiameterDimension)
public:
Standard_EXPORT GEOM_AISDiameter( const Standard_Integer theId );
{
public:
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISAngle,AIS_AngleDimension)
+ DEFINE_STANDARD_RTTIEXT(GEOM_AISAngle,AIS_AngleDimension)
public:
Standard_EXPORT GEOM_AISAngle( const Standard_Integer theId );
#include <GEOMUtils.hxx>
-#include <Basics_OCCTVersion.hxx>
-
// Open CASCADE Includes
#include <AIS_InteractiveContext.hxx>
#include <BRepAdaptor_Surface.hxx>
#include <gp_Dir.hxx>
#include <gp_Pnt.hxx>
#include <gp_Vec.hxx>
-
-#if OCC_VERSION_LARGE > 0x06070200
#include <Prs3d_VertexDrawMode.hxx>
-#endif
-
-#if OCC_VERSION_MAJOR < 7
- #include <StdPrs_WFDeflectionShape.hxx>
-#else
- #include <StdPrs_WFShape.hxx>
-#endif
+#include <StdPrs_WFShape.hxx>
#include <SalomeApp_Tools.h>
#include <SUIT_Session.h>
#include <SUIT_ResourceMgr.h>
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISShape, SALOME_AISShape)
+IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISShape, SALOME_AISShape)
GEOM_AISShape::TopLevelDispMode GEOM_AISShape::myTopLevelDm = GEOM_AISShape::TopKeepCurrent;
Quantity_Color GEOM_AISShape::myTopLevelColor;
Handle(SelectMgr_Selection) sel = theObj->Selection( m );
for ( sel->Init(); sel->More(); sel->Next() ) {
-#if OCC_VERSION_LARGE > 0x06080100
const Handle(SelectMgr_SensitiveEntity) aHSenEntity = sel->Sensitive();
if( aHSenEntity.IsNull() )
continue;
Handle(SelectBasics_SensitiveEntity) entity = aHSenEntity->BaseSensitive();
-#else
- Handle(SelectBasics_SensitiveEntity) entity = sel->Sensitive();
-#endif
if ( entity.IsNull() )
continue;
Handle(SelectMgr_EntityOwner) owner =
void GEOM_AISShape::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
const Handle(Prs3d_Presentation)& aPrs,
const Standard_Integer aMode)
-{
+{
if (IsInfinite()) aPrs->SetInfiniteState(Standard_True); //pas de prise en compte lors du FITALL
Handle(AIS_InteractiveContext) anIC = GetContext();
bool anIsColorField = anIsField && myFieldDataType != GEOM::FDT_String;
bool anIsTextField = anIsField && myFieldDataType == GEOM::FDT_String;
-#if OCC_VERSION_LARGE > 0x06070200
if (isShowVertices())
myDrawer->SetVertexDrawMode(Prs3d_VDM_All);
-#endif
// StdSelect_DisplayMode d = (StdSelect_DisplayMode) aMode;
bool isTopLev = isTopLevel() && switchTopLevel();
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:
}
case TexturedShape:
{
-#ifdef USE_TEXTURED_SHAPE
- AIS_TexturedShape::Compute(aPresentationManager, aPrs, aMode);
-#else
- AIS_Shape::Compute(aPresentationManager, aPrs, aMode);
-#endif
+ shadingMode(aPresentationManager, aPrs, Shading);
+ break;
}
}
if (isShowVectors())
{
// PAL12113: AIS_Shape::Compute() works correctly with shapes containing no faces
//StdPrs_ShadedShape::Add(aPrs,myshape,myDrawer);
-#ifdef USE_TEXTURED_SHAPE
- AIS_TexturedShape::Compute(aPresentationManager, aPrs, aMode);
-#else
- AIS_Shape::Compute(aPresentationManager, aPrs, aMode);
-#endif
+ SALOME_AISShape::Compute(aPresentationManager, aPrs, aMode);
}
}
else
{
Quantity_Color aColor( aQColor.redF(), aQColor.greenF(), aQColor.blueF(), Quantity_TOC_RGB );
+ SetCustomColor( aSubShape, aColor );
if( myFieldDimension == 0 )
{
TopoDS_Vertex aVertexShape = TopoDS::Vertex( aSubShape );
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 ||
myFieldDimension == -1 )
{
- myDrawer->ShadingAspect()->SetColor( aColor );
- StdPrs_ShadedShape::Add( thePrs, aSubShape, myDrawer );
+ //Handle(Prs3d_ShadingAspect) anAspect = new Prs3d_ShadingAspect();
+ //anAspect->SetColor( aColor );
+ //myDrawer->SetShadingAspect( anAspect );
+ //StdPrs_ShadedShape::Add( thePrs, aSubShape, myDrawer );
}
}
}
}
+
+ SALOME_AISShape::Compute( Handle(PrsMgr_PresentationManager3d)(),
+ thePrs, AIS_Shaded );
}
void GEOM_AISShape::drawName( const Handle(Prs3d_Presentation)& thePrs )
static Quantity_Color myTopLevelColor;
public:
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISShape,SALOME_AISShape)
+ DEFINE_STANDARD_RTTIEXT(GEOM_AISShape, SALOME_AISShape)
};
DEFINE_STANDARD_HANDLE(GEOM_AISShape, SALOME_AISShape)
#include "GEOM_AISTrihedron.hxx"
#include <Geom_Axis2Placement.hxx>
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISTrihedron, AIS_Trihedron)
+IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISTrihedron, AIS_Trihedron)
/*
Class : GEOM_AISTrihedron
Handle(SALOME_InteractiveObject) myObject;
public:
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISTrihedron,AIS_Trihedron)
+ DEFINE_STANDARD_RTTIEXT(GEOM_AISTrihedron,AIS_Trihedron)
};
#endif
#include <Prs3d_Presentation.hxx>
#include <PrsMgr_PresentationManager3d.hxx>
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISVector, GEOM_AISShape)
+IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISVector, GEOM_AISShape)
//=======================================================================
//function : GEOM_AISVector
virtual bool isShowVectors() {return true;}
public:
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISVector,GEOM_AISShape)
+ DEFINE_STANDARD_RTTIEXT(GEOM_AISVector,GEOM_AISShape)
};
DEFINE_STANDARD_HANDLE(GEOM_AISVector, GEOM_AISShape)
SetDisplayMode( 0 );
SetZLayer( Graphic3d_ZLayerId_Default );
SetAutoHide( Standard_True );
-#if OCC_VERSION_LARGE <= 0x07010001
- SetHilightMode( HighlightAll );
-#endif
SetMutable( Standard_True );
SetDepthCulling( Standard_True );
return;
}
}
-#if OCC_VERSION_LARGE > 0x07010001
const Handle(Graphic3d_PresentationAttributes) aHighlightStyle = theWorkspace->HighlightStyle();
if (!aHighlightStyle.IsNull() && myAISObject->myHilightMode == HighlightLabel)
{
theWorkspace->SetHighlightStyle(empty);
theWorkspace->ApplyAspectLine();
}
-#else
- const bool toHighlight = theWorkspace->ToHighlight();
-
- if (toHighlight && myAISObject->myHilightMode == HighlightLabel)
- {
- theWorkspace->SetHighlight( false );
- theWorkspace->ApplyAspectLine();
- }
-#endif
GLint myOldDepthMode = 0;
aContext->ApplyModelViewMatrix();
-#if OCC_VERSION_LARGE > 0x07010001
theWorkspace->SetHighlightStyle(aHighlightStyle);
-#else
- if ( toHighlight != theWorkspace->ToHighlight() )
- {
- theWorkspace->SetHighlight( toHighlight );
- }
-#endif
}
// =======================================================================
// purpose : Perform highlighting of the presentation.
// =======================================================================
void GEOM_Annotation::GEOM_AnnotationOwner::HilightWithColor( const Handle(PrsMgr_PresentationManager3d)& thePM,
-#if OCC_VERSION_LARGE > 0x07010001
const Handle(Prs3d_Drawer)& theStyle,
-#else
- const Handle(Graphic3d_HighlightStyle)& theStyle,
-#endif
const Standard_Integer theMode )
{
if ( myPrsSh.IsNull() )
{
Handle(Prs3d_Drawer) aDrawer = new Prs3d_Drawer;
-#if OCC_VERSION_LARGE > 0x07010001
aDrawer->Link( theStyle );
-#else
- aDrawer->Link( Selectable()->HilightAttributes() );
-#endif
Handle(Prs3d_IsoAspect) aUIsoAspect = new Prs3d_IsoAspect(
aDrawer->UIsoAspect()->Aspect()->Color(),
aDrawer->UIsoAspect()->Aspect()->Type(),
const Standard_Integer theMode )
{
SelectMgr_EntityOwner::Unhilight( thePM, theMode );
-
-#if OCC_VERSION_LARGE > 0x07010001
thePM->Unhighlight( myPrsSh );
-#else
- thePM->Unhighlight( myPrsSh, theMode );
-#endif
}
// =======================================================================
#ifndef GEOM_Annotation_HeaderFile
#define GEOM_Annotation_HeaderFile
-#include <Basics_OCCTVersion.hxx>
-
#include <AIS_InteractiveObject.hxx>
#include <Bnd_Box.hxx>
#include <Font_FontAspect.hxx>
//! \param theMode [in] the display mode.
virtual void
HilightWithColor( const Handle(PrsMgr_PresentationManager3d)& thePM,
-#if OCC_VERSION_LARGE > 0x07010001
const Handle(Prs3d_Drawer)& theStyle,
-#else
- const Handle(Graphic3d_HighlightStyle)& theStyle,
-#endif
const Standard_Integer theMode = 0 ) Standard_OVERRIDE;
//! Removes highlighting from the type of shape.
#include "GEOM_InteractiveObject.hxx"
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_InteractiveObject, SALOME_InteractiveObject)
+IMPLEMENT_STANDARD_RTTIEXT(GEOM_InteractiveObject, SALOME_InteractiveObject)
GEOM_InteractiveObject::GEOM_InteractiveObject()
: SALOME_InteractiveObject()
std::string myFatherIOR;
public:
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_InteractiveObject,SALOME_InteractiveObject)
+ DEFINE_STANDARD_RTTIEXT(GEOM_InteractiveObject,SALOME_InteractiveObject)
};
DEFINE_STANDARD_HANDLE(GEOM_InteractiveObject, SALOME_InteractiveObject)
#include <TopoDS_Shape.hxx>
#include <Prs3d_IsoAspect.hxx>
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_TopWireframeShape, SALOME_AISShape)
+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:
- OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_TopWireframeShape,SALOME_AISShape)
+ DEFINE_STANDARD_RTTIEXT(GEOM_TopWireframeShape,SALOME_AISShape)
};
DEFINE_STANDARD_HANDLE(GEOM_TopWireframeShape, SALOME_AISShape)
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer STEPPlugin_ExportDriver::Execute(LOGBOOK& log) const
+Standard_Integer STEPPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
return false;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ExportDriver,GEOM_BaseDriver );
+IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ExportDriver,GEOM_BaseDriver );
~STEPPlugin_ExportDriver() {};
static const Standard_GUID& GetID();
- virtual Standard_Integer Execute(LOGBOOK& log) const;
- Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; }
- virtual void Validate( LOGBOOK& ) const {}
+ virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_Boolean MustExecute( const Handle(TFunction_Logbook)& ) const { return Standard_True; }
+ virtual void Validate( Handle(TFunction_Logbook)& ) const {}
virtual bool GetCreationInformation( std::string& theOperationName,
std::vector<GEOM_Param>& params );
- OCCT_DEFINE_STANDARD_RTTIEXT(STEPPlugin_ExportDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(STEPPlugin_ExportDriver,GEOM_BaseDriver)
};
#endif // _STEPPlugin_ExportDriver_HXX
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer STEPPlugin_ImportDriver::Execute(LOGBOOK& log) const
+Standard_Integer STEPPlugin_ImportDriver::Execute(Handle(TFunction_Logbook)& log) const
{
if( Label().IsNull() ) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
aFunction->SetValue( aResShape );
-#if OCC_VERSION_MAJOR < 7
- log.SetTouched(Label());
-#else
log->SetTouched(Label());
-#endif
return 1;
}
return aValue;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ImportDriver, GEOM_BaseDriver );
+IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ImportDriver, GEOM_BaseDriver );
~STEPPlugin_ImportDriver() {};
static const Standard_GUID& GetID();
- virtual Standard_Integer Execute(LOGBOOK& log) const;
- Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; }
- virtual void Validate( LOGBOOK& ) const {}
+ virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_Boolean MustExecute( const Handle(TFunction_Logbook)& ) const { return Standard_True; }
+ virtual void Validate( Handle(TFunction_Logbook)& ) const {}
virtual bool GetCreationInformation( std::string& theOperationName,
std::vector<GEOM_Param>& params );
const TCollection_AsciiString&,
TCollection_AsciiString& );
- OCCT_DEFINE_STANDARD_RTTIEXT(STEPPlugin_ImportDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(STEPPlugin_ImportDriver,GEOM_BaseDriver)
};
#endif // _STEPPlugin_ImportDriver_HXX
// KERNEL includes
#include <utilities.h>
#include <Basics_Utils.hxx>
-#include <Basics_OCCTVersion.hxx>
// GEOM includes
#include "GEOM_Function.hxx"
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer STLPlugin_ExportDriver::Execute(LOGBOOK& log) const
+Standard_Integer STLPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
TopoDS_Shape aCopyShape = aCopy.Shape();
// ASCII mode
aWriter.ASCIIMode() = anIsASCII;
-#if OCC_VERSION_LARGE > 0x06080000
if ( anIsRelative ) {
Standard_Real aXmin, aYmin, aZmin, aXmax, aYmax, aZmax;
Bnd_Box bndBox;
//Compute triangulation
BRepTools::Clean( aCopyShape );
BRepMesh_IncrementalMesh aMesh( aCopyShape, aDeflection );
-#else
- // set relative mode on false for using custom deflection coefficient
- aWriter.RelativeMode( ) = anIsRelative;
- if( anIsRelative )
- aWriter.SetCoefficient( aDeflection );
- else
- aWriter.SetDeflection( aDeflection );
-#endif
aWriter.Write( aCopyShape, aFileName.ToCString() );
-#if OCC_VERSION_MAJOR < 7
- log.SetTouched(Label());
-#else
log->SetTouched(Label());
-#endif
return 1;
}
catch( Standard_Failure )
return false;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ExportDriver,GEOM_BaseDriver );
+IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ExportDriver,GEOM_BaseDriver );
~STLPlugin_ExportDriver() {};
static const Standard_GUID& GetID();
- virtual Standard_Integer Execute(LOGBOOK& log) const;
- Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; }
- virtual void Validate( LOGBOOK& ) const {}
+ virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_Boolean MustExecute( const Handle(TFunction_Logbook)& ) const { return Standard_True; }
+ virtual void Validate( Handle(TFunction_Logbook)& ) const {}
virtual bool GetCreationInformation( std::string& theOperationName,
std::vector<GEOM_Param>& params );
- OCCT_DEFINE_STANDARD_RTTIEXT(STLPlugin_ExportDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(STLPlugin_ExportDriver,GEOM_BaseDriver)
};
#endif // _STLPlugin_ExportDriver_HXX
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer STLPlugin_ImportDriver::Execute(LOGBOOK& log) const
+Standard_Integer STLPlugin_ImportDriver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ImportDriver, GEOM_BaseDriver );
+IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ImportDriver, GEOM_BaseDriver );
~STLPlugin_ImportDriver() {};
static const Standard_GUID& GetID();
- virtual Standard_Integer Execute(LOGBOOK& log) const;
- Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; }
- virtual void Validate( LOGBOOK& ) const {}
+ virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_Boolean MustExecute( const Handle(TFunction_Logbook)& ) const { return Standard_True; }
+ virtual void Validate( Handle(TFunction_Logbook)& ) const {}
virtual bool GetCreationInformation( std::string& theOperationName,
std::vector<GEOM_Param>& params );
- OCCT_DEFINE_STANDARD_RTTIEXT(STLPlugin_ImportDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(STLPlugin_ImportDriver,GEOM_BaseDriver)
};
#endif // _STLPlugin_ImportDriver_HXX
#ifndef ShHealOper_ChangeOrientation_HeaderFile
#define ShHealOper_ChangeOrientation_HeaderFile
-#include <MMgt_TShared.hxx>
#include <ShHealOper_Tool.hxx>
#include <TopoDS_Shape.hxx>
#ifndef ShHealOper_CloseContour_HeaderFile
#define ShHealOper_CloseContour_HeaderFile
-#include <MMgt_TShared.hxx>
#include <TopoDS_Shape.hxx>
#include <TopTools_SequenceOfShape.hxx>
#include <TopoDS_Wire.hxx>
// Created: 26.04.04 17:35:30
// Author: Galina KULIKOVA
-#include <Basics_OCCTVersion.hxx>
-
#include <ShapeFix_Shell.hxx>
#include <ShapeFix_Face.hxx>
#include <ShHealOper_FillHoles.hxx>
#ifndef ShHealOper_FillHoles_HeaderFile
#define ShHealOper_FillHoles_HeaderFile
-#include <MMgt_TShared.hxx>
#include <TopoDS_Shape.hxx>
#include <TopTools_SequenceOfShape.hxx>
#include <TopoDS_Wire.hxx>
#ifndef ShHealOper_RemoveFace_HeaderFile
#define ShHealOper_RemoveFace_HeaderFile
-#include <MMgt_TShared.hxx>
#include <ShHealOper_Tool.hxx>
#include <TopoDS_Shape.hxx>
#include <TopTools_SequenceOfShape.hxx>
#ifndef ShHealOper_RemoveInternalWires_HeaderFile
#define ShHealOper_RemoveInternalWires_HeaderFile
-#include <MMgt_TShared.hxx>
#include <ShHealOper_Tool.hxx>
#include <TopoDS_Shape.hxx>
#include <TopTools_SequenceOfShape.hxx>
#ifndef ShHealOper_Sewing_HeaderFile
#define ShHealOper_Sewing_HeaderFile
-#include <MMgt_TShared.hxx>
#include <ShHealOper_Tool.hxx>
#include <TopoDS_Shape.hxx>
#include <TopAbs_ShapeEnum.hxx>
public:
// Declaration of CASCADE RTTI
- OCCT_DEFINE_STANDARD_RTTIEXT(ShHealOper_SplitCurve2d,ShapeUpgrade_SplitCurve2d)
+ DEFINE_STANDARD_RTTIEXT(ShHealOper_SplitCurve2d,ShapeUpgrade_SplitCurve2d)
};
// Definition of HANDLE object using Standard_DefineHandle.hxx
#include <ShapeExtend_Status.hxx>
#include <ShapeExtend.hxx>
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(ShHealOper_SplitCurve2d,ShapeUpgrade_SplitCurve2d)
+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
- OCCT_DEFINE_STANDARD_RTTIEXT(ShHealOper_SplitCurve2d,ShapeUpgrade_SplitCurve2d)
+ DEFINE_STANDARD_RTTIEXT(ShHealOper_SplitCurve2d,ShapeUpgrade_SplitCurve2d)
};
// Definition of HANDLE object using Standard_DefineHandle.hxx
#include <ShapeExtend_Status.hxx>
#include <ShapeExtend.hxx>
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(ShHealOper_SplitCurve3d,ShapeUpgrade_SplitCurve3d)
+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
- OCCT_DEFINE_STANDARD_RTTIEXT(ShHealOper_SplitCurve3d,ShapeUpgrade_SplitCurve3d)
+ DEFINE_STANDARD_RTTIEXT(ShHealOper_SplitCurve3d,ShapeUpgrade_SplitCurve3d)
};
// Definition of HANDLE object using Standard_DefineHandle.hxx
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer VTKPlugin_ExportDriver::Execute(LOGBOOK& log) const
+Standard_Integer VTKPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
return false;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT( VTKPlugin_ExportDriver,GEOM_BaseDriver );
+IMPLEMENT_STANDARD_RTTIEXT( VTKPlugin_ExportDriver,GEOM_BaseDriver );
~VTKPlugin_ExportDriver() {};
static const Standard_GUID& GetID();
- virtual Standard_Integer Execute(LOGBOOK& log) const;
- Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; }
- virtual void Validate( LOGBOOK& ) const {}
+ virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_Boolean MustExecute( const Handle(TFunction_Logbook)& ) const { return Standard_True; }
+ virtual void Validate( Handle(TFunction_Logbook)& ) const {}
virtual bool GetCreationInformation( std::string& theOperationName,
std::vector<GEOM_Param>& params );
- OCCT_DEFINE_STANDARD_RTTIEXT(VTKPlugin_ExportDriver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(VTKPlugin_ExportDriver,GEOM_BaseDriver)
};
#endif // _VTKPlugin_ExportDriver_HXX
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer XAOPlugin_Driver::Execute(LOGBOOK& log) const
+Standard_Integer XAOPlugin_Driver::Execute(Handle(TFunction_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;
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(XAOPlugin_Driver, GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT(XAOPlugin_Driver, GEOM_BaseDriver);
~XAOPlugin_Driver();
static const Standard_GUID& GetID();
- virtual Standard_Integer Execute(LOGBOOK& log) const;
- Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
- virtual void Validate(LOGBOOK&) const {}
+ virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
+ Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; }
+ virtual void Validate(Handle(TFunction_Logbook)&) const {}
virtual bool GetCreationInformation(std::string& theOperationName,
std::vector<GEOM_Param>& theParams);
static int GetFileNameTag() { return 1; } // where to store file name in GEOM_Function
- OCCT_DEFINE_STANDARD_RTTIEXT(XAOPlugin_Driver,GEOM_BaseDriver)
+ DEFINE_STANDARD_RTTIEXT(XAOPlugin_Driver,GEOM_BaseDriver)
};
#endif // _XAOPlugin_Driver_HXX
