mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2024-12-25 17:00:35 +05:00
Migration to OCCT 7.0
This commit is contained in:
parent
1f3630e04d
commit
31b91717e0
@ -1,5 +1,7 @@
|
||||
formatlist:SALOME_GEOM
|
||||
|
||||
formatlist:SALOME_GEOM|BinOcaf
|
||||
!
|
||||
! SALOME_GEOM format
|
||||
!
|
||||
SALOME_GEOM.Description: GEOM Document Version 1.0
|
||||
SALOME_GEOM.FileExtension: sgd
|
||||
SALOME_GEOM.StoragePlugin: ad696000-5b34-11d1-b5ba-00a0c9064368
|
||||
@ -7,4 +9,10 @@ SALOME_GEOM.RetrievalPlugin: ad696001-5b34-11d1-b5ba-00a0c9064368
|
||||
SALOME_GEOMSchema: ad696002-5b34-11d1-b5ba-00a0c9064368
|
||||
SALOME_GEOM.AttributeStoragePlugin: 47b0b826-d931-11d1-b5da-00a0c9064368
|
||||
SALOME_GEOM.AttributeRetrievalPlugin: 47b0b827-d931-11d1-b5da-00a0c9064368
|
||||
|
||||
!
|
||||
! BinOcaf format
|
||||
!
|
||||
BinOcaf.Description: Bin Ocaf Document Version 1.0
|
||||
BinOcaf.FileExtension: cbf
|
||||
BinOcaf.StoragePlugin: 03a56835-8269-11d5-aab2-0050044b1af1
|
||||
BinOcaf.RetrievalPlugin: 03a56836-8269-11d5-aab2-0050044b1af1
|
||||
|
@ -8,3 +8,8 @@ a148e300-5740-11d1-a904-080036aaa103.Location: FWOSPlugin
|
||||
ad696000-5b34-11d1-b5ba-00a0c9064368.Location: @CAS_STDPLUGIN@
|
||||
ad696001-5b34-11d1-b5ba-00a0c9064368.Location: @CAS_STDPLUGIN@
|
||||
ad696002-5b34-11d1-b5ba-00a0c9064368.Location: @CAS_STDPLUGIN@
|
||||
!
|
||||
! BinOcaf Document Plugin
|
||||
!
|
||||
03a56835-8269-11d5-aab2-0050044b1af1.Location: @CAS_BINPLUGIN@
|
||||
03a56836-8269-11d5-aab2-0050044b1af1.Location: @CAS_BINPLUGIN@
|
||||
|
@ -33,7 +33,7 @@
|
||||
#include <TopoDS_Shape.hxx>
|
||||
#include <Geom_Plane.hxx>
|
||||
|
||||
class Handle(Geom_RectangularTrimmedSurface);
|
||||
#include <Geom_RectangularTrimmedSurface.hxx>
|
||||
|
||||
class VolumeSection{
|
||||
|
||||
@ -41,7 +41,7 @@ public:
|
||||
// Constructeur effectuant le maillage de peau de la shape
|
||||
Standard_EXPORT VolumeSection(TopoDS_Shape , Standard_Real);
|
||||
|
||||
//Methode qui affecte € un point,les coordonn‰es de centre de la boite englobante de la shape
|
||||
//Methode qui affecte <EFBFBD> un point,les coordonn<6E>es de centre de la boite englobante de la shape
|
||||
Standard_EXPORT void CenterOfGravity();
|
||||
|
||||
// Methode qui calcule le volume sous un plan Z = h
|
||||
@ -50,10 +50,10 @@ public:
|
||||
// Methode qui resout l'equation V(h)=constante
|
||||
Standard_EXPORT Standard_Real Archimede(Standard_Real , Standard_Real);
|
||||
|
||||
// Methode permettant de "setter" un plan afin de l'utiliser € l'interieur de la classe
|
||||
// Methode permettant de "setter" un plan afin de l'utiliser <EFBFBD> l'interieur de la classe
|
||||
Standard_EXPORT void SetPlane(Handle (Geom_Plane));
|
||||
|
||||
// Methode permettant de r‰cup‰rer la shape modifi‰e € l'ext‰rieur de la classe
|
||||
// Methode permettant de r<EFBFBD>cup<EFBFBD>rer la shape modifi<66>e <20> l'ext<78>rieur de la classe
|
||||
Standard_EXPORT TopoDS_Shape GetShape();
|
||||
|
||||
// Methode effectuant la rotation du plan et de la shape
|
||||
@ -62,10 +62,10 @@ public:
|
||||
// Methode effectuant la rotation inverse du plan et de la shape
|
||||
Standard_EXPORT Handle (Geom_RectangularTrimmedSurface) InvMakeRotation(gp_Dir,Handle(Geom_RectangularTrimmedSurface));
|
||||
|
||||
// Methode permettant de d‰couper le plan selon une projection de la Shape
|
||||
// Methode permettant de d<EFBFBD>couper le plan selon une projection de la Shape
|
||||
Standard_EXPORT Handle (Geom_RectangularTrimmedSurface) TrimSurf();
|
||||
|
||||
// Methode permmettant de deplacer le plan jusqu'a la position donn‰e par Archimˆde
|
||||
// Methode permmettant de deplacer le plan jusqu'a la position donn<EFBFBD>e par Archim<69>de
|
||||
Standard_EXPORT Handle (Geom_RectangularTrimmedSurface) AjustePlan(Handle(Geom_RectangularTrimmedSurface),Standard_Real,gp_Pnt);
|
||||
|
||||
Standard_EXPORT void getZ( double& min, double& max);
|
||||
|
@ -49,7 +49,6 @@
|
||||
#include <TopoDS_Shape.hxx>
|
||||
#include <TopoDS_Edge.hxx>
|
||||
|
||||
#include <TFunction_Logbook.hxx>
|
||||
#include <StdFail_NotDone.hxx>
|
||||
|
||||
#include <TopExp.hxx>
|
||||
@ -84,7 +83,7 @@ AdvancedEngine_DividedDiskDriver::AdvancedEngine_DividedDiskDriver()
|
||||
//function : Execute
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
Standard_Integer AdvancedEngine_DividedDiskDriver::Execute(TFunction_Logbook& log) const
|
||||
Standard_Integer AdvancedEngine_DividedDiskDriver::Execute(LOGBOOK& log) const
|
||||
{
|
||||
if (Label().IsNull()) return 0;
|
||||
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
|
||||
@ -139,7 +138,11 @@ Standard_Integer AdvancedEngine_DividedDiskDriver::Execute(TFunction_Logbook& lo
|
||||
|
||||
aFunction->SetValue(aShape);
|
||||
|
||||
#if OCC_VERSION_MAJOR < 7
|
||||
log.SetTouched(Label());
|
||||
#else
|
||||
log->SetTouched(Label());
|
||||
#endif
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -524,5 +527,4 @@ GetCreationInformation(std::string& theOperationName,
|
||||
return true;
|
||||
}
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE (AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver);
|
||||
IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver);
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver);
|
||||
|
@ -41,12 +41,9 @@ public:
|
||||
// Methods PUBLIC
|
||||
//
|
||||
AdvancedEngine_DividedDiskDriver();
|
||||
virtual Standard_Integer Execute(TFunction_Logbook& log) const;
|
||||
virtual void Validate(TFunction_Logbook&) const {}
|
||||
Standard_Boolean MustExecute(const TFunction_Logbook&) const
|
||||
{
|
||||
return Standard_True;
|
||||
}
|
||||
virtual Standard_Integer Execute(LOGBOOK& log) const;
|
||||
virtual void Validate(LOGBOOK&) const {}
|
||||
Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
|
||||
static const Standard_GUID& GetID();
|
||||
~AdvancedEngine_DividedDiskDriver() {};
|
||||
|
||||
@ -59,7 +56,7 @@ private:
|
||||
TopoDS_Shell MakeDiskHexagon (double R, double Ratio) const;
|
||||
TopoDS_Shape MakeDiskSquare (double R, double Ratio) const;
|
||||
|
||||
DEFINE_STANDARD_RTTI( AdvancedEngine_DividedDiskDriver )
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver)
|
||||
};
|
||||
|
||||
#endif // _AdvancedEngine_DividedDiskDriver_HXX
|
||||
|
@ -33,31 +33,30 @@
|
||||
#include <OpUtil.hxx>
|
||||
#include <Utils_ExceptHandlers.hxx>
|
||||
|
||||
#include "GEOM_Function.hxx"
|
||||
#include "GEOM_PythonDump.hxx"
|
||||
#include "GEOMUtils.hxx"
|
||||
#include "GEOMAlgo_ClsfSurf.hxx"
|
||||
#include "GEOMAlgo_FinderShapeOn2.hxx"
|
||||
#include "GEOMAlgo_Splitter.hxx"
|
||||
#include <GEOM_Function.hxx>
|
||||
#include <GEOM_PythonDump.hxx>
|
||||
#include <GEOMUtils.hxx>
|
||||
#include <GEOMAlgo_ClsfSurf.hxx>
|
||||
#include <GEOMAlgo_FinderShapeOn2.hxx>
|
||||
#include <GEOMAlgo_Splitter.hxx>
|
||||
|
||||
#include "GEOMImpl_Gen.hxx"
|
||||
#include "GEOMImpl_Types.hxx"
|
||||
#include <GEOMImpl_Gen.hxx>
|
||||
#include <GEOMImpl_Types.hxx>
|
||||
|
||||
#include "GEOMImpl_IBasicOperations.hxx"
|
||||
#include "GEOMImpl_IBooleanOperations.hxx"
|
||||
#include "GEOMImpl_IShapesOperations.hxx"
|
||||
#include "GEOMImpl_ITransformOperations.hxx"
|
||||
#include "GEOMImpl_IBlocksOperations.hxx"
|
||||
#include "GEOMImpl_I3DPrimOperations.hxx"
|
||||
#include "GEOMImpl_ILocalOperations.hxx"
|
||||
#include "GEOMImpl_IHealingOperations.hxx"
|
||||
#include "GEOMImpl_IGroupOperations.hxx"
|
||||
#include "GEOMImpl_GlueDriver.hxx"
|
||||
#include <GEOMImpl_IBasicOperations.hxx>
|
||||
#include <GEOMImpl_IBooleanOperations.hxx>
|
||||
#include <GEOMImpl_IShapesOperations.hxx>
|
||||
#include <GEOMImpl_ITransformOperations.hxx>
|
||||
#include <GEOMImpl_IBlocksOperations.hxx>
|
||||
#include <GEOMImpl_I3DPrimOperations.hxx>
|
||||
#include <GEOMImpl_ILocalOperations.hxx>
|
||||
#include <GEOMImpl_IHealingOperations.hxx>
|
||||
#include <GEOMImpl_IGroupOperations.hxx>
|
||||
#include <GEOMImpl_GlueDriver.hxx>
|
||||
|
||||
#include <TDF_Tool.hxx>
|
||||
#include <TFunction_DriverTable.hxx>
|
||||
#include <TFunction_Driver.hxx>
|
||||
#include <TFunction_Logbook.hxx>
|
||||
#include <TNaming_CopyShape.hxx>
|
||||
|
||||
#include <TopExp.hxx>
|
||||
@ -812,7 +811,7 @@ bool AdvancedEngine_IOperations::MakeGroups(Handle(GEOM_Object) theShape, int sh
|
||||
//=============================================================================
|
||||
bool AdvancedEngine_IOperations::GetFacesOnSurf
|
||||
(const TopoDS_Shape &theShape,
|
||||
const Handle_Geom_Surface& theSurface,
|
||||
const Handle(Geom_Surface)& theSurface,
|
||||
const Standard_Real theTolerance,
|
||||
TopTools_ListOfShape &theFaces)
|
||||
{
|
||||
|
@ -28,6 +28,9 @@
|
||||
#include "GEOM_Engine.hxx"
|
||||
#include "GEOM_Object.hxx"
|
||||
|
||||
#include <TopTools_ListOfShape.hxx>
|
||||
#include <Geom_Surface.hxx>
|
||||
|
||||
#include <list>
|
||||
#include <gp_Ax2.hxx>
|
||||
|
||||
@ -40,8 +43,6 @@ class GEOMImpl_I3DPrimOperations;
|
||||
class GEOMImpl_ILocalOperations;
|
||||
class GEOMImpl_IHealingOperations;
|
||||
class GEOMImpl_IGroupOperations;
|
||||
class Handle_Geom_Surface;
|
||||
class TopTools_ListOfShape;
|
||||
|
||||
class ADVANCEDENGINE_EXPORT AdvancedEngine_IOperations: public GEOM_IOperations
|
||||
{
|
||||
@ -71,7 +72,7 @@ private:
|
||||
gp_Trsf aTrsf);
|
||||
|
||||
bool GetFacesOnSurf(const TopoDS_Shape &theShape,
|
||||
const Handle_Geom_Surface& theSurface,
|
||||
const Handle(Geom_Surface)& theSurface,
|
||||
const Standard_Real theTolerance,
|
||||
TopTools_ListOfShape &theFaces);
|
||||
|
||||
|
@ -38,7 +38,6 @@
|
||||
#include <gp_Pln.hxx>
|
||||
#include <gp_Dir.hxx>
|
||||
#include <gp_Trsf.hxx>
|
||||
#include <TFunction_Logbook.hxx>
|
||||
#include <StdFail_NotDone.hxx>
|
||||
#include <BRepPrimAPI_MakeCone.hxx>
|
||||
#include <BRepPrimAPI_MakeCylinder.hxx>
|
||||
@ -401,7 +400,7 @@ TopoDS_Shape AdvancedEngine_PipeTShapeDriver::MakeQuarterPipeTShape (const doubl
|
||||
//function : Execute
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
Standard_Integer AdvancedEngine_PipeTShapeDriver::Execute (TFunction_Logbook& log) const
|
||||
Standard_Integer AdvancedEngine_PipeTShapeDriver::Execute(LOGBOOK& log) const
|
||||
{
|
||||
if (Label().IsNull()) return 0;
|
||||
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
|
||||
@ -624,7 +623,11 @@ Standard_Integer AdvancedEngine_PipeTShapeDriver::Execute (TFunction_Logbook& lo
|
||||
|
||||
aFunction->SetValue(aShape);
|
||||
|
||||
#if OCC_VERSION_MAJOR < 7
|
||||
log.SetTouched(Label());
|
||||
#else
|
||||
log->SetTouched(Label());
|
||||
#endif
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -685,5 +688,4 @@ GetCreationInformation(std::string& theOperationName,
|
||||
return true;
|
||||
}
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE (AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver);
|
||||
IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver);
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver);
|
||||
|
@ -36,12 +36,10 @@ public:
|
||||
// Methods PUBLIC
|
||||
//
|
||||
AdvancedEngine_PipeTShapeDriver();
|
||||
virtual Standard_Integer Execute(TFunction_Logbook& log) const;
|
||||
virtual void Validate(TFunction_Logbook&) const {}
|
||||
Standard_Boolean MustExecute(const TFunction_Logbook&) const
|
||||
{
|
||||
return Standard_True;
|
||||
}
|
||||
virtual Standard_Integer Execute(LOGBOOK& log) const;
|
||||
virtual void Validate(LOGBOOK&) const {}
|
||||
Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
|
||||
|
||||
static const Standard_GUID& GetID();
|
||||
~AdvancedEngine_PipeTShapeDriver() {};
|
||||
|
||||
@ -49,8 +47,7 @@ public:
|
||||
std::vector<GEOM_Param>& params);
|
||||
// Type management
|
||||
//
|
||||
DEFINE_STANDARD_RTTI( AdvancedEngine_PipeTShapeDriver )
|
||||
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver)
|
||||
private:
|
||||
|
||||
/*!
|
||||
|
@ -25,7 +25,6 @@
|
||||
|
||||
#include "GEOM_Function.hxx"
|
||||
|
||||
#include <TFunction_Logbook.hxx>
|
||||
#include <StdFail_NotDone.hxx>
|
||||
|
||||
#include <TopoDS_Vertex.hxx>
|
||||
@ -98,7 +97,7 @@ AdvancedEngine_SmoothingSurfaceDriver::AdvancedEngine_SmoothingSurfaceDriver()
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
TopoDS_Shape AdvancedEngine_SmoothingSurfaceDriver::MakeSmoothingSurfaceUnClosed
|
||||
(const Handle_TColgp_HArray1OfPnt &theListOfPoints,
|
||||
(const Handle(TColgp_HArray1OfPnt) &theListOfPoints,
|
||||
const Standard_Integer theNbMax,
|
||||
const Standard_Integer theDegMax,
|
||||
const Standard_Real theDMax) const
|
||||
@ -165,7 +164,7 @@ TopoDS_Shape AdvancedEngine_SmoothingSurfaceDriver::MakeSmoothingSurfaceUnClosed
|
||||
//function : Execute
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
Standard_Integer AdvancedEngine_SmoothingSurfaceDriver::Execute(TFunction_Logbook& log) const
|
||||
Standard_Integer AdvancedEngine_SmoothingSurfaceDriver::Execute(LOGBOOK& log) const
|
||||
{
|
||||
if (Label().IsNull()) return 0;
|
||||
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
|
||||
@ -223,7 +222,11 @@ Standard_Integer AdvancedEngine_SmoothingSurfaceDriver::Execute(TFunction_Logboo
|
||||
|
||||
aFunction->SetValue(aShape);
|
||||
|
||||
#if OCC_VERSION_MAJOR < 7
|
||||
log.SetTouched(Label());
|
||||
#else
|
||||
log->SetTouched(Label());
|
||||
#endif
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -271,5 +274,4 @@ GetCreationInformation(std::string& theOperationName,
|
||||
return true;
|
||||
}
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE (AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver);
|
||||
IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver);
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver);
|
||||
|
@ -22,7 +22,6 @@
|
||||
|
||||
#include "GEOM_BaseDriver.hxx"
|
||||
|
||||
#include <TFunction_Logbook.hxx>
|
||||
#include <TColgp_HArray1OfPnt.hxx>
|
||||
#include <TopoDS_Shape.hxx>
|
||||
|
||||
@ -34,12 +33,10 @@ public:
|
||||
// Methods PUBLIC
|
||||
//
|
||||
AdvancedEngine_SmoothingSurfaceDriver();
|
||||
virtual Standard_Integer Execute(TFunction_Logbook& log) const;
|
||||
virtual void Validate(TFunction_Logbook&) const {}
|
||||
Standard_Boolean MustExecute(const TFunction_Logbook&) const
|
||||
{
|
||||
return Standard_True;
|
||||
}
|
||||
virtual Standard_Integer Execute(LOGBOOK& log) const;
|
||||
virtual void Validate(LOGBOOK&) const {}
|
||||
Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
|
||||
|
||||
static const Standard_GUID& GetID();
|
||||
~AdvancedEngine_SmoothingSurfaceDriver() {};
|
||||
|
||||
@ -47,11 +44,10 @@ public:
|
||||
std::vector<GEOM_Param>& params);
|
||||
// Type management
|
||||
//
|
||||
DEFINE_STANDARD_RTTI( AdvancedEngine_SmoothingSurfaceDriver )
|
||||
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver)
|
||||
private:
|
||||
TopoDS_Shape MakeSmoothingSurfaceUnClosed
|
||||
(const Handle_TColgp_HArray1OfPnt &theListOfPoints,
|
||||
(const Handle(TColgp_HArray1OfPnt) &theListOfPoints,
|
||||
const Standard_Integer theNbMax,
|
||||
const Standard_Integer theDegMax,
|
||||
const Standard_Real theDMax) const;
|
||||
|
@ -54,7 +54,7 @@ BREPPlugin_ExportDriver::BREPPlugin_ExportDriver()
|
||||
//function : Execute
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
Standard_Integer BREPPlugin_ExportDriver::Execute( TFunction_Logbook& log ) const
|
||||
Standard_Integer BREPPlugin_ExportDriver::Execute(LOGBOOK& log) const
|
||||
{
|
||||
if (Label().IsNull()) return 0;
|
||||
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
|
||||
@ -83,15 +83,6 @@ Standard_Integer BREPPlugin_ExportDriver::Execute( TFunction_Logbook& log ) cons
|
||||
return 1;
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
//function : MustExecute
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
Standard_Boolean BREPPlugin_ExportDriver::MustExecute( const TFunction_Logbook& ) const
|
||||
{
|
||||
return Standard_True;
|
||||
}
|
||||
|
||||
//================================================================================
|
||||
/*!
|
||||
* \brief Returns a name of creation operation and names and values of creation parameters
|
||||
@ -104,5 +95,4 @@ GetCreationInformation( std::string& theOperationName,
|
||||
return false;
|
||||
}
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE( BREPPlugin_ExportDriver,GEOM_BaseDriver );
|
||||
IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ExportDriver,GEOM_BaseDriver );
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ExportDriver,GEOM_BaseDriver );
|
||||
|
@ -23,9 +23,6 @@
|
||||
// GEOM includes
|
||||
#include "GEOM_BaseDriver.hxx"
|
||||
|
||||
// OCCT includes
|
||||
#include <TFunction_Logbook.hxx>
|
||||
|
||||
DEFINE_STANDARD_HANDLE( BREPPlugin_ExportDriver, GEOM_BaseDriver );
|
||||
|
||||
class BREPPlugin_ExportDriver : public GEOM_BaseDriver
|
||||
@ -35,14 +32,14 @@ public:
|
||||
~BREPPlugin_ExportDriver() {};
|
||||
|
||||
static const Standard_GUID& GetID();
|
||||
virtual Standard_Integer Execute( TFunction_Logbook& log ) const;
|
||||
Standard_Boolean MustExecute( const TFunction_Logbook& ) const;
|
||||
virtual void Validate( TFunction_Logbook& ) const {}
|
||||
virtual Standard_Integer Execute(LOGBOOK& log) const;
|
||||
virtual void Validate(LOGBOOK&) const {}
|
||||
Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
|
||||
|
||||
virtual bool GetCreationInformation( std::string& theOperationName,
|
||||
std::vector<GEOM_Param>& params );
|
||||
|
||||
DEFINE_STANDARD_RTTI( BREPPlugin_ExportDriver )
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(BREPPlugin_ExportDriver,GEOM_BaseDriver)
|
||||
};
|
||||
|
||||
#endif // _BREPPlugin_ExportDriver_HXX
|
||||
|
@ -55,7 +55,7 @@ BREPPlugin_ImportDriver::BREPPlugin_ImportDriver()
|
||||
//function : Execute
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
Standard_Integer BREPPlugin_ImportDriver::Execute( TFunction_Logbook& log ) const
|
||||
Standard_Integer BREPPlugin_ImportDriver::Execute(LOGBOOK& log) const
|
||||
{
|
||||
if( Label().IsNull() ) return 0;
|
||||
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
|
||||
@ -76,20 +76,15 @@ Standard_Integer BREPPlugin_ImportDriver::Execute( TFunction_Logbook& log ) cons
|
||||
|
||||
aFunction->SetValue( aShape );
|
||||
|
||||
log.SetTouched( Label() );
|
||||
#if OCC_VERSION_MAJOR < 7
|
||||
log.SetTouched(Label());
|
||||
#else
|
||||
log->SetTouched(Label());
|
||||
#endif
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
//function : MustExecute
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
Standard_Boolean BREPPlugin_ImportDriver::MustExecute( const TFunction_Logbook& ) const
|
||||
{
|
||||
return Standard_True;
|
||||
}
|
||||
|
||||
//================================================================================
|
||||
/*!
|
||||
* \brief Returns a name of creation operation and names and values of creation parameters
|
||||
@ -118,5 +113,4 @@ GetCreationInformation( std::string& theOperationName,
|
||||
return true;
|
||||
}
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE( BREPPlugin_ImportDriver, GEOM_BaseDriver );
|
||||
IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ImportDriver, GEOM_BaseDriver );
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ImportDriver, GEOM_BaseDriver );
|
||||
|
@ -23,9 +23,6 @@
|
||||
// GEOM includes
|
||||
#include "GEOM_BaseDriver.hxx"
|
||||
|
||||
// OCCT includes
|
||||
#include <TFunction_Logbook.hxx>
|
||||
|
||||
DEFINE_STANDARD_HANDLE( BREPPlugin_ImportDriver, GEOM_BaseDriver );
|
||||
|
||||
class BREPPlugin_ImportDriver : public GEOM_BaseDriver
|
||||
@ -35,14 +32,14 @@ public:
|
||||
~BREPPlugin_ImportDriver() {};
|
||||
|
||||
static const Standard_GUID& GetID();
|
||||
virtual Standard_Integer Execute( TFunction_Logbook& log ) const;
|
||||
Standard_Boolean MustExecute( const TFunction_Logbook& ) const;
|
||||
virtual void Validate( TFunction_Logbook& ) const {}
|
||||
virtual Standard_Integer Execute(LOGBOOK& log) const;
|
||||
Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; }
|
||||
virtual void Validate( LOGBOOK& ) const {}
|
||||
|
||||
virtual bool GetCreationInformation( std::string& theOperationName,
|
||||
std::vector<GEOM_Param>& params );
|
||||
std::vector<GEOM_Param>& params );
|
||||
|
||||
DEFINE_STANDARD_RTTI( BREPPlugin_ImportDriver )
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(BREPPlugin_ImportDriver,GEOM_BaseDriver)
|
||||
};
|
||||
|
||||
#endif // _BREPPlugin_ImportDriver_HXX
|
||||
|
@ -36,8 +36,7 @@
|
||||
|
||||
#include <Precision.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE(BlockFix_BlockFixAPI, MMgt_TShared);
|
||||
IMPLEMENT_STANDARD_RTTIEXT(BlockFix_BlockFixAPI, MMgt_TShared);
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT(BlockFix_BlockFixAPI, MMgt_TShared);
|
||||
|
||||
//=======================================================================
|
||||
//function : BlockFix_BlockFixAPI
|
||||
|
@ -26,11 +26,13 @@
|
||||
#include <Standard.hxx>
|
||||
#include <Standard_DefineHandle.hxx>
|
||||
|
||||
#include <Handle_ShapeBuild_ReShape.hxx>
|
||||
#include <ShapeBuild_ReShape.hxx>
|
||||
#include <TopoDS_Shape.hxx>
|
||||
#include <Standard_Real.hxx>
|
||||
#include <MMgt_TShared.hxx>
|
||||
|
||||
#include <Basics_OCCTVersion.hxx>
|
||||
|
||||
DEFINE_STANDARD_HANDLE(BlockFix_BlockFixAPI, MMgt_TShared);
|
||||
|
||||
class BlockFix_BlockFixAPI : public MMgt_TShared
|
||||
@ -41,15 +43,15 @@ public:
|
||||
|
||||
void SetShape(const TopoDS_Shape& Shape);
|
||||
TopoDS_Shape Shape() const;
|
||||
Handle_ShapeBuild_ReShape& Context();
|
||||
Handle(ShapeBuild_ReShape)& Context();
|
||||
Standard_Real& Tolerance();
|
||||
Standard_Integer& OptimumNbFaces();
|
||||
Standard_EXPORT void Perform();
|
||||
|
||||
DEFINE_STANDARD_RTTI(BlockFix_BlockFixAPI);
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(BlockFix_BlockFixAPI,MMgt_TShared)
|
||||
|
||||
private:
|
||||
Handle_ShapeBuild_ReShape myContext;
|
||||
Handle(ShapeBuild_ReShape) myContext;
|
||||
TopoDS_Shape myShape;
|
||||
Standard_Real myTolerance;
|
||||
Standard_Integer myOptimumNbFaces;
|
||||
|
@ -40,13 +40,11 @@
|
||||
#include <TopoDS_Edge.hxx>
|
||||
#include <TopoDS_Face.hxx>
|
||||
#include <TopoDS_Solid.hxx>
|
||||
#include <TopoDS_Shape.hxx>
|
||||
#include <TopoDS_Vertex.hxx>
|
||||
|
||||
#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
|
||||
#include <TopTools_IndexedMapOfShape.hxx>
|
||||
#include <TopTools_MapOfShape.hxx>
|
||||
#include <TopTools_ListOfShape.hxx>
|
||||
#include <TopTools_ListIteratorOfListOfShape.hxx>
|
||||
|
||||
//=======================================================================
|
||||
|
@ -27,11 +27,9 @@
|
||||
#include <Standard_Boolean.hxx>
|
||||
#include <Standard_Integer.hxx>
|
||||
#include <TopTools_SequenceOfShape.hxx>
|
||||
#include <TopTools_ListOfShape.hxx>
|
||||
#include <Standard_OStream.hxx>
|
||||
|
||||
class TopoDS_Shape;
|
||||
class TopTools_ListOfShape;
|
||||
|
||||
#include <Standard.hxx>
|
||||
#include <Standard_Macro.hxx>
|
||||
|
||||
|
@ -50,8 +50,7 @@
|
||||
|
||||
#include <gp_Pnt.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification);
|
||||
IMPLEMENT_STANDARD_RTTIEXT(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification);
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification);
|
||||
|
||||
//=======================================================================
|
||||
//function : BlockFix_PeriodicSurfaceModifier()
|
||||
|
@ -33,19 +33,18 @@
|
||||
#include <TColStd_IndexedMapOfTransient.hxx>
|
||||
#include <BRepTools_Modification.hxx>
|
||||
#include <Standard_Boolean.hxx>
|
||||
#include <Handle_Geom_Surface.hxx>
|
||||
#include <Handle_Geom_Curve.hxx>
|
||||
#include <Handle_Geom2d_Curve.hxx>
|
||||
#include <GeomAbs_Shape.hxx>
|
||||
|
||||
class TopoDS_Face;
|
||||
class Geom_Surface;
|
||||
class TopLoc_Location;
|
||||
class TopoDS_Edge;
|
||||
class Geom_Curve;
|
||||
#include <Basics_OCCTVersion.hxx>
|
||||
|
||||
class TopoDS_Vertex;
|
||||
class gp_Pnt;
|
||||
class TopoDS_Edge;
|
||||
class TopoDS_Face;
|
||||
class TopLoc_Location;
|
||||
class Geom_Surface;
|
||||
class Geom_Curve;
|
||||
class Geom2d_Curve;
|
||||
class gp_Pnt;
|
||||
|
||||
DEFINE_STANDARD_HANDLE(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification);
|
||||
|
||||
@ -84,7 +83,7 @@ public:
|
||||
const TopoDS_Face& NewF1,
|
||||
const TopoDS_Face& NewF2);
|
||||
|
||||
DEFINE_STANDARD_RTTI(BlockFix_PeriodicSurfaceModifier);
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(BlockFix_PeriodicSurfaceModifier,BRepTools_Modification)
|
||||
|
||||
private:
|
||||
Standard_Real myTolerance;
|
||||
|
@ -56,8 +56,7 @@
|
||||
#include <gp_Pnt.hxx>
|
||||
#include <gp_Sphere.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE(BlockFix_SphereSpaceModifier, BRepTools_Modification);
|
||||
IMPLEMENT_STANDARD_RTTIEXT(BlockFix_SphereSpaceModifier, BRepTools_Modification);
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT(BlockFix_SphereSpaceModifier, BRepTools_Modification);
|
||||
|
||||
//=======================================================================
|
||||
//function : BlockFix_SphereSpaceModifier
|
||||
|
@ -31,19 +31,18 @@
|
||||
#include <TColStd_IndexedMapOfTransient.hxx>
|
||||
#include <BRepTools_Modification.hxx>
|
||||
#include <Standard_Boolean.hxx>
|
||||
#include <Handle_Geom_Surface.hxx>
|
||||
#include <Handle_Geom_Curve.hxx>
|
||||
#include <Handle_Geom2d_Curve.hxx>
|
||||
#include <GeomAbs_Shape.hxx>
|
||||
|
||||
class TopoDS_Face;
|
||||
class Geom_Surface;
|
||||
class TopLoc_Location;
|
||||
class TopoDS_Edge;
|
||||
class Geom_Curve;
|
||||
#include <Basics_OCCTVersion.hxx>
|
||||
|
||||
class TopoDS_Vertex;
|
||||
class gp_Pnt;
|
||||
class TopoDS_Edge;
|
||||
class TopoDS_Face;
|
||||
class TopLoc_Location;
|
||||
class Geom_Surface;
|
||||
class Geom_Curve;
|
||||
class Geom2d_Curve;
|
||||
class gp_Pnt;
|
||||
|
||||
DEFINE_STANDARD_HANDLE(BlockFix_SphereSpaceModifier, BRepTools_Modification);
|
||||
|
||||
@ -71,7 +70,7 @@ public:
|
||||
const TopoDS_Face& NewF1, const TopoDS_Face& NewF2);
|
||||
Standard_EXPORT Standard_Boolean ForRotation (const TopoDS_Face& F);
|
||||
|
||||
DEFINE_STANDARD_RTTI(BlockFix_SphereSpaceModifier);
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(BlockFix_SphereSpaceModifier,BRepTools_Modification)
|
||||
|
||||
private:
|
||||
Standard_Real myTolerance;
|
||||
|
@ -41,7 +41,7 @@ public:
|
||||
|
||||
private:
|
||||
Standard_Real myTolerance;
|
||||
Handle_ShapeBuild_ReShape myContext;
|
||||
Handle(ShapeBuild_ReShape) myContext;
|
||||
|
||||
};
|
||||
|
||||
|
@ -38,7 +38,6 @@
|
||||
#include <TopoDS_Wire.hxx>
|
||||
|
||||
#include <Prs3d_PointAspect.hxx>
|
||||
#include <Handle_Prs3d_PointAspect.hxx>
|
||||
#include <iostream>
|
||||
#define DEBTRACE(msg) {std::cerr<<std::flush<<__FILE__<<" ["<<__LINE__<<"] : "<<msg<<std::endl<<std::flush;}
|
||||
|
||||
|
@ -35,7 +35,7 @@
|
||||
struct CurveCreator_Section;
|
||||
class CurveCreator_Displayer;
|
||||
class AIS_Shape;
|
||||
class Handle_AIS_InteractiveObject;
|
||||
class AIS_InteractiveObject;
|
||||
|
||||
/**
|
||||
* The CurveCreator_Curve object is represented as one or more sets of
|
||||
@ -292,7 +292,7 @@ public:
|
||||
/**
|
||||
* Get the curve AIS object
|
||||
*/
|
||||
virtual Handle_AIS_InteractiveObject getAISObject( const bool theNeedToBuild = false ) const;
|
||||
virtual Handle(AIS_InteractiveObject) getAISObject( const bool theNeedToBuild = false ) const;
|
||||
|
||||
protected:
|
||||
/**
|
||||
|
@ -19,7 +19,7 @@
|
||||
|
||||
#include "CurveCreator_Displayer.hxx"
|
||||
|
||||
CurveCreator_Displayer::CurveCreator_Displayer( Handle_AIS_InteractiveContext theContext,
|
||||
CurveCreator_Displayer::CurveCreator_Displayer( Handle(AIS_InteractiveContext) theContext,
|
||||
const int theZLayer ) :
|
||||
myContext( theContext ), myZLayer( theZLayer )
|
||||
{
|
||||
|
@ -32,11 +32,11 @@ class CURVECREATOR_EXPORT CurveCreator_Displayer
|
||||
typedef std::vector<Handle_AIS_InteractiveObject> AISObjectsList;
|
||||
|
||||
public:
|
||||
CurveCreator_Displayer( Handle_AIS_InteractiveContext theContext,
|
||||
CurveCreator_Displayer( Handle(AIS_InteractiveContext) theContext,
|
||||
const int theZLayer = -1 );
|
||||
~CurveCreator_Displayer(void);
|
||||
|
||||
void display( const Handle_AIS_InteractiveObject& theObject, bool isUpdate );
|
||||
void display( const Handle(AIS_InteractiveObject)& theObject, bool isUpdate );
|
||||
void eraseAll( bool isUpdate );
|
||||
//void highlight( const AISObjectsList& theObjects, bool isHL );
|
||||
|
||||
@ -44,7 +44,7 @@ protected:
|
||||
Quantity_Color getActiveColor( bool isHL );
|
||||
|
||||
private:
|
||||
Handle_AIS_InteractiveContext myContext;
|
||||
Handle(AIS_InteractiveContext) myContext;
|
||||
AISObjectsList myObjects;
|
||||
int myZLayer;
|
||||
};
|
||||
|
@ -27,14 +27,13 @@
|
||||
#include "CurveCreator_Macro.hxx"
|
||||
|
||||
#include <TColgp_HArray1OfPnt.hxx>
|
||||
#include <AIS_InteractiveObject.hxx>
|
||||
|
||||
#include <deque>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <list>
|
||||
|
||||
class Handle_AIS_InteractiveObject;
|
||||
|
||||
namespace CurveCreator
|
||||
{
|
||||
//! Type of the section
|
||||
@ -221,7 +220,7 @@ public:
|
||||
/*** Presentation methods ***/
|
||||
/***********************************************/
|
||||
|
||||
virtual Handle_AIS_InteractiveObject getAISObject( const bool theNeedToBuild = false ) const = 0;
|
||||
virtual Handle(AIS_InteractiveObject) getAISObject( const bool theNeedToBuild = false ) const = 0;
|
||||
|
||||
protected:
|
||||
virtual void constructAISObject() = 0;
|
||||
|
@ -618,22 +618,22 @@ void CurveCreator_Utils::setSelectedPoints( Handle(AIS_InteractiveContext) theCo
|
||||
//ASL: we switch off automatic highlight to improve performance of selection
|
||||
theContext->SetAutomaticHilight( Standard_False );
|
||||
|
||||
Handle_SelectMgr_Selection aSelection = anAISShape->Selection( AIS_Shape::SelectionMode( TopAbs_VERTEX ) );
|
||||
Handle(SelectMgr_Selection) aSelection = anAISShape->Selection( AIS_Shape::SelectionMode( TopAbs_VERTEX ) );
|
||||
for( aSelection->Init(); aSelection->More(); aSelection->Next() )
|
||||
{
|
||||
#if OCC_VERSION_LARGE > 0x06080100
|
||||
const Handle(SelectMgr_SensitiveEntity) aHSenEntity = aSelection->Sensitive();
|
||||
if( aHSenEntity.IsNull() )
|
||||
continue;
|
||||
Handle_SelectBasics_SensitiveEntity aSenEntity = aHSenEntity->BaseSensitive();
|
||||
Handle(SelectBasics_SensitiveEntity) aSenEntity = aHSenEntity->BaseSensitive();
|
||||
#else
|
||||
Handle_SelectBasics_SensitiveEntity aSenEntity = aSelection->Sensitive();
|
||||
Handle(SelectBasics_SensitiveEntity) aSenEntity = aSelection->Sensitive();
|
||||
#endif
|
||||
|
||||
Handle_Select3D_SensitivePoint aSenPnt = Handle_Select3D_SensitivePoint::DownCast( aSenEntity );
|
||||
Handle(Select3D_SensitivePoint) aSenPnt = Handle(Select3D_SensitivePoint)::DownCast( aSenEntity );
|
||||
|
||||
gp_Pnt anOwnerPnt = aSenPnt->Point();
|
||||
Handle_SelectMgr_EntityOwner anOwner = Handle_SelectMgr_EntityOwner::DownCast( aSenPnt->OwnerId() );
|
||||
Handle(SelectMgr_EntityOwner) anOwner = Handle(SelectMgr_EntityOwner)::DownCast( aSenPnt->OwnerId() );
|
||||
|
||||
|
||||
CurveCreator_ICurve::SectionToPointList::const_iterator anIt = thePoints.begin(),
|
||||
@ -992,7 +992,7 @@ Handle(TColgp_HArray1OfPnt) CurveCreator_Utils::getPoints
|
||||
// purpose :
|
||||
//=======================================================================
|
||||
void CurveCreator_Utils::FindPlane
|
||||
(const Handle_TColgp_HArray1OfPnt &thePoints,
|
||||
(const Handle(TColgp_HArray1OfPnt) &thePoints,
|
||||
gp_Pln &thePlane,
|
||||
Standard_Integer &thePlnStatus)
|
||||
{
|
||||
|
@ -205,7 +205,7 @@ protected:
|
||||
* \param IsBSpline BSpline flag. Output parameter.
|
||||
* \return the array of points. Null handle in case of failure.
|
||||
*/
|
||||
static Handle_TColgp_HArray1OfPnt getPoints
|
||||
static Handle(TColgp_HArray1OfPnt) getPoints
|
||||
(const TopoDS_Shape &theShape,
|
||||
bool &IsClosed,
|
||||
bool &IsBSpline);
|
||||
@ -226,7 +226,7 @@ protected:
|
||||
* \param thePlnStatus the current status on input. It can be modified on
|
||||
* output.
|
||||
*/
|
||||
static void FindPlane(const Handle_TColgp_HArray1OfPnt &thePoints,
|
||||
static void FindPlane(const Handle(TColgp_HArray1OfPnt) &thePoints,
|
||||
gp_Pln &thePlane,
|
||||
Standard_Integer &thePlnStatus);
|
||||
|
||||
|
@ -19,8 +19,6 @@
|
||||
|
||||
#include "CurveCreator_Widget.h"
|
||||
#include "CurveCreator_TreeView.h"
|
||||
#include "CurveCreator_ICurve.hxx"
|
||||
#include "CurveCreator.hxx"
|
||||
#include "CurveCreator_NewSectionDlg.h"
|
||||
#include "CurveCreator_Utils.hxx"
|
||||
#include "CurveCreator_UtilsICurve.hxx"
|
||||
|
@ -24,29 +24,28 @@
|
||||
#include "CurveCreator.hxx"
|
||||
#include "CurveCreator_ICurve.hxx"
|
||||
|
||||
#include <QWidget>
|
||||
#include <QMap>
|
||||
|
||||
#include <OCCViewer_ViewWindow.h>
|
||||
#include <SUIT_ViewWindow.h>
|
||||
#include <OCCViewer_ViewWindow.h>
|
||||
|
||||
#include <AIS_InteractiveObject.hxx>
|
||||
#include <AIS_InteractiveContext.hxx>
|
||||
|
||||
#include <AIS_ListOfInteractive.hxx>
|
||||
#include <Geom_Curve.hxx>
|
||||
#include <V3d_View.hxx>
|
||||
#include <gp_Pnt.hxx>
|
||||
#include <TopoDS_Vertex.hxx> // TODO - remove
|
||||
|
||||
#include <QWidget>
|
||||
#include <QMap>
|
||||
|
||||
class CurveCreator_TableView;
|
||||
class CurveCreator_TreeView;
|
||||
class CurveCreator_NewSectionDlg;
|
||||
|
||||
class OCCViewer_Viewer;
|
||||
class OCCViewer_ViewPort3d;
|
||||
|
||||
class AIS_ListOfInteractive;
|
||||
|
||||
class QAction;
|
||||
class QPixmap;
|
||||
class CurveCreator_TableView;
|
||||
class CurveCreator_TreeView;
|
||||
class CurveCreator_NewSectionDlg;
|
||||
|
||||
class CURVECREATOR_EXPORT CurveCreator_Widget : public QWidget
|
||||
{
|
||||
|
@ -105,8 +105,7 @@ DEFINE_STANDARD_HANDLE(AIS_Text, AIS_InteractiveObject)
|
||||
class AIS_Text:public AIS_InteractiveObject
|
||||
{
|
||||
public:
|
||||
// CASCADE RTTI
|
||||
DEFINE_STANDARD_RTTI(AIS_Text );
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(AIS_Text,AIS_InteractiveObject)
|
||||
|
||||
AIS_Text(){};
|
||||
|
||||
@ -148,8 +147,7 @@ protected:
|
||||
Graphic3d_VerticalTextAlignment aVJustification;
|
||||
};
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE(AIS_Text, AIS_InteractiveObject)
|
||||
IMPLEMENT_STANDARD_RTTIEXT(AIS_Text, AIS_InteractiveObject)
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT(AIS_Text, AIS_InteractiveObject)
|
||||
|
||||
AIS_Text::AIS_Text( const TCollection_ExtendedString& text, const gp_Pnt& position,
|
||||
Quantity_Color color = Quantity_NOC_YELLOW,
|
||||
@ -180,7 +178,7 @@ void AIS_Text::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentation
|
||||
|
||||
aPresentation->Clear();
|
||||
|
||||
Handle_Prs3d_TextAspect asp = myDrawer->TextAspect();
|
||||
Handle(Prs3d_TextAspect) asp = myDrawer->TextAspect();
|
||||
|
||||
asp->SetFont(aFont);
|
||||
asp->SetColor(aColor);
|
||||
@ -1394,7 +1392,7 @@ void EntityGUI_3DSketcherDlg::displayTrihedron (int selMode)
|
||||
gp_Pnt P(getLastPoint().x,getLastPoint().y,getLastPoint().z);
|
||||
Handle(Geom_Axis2Placement) anAxis = new Geom_Axis2Placement(P,gp::DZ(),gp::DX());
|
||||
Handle(AIS_Trihedron) anIO = new AIS_Trihedron(anAxis);
|
||||
anIO->SetSelectionMode(selMode);
|
||||
anIO->GetContext()->Activate(anIO, selMode);
|
||||
|
||||
SOCC_Prs* aSPrs = dynamic_cast<SOCC_Prs*>
|
||||
(((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->CreatePrs(0));
|
||||
@ -1536,7 +1534,7 @@ void EntityGUI_3DSketcherDlg::displayAngle (double theAngle,
|
||||
P0,
|
||||
P1,
|
||||
P2);
|
||||
if (anAngleIO == NULL)
|
||||
if (anAngleIO.IsNull())
|
||||
return;
|
||||
|
||||
if (store)
|
||||
|
@ -22,10 +22,7 @@
|
||||
|
||||
#include <GEOM_Application.hxx>
|
||||
|
||||
#include <TColStd_SequenceOfExtendedString.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE (GEOM_Application, TDocStd_Application)
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOM_Application, TDocStd_Application)
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_Application, TDocStd_Application)
|
||||
|
||||
//=======================================================================
|
||||
//function : GEOM_Application
|
||||
@ -53,6 +50,9 @@ GEOM_Application::~GEOM_Application()
|
||||
void GEOM_Application::Formats(TColStd_SequenceOfExtendedString& Formats)
|
||||
{
|
||||
Formats.Append(TCollection_ExtendedString ("SALOME_GEOM"));
|
||||
#if OCC_VERSION_MAJOR > 6
|
||||
Formats.Append(TCollection_ExtendedString ("BinOcaf"));
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
@ -26,8 +26,9 @@
|
||||
#include <TDocStd_Application.hxx>
|
||||
#include <Standard.hxx>
|
||||
#include <Standard_DefineHandle.hxx>
|
||||
#include <TColStd_SequenceOfExtendedString.hxx>
|
||||
|
||||
class TColStd_SequenceOfExtendedString;
|
||||
#include <Basics_OCCTVersion.hxx>
|
||||
|
||||
class GEOM_Application : public TDocStd_Application
|
||||
{
|
||||
@ -39,7 +40,7 @@ public:
|
||||
Standard_EXPORT Standard_CString ResourcesName();
|
||||
|
||||
public:
|
||||
DEFINE_STANDARD_RTTI(GEOM_Application);
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_Application,TDocStd_Application)
|
||||
};
|
||||
|
||||
DEFINE_STANDARD_HANDLE(GEOM_Application, TDocStd_Application)
|
||||
|
@ -30,12 +30,10 @@
|
||||
#include "GEOM_Object.hxx"
|
||||
#include "GEOM_Engine.hxx"
|
||||
|
||||
#include <TColStd_HArray1OfInteger.hxx>
|
||||
#include <TDataStd_Name.hxx>
|
||||
#include <TDocStd_Owner.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE (GEOM_BaseDriver,TFunction_Driver);
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver);
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver);
|
||||
|
||||
//================================================================================
|
||||
/*!
|
||||
|
@ -27,17 +27,26 @@
|
||||
#ifndef __GEOM_BaseDriver_HXX__
|
||||
#define __GEOM_BaseDriver_HXX__
|
||||
|
||||
#include "GEOM_Function.hxx"
|
||||
|
||||
#include <TFunction_Driver.hxx>
|
||||
#include <TFunction_Logbook.hxx>
|
||||
#include <TopAbs_ShapeEnum.hxx>
|
||||
#include <TopAbs_State.hxx>
|
||||
#include <TColStd_HSequenceOfTransient.hxx>
|
||||
#include <TColStd_HArray1OfInteger.hxx>
|
||||
|
||||
#include <Basics_OCCTVersion.hxx>
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <sstream>
|
||||
|
||||
class Handle(GEOM_Function);
|
||||
class Handle(TColStd_HSequenceOfTransient);
|
||||
class Handle(TColStd_HArray1OfInteger);
|
||||
#if OCC_VERSION_MAJOR < 7
|
||||
#define LOGBOOK TFunction_Logbook
|
||||
#else
|
||||
#define LOGBOOK Handle(TFunction_Logbook)
|
||||
#endif
|
||||
|
||||
struct GEOM_Param
|
||||
{
|
||||
@ -98,7 +107,7 @@ public:
|
||||
return params.back();
|
||||
}
|
||||
|
||||
DEFINE_STANDARD_RTTI (GEOM_BaseDriver)
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver)
|
||||
};
|
||||
|
||||
DEFINE_STANDARD_HANDLE (GEOM_BaseDriver,TFunction_Driver);
|
||||
|
@ -36,7 +36,6 @@
|
||||
#include <TDataStd_UAttribute.hxx>
|
||||
#include <TDocStd_Document.hxx>
|
||||
#include <TDocStd_Owner.hxx>
|
||||
#include <TFunction_Driver.hxx>
|
||||
#include <TFunction_DriverTable.hxx>
|
||||
|
||||
#include "utilities.h"
|
||||
@ -516,5 +515,4 @@ TDF_Label GEOM_BaseObject::GetFreeLabel()
|
||||
return _label.FindChild(FREE_LABEL);
|
||||
}
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE (GEOM_BaseObject, Standard_Transient );
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseObject, Standard_Transient );
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseObject, Standard_Transient );
|
||||
|
@ -30,11 +30,11 @@
|
||||
#include <TCollection_AsciiString.hxx>
|
||||
#include <TDF_Label.hxx>
|
||||
#include <TDataStd_TreeNode.hxx>
|
||||
#include <TFunction_Driver.hxx>
|
||||
|
||||
#include <vector>
|
||||
|
||||
class GEOM_BaseObject;
|
||||
class Handle(TFunction_Driver);
|
||||
class GEOM_Engine;
|
||||
|
||||
DEFINE_STANDARD_HANDLE( GEOM_BaseObject, Standard_Transient );
|
||||
@ -166,7 +166,7 @@ public:
|
||||
int _docID;
|
||||
|
||||
public:
|
||||
DEFINE_STANDARD_RTTI( GEOM_BaseObject );
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_BaseObject,Standard_Transient)
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@ -62,7 +62,6 @@
|
||||
#include <TColStd_MapOfTransient.hxx>
|
||||
#include <TColStd_HSequenceOfInteger.hxx>
|
||||
|
||||
#include <TColStd_HArray1OfByte.hxx>
|
||||
#include <TColStd_DataMapIteratorOfDataMapOfIntegerTransient.hxx>
|
||||
|
||||
#include <Resource_DataMapIteratorOfDataMapOfAsciiStringAsciiString.hxx>
|
||||
@ -265,7 +264,11 @@ Handle(TDocStd_Document) GEOM_Engine::GetDocument(int theDocID, bool force)
|
||||
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);
|
||||
@ -564,6 +567,13 @@ bool GEOM_Engine::Load(int theDocID, const char* theFileName)
|
||||
return false;
|
||||
}
|
||||
|
||||
#if OCC_VERSION_MAJOR > 6
|
||||
// Replace old document format by the new one.
|
||||
if (aDoc->StorageFormat().IsEqual("SALOME_GEOM")) {
|
||||
aDoc->ChangeStorageFormat("BinOcaf");
|
||||
}
|
||||
#endif
|
||||
|
||||
aDoc->SetUndoLimit(_UndoLimit);
|
||||
|
||||
if(_mapIDDocument.IsBound(theDocID)) _mapIDDocument.UnBind(theDocID);
|
||||
|
@ -34,6 +34,7 @@
|
||||
#include <Resource_DataMapOfAsciiStringAsciiString.hxx>
|
||||
#include <TDocStd_Document.hxx>
|
||||
#include <TColStd_HArray1OfInteger.hxx>
|
||||
#include <TColStd_HArray1OfByte.hxx>
|
||||
#include <TColStd_HSequenceOfAsciiString.hxx>
|
||||
#include <TColStd_MapOfInteger.hxx>
|
||||
#include <TDF_Label.hxx>
|
||||
@ -55,8 +56,6 @@ struct TObjectData
|
||||
bool _unpublished;
|
||||
};
|
||||
|
||||
class Handle_TColStd_HArray1OfByte;
|
||||
|
||||
struct TVariable{
|
||||
TCollection_AsciiString myVariable;
|
||||
bool isVariable;
|
||||
|
@ -318,8 +318,8 @@ Handle(TColStd_HArray1OfExtendedString) GEOM_Field::GetComponents()
|
||||
//function : getFunctionToSetValues
|
||||
//purpose : dump any HArray into a string
|
||||
//=======================================================================
|
||||
template< class Handle_HARRAY1 >
|
||||
TCollection_AsciiString arrayToSting( const Handle_HARRAY1& ar,
|
||||
template< class HandleArray1 >
|
||||
TCollection_AsciiString arrayToSting( const HandleArray1& ar,
|
||||
const char* quote="")
|
||||
{
|
||||
TCollection_AsciiString s;
|
||||
@ -756,7 +756,5 @@ const Standard_GUID& GEOM_FieldStep::GetDataID()
|
||||
return TDataStd_ExtStringArray::GetID();
|
||||
}
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE (GEOM_Field, GEOM_BaseObject );
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOM_Field, GEOM_BaseObject );
|
||||
IMPLEMENT_STANDARD_HANDLE (GEOM_FieldStep, GEOM_BaseObject );
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOM_FieldStep, GEOM_BaseObject );
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_Field, GEOM_BaseObject );
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_FieldStep, GEOM_BaseObject );
|
||||
|
@ -36,8 +36,6 @@ class GEOM_FieldStep;
|
||||
DEFINE_STANDARD_HANDLE( GEOM_Field, GEOM_BaseObject );
|
||||
DEFINE_STANDARD_HANDLE( GEOM_FieldStep, GEOM_BaseObject );
|
||||
|
||||
|
||||
|
||||
class GEOM_Field : public GEOM_BaseObject
|
||||
{
|
||||
GEOM_Field(const TDF_Label& theLabel);
|
||||
@ -125,7 +123,7 @@ class GEOM_Field : public GEOM_BaseObject
|
||||
// Returns all steps
|
||||
Standard_EXPORT std::list< Handle(GEOM_FieldStep)> GetSteps();
|
||||
|
||||
DEFINE_STANDARD_RTTI( GEOM_Field );
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_Field,GEOM_BaseObject)
|
||||
|
||||
private:
|
||||
|
||||
@ -187,9 +185,7 @@ public:
|
||||
// Returns GUID of CAF data array
|
||||
const Standard_GUID& GetDataID();
|
||||
|
||||
|
||||
|
||||
DEFINE_STANDARD_RTTI( GEOM_FieldStep );
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_FieldStep,GEOM_BaseObject)
|
||||
|
||||
private:
|
||||
|
||||
|
@ -56,10 +56,6 @@
|
||||
|
||||
#include <TColStd_ListOfInteger.hxx>
|
||||
#include <TColStd_ListIteratorOfListOfInteger.hxx>
|
||||
#include <TColStd_HArray1OfReal.hxx>
|
||||
#include <TColStd_HArray1OfInteger.hxx>
|
||||
#include <TColStd_HSequenceOfTransient.hxx>
|
||||
#include <TCollection_AsciiString.hxx>
|
||||
#include <TCollection_ExtendedString.hxx>
|
||||
|
||||
#include <cstdlib>
|
||||
@ -993,5 +989,4 @@ void* GEOM_Function::GetCallBackData()
|
||||
return reinterpret_cast<void*> ( address );
|
||||
}
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE (GEOM_Function, Standard_Transient);
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOM_Function, Standard_Transient );
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_Function, Standard_Transient );
|
||||
|
@ -26,16 +26,18 @@
|
||||
#include <Standard_Transient.hxx>
|
||||
#include <Standard_GUID.hxx>
|
||||
#include <TColStd_HArray1OfExtendedString.hxx>
|
||||
#include <TColStd_HArray1OfByte.hxx>
|
||||
#include <TColStd_HArray1OfReal.hxx>
|
||||
#include <TColStd_HArray1OfInteger.hxx>
|
||||
#include <TColStd_HSequenceOfTransient.hxx>
|
||||
#include <TCollection_AsciiString.hxx>
|
||||
#include <TDF_Label.hxx>
|
||||
#include <TDF_LabelSequence.hxx>
|
||||
#include <TDataStd_ListOfExtendedString.hxx>
|
||||
#include <TopoDS_Shape.hxx>
|
||||
|
||||
class Handle_TColStd_HArray1OfByte;
|
||||
class Handle_TColStd_HArray1OfReal;
|
||||
class Handle_TColStd_HArray1OfInteger;
|
||||
class Handle_TColStd_HSequenceOfTransient;
|
||||
#include <Basics_OCCTVersion.hxx>
|
||||
|
||||
class GEOM_Function;
|
||||
DEFINE_STANDARD_HANDLE (GEOM_Function, Standard_Transient);
|
||||
|
||||
@ -195,7 +197,7 @@ public:
|
||||
//Returns top label of this function's naming tree
|
||||
Standard_EXPORT TDF_Label GetNamingEntry (const Standard_Boolean create = Standard_True);
|
||||
|
||||
DEFINE_STANDARD_RTTI (GEOM_Function);
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_Function,Standard_Transient)
|
||||
|
||||
private:
|
||||
|
||||
|
@ -296,6 +296,5 @@ GEOM_Object::GetLastFunctions( const std::list< Handle(GEOM_Object) >& theObject
|
||||
return funs;
|
||||
}
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE (GEOM_Object, GEOM_BaseObject );
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOM_Object, GEOM_BaseObject );
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_Object, GEOM_BaseObject );
|
||||
|
||||
|
@ -34,7 +34,7 @@
|
||||
#include <list>
|
||||
|
||||
class GEOM_Object;
|
||||
class Handle(TFunction_Driver);
|
||||
class TFunction_Driver;
|
||||
class GEOM_Engine;
|
||||
|
||||
DEFINE_STANDARD_HANDLE( GEOM_Object, GEOM_BaseObject );
|
||||
@ -115,7 +115,7 @@ class GEOM_Object : public GEOM_BaseObject
|
||||
GetLastFunctions( const std::list< Handle(GEOM_Object) >& theObjects );
|
||||
|
||||
public:
|
||||
DEFINE_STANDARD_RTTI( GEOM_Object );
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_Object,GEOM_BaseObject)
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@ -48,6 +48,10 @@ namespace GEOM
|
||||
|
||||
//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);
|
||||
|
@ -56,7 +56,7 @@ bool GEOM_Solver::UpdateObject(Handle(GEOM_Object) theObject, TDF_LabelSequence&
|
||||
//=============================================================================
|
||||
bool GEOM_Solver::ComputeFunction(Handle(GEOM_Function) theFunction)
|
||||
{
|
||||
if(theFunction == NULL) return false;
|
||||
if(theFunction.IsNull()) return false;
|
||||
Standard_GUID aGUID = theFunction->GetDriverGUID();
|
||||
|
||||
Handle(TFunction_Driver) aDriver;
|
||||
@ -64,7 +64,11 @@ bool GEOM_Solver::ComputeFunction(Handle(GEOM_Function) theFunction)
|
||||
|
||||
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;
|
||||
|
@ -48,7 +48,7 @@ GEOM_SubShapeDriver::GEOM_SubShapeDriver()
|
||||
//function : Execute
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
Standard_Integer GEOM_SubShapeDriver::Execute(TFunction_Logbook& log) const
|
||||
Standard_Integer GEOM_SubShapeDriver::Execute(LOGBOOK& log) const
|
||||
{
|
||||
if (Label().IsNull()) return 0;
|
||||
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
|
||||
@ -101,8 +101,11 @@ Standard_Integer GEOM_SubShapeDriver::Execute(TFunction_Logbook& log) const
|
||||
if (aShape.IsNull()) return 0;
|
||||
|
||||
aFunction->SetValue(aShape);
|
||||
|
||||
#if OCC_VERSION_MAJOR < 7
|
||||
log.SetTouched(Label());
|
||||
#else
|
||||
log->SetTouched(Label());
|
||||
#endif
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -155,6 +158,5 @@ GetCreationInformation(std::string& theOperationName,
|
||||
|
||||
return true;
|
||||
}
|
||||
IMPLEMENT_STANDARD_HANDLE (GEOM_SubShapeDriver,GEOM_BaseDriver);
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT (GEOM_SubShapeDriver,GEOM_BaseDriver);
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOM_SubShapeDriver,GEOM_BaseDriver);
|
||||
|
@ -26,18 +26,7 @@
|
||||
#ifndef _GEOM_SubShapeDriver_HeaderFile
|
||||
#define _GEOM_SubShapeDriver_HeaderFile
|
||||
|
||||
#ifndef _Standard_GUID_HeaderFile
|
||||
#include <Standard_GUID.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _TFunction_Driver_HeaderFile
|
||||
#include <TFunction_Driver.hxx>
|
||||
#endif
|
||||
#ifndef _TFunction_Logbook_HeaderFile
|
||||
#include <TFunction_Logbook.hxx>
|
||||
#endif
|
||||
|
||||
#include "GEOM_BaseDriver.hxx"
|
||||
#include <GEOM_BaseDriver.hxx>
|
||||
|
||||
DEFINE_STANDARD_HANDLE( GEOM_SubShapeDriver, GEOM_BaseDriver );
|
||||
|
||||
@ -45,22 +34,19 @@ class GEOM_SubShapeDriver : public GEOM_BaseDriver {
|
||||
|
||||
public:
|
||||
|
||||
// Methods PUBLIC
|
||||
//
|
||||
Standard_EXPORT GEOM_SubShapeDriver();
|
||||
Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
|
||||
Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
|
||||
Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
|
||||
Standard_EXPORT static const Standard_GUID& GetID();
|
||||
Standard_EXPORT ~GEOM_SubShapeDriver() {};
|
||||
Standard_EXPORT GEOM_SubShapeDriver();
|
||||
Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
|
||||
Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
|
||||
Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
|
||||
|
||||
Standard_EXPORT static const Standard_GUID& GetID();
|
||||
Standard_EXPORT ~GEOM_SubShapeDriver() {};
|
||||
|
||||
Standard_EXPORT virtual
|
||||
bool GetCreationInformation(std::string& theOperationName,
|
||||
std::vector<GEOM_Param>& params);
|
||||
|
||||
DEFINE_STANDARD_RTTI( GEOM_SubShapeDriver )
|
||||
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_SubShapeDriver,GEOM_BaseDriver)
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@ -32,10 +32,8 @@
|
||||
#include <Standard_Macro.hxx>
|
||||
#include <Standard_Boolean.hxx>
|
||||
#if OCC_VERSION_LARGE > 0x06070100
|
||||
#include <Handle_IntTools_Context.hxx>
|
||||
#include <IntTools_Context.hxx>
|
||||
#else
|
||||
#include <Handle_BOPInt_Context.hxx>
|
||||
#include <BOPInt_Context.hxx>
|
||||
#endif
|
||||
#include <Standard_Integer.hxx>
|
||||
|
@ -27,8 +27,7 @@
|
||||
//
|
||||
#include <GEOMAlgo_Clsf.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE(GEOMAlgo_Clsf, GEOMAlgo_HAlgo);
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_Clsf, GEOMAlgo_HAlgo);
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_Clsf, GEOMAlgo_HAlgo);
|
||||
|
||||
//=======================================================================
|
||||
//function :
|
||||
|
@ -36,8 +36,6 @@
|
||||
#include <Standard_Real.hxx>
|
||||
#include <GEOMAlgo_HAlgo.hxx>
|
||||
#include <Standard_Boolean.hxx>
|
||||
#include <Handle_Geom_Curve.hxx>
|
||||
#include <Handle_Geom_Surface.hxx>
|
||||
#include <Geom_Curve.hxx>
|
||||
#include <Geom_Surface.hxx>
|
||||
|
||||
@ -71,7 +69,7 @@ class GEOMAlgo_Clsf : public GEOMAlgo_HAlgo
|
||||
Standard_EXPORT
|
||||
virtual Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const;
|
||||
|
||||
DEFINE_STANDARD_RTTI(GEOMAlgo_Clsf);
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_Clsf,GEOMAlgo_HAlgo)
|
||||
|
||||
protected:
|
||||
Standard_EXPORT
|
||||
|
@ -47,8 +47,7 @@
|
||||
|
||||
#include <GEOMAlgo_SurfaceTools.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf)
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf)
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf)
|
||||
|
||||
//=======================================================================
|
||||
//function :
|
||||
|
@ -35,8 +35,6 @@
|
||||
#include <GeomAdaptor_Surface.hxx>
|
||||
#include <GEOMAlgo_Clsf.hxx>
|
||||
#include <Standard_Boolean.hxx>
|
||||
#include <Handle_Geom_Curve.hxx>
|
||||
#include <Handle_Geom_Surface.hxx>
|
||||
#include <Geom_Curve.hxx>
|
||||
#include <Geom_Surface.hxx>
|
||||
|
||||
@ -73,7 +71,7 @@ class GEOMAlgo_ClsfBox : public GEOMAlgo_Clsf
|
||||
Standard_EXPORT
|
||||
virtual Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const;
|
||||
|
||||
DEFINE_STANDARD_RTTI(GEOMAlgo_ClsfBox)
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox,GEOMAlgo_Clsf)
|
||||
|
||||
protected:
|
||||
TopoDS_Shape myBox;
|
||||
|
@ -31,9 +31,7 @@
|
||||
|
||||
#include <Geom_Plane.hxx>
|
||||
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE(GEOMAlgo_ClsfQuad, GEOMAlgo_Clsf);
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad, GEOMAlgo_Clsf);
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad, GEOMAlgo_Clsf);
|
||||
|
||||
//=======================================================================
|
||||
//function :
|
||||
|
@ -78,7 +78,7 @@ public:
|
||||
Standard_EXPORT
|
||||
virtual Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const;
|
||||
|
||||
DEFINE_STANDARD_RTTI(GEOMAlgo_ClsfQuad);
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad,GEOMAlgo_Clsf)
|
||||
|
||||
protected:
|
||||
|
||||
|
@ -32,8 +32,7 @@
|
||||
#include <BRep_Builder.hxx>
|
||||
#include <BRepClass3d_SolidClassifier.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE(GEOMAlgo_ClsfSolid, GEOMAlgo_Clsf)
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid, GEOMAlgo_Clsf)
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid, GEOMAlgo_Clsf)
|
||||
|
||||
//=======================================================================
|
||||
//function :
|
||||
|
@ -58,7 +58,7 @@ class GEOMAlgo_ClsfSolid : public GEOMAlgo_Clsf
|
||||
Standard_EXPORT
|
||||
virtual void CheckData() ;
|
||||
|
||||
DEFINE_STANDARD_RTTI(GEOMAlgo_ClsfSolid)
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid,GEOMAlgo_Clsf)
|
||||
|
||||
protected:
|
||||
TopoDS_Shape myShape;
|
||||
|
@ -32,8 +32,7 @@
|
||||
|
||||
#include <GEOMAlgo_SurfaceTools.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf);
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf);
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf);
|
||||
|
||||
//=======================================================================
|
||||
//function :
|
||||
|
@ -30,11 +30,9 @@
|
||||
|
||||
#include <Standard.hxx>
|
||||
#include <Standard_DefineHandle.hxx>
|
||||
#include <Handle_Geom_Surface.hxx>
|
||||
#include <GeomAdaptor_Surface.hxx>
|
||||
#include <GEOMAlgo_Clsf.hxx>
|
||||
#include <Standard_Boolean.hxx>
|
||||
#include <Handle_Geom_Curve.hxx>
|
||||
#include <Geom_Surface.hxx>
|
||||
#include <Geom_Curve.hxx>
|
||||
|
||||
@ -57,7 +55,7 @@ class GEOMAlgo_ClsfSurf : public GEOMAlgo_Clsf
|
||||
void SetSurface(const Handle(Geom_Surface)& aS) ;
|
||||
|
||||
Standard_EXPORT
|
||||
const Handle_Geom_Surface& Surface() const;
|
||||
const Handle(Geom_Surface)& Surface() const;
|
||||
|
||||
Standard_EXPORT
|
||||
virtual void Perform() ;
|
||||
@ -71,10 +69,10 @@ class GEOMAlgo_ClsfSurf : public GEOMAlgo_Clsf
|
||||
Standard_EXPORT
|
||||
virtual Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const;
|
||||
|
||||
DEFINE_STANDARD_RTTI(GEOMAlgo_ClsfSurf);
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf,GEOMAlgo_Clsf)
|
||||
|
||||
protected:
|
||||
Handle_Geom_Surface myS;
|
||||
Handle(Geom_Surface) myS;
|
||||
GeomAdaptor_Surface myGAS;
|
||||
};
|
||||
#endif
|
||||
|
@ -34,8 +34,7 @@
|
||||
#include <TopTools_DataMapOfShapeListOfShape.hxx>
|
||||
#include <TopTools_ListOfShape.hxx>
|
||||
#include <TopTools_MapOfShape.hxx>
|
||||
|
||||
class TopTools_IndexedMapOfShape;
|
||||
#include <TopTools_IndexedMapOfShape.hxx>
|
||||
|
||||
|
||||
/**
|
||||
|
@ -32,7 +32,6 @@
|
||||
#include <Standard_Macro.hxx>
|
||||
#include <Standard_Boolean.hxx>
|
||||
|
||||
#include <Handle_Geom_Surface.hxx>
|
||||
#include <Geom_Surface.hxx>
|
||||
|
||||
#include <TopAbs_ShapeEnum.hxx>
|
||||
@ -73,7 +72,7 @@ class GEOMAlgo_FinderShapeOn : public GEOMAlgo_ShapeAlgo
|
||||
void SetState(const GEOMAlgo_State aSF) ;
|
||||
|
||||
Standard_EXPORT
|
||||
const Handle_Geom_Surface& Surface() const;
|
||||
const Handle(Geom_Surface)& Surface() const;
|
||||
|
||||
Standard_EXPORT
|
||||
TopAbs_ShapeEnum ShapeType() const;
|
||||
@ -113,7 +112,7 @@ protected:
|
||||
void FindVertices() ;
|
||||
|
||||
|
||||
Handle_Geom_Surface mySurface;
|
||||
Handle(Geom_Surface) mySurface;
|
||||
TopAbs_ShapeEnum myShapeType;
|
||||
GEOMAlgo_State myState;
|
||||
TopoDS_Shape myArg1;
|
||||
|
@ -39,7 +39,6 @@
|
||||
#include <TopTools_ListOfShape.hxx>
|
||||
|
||||
#include <Geom_Surface.hxx>
|
||||
#include <Handle_Geom_Surface.hxx>
|
||||
#include <GeomAdaptor_Surface.hxx>
|
||||
|
||||
#include <gp_Pnt.hxx>
|
||||
@ -83,7 +82,7 @@ class GEOMAlgo_FinderShapeOn1 : public GEOMAlgo_ShapeAlgo
|
||||
Standard_Integer NbPntsMax() const;
|
||||
|
||||
Standard_EXPORT
|
||||
const Handle_Geom_Surface& Surface() const;
|
||||
const Handle(Geom_Surface)& Surface() const;
|
||||
|
||||
Standard_EXPORT
|
||||
TopAbs_ShapeEnum ShapeType() const;
|
||||
@ -133,7 +132,7 @@ class GEOMAlgo_FinderShapeOn1 : public GEOMAlgo_ShapeAlgo
|
||||
virtual TopAbs_State GetPointState(const gp_Pnt& aP) ;
|
||||
|
||||
|
||||
Handle_Geom_Surface mySurface;
|
||||
Handle(Geom_Surface) mySurface;
|
||||
TopAbs_ShapeEnum myShapeType;
|
||||
GEOMAlgo_State myState;
|
||||
Standard_Integer myNbPntsMin;
|
||||
|
@ -62,7 +62,7 @@ class GEOMAlgo_FinderShapeOn2 : public GEOMAlgo_ShapeAlgo
|
||||
void SetClsf(const Handle(GEOMAlgo_Clsf)& aClsf) ;
|
||||
|
||||
Standard_EXPORT
|
||||
const Handle_GEOMAlgo_Clsf& Clsf() const;
|
||||
const Handle(GEOMAlgo_Clsf)& Clsf() const;
|
||||
|
||||
Standard_EXPORT
|
||||
void SetShapeType(const TopAbs_ShapeEnum aST) ;
|
||||
@ -134,7 +134,7 @@ protected:
|
||||
GEOMAlgo_State myState;
|
||||
Standard_Integer myNbPntsMin;
|
||||
Standard_Integer myNbPntsMax;
|
||||
Handle_GEOMAlgo_Clsf myClsf;
|
||||
Handle(GEOMAlgo_Clsf) myClsf;
|
||||
TopTools_ListOfShape myLS;
|
||||
GEOMAlgo_IndexedDataMapOfShapeState myMSS;
|
||||
};
|
||||
|
@ -26,7 +26,6 @@
|
||||
|
||||
#include <GEOMAlgo_GetInPlaceAPI.hxx>
|
||||
#include <GEOMAlgo_GetInPlace.hxx>
|
||||
#include <GEOM_Function.hxx>
|
||||
#include <GEOM_Object.hxx>
|
||||
#include <GEOMUtils.hxx>
|
||||
|
||||
@ -46,8 +45,6 @@
|
||||
#include <TopExp_Explorer.hxx>
|
||||
#include <TopoDS.hxx>
|
||||
#include <TopoDS_Vertex.hxx>
|
||||
#include <TopTools_MapOfShape.hxx>
|
||||
|
||||
|
||||
//=======================================================================
|
||||
//function : GetInPlace
|
||||
|
@ -26,17 +26,16 @@
|
||||
#ifndef _GEOMAlgo_GetInPlaceAPI_HeaderFile
|
||||
#define _GEOMAlgo_GetInPlaceAPI_HeaderFile
|
||||
|
||||
#include <GEOM_Function.hxx>
|
||||
|
||||
#include <TopTools_IndexedMapOfShape.hxx>
|
||||
#include <TopTools_ListOfShape.hxx>
|
||||
#include <gp_Vec.hxx>
|
||||
|
||||
class GEOMAlgo_GetInPlace;
|
||||
class Handle_GEOM_Function;
|
||||
class BRepExtrema_DistShapeShape;
|
||||
class TopoDS_Face;
|
||||
class TopoDS_Shape;
|
||||
class TopTools_IndexedMapOfShape;
|
||||
class TopTools_ListOfShape;
|
||||
|
||||
|
||||
/**
|
||||
* This is an API class for all GetInPlace algorithm.
|
||||
@ -83,7 +82,7 @@ public:
|
||||
* list is not cleared at first.
|
||||
*/
|
||||
Standard_EXPORT static Standard_Boolean GetInPlaceByHistory
|
||||
(const Handle_GEOM_Function &theWhereFunction,
|
||||
(const Handle(GEOM_Function) &theWhereFunction,
|
||||
const TopTools_IndexedMapOfShape &theWhereIndices,
|
||||
const TopoDS_Shape &theWhat,
|
||||
TopTools_ListOfShape &theShapesInPlace);
|
||||
|
@ -546,7 +546,7 @@ Standard_Integer CheckAncesstors
|
||||
const TopTools_IndexedDataMapOfShapeListOfShape& aMEV,
|
||||
TopTools_IndexedDataMapOfShapeListOfShape& aMEVZ)
|
||||
{
|
||||
Standard_Address pLE, pLV, pLVZ;
|
||||
TopTools_ListOfShape *pLE, *pLV, *pLVZ;
|
||||
Standard_Integer iRet, aNbVX;
|
||||
TopTools_ListIteratorOfListOfShape aItLE, aItLV;
|
||||
TopTools_MapOfShape aMFence;
|
||||
@ -554,24 +554,28 @@ Standard_Integer CheckAncesstors
|
||||
//
|
||||
iRet=0;
|
||||
//
|
||||
pLE=aMVE.FindFromKey1(aVSD);
|
||||
#if OCC_VERSION_MAJOR < 7
|
||||
pLE=const_cast<TopTools_ListOfShape*>(&aMVE.FindFromKey(aVSD));
|
||||
#else
|
||||
pLE=const_cast<TopTools_IndexedDataMapOfShapeListOfShape&>(aMVE).ChangeSeek(aVSD);
|
||||
#endif
|
||||
if (!pLE) {
|
||||
return iRet;
|
||||
}
|
||||
//
|
||||
const TopTools_ListOfShape& aLE=*((TopTools_ListOfShape*)pLE);
|
||||
aItLE.Initialize(aLE);
|
||||
aItLE.Initialize(*pLE);
|
||||
for (; aItLE.More(); aItLE.Next()) {
|
||||
const TopoDS_Shape& aE=aItLE.Value();
|
||||
//
|
||||
pLV=aMEV.FindFromKey1(aE);
|
||||
#if OCC_VERSION_MAJOR < 7
|
||||
pLV=const_cast<TopTools_ListOfShape*>(&aMEV.FindFromKey(aE));
|
||||
#else
|
||||
pLV=const_cast<TopTools_IndexedDataMapOfShapeListOfShape&>(aMEV).ChangeSeek(aE);
|
||||
#endif
|
||||
if (!pLV) {
|
||||
continue; // it should be not so
|
||||
}
|
||||
//
|
||||
aLVX.Clear();
|
||||
const TopTools_ListOfShape& aLV=*((TopTools_ListOfShape*)pLV);
|
||||
aItLV.Initialize(aLV);
|
||||
aItLV.Initialize(*pLV);
|
||||
for (; aItLV.More(); aItLV.Next()) {
|
||||
const TopoDS_Shape& aV=aItLV.Value();
|
||||
if (!aV.IsSame(aVSD)) {
|
||||
@ -590,12 +594,16 @@ Standard_Integer CheckAncesstors
|
||||
//
|
||||
iRet=1;
|
||||
//
|
||||
pLVZ=aMEVZ.FindFromKey1(aE);
|
||||
#if OCC_VERSION_MAJOR < 7
|
||||
pLVZ=const_cast<TopTools_ListOfShape*>(&aMEVZ.FindFromKey(aE));
|
||||
#else
|
||||
pLVZ=aMEVZ.ChangeSeek(aE);
|
||||
#endif
|
||||
if (!pLVZ) {
|
||||
aMEVZ.Add(aE, aLVX);
|
||||
}
|
||||
else {
|
||||
TopTools_ListOfShape& aLVZ=*((TopTools_ListOfShape*)pLVZ);
|
||||
TopTools_ListOfShape& aLVZ=*pLVZ;
|
||||
aLVZ.Append(aLVX);
|
||||
}
|
||||
}
|
||||
|
@ -27,8 +27,7 @@
|
||||
//
|
||||
#include <GEOMAlgo_HAlgo.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE(GEOMAlgo_HAlgo, MMgt_TShared);
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_HAlgo, MMgt_TShared);
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_HAlgo, MMgt_TShared);
|
||||
|
||||
//=======================================================================
|
||||
// function:
|
||||
|
@ -34,6 +34,8 @@
|
||||
#include <Standard_Integer.hxx>
|
||||
#include <MMgt_TShared.hxx>
|
||||
|
||||
#include <Basics_OCCTVersion.hxx>
|
||||
|
||||
DEFINE_STANDARD_HANDLE(GEOMAlgo_HAlgo, MMgt_TShared);
|
||||
|
||||
//=======================================================================
|
||||
@ -58,7 +60,7 @@ class GEOMAlgo_HAlgo : public MMgt_TShared
|
||||
Standard_EXPORT
|
||||
Standard_Integer WarningStatus() const;
|
||||
|
||||
DEFINE_STANDARD_RTTI(GEOMAlgo_HAlgo);
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_HAlgo,MMgt_TShared)
|
||||
|
||||
protected:
|
||||
Standard_EXPORT
|
||||
|
@ -35,9 +35,9 @@
|
||||
#include <TopoDS_Shape.hxx>
|
||||
#include <Standard_Real.hxx>
|
||||
#if OCC_VERSION_LARGE > 0x06070100
|
||||
#include <Handle_IntTools_Context.hxx>
|
||||
#include <IntTools_Context.hxx>
|
||||
#else
|
||||
#include <Handle_BOPInt_Context.hxx>
|
||||
#include <BOPInt_Context.hxx>
|
||||
#endif
|
||||
#include <GEOMAlgo_Algo.hxx>
|
||||
|
||||
@ -60,9 +60,9 @@ class GEOMAlgo_ShapeAlgo : public GEOMAlgo_Algo
|
||||
//! Returns cashed geometrical tools <br>
|
||||
Standard_EXPORT
|
||||
#if OCC_VERSION_LARGE > 0x06070100
|
||||
const Handle_IntTools_Context& Context() const;
|
||||
const Handle(IntTools_Context)& Context() const;
|
||||
#else
|
||||
const Handle_BOPInt_Context& Context() const;
|
||||
const Handle(BOPInt_Context)& Context() const;
|
||||
#endif
|
||||
|
||||
Standard_EXPORT
|
||||
@ -95,9 +95,9 @@ protected:
|
||||
Standard_Real myTolerance;
|
||||
TopoDS_Shape myResult;
|
||||
#if OCC_VERSION_LARGE > 0x06070100
|
||||
Handle_IntTools_Context myContext;
|
||||
Handle(IntTools_Context) myContext;
|
||||
#else
|
||||
Handle_BOPInt_Context myContext;
|
||||
Handle(BOPInt_Context) myContext;
|
||||
#endif
|
||||
};
|
||||
#endif
|
||||
|
@ -31,7 +31,6 @@
|
||||
#include <Standard.hxx>
|
||||
#include <Standard_Macro.hxx>
|
||||
#include <Standard_Boolean.hxx>
|
||||
#include <Handle_Geom_Surface.hxx>
|
||||
#include <Standard_Real.hxx>
|
||||
#include <TopAbs_State.hxx>
|
||||
#include <GEOMAlgo_State.hxx>
|
||||
|
@ -54,7 +54,6 @@
|
||||
#include <OCCViewer_ViewModel.h>
|
||||
#include <SVTK_ViewModel.h>
|
||||
|
||||
#include <TColStd_MapOfInteger.hxx>
|
||||
#include <TCollection_AsciiString.hxx>
|
||||
#include <TColStd_IndexedMapOfInteger.hxx>
|
||||
|
||||
|
@ -35,6 +35,8 @@
|
||||
#include <SALOMEconfig.h>
|
||||
#include CORBA_CLIENT_HEADER(GEOM_Gen)
|
||||
|
||||
#include <TColStd_MapOfInteger.hxx>
|
||||
|
||||
#include <QString>
|
||||
#include <QMap>
|
||||
|
||||
@ -47,7 +49,6 @@ class SUIT_Desktop;
|
||||
class SUIT_ViewWindow;
|
||||
class SALOME_Prs;
|
||||
class GEOM_Operation;
|
||||
class TColStd_MapOfInteger;
|
||||
|
||||
//================================================================
|
||||
// Class : GEOMBase_Helper
|
||||
|
@ -30,8 +30,7 @@
|
||||
#include <AIS_InteractiveObject.hxx>
|
||||
#include <SelectMgr_EntityOwner.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE(GEOM_OCCFilter, SelectMgr_Filter)
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOM_OCCFilter, SelectMgr_Filter)
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_OCCFilter, SelectMgr_Filter)
|
||||
|
||||
//=======================================================================
|
||||
// function : GEOM_OCCFilter
|
||||
|
@ -27,6 +27,8 @@
|
||||
|
||||
#include <Standard_DefineHandle.hxx>
|
||||
|
||||
#include <Basics_OCCTVersion.hxx>
|
||||
|
||||
class LightApp_SelectionMgr;
|
||||
|
||||
class GEOM_OCCFilter : public SelectMgr_Filter
|
||||
@ -42,7 +44,7 @@ private:
|
||||
|
||||
public:
|
||||
|
||||
DEFINE_STANDARD_RTTI(GEOM_OCCFilter);
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_OCCFilter,SelectMgr_Filter)
|
||||
|
||||
};
|
||||
|
||||
|
@ -38,7 +38,6 @@
|
||||
#include <GEOM_OCCFilter.h>
|
||||
|
||||
#include <GEOM_Actor.h>
|
||||
#include <GEOM_AISShape.hxx>
|
||||
#include <GEOM_AISDimension.hxx>
|
||||
#include <GEOM_TopWireframeShape.hxx>
|
||||
#include <GEOM_AISVector.hxx>
|
||||
@ -87,7 +86,9 @@
|
||||
#include <AIS_AngleDimension.hxx>
|
||||
#include <AIS_ListIteratorOfListOfInteractive.hxx>
|
||||
#include <Aspect_PolygonOffsetMode.hxx>
|
||||
#include <Aspect_ColorScale.hxx>
|
||||
#if OCC_VERSION_MAJOR < 7
|
||||
#include <Aspect_ColorScale.hxx>
|
||||
#endif
|
||||
#include <Prs3d_IsoAspect.hxx>
|
||||
#include <Prs3d_PointAspect.hxx>
|
||||
#include <StdSelect_TypeOfEdge.hxx>
|
||||
@ -99,7 +100,6 @@
|
||||
#include <Geom_Axis2Placement.hxx>
|
||||
#include <Graphic3d_AspectFillArea3d.hxx>
|
||||
#include <gp_Pln.hxx>
|
||||
#include <TColStd_MapOfInteger.hxx>
|
||||
#include <TColStd_MapIteratorOfMapOfInteger.hxx>
|
||||
#include <TopoDS_Iterator.hxx>
|
||||
#include <Graphic3d_AspectMarker3d.hxx>
|
||||
@ -507,6 +507,12 @@ GEOM_Displayer::GEOM_Displayer( SalomeApp_Study* st )
|
||||
|
||||
myViewFrame = 0;
|
||||
|
||||
#if OCC_VERSION_MAJOR >= 7
|
||||
myColorScale = new AIS_ColorScale;
|
||||
myColorScale->SetZLayer (Graphic3d_ZLayerId_TopOSD);
|
||||
myColorScale->SetTransformPersistence (Graphic3d_TMF_2d, gp_Pnt (-1,-1,0));
|
||||
#endif
|
||||
|
||||
myFieldDataType = GEOM::FDT_Double;
|
||||
myFieldDimension = 0;
|
||||
myFieldStepRangeMin = 0;
|
||||
@ -2922,7 +2928,7 @@ QList<QVariant> GEOM_Displayer::groupFieldData( const QList<QVariant>& theFieldS
|
||||
return aResultList;
|
||||
}
|
||||
|
||||
// Note: the method is copied from Aspect_ColorScale class
|
||||
// Note: the method is copied from AIS_ColorScale class
|
||||
Standard_Integer GEOM_Displayer::HueFromValue( const Standard_Integer aValue,
|
||||
const Standard_Integer aMin,
|
||||
const Standard_Integer aMax )
|
||||
@ -2938,7 +2944,7 @@ Standard_Integer GEOM_Displayer::HueFromValue( const Standard_Integer aValue,
|
||||
return aHue;
|
||||
}
|
||||
|
||||
// Note: the method is copied from Aspect_ColorScale class
|
||||
// Note: the method is copied from AIS_ColorScale class
|
||||
Standard_Boolean GEOM_Displayer::FindColor( const Standard_Real aValue,
|
||||
const Standard_Real aMin,
|
||||
const Standard_Real aMax,
|
||||
@ -2976,6 +2982,7 @@ void GEOM_Displayer::UpdateColorScale( const bool theIsRedisplayFieldSteps, cons
|
||||
if( !aViewModel )
|
||||
return;
|
||||
|
||||
#if OCC_VERSION_MAJOR < 7
|
||||
Handle(V3d_Viewer) aViewer = aViewModel->getViewer3d();
|
||||
if( aViewer.IsNull() )
|
||||
return;
|
||||
@ -2987,6 +2994,7 @@ void GEOM_Displayer::UpdateColorScale( const bool theIsRedisplayFieldSteps, cons
|
||||
Handle(V3d_View) aView = aViewer->ActiveView();
|
||||
if( aView.IsNull() )
|
||||
return;
|
||||
#endif
|
||||
|
||||
Standard_Boolean anIsDisplayColorScale = Standard_False;
|
||||
TCollection_AsciiString aColorScaleTitle;
|
||||
@ -3038,38 +3046,49 @@ void GEOM_Displayer::UpdateColorScale( const bool theIsRedisplayFieldSteps, cons
|
||||
|
||||
if( anIsDisplayColorScale )
|
||||
{
|
||||
Handle(Aspect_ColorScale) aColorScale = aView->ColorScale();
|
||||
if( !aColorScale.IsNull() )
|
||||
SUIT_Session* session = SUIT_Session::session();
|
||||
SUIT_ResourceMgr* resMgr = session->resourceMgr();
|
||||
|
||||
Standard_Real anXPos = resMgr->doubleValue( "Geometry", "scalar_bar_x_position", 0.05 );
|
||||
Standard_Real anYPos = resMgr->doubleValue( "Geometry", "scalar_bar_y_position", 0.1 );
|
||||
Standard_Real aWidth = resMgr->doubleValue( "Geometry", "scalar_bar_width", 0.2 );
|
||||
Standard_Real aHeight = resMgr->doubleValue( "Geometry", "scalar_bar_height", 0.5 );
|
||||
Standard_Integer aTextHeight = resMgr->integerValue( "Geometry", "scalar_bar_text_height", 14 );
|
||||
Standard_Integer aNbIntervals = resMgr->integerValue( "Geometry", "scalar_bar_nb_intervals", 20 );
|
||||
|
||||
#if OCC_VERSION_MAJOR < 7
|
||||
Handle(Aspect_ColorScale) myColorScale = aView->ColorScale();
|
||||
if( !myColorScale.IsNull() )
|
||||
{
|
||||
SUIT_Session* session = SUIT_Session::session();
|
||||
SUIT_ResourceMgr* resMgr = session->resourceMgr();
|
||||
#endif
|
||||
|
||||
Standard_Real anXPos = resMgr->doubleValue( "Geometry", "scalar_bar_x_position", 0.05 );
|
||||
Standard_Real anYPos = resMgr->doubleValue( "Geometry", "scalar_bar_y_position", 0.1 );
|
||||
Standard_Real aWidth = resMgr->doubleValue( "Geometry", "scalar_bar_width", 0.2 );
|
||||
Standard_Real aHeight = resMgr->doubleValue( "Geometry", "scalar_bar_height", 0.5 );
|
||||
Standard_Integer aTextHeight = resMgr->integerValue( "Geometry", "scalar_bar_text_height", 14 );
|
||||
Standard_Integer aNbIntervals = resMgr->integerValue( "Geometry", "scalar_bar_nb_intervals", 20 );
|
||||
myColorScale->SetXPosition( anXPos );
|
||||
myColorScale->SetYPosition( anYPos );
|
||||
myColorScale->SetWidth( aWidth );
|
||||
myColorScale->SetHeight( aHeight );
|
||||
|
||||
aColorScale->SetXPosition( anXPos );
|
||||
aColorScale->SetYPosition( anYPos );
|
||||
aColorScale->SetWidth( aWidth );
|
||||
aColorScale->SetHeight( aHeight );
|
||||
myColorScale->SetTextHeight( aTextHeight );
|
||||
myColorScale->SetNumberOfIntervals( anIsBoolean ? 2 : aNbIntervals );
|
||||
|
||||
aColorScale->SetTextHeight( aTextHeight );
|
||||
aColorScale->SetNumberOfIntervals( anIsBoolean ? 2 : aNbIntervals );
|
||||
myColorScale->SetTitle( aColorScaleTitle );
|
||||
myColorScale->SetRange( aColorScaleMin, aColorScaleMax );
|
||||
|
||||
aColorScale->SetTitle( aColorScaleTitle );
|
||||
aColorScale->SetRange( aColorScaleMin, aColorScaleMax );
|
||||
#if OCC_VERSION_MAJOR < 7
|
||||
}
|
||||
if( !aView->ColorScaleIsDisplayed() )
|
||||
aView->ColorScaleDisplay();
|
||||
}
|
||||
else
|
||||
{
|
||||
if( aView->ColorScaleIsDisplayed() )
|
||||
aView->ColorScaleErase();
|
||||
#else
|
||||
if( !aViewModel->getAISContext()->IsDisplayed( myColorScale ) )
|
||||
aViewModel->getAISContext()->Display( myColorScale );
|
||||
}
|
||||
else
|
||||
if( aViewModel->getAISContext()->IsDisplayed( myColorScale ) )
|
||||
aViewModel->getAISContext()->Erase( myColorScale );
|
||||
#endif
|
||||
|
||||
if( theIsRedisplayFieldSteps )
|
||||
{
|
||||
|
@ -28,6 +28,7 @@
|
||||
#define GEOM_DISPLAYER_H
|
||||
|
||||
#include "GEOM_GEOMGUI.hxx"
|
||||
#include <GEOM_AISShape.hxx>
|
||||
|
||||
#include <SALOME_InteractiveObject.hxx>
|
||||
|
||||
@ -44,7 +45,11 @@ class SALOME_OCCViewType;
|
||||
#include <LightApp_Displayer.h>
|
||||
#include <LightApp_Study.h>
|
||||
#include <Aspect_TypeOfMarker.hxx>
|
||||
#if OCC_VERSION_MAJOR >= 7
|
||||
#include <AIS_ColorScale.hxx>
|
||||
#endif
|
||||
#include <TCollection_AsciiString.hxx>
|
||||
#include <TColStd_MapOfInteger.hxx>
|
||||
#include <Basics_OCCTVersion.hxx>
|
||||
#include <QList>
|
||||
|
||||
@ -60,14 +65,11 @@ class SALOME_OCCViewType;
|
||||
|
||||
typedef std::list<GEOM::GEOM_Object_ptr> ObjectList;
|
||||
|
||||
class TColStd_MapOfInteger;
|
||||
class LightApp_SelectionMgr;
|
||||
class SalomeApp_Study;
|
||||
class SalomeApp_Application;
|
||||
class SUIT_SelectionFilter;
|
||||
class Handle_GEOM_AISShape;
|
||||
class gp_Ax3;
|
||||
//class SALOME_Selection;
|
||||
|
||||
class GEOMGUI_EXPORT GEOM_Displayer : public LightApp_Displayer
|
||||
{
|
||||
@ -298,6 +300,9 @@ protected:
|
||||
std::string myTexture;
|
||||
int myType;
|
||||
SALOME_View* myViewFrame;
|
||||
#if OCC_VERSION_MAJOR >= 7
|
||||
Handle(AIS_ColorScale) myColorScale;
|
||||
#endif
|
||||
|
||||
// Attributes
|
||||
Quantity_Color myShadingColor;
|
||||
|
@ -65,7 +65,7 @@ GEOMImpl_3DSketcherDriver::GEOMImpl_3DSketcherDriver()
|
||||
//function : Execute
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
Standard_Integer GEOMImpl_3DSketcherDriver::Execute(TFunction_Logbook& log) const
|
||||
Standard_Integer GEOMImpl_3DSketcherDriver::Execute(LOGBOOK& log) const
|
||||
{
|
||||
if (Label().IsNull()) return 0;
|
||||
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
|
||||
@ -319,7 +319,11 @@ Standard_Integer GEOMImpl_3DSketcherDriver::Execute(TFunction_Logbook& log) cons
|
||||
if (aShape.IsNull()) return 0;
|
||||
|
||||
aFunction->SetValue(aShape);
|
||||
#if OCC_VERSION_MAJOR < 7
|
||||
log.SetTouched(Label());
|
||||
#else
|
||||
log->SetTouched(Label());
|
||||
#endif
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -365,5 +369,4 @@ GetCreationInformation(std::string& theOperationName,
|
||||
return true;
|
||||
}
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE (GEOMImpl_3DSketcherDriver,GEOM_BaseDriver);
|
||||
IMPLEMENT_STANDARD_RTTIEXT(GEOMImpl_3DSketcherDriver,GEOM_BaseDriver);
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMImpl_3DSketcherDriver,GEOM_BaseDriver);
|
||||
|
@ -23,61 +23,26 @@
|
||||
#ifndef _GEOMImpl_3DSketcherDriver_HeaderFile
|
||||
#define _GEOMImpl_3DSketcherDriver_HeaderFile
|
||||
|
||||
#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
|
||||
#include <TColStd_SequenceOfExtendedString.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_TypeMismatch_HeaderFile
|
||||
#include <Standard_TypeMismatch.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _Standard_HeaderFile
|
||||
#include <Standard.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _Standard_Macro_HeaderFile
|
||||
#include <Standard_Macro.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_HeaderFile
|
||||
#include <Standard.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_GUID_HeaderFile
|
||||
#include <Standard_GUID.hxx>
|
||||
#endif
|
||||
|
||||
#include <GEOM_BaseDriver.hxx>
|
||||
|
||||
DEFINE_STANDARD_HANDLE( GEOMImpl_3DSketcherDriver, GEOM_BaseDriver );
|
||||
|
||||
#ifndef _GEOM_BaseDriver_HeaderFile
|
||||
#include <GEOM_BaseDriver.hxx>
|
||||
#endif
|
||||
#ifndef _TFunction_Logbook_HeaderFile
|
||||
#include <TFunction_Logbook.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_CString_HeaderFile
|
||||
#include <Standard_CString.hxx>
|
||||
#endif
|
||||
|
||||
|
||||
class GEOMImpl_3DSketcherDriver : public GEOM_BaseDriver {
|
||||
|
||||
public:
|
||||
|
||||
// Methods PUBLIC
|
||||
//
|
||||
Standard_EXPORT GEOMImpl_3DSketcherDriver();
|
||||
Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
|
||||
Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
|
||||
Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
|
||||
Standard_EXPORT static const Standard_GUID& GetID();
|
||||
Standard_EXPORT ~GEOMImpl_3DSketcherDriver() {};
|
||||
Standard_EXPORT GEOMImpl_3DSketcherDriver();
|
||||
Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
|
||||
Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
|
||||
Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
|
||||
|
||||
Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName,
|
||||
std::vector<GEOM_Param>& params);
|
||||
Standard_EXPORT static const Standard_GUID& GetID();
|
||||
Standard_EXPORT ~GEOMImpl_3DSketcherDriver() {};
|
||||
|
||||
// Type management
|
||||
//
|
||||
DEFINE_STANDARD_RTTI( GEOMImpl_3DSketcherDriver )
|
||||
Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName,
|
||||
std::vector<GEOM_Param>& params);
|
||||
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_3DSketcherDriver,GEOM_BaseDriver)
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@ -74,7 +74,7 @@ GEOMImpl_ArcDriver::GEOMImpl_ArcDriver()
|
||||
//function : Execute
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
Standard_Integer GEOMImpl_ArcDriver::Execute(TFunction_Logbook& log) const
|
||||
Standard_Integer GEOMImpl_ArcDriver::Execute(LOGBOOK& log) const
|
||||
{
|
||||
if (Label().IsNull()) return 0;
|
||||
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
|
||||
@ -112,7 +112,7 @@ Standard_Integer GEOMImpl_ArcDriver::Execute(TFunction_Logbook& log) const
|
||||
if (aType == CIRC_ARC_THREE_PNT)
|
||||
{
|
||||
GC_MakeArcOfCircle arc (aP1, aP2, aP3);
|
||||
aShape = BRepBuilderAPI_MakeEdge(arc).Edge();
|
||||
aShape = BRepBuilderAPI_MakeEdge(arc.Value()).Edge();
|
||||
} else if ( aType == CIRC_ARC_CENTER ) { // CIRC_ARC_CENTER
|
||||
Standard_Boolean sense = aCI.GetSense();
|
||||
|
||||
@ -128,7 +128,7 @@ Standard_Integer GEOMImpl_ArcDriver::Execute(TFunction_Logbook& log) const
|
||||
Handle(Geom_Circle) aGeomCirc = circ.Value();
|
||||
|
||||
GC_MakeArcOfCircle arc (aGeomCirc->Circ(), aP2, aP3, Standard_True);
|
||||
aShape = BRepBuilderAPI_MakeEdge(arc).Edge();
|
||||
aShape = BRepBuilderAPI_MakeEdge(arc.Value()).Edge();
|
||||
} else if ( aType == ELLIPSE_ARC_CENTER_TWO_PNT ) { // ELLIPSE_ARC_CENTER_TWO_PNT
|
||||
if ( aP1.Distance(aP2) <= aP1.Distance(aP3) ) {
|
||||
// Standard_ConstructionError::Raise("Arc creation aborted: the distance from Center Point to Point 1 needs to be bigger than the distance from Center Point to Point 2");
|
||||
@ -146,7 +146,7 @@ Standard_Integer GEOMImpl_ArcDriver::Execute(TFunction_Logbook& log) const
|
||||
// double alpha = fabs(aV1.Angle(aV2));
|
||||
|
||||
GC_MakeArcOfEllipse arc (aGeomEllipse->Elips(), aP2, aP3, Standard_True);
|
||||
aShape = BRepBuilderAPI_MakeEdge(arc).Edge();
|
||||
aShape = BRepBuilderAPI_MakeEdge(arc.Value()).Edge();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -157,7 +157,11 @@ Standard_Integer GEOMImpl_ArcDriver::Execute(TFunction_Logbook& log) const
|
||||
|
||||
aFunction->SetValue(aShape);
|
||||
|
||||
#if OCC_VERSION_MAJOR < 7
|
||||
log.SetTouched(Label());
|
||||
#else
|
||||
log->SetTouched(Label());
|
||||
#endif
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -203,6 +207,4 @@ GetCreationInformation(std::string& theOperationName,
|
||||
return true;
|
||||
}
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE (GEOMImpl_ArcDriver,GEOM_BaseDriver);
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArcDriver,GEOM_BaseDriver);
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArcDriver,GEOM_BaseDriver);
|
||||
|
@ -26,41 +26,7 @@
|
||||
#ifndef _GEOMImpl_ArcDriver_HeaderFile
|
||||
#define _GEOMImpl_ArcDriver_HeaderFile
|
||||
|
||||
#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
|
||||
#include <TColStd_SequenceOfExtendedString.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_TypeMismatch_HeaderFile
|
||||
#include <Standard_TypeMismatch.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _Standard_HeaderFile
|
||||
#include <Standard.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _Standard_Macro_HeaderFile
|
||||
#include <Standard_Macro.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_HeaderFile
|
||||
#include <Standard.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_GUID_HeaderFile
|
||||
#include <Standard_GUID.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _TFunction_Driver_HeaderFile
|
||||
#include <TFunction_Driver.hxx>
|
||||
#endif
|
||||
#ifndef _TFunction_Logbook_HeaderFile
|
||||
#include <TFunction_Logbook.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_CString_HeaderFile
|
||||
#include <Standard_CString.hxx>
|
||||
#endif
|
||||
|
||||
class TColStd_SequenceOfExtendedString;
|
||||
|
||||
|
||||
#include "GEOM_BaseDriver.hxx"
|
||||
#include <GEOM_BaseDriver.hxx>
|
||||
|
||||
DEFINE_STANDARD_HANDLE( GEOMImpl_ArcDriver, GEOM_BaseDriver );
|
||||
|
||||
@ -68,19 +34,17 @@ class GEOMImpl_ArcDriver : public GEOM_BaseDriver {
|
||||
|
||||
public:
|
||||
|
||||
// Methods PUBLIC
|
||||
//
|
||||
Standard_EXPORT GEOMImpl_ArcDriver();
|
||||
Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
|
||||
Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
|
||||
Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
|
||||
Standard_EXPORT static const Standard_GUID& GetID();
|
||||
Standard_EXPORT ~GEOMImpl_ArcDriver() {};
|
||||
Standard_EXPORT GEOMImpl_ArcDriver();
|
||||
Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
|
||||
Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
|
||||
Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
|
||||
Standard_EXPORT static const Standard_GUID& GetID();
|
||||
Standard_EXPORT ~GEOMImpl_ArcDriver() {};
|
||||
|
||||
Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName,
|
||||
std::vector<GEOM_Param>& params);
|
||||
Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName,
|
||||
std::vector<GEOM_Param>& params);
|
||||
|
||||
DEFINE_STANDARD_RTTI( GEOMImpl_ArcDriver )
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ArcDriver,GEOM_BaseDriver)
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@ -69,7 +69,7 @@ GEOMImpl_ArchimedeDriver::GEOMImpl_ArchimedeDriver()
|
||||
//function : Execute
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
Standard_Integer GEOMImpl_ArchimedeDriver::Execute(TFunction_Logbook& log) const
|
||||
Standard_Integer GEOMImpl_ArchimedeDriver::Execute(LOGBOOK& log) const
|
||||
{
|
||||
if (Label().IsNull()) return 0;
|
||||
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
|
||||
@ -138,7 +138,11 @@ Standard_Integer GEOMImpl_ArchimedeDriver::Execute(TFunction_Logbook& log) const
|
||||
|
||||
aFunction->SetValue(tirant);
|
||||
|
||||
#if OCC_VERSION_MAJOR < 7
|
||||
log.SetTouched(Label());
|
||||
#else
|
||||
log->SetTouched(Label());
|
||||
#endif
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -170,6 +174,4 @@ GetCreationInformation(std::string& theOperationName,
|
||||
return true;
|
||||
}
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE (GEOMImpl_ArchimedeDriver,GEOM_BaseDriver);
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArchimedeDriver,GEOM_BaseDriver);
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArchimedeDriver,GEOM_BaseDriver);
|
||||
|
@ -22,45 +22,11 @@
|
||||
|
||||
// File : GEOMImpl_ArchimedeDriver.hxx
|
||||
// Module : GEOMImpl
|
||||
//
|
||||
|
||||
#ifndef _GEOMImpl_ArchimedeDriver_HeaderFile
|
||||
#define _GEOMImpl_ArchimedeDriver_HeaderFile
|
||||
|
||||
#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
|
||||
#include <TColStd_SequenceOfExtendedString.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_TypeMismatch_HeaderFile
|
||||
#include <Standard_TypeMismatch.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _Standard_HeaderFile
|
||||
#include <Standard.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _Standard_Macro_HeaderFile
|
||||
#include <Standard_Macro.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_HeaderFile
|
||||
#include <Standard.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_GUID_HeaderFile
|
||||
#include <Standard_GUID.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _TFunction_Driver_HeaderFile
|
||||
#include <TFunction_Driver.hxx>
|
||||
#endif
|
||||
#ifndef _TFunction_Logbook_HeaderFile
|
||||
#include <TFunction_Logbook.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_CString_HeaderFile
|
||||
#include <Standard_CString.hxx>
|
||||
#endif
|
||||
|
||||
class TColStd_SequenceOfExtendedString;
|
||||
|
||||
|
||||
#include "GEOM_BaseDriver.hxx"
|
||||
#include <GEOM_BaseDriver.hxx>
|
||||
|
||||
DEFINE_STANDARD_HANDLE( GEOMImpl_ArchimedeDriver, GEOM_BaseDriver );
|
||||
|
||||
@ -68,19 +34,17 @@ class GEOMImpl_ArchimedeDriver : public GEOM_BaseDriver {
|
||||
|
||||
public:
|
||||
|
||||
// Methods PUBLIC
|
||||
//
|
||||
Standard_EXPORT GEOMImpl_ArchimedeDriver();
|
||||
Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
|
||||
Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
|
||||
Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
|
||||
Standard_EXPORT static const Standard_GUID& GetID();
|
||||
Standard_EXPORT ~GEOMImpl_ArchimedeDriver() {};
|
||||
Standard_EXPORT GEOMImpl_ArchimedeDriver();
|
||||
Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
|
||||
Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
|
||||
Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
|
||||
Standard_EXPORT static const Standard_GUID& GetID();
|
||||
Standard_EXPORT ~GEOMImpl_ArchimedeDriver() {};
|
||||
|
||||
Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName,
|
||||
std::vector<GEOM_Param>& params);
|
||||
Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName,
|
||||
std::vector<GEOM_Param>& params);
|
||||
|
||||
DEFINE_STANDARD_RTTI( GEOMImpl_ArchimedeDriver )
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ArchimedeDriver,GEOM_BaseDriver)
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@ -123,7 +123,7 @@ GEOMImpl_BlockDriver::GEOMImpl_BlockDriver()
|
||||
//function : Execute
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
Standard_Integer GEOMImpl_BlockDriver::Execute(TFunction_Logbook& log) const
|
||||
Standard_Integer GEOMImpl_BlockDriver::Execute(LOGBOOK& log) const
|
||||
{
|
||||
if (Label().IsNull()) return 0;
|
||||
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
|
||||
@ -755,7 +755,11 @@ Standard_Integer GEOMImpl_BlockDriver::Execute(TFunction_Logbook& log) const
|
||||
|
||||
aFunction->SetValue(aShape);
|
||||
|
||||
#if OCC_VERSION_MAJOR < 7
|
||||
log.SetTouched(Label());
|
||||
#else
|
||||
log->SetTouched(Label());
|
||||
#endif
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -1156,6 +1160,4 @@ GetCreationInformation(std::string& theOperationName,
|
||||
return true;
|
||||
}
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE (GEOMImpl_BlockDriver,GEOM_BaseDriver);
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BlockDriver,GEOM_BaseDriver);
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BlockDriver,GEOM_BaseDriver);
|
||||
|
@ -26,42 +26,9 @@
|
||||
#ifndef _GEOMImpl_BlockDriver_HeaderFile
|
||||
#define _GEOMImpl_BlockDriver_HeaderFile
|
||||
|
||||
#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
|
||||
#include <TColStd_SequenceOfExtendedString.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_TypeMismatch_HeaderFile
|
||||
#include <Standard_TypeMismatch.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _Standard_HeaderFile
|
||||
#include <Standard.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _Standard_Macro_HeaderFile
|
||||
#include <Standard_Macro.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_HeaderFile
|
||||
#include <Standard.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_GUID_HeaderFile
|
||||
#include <Standard_GUID.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _TFunction_Driver_HeaderFile
|
||||
#include <TFunction_Driver.hxx>
|
||||
#endif
|
||||
#ifndef _TFunction_Logbook_HeaderFile
|
||||
#include <TFunction_Logbook.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_CString_HeaderFile
|
||||
#include <Standard_CString.hxx>
|
||||
#endif
|
||||
#include <TopoDS_Shape.hxx>
|
||||
|
||||
class TColStd_SequenceOfExtendedString;
|
||||
|
||||
|
||||
#include "GEOM_BaseDriver.hxx"
|
||||
#include <GEOM_BaseDriver.hxx>
|
||||
|
||||
DEFINE_STANDARD_HANDLE( GEOMImpl_BlockDriver, GEOM_BaseDriver );
|
||||
|
||||
@ -69,36 +36,34 @@ class GEOMImpl_BlockDriver : public GEOM_BaseDriver {
|
||||
|
||||
public:
|
||||
|
||||
// Methods PUBLIC
|
||||
//
|
||||
Standard_EXPORT GEOMImpl_BlockDriver();
|
||||
Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
|
||||
Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
|
||||
Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
|
||||
Standard_EXPORT static const Standard_GUID& GetID();
|
||||
Standard_EXPORT ~GEOMImpl_BlockDriver() {};
|
||||
Standard_EXPORT GEOMImpl_BlockDriver();
|
||||
Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
|
||||
Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
|
||||
Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
|
||||
|
||||
Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName,
|
||||
std::vector<GEOM_Param>& params);
|
||||
Standard_EXPORT static const Standard_GUID& GetID();
|
||||
Standard_EXPORT ~GEOMImpl_BlockDriver() {};
|
||||
|
||||
Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName,
|
||||
std::vector<GEOM_Param>& params);
|
||||
|
||||
private:
|
||||
void MultiTransformate1D (const TopoDS_Shape& theBlock,
|
||||
const TopoDS_Shape& theFace1,
|
||||
const TopoDS_Shape& theFace2,
|
||||
const Standard_Integer theNbIter,
|
||||
TopoDS_Shape& theResult) const;
|
||||
void MultiTransformate1D (const TopoDS_Shape& theBlock,
|
||||
const TopoDS_Shape& theFace1,
|
||||
const TopoDS_Shape& theFace2,
|
||||
const Standard_Integer theNbIter,
|
||||
TopoDS_Shape& theResult) const;
|
||||
|
||||
void MultiTransformate2D (const TopoDS_Shape& theBlock,
|
||||
const TopoDS_Shape& theFace1U,
|
||||
const TopoDS_Shape& theFace2U,
|
||||
const Standard_Integer theNbIterU,
|
||||
const TopoDS_Shape& theFace1V,
|
||||
const TopoDS_Shape& theFace2V,
|
||||
const Standard_Integer theNbIterV,
|
||||
TopoDS_Shape& theResult) const;
|
||||
|
||||
DEFINE_STANDARD_RTTI( GEOMImpl_BlockDriver )
|
||||
void MultiTransformate2D (const TopoDS_Shape& theBlock,
|
||||
const TopoDS_Shape& theFace1U,
|
||||
const TopoDS_Shape& theFace2U,
|
||||
const Standard_Integer theNbIterU,
|
||||
const TopoDS_Shape& theFace1V,
|
||||
const TopoDS_Shape& theFace2V,
|
||||
const Standard_Integer theNbIterV,
|
||||
TopoDS_Shape& theResult) const;
|
||||
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_BlockDriver,GEOM_BaseDriver)
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@ -113,7 +113,7 @@ GEOMImpl_BooleanDriver::GEOMImpl_BooleanDriver()
|
||||
//function : Execute
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
Standard_Integer GEOMImpl_BooleanDriver::Execute (TFunction_Logbook& log) const
|
||||
Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const
|
||||
{
|
||||
if (Label().IsNull()) return 0;
|
||||
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
|
||||
@ -322,7 +322,11 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute (TFunction_Logbook& log) const
|
||||
|
||||
aFunction->SetValue(aShape);
|
||||
|
||||
#if OCC_VERSION_MAJOR < 7
|
||||
log.SetTouched(Label());
|
||||
#else
|
||||
log->SetTouched(Label());
|
||||
#endif
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -618,6 +622,4 @@ GetCreationInformation(std::string& theOperationName,
|
||||
return true;
|
||||
}
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE (GEOMImpl_BooleanDriver,GEOM_BaseDriver);
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BooleanDriver,GEOM_BaseDriver);
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BooleanDriver,GEOM_BaseDriver);
|
||||
|
@ -26,53 +26,9 @@
|
||||
#ifndef _GEOMImpl_BooleanDriver_HeaderFile
|
||||
#define _GEOMImpl_BooleanDriver_HeaderFile
|
||||
|
||||
#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
|
||||
#include <TColStd_SequenceOfExtendedString.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_TypeMismatch_HeaderFile
|
||||
#include <Standard_TypeMismatch.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _Standard_HeaderFile
|
||||
#include <Standard.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _Standard_Macro_HeaderFile
|
||||
#include <Standard_Macro.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_HeaderFile
|
||||
#include <Standard.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_GUID_HeaderFile
|
||||
#include <Standard_GUID.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _TopoDS_Shape_HeaderFile
|
||||
#include <TopoDS_Shape.hxx>
|
||||
#endif
|
||||
|
||||
|
||||
class Standard_Transient;
|
||||
class Handle_Standard_Type;
|
||||
class Handle(TFunction_Driver);
|
||||
class GEOMImpl_BooleanDriver;
|
||||
|
||||
|
||||
|
||||
#ifndef _TFunction_Driver_HeaderFile
|
||||
#include <TFunction_Driver.hxx>
|
||||
#endif
|
||||
#ifndef _TFunction_Logbook_HeaderFile
|
||||
#include <TFunction_Logbook.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_CString_HeaderFile
|
||||
#include <Standard_CString.hxx>
|
||||
#endif
|
||||
|
||||
class TColStd_SequenceOfExtendedString;
|
||||
|
||||
|
||||
#include "GEOM_BaseDriver.hxx"
|
||||
#include <GEOM_BaseDriver.hxx>
|
||||
|
||||
DEFINE_STANDARD_HANDLE( GEOMImpl_BooleanDriver, GEOM_BaseDriver );
|
||||
|
||||
@ -80,17 +36,15 @@ class GEOMImpl_BooleanDriver : public GEOM_BaseDriver {
|
||||
|
||||
public:
|
||||
|
||||
// Methods PUBLIC
|
||||
//
|
||||
Standard_EXPORT GEOMImpl_BooleanDriver();
|
||||
Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
|
||||
Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
|
||||
Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
|
||||
Standard_EXPORT static const Standard_GUID& GetID();
|
||||
Standard_EXPORT ~GEOMImpl_BooleanDriver() {};
|
||||
Standard_EXPORT GEOMImpl_BooleanDriver();
|
||||
Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
|
||||
Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
|
||||
Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
|
||||
Standard_EXPORT static const Standard_GUID& GetID();
|
||||
Standard_EXPORT ~GEOMImpl_BooleanDriver() {};
|
||||
|
||||
Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName,
|
||||
std::vector<GEOM_Param>& params);
|
||||
Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName,
|
||||
std::vector<GEOM_Param>& params);
|
||||
|
||||
private:
|
||||
|
||||
@ -98,7 +52,7 @@ private:
|
||||
const TopoDS_Shape theShape2,
|
||||
const Standard_Integer theType) const;
|
||||
|
||||
DEFINE_STANDARD_RTTI( GEOMImpl_BooleanDriver )
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_BooleanDriver,GEOM_BaseDriver)
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@ -64,7 +64,7 @@ GEOMImpl_BoxDriver::GEOMImpl_BoxDriver()
|
||||
//function : Execute
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
Standard_Integer GEOMImpl_BoxDriver::Execute(TFunction_Logbook& log) const
|
||||
Standard_Integer GEOMImpl_BoxDriver::Execute(LOGBOOK& log) const
|
||||
{
|
||||
if (Label().IsNull()) return 0;
|
||||
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
|
||||
@ -116,7 +116,11 @@ Standard_Integer GEOMImpl_BoxDriver::Execute(TFunction_Logbook& log) const
|
||||
|
||||
aFunction->SetValue(aShape);
|
||||
|
||||
#if OCC_VERSION_MAJOR < 7
|
||||
log.SetTouched(Label());
|
||||
#else
|
||||
log->SetTouched(Label());
|
||||
#endif
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -156,7 +160,4 @@ bool GEOMImpl_BoxDriver::GetCreationInformation(std::string& theOper
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE (GEOMImpl_BoxDriver,GEOM_BaseDriver);
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BoxDriver,GEOM_BaseDriver);
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BoxDriver,GEOM_BaseDriver);
|
||||
|
@ -26,41 +26,7 @@
|
||||
#ifndef _GEOMImpl_BoxDriver_HeaderFile
|
||||
#define _GEOMImpl_BoxDriver_HeaderFile
|
||||
|
||||
#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
|
||||
#include <TColStd_SequenceOfExtendedString.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_TypeMismatch_HeaderFile
|
||||
#include <Standard_TypeMismatch.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _Standard_HeaderFile
|
||||
#include <Standard.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _Standard_Macro_HeaderFile
|
||||
#include <Standard_Macro.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_HeaderFile
|
||||
#include <Standard.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_GUID_HeaderFile
|
||||
#include <Standard_GUID.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _TFunction_Driver_HeaderFile
|
||||
#include <TFunction_Driver.hxx>
|
||||
#endif
|
||||
#ifndef _TFunction_Logbook_HeaderFile
|
||||
#include <TFunction_Logbook.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_CString_HeaderFile
|
||||
#include <Standard_CString.hxx>
|
||||
#endif
|
||||
|
||||
class TColStd_SequenceOfExtendedString;
|
||||
|
||||
|
||||
#include "GEOM_BaseDriver.hxx"
|
||||
#include <GEOM_BaseDriver.hxx>
|
||||
|
||||
DEFINE_STANDARD_HANDLE( GEOMImpl_BoxDriver, GEOM_BaseDriver );
|
||||
|
||||
@ -68,21 +34,18 @@ class GEOMImpl_BoxDriver : public GEOM_BaseDriver {
|
||||
|
||||
public:
|
||||
|
||||
// Methods PUBLIC
|
||||
//
|
||||
Standard_EXPORT GEOMImpl_BoxDriver();
|
||||
Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
|
||||
Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
|
||||
Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
|
||||
Standard_EXPORT static const Standard_GUID& GetID();
|
||||
Standard_EXPORT ~GEOMImpl_BoxDriver() {};
|
||||
Standard_EXPORT GEOMImpl_BoxDriver();
|
||||
Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
|
||||
Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
|
||||
Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
|
||||
Standard_EXPORT static const Standard_GUID& GetID();
|
||||
Standard_EXPORT ~GEOMImpl_BoxDriver() {};
|
||||
|
||||
Standard_EXPORT virtual
|
||||
bool GetCreationInformation(std::string& theOperationNameName,
|
||||
std::vector<GEOM_Param>& params);
|
||||
|
||||
|
||||
DEFINE_STANDARD_RTTI( GEOMImpl_BoxDriver )
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_BoxDriver,GEOM_BaseDriver)
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@ -95,7 +95,7 @@ static Standard_Boolean isGoodForChamfer (const TopoDS_Shape& theShape)
|
||||
//function : Execute
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
Standard_Integer GEOMImpl_ChamferDriver::Execute(TFunction_Logbook& log) const
|
||||
Standard_Integer GEOMImpl_ChamferDriver::Execute(LOGBOOK& log) const
|
||||
{
|
||||
if (Label().IsNull()) return 0;
|
||||
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
|
||||
@ -267,7 +267,11 @@ Standard_Integer GEOMImpl_ChamferDriver::Execute(TFunction_Logbook& log) const
|
||||
|
||||
aFunction->SetValue(aShape);
|
||||
|
||||
#if OCC_VERSION_MAJOR < 7
|
||||
log.SetTouched(Label());
|
||||
#else
|
||||
log->SetTouched(Label());
|
||||
#endif
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -357,6 +361,4 @@ GetCreationInformation(std::string& theOperationName,
|
||||
return true;
|
||||
}
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE (GEOMImpl_ChamferDriver,GEOM_BaseDriver);
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ChamferDriver,GEOM_BaseDriver);
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ChamferDriver,GEOM_BaseDriver);
|
||||
|
@ -26,41 +26,7 @@
|
||||
#ifndef _GEOMImpl_ChamferDriver_HeaderFile
|
||||
#define _GEOMImpl_ChamferDriver_HeaderFile
|
||||
|
||||
#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
|
||||
#include <TColStd_SequenceOfExtendedString.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_TypeMismatch_HeaderFile
|
||||
#include <Standard_TypeMismatch.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _Standard_HeaderFile
|
||||
#include <Standard.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _Standard_Macro_HeaderFile
|
||||
#include <Standard_Macro.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_HeaderFile
|
||||
#include <Standard.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_GUID_HeaderFile
|
||||
#include <Standard_GUID.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _TFunction_Driver_HeaderFile
|
||||
#include <TFunction_Driver.hxx>
|
||||
#endif
|
||||
#ifndef _TFunction_Logbook_HeaderFile
|
||||
#include <TFunction_Logbook.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_CString_HeaderFile
|
||||
#include <Standard_CString.hxx>
|
||||
#endif
|
||||
|
||||
class TColStd_SequenceOfExtendedString;
|
||||
|
||||
|
||||
#include "GEOM_BaseDriver.hxx"
|
||||
#include <GEOM_BaseDriver.hxx>
|
||||
|
||||
DEFINE_STANDARD_HANDLE( GEOMImpl_ChamferDriver, GEOM_BaseDriver );
|
||||
|
||||
@ -68,20 +34,18 @@ class GEOMImpl_ChamferDriver : public GEOM_BaseDriver {
|
||||
|
||||
public:
|
||||
|
||||
// Methods PUBLIC
|
||||
//
|
||||
Standard_EXPORT GEOMImpl_ChamferDriver();
|
||||
Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
|
||||
Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
|
||||
Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
|
||||
Standard_EXPORT static const Standard_GUID& GetID();
|
||||
Standard_EXPORT ~GEOMImpl_ChamferDriver() {};
|
||||
Standard_EXPORT GEOMImpl_ChamferDriver();
|
||||
Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
|
||||
Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
|
||||
Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
|
||||
Standard_EXPORT static const Standard_GUID& GetID();
|
||||
Standard_EXPORT ~GEOMImpl_ChamferDriver() {};
|
||||
|
||||
Standard_EXPORT virtual
|
||||
bool GetCreationInformation(std::string& theOperationName,
|
||||
std::vector<GEOM_Param>& params);
|
||||
|
||||
DEFINE_STANDARD_RTTI( GEOMImpl_ChamferDriver )
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ChamferDriver,GEOM_BaseDriver)
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@ -71,7 +71,7 @@ GEOMImpl_CircleDriver::GEOMImpl_CircleDriver()
|
||||
//function : Execute
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
Standard_Integer GEOMImpl_CircleDriver::Execute(TFunction_Logbook& log) const
|
||||
Standard_Integer GEOMImpl_CircleDriver::Execute(LOGBOOK& log) const
|
||||
{
|
||||
if (Label().IsNull()) return 0;
|
||||
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
|
||||
@ -187,7 +187,11 @@ Standard_Integer GEOMImpl_CircleDriver::Execute(TFunction_Logbook& log) const
|
||||
|
||||
aFunction->SetValue(aShape);
|
||||
|
||||
#if OCC_VERSION_MAJOR < 7
|
||||
log.SetTouched(Label());
|
||||
#else
|
||||
log->SetTouched(Label());
|
||||
#endif
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -233,6 +237,4 @@ GetCreationInformation(std::string& theOperationName,
|
||||
return true;
|
||||
}
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE (GEOMImpl_CircleDriver,GEOM_BaseDriver);
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CircleDriver,GEOM_BaseDriver);
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CircleDriver,GEOM_BaseDriver);
|
||||
|
@ -26,41 +26,7 @@
|
||||
#ifndef _GEOMImpl_CircleDriver_HeaderFile
|
||||
#define _GEOMImpl_CircleDriver_HeaderFile
|
||||
|
||||
#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
|
||||
#include <TColStd_SequenceOfExtendedString.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_TypeMismatch_HeaderFile
|
||||
#include <Standard_TypeMismatch.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _Standard_HeaderFile
|
||||
#include <Standard.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _Standard_Macro_HeaderFile
|
||||
#include <Standard_Macro.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_HeaderFile
|
||||
#include <Standard.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_GUID_HeaderFile
|
||||
#include <Standard_GUID.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _TFunction_Driver_HeaderFile
|
||||
#include <TFunction_Driver.hxx>
|
||||
#endif
|
||||
#ifndef _TFunction_Logbook_HeaderFile
|
||||
#include <TFunction_Logbook.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_CString_HeaderFile
|
||||
#include <Standard_CString.hxx>
|
||||
#endif
|
||||
|
||||
class TColStd_SequenceOfExtendedString;
|
||||
|
||||
|
||||
#include "GEOM_BaseDriver.hxx"
|
||||
#include <GEOM_BaseDriver.hxx>
|
||||
|
||||
DEFINE_STANDARD_HANDLE( GEOMImpl_CircleDriver, GEOM_BaseDriver );
|
||||
|
||||
@ -68,20 +34,19 @@ class GEOMImpl_CircleDriver : public GEOM_BaseDriver {
|
||||
|
||||
public:
|
||||
|
||||
// Methods PUBLIC
|
||||
//
|
||||
Standard_EXPORT GEOMImpl_CircleDriver();
|
||||
Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
|
||||
Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
|
||||
Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
|
||||
Standard_EXPORT static const Standard_GUID& GetID();
|
||||
Standard_EXPORT ~GEOMImpl_CircleDriver() {};
|
||||
Standard_EXPORT GEOMImpl_CircleDriver();
|
||||
Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
|
||||
Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
|
||||
Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
|
||||
|
||||
Standard_EXPORT static const Standard_GUID& GetID();
|
||||
Standard_EXPORT ~GEOMImpl_CircleDriver() {};
|
||||
|
||||
Standard_EXPORT virtual
|
||||
bool GetCreationInformation(std::string& theOperationName,
|
||||
std::vector<GEOM_Param>& params);
|
||||
|
||||
DEFINE_STANDARD_RTTI( GEOMImpl_CircleDriver )
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_CircleDriver,GEOM_BaseDriver)
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@ -67,7 +67,7 @@ GEOMImpl_ConeDriver::GEOMImpl_ConeDriver()
|
||||
//function : Execute
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
Standard_Integer GEOMImpl_ConeDriver::Execute(TFunction_Logbook& log) const
|
||||
Standard_Integer GEOMImpl_ConeDriver::Execute(LOGBOOK& log) const
|
||||
{
|
||||
if (Label().IsNull()) return 0;
|
||||
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
|
||||
@ -137,7 +137,11 @@ Standard_Integer GEOMImpl_ConeDriver::Execute(TFunction_Logbook& log) const
|
||||
}
|
||||
if (aShape.IsNull()) return 0;
|
||||
|
||||
#if OCC_VERSION_MAJOR < 7
|
||||
log.SetTouched(Label());
|
||||
#else
|
||||
log->SetTouched(Label());
|
||||
#endif
|
||||
|
||||
aFunction->SetValue(aShape);
|
||||
return 1;
|
||||
@ -181,6 +185,4 @@ GetCreationInformation(std::string& theOperationName,
|
||||
return true;
|
||||
}
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE (GEOMImpl_ConeDriver,GEOM_BaseDriver);
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ConeDriver,GEOM_BaseDriver);
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ConeDriver,GEOM_BaseDriver);
|
||||
|
@ -26,41 +26,7 @@
|
||||
#ifndef _GEOMImpl_ConeDriver_HeaderFile
|
||||
#define _GEOMImpl_ConeDriver_HeaderFile
|
||||
|
||||
#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
|
||||
#include <TColStd_SequenceOfExtendedString.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_TypeMismatch_HeaderFile
|
||||
#include <Standard_TypeMismatch.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _Standard_HeaderFile
|
||||
#include <Standard.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _Standard_Macro_HeaderFile
|
||||
#include <Standard_Macro.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_HeaderFile
|
||||
#include <Standard.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_GUID_HeaderFile
|
||||
#include <Standard_GUID.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _TFunction_Driver_HeaderFile
|
||||
#include <TFunction_Driver.hxx>
|
||||
#endif
|
||||
#ifndef _TFunction_Logbook_HeaderFile
|
||||
#include <TFunction_Logbook.hxx>
|
||||
#endif
|
||||
#ifndef _Standard_CString_HeaderFile
|
||||
#include <Standard_CString.hxx>
|
||||
#endif
|
||||
|
||||
class TColStd_SequenceOfExtendedString;
|
||||
|
||||
|
||||
#include "GEOM_BaseDriver.hxx"
|
||||
#include <GEOM_BaseDriver.hxx>
|
||||
|
||||
DEFINE_STANDARD_HANDLE( GEOMImpl_ConeDriver, GEOM_BaseDriver );
|
||||
|
||||
@ -68,20 +34,18 @@ class GEOMImpl_ConeDriver : public GEOM_BaseDriver {
|
||||
|
||||
public:
|
||||
|
||||
// Methods PUBLIC
|
||||
//
|
||||
Standard_EXPORT GEOMImpl_ConeDriver();
|
||||
Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
|
||||
Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
|
||||
Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
|
||||
Standard_EXPORT static const Standard_GUID& GetID();
|
||||
Standard_EXPORT ~GEOMImpl_ConeDriver() {};
|
||||
Standard_EXPORT GEOMImpl_ConeDriver();
|
||||
Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
|
||||
Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
|
||||
Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
|
||||
Standard_EXPORT static const Standard_GUID& GetID();
|
||||
Standard_EXPORT ~GEOMImpl_ConeDriver() {};
|
||||
|
||||
Standard_EXPORT virtual
|
||||
bool GetCreationInformation(std::string& theOperationName,
|
||||
std::vector<GEOM_Param>& params);
|
||||
|
||||
DEFINE_STANDARD_RTTI( GEOMImpl_ConeDriver )
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ConeDriver,GEOM_BaseDriver)
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@ -33,9 +33,6 @@
|
||||
#include <TopExp.hxx>
|
||||
#include <TNaming_CopyShape.hxx>
|
||||
#include <TColStd_IndexedDataMapOfTransientTransient.hxx>
|
||||
#include <TFunction_Logbook.hxx>
|
||||
#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
|
||||
#include <TopTools_IndexedMapOfShape.hxx>
|
||||
#include <TopTools_ListIteratorOfListOfShape.hxx>
|
||||
#include <TopTools_ListOfShape.hxx>
|
||||
#include <TopTools_MapIteratorOfMapOfShape.hxx>
|
||||
@ -69,7 +66,7 @@ GEOMImpl_CopyDriver::GEOMImpl_CopyDriver()
|
||||
//function : Execute
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
Standard_Integer GEOMImpl_CopyDriver::Execute(TFunction_Logbook& log) const
|
||||
Standard_Integer GEOMImpl_CopyDriver::Execute(LOGBOOK& log) const
|
||||
{
|
||||
if (Label().IsNull()) return 0;
|
||||
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
|
||||
@ -101,7 +98,11 @@ Standard_Integer GEOMImpl_CopyDriver::Execute(TFunction_Logbook& log) const
|
||||
|
||||
aFunction->SetValue(aCopy);
|
||||
|
||||
#if OCC_VERSION_MAJOR < 7
|
||||
log.SetTouched(Label());
|
||||
#else
|
||||
log->SetTouched(Label());
|
||||
#endif
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -149,8 +150,7 @@ GetCreationInformation(std::string& theOperationName,
|
||||
* \brief Performs Transfer Data operation.
|
||||
*/
|
||||
//================================================================================
|
||||
|
||||
Standard_Integer GEOMImpl_CopyDriver::transferData(TFunction_Logbook& log) const
|
||||
Standard_Integer GEOMImpl_CopyDriver::transferData(LOGBOOK& log) const
|
||||
{
|
||||
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
|
||||
GEOMImpl_ITransferData aTD (aFunction);
|
||||
@ -414,6 +414,4 @@ Standard_Boolean GEOMImpl_CopyDriver::getInPlaceByHistory
|
||||
return Standard_True;
|
||||
}
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE (GEOMImpl_CopyDriver,GEOM_BaseDriver);
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CopyDriver,GEOM_BaseDriver);
|
||||
OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CopyDriver,GEOM_BaseDriver);
|
||||
|
@ -26,39 +26,36 @@
|
||||
#ifndef _GEOMImpl_CopyDriver_HeaderFile
|
||||
#define _GEOMImpl_CopyDriver_HeaderFile
|
||||
|
||||
#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
|
||||
#include <TopTools_IndexedMapOfShape.hxx>
|
||||
|
||||
#include <GEOM_BaseDriver.hxx>
|
||||
|
||||
class TopoDS_Shape;
|
||||
class TopTools_IndexedDataMapOfShapeListOfShape;
|
||||
class TopTools_IndexedMapOfShape;
|
||||
class Standard_GUID;
|
||||
|
||||
|
||||
#include "GEOM_BaseDriver.hxx"
|
||||
|
||||
|
||||
DEFINE_STANDARD_HANDLE( GEOMImpl_CopyDriver, GEOM_BaseDriver );
|
||||
|
||||
class GEOMImpl_CopyDriver : public GEOM_BaseDriver {
|
||||
|
||||
public:
|
||||
|
||||
// Methods PUBLIC
|
||||
//
|
||||
Standard_EXPORT GEOMImpl_CopyDriver();
|
||||
Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const;
|
||||
Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
|
||||
Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
|
||||
Standard_EXPORT static const Standard_GUID& GetID();
|
||||
Standard_EXPORT ~GEOMImpl_CopyDriver() {};
|
||||
Standard_EXPORT GEOMImpl_CopyDriver();
|
||||
Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const;
|
||||
Standard_EXPORT virtual void Validate(LOGBOOK&) const {}
|
||||
Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; }
|
||||
Standard_EXPORT static const Standard_GUID& GetID();
|
||||
Standard_EXPORT ~GEOMImpl_CopyDriver() {};
|
||||
|
||||
Standard_EXPORT virtual
|
||||
bool GetCreationInformation(std::string& theOperationName,
|
||||
std::vector<GEOM_Param>& params);
|
||||
|
||||
DEFINE_STANDARD_RTTI( GEOMImpl_CopyDriver )
|
||||
OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_CopyDriver,GEOM_BaseDriver)
|
||||
|
||||
private:
|
||||
|
||||
Standard_Integer transferData(TFunction_Logbook& log) const;
|
||||
Standard_Integer transferData(LOGBOOK& log) const;
|
||||
|
||||
Standard_Boolean getInPlace
|
||||
(const TopoDS_Shape &theSourceShape,
|
||||
@ -78,7 +75,6 @@ private:
|
||||
const TopoDS_Shape &theDestinationShape,
|
||||
const Handle(GEOM_Function) &theDestinationRef,
|
||||
TopTools_IndexedDataMapOfShapeListOfShape &theMapSourceDest) const;
|
||||
|
||||
};
|
||||
|
||||
#endif
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user