Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unnecessary includes
[modules/geom.git]
/
src
/
GEOMImpl
/
GEOMImpl_ILocalOperations.cxx
diff --git
a/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx
b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx
index cb2c4698ccaaaa76df45d0061ae7baaf10f47f65..66ac3be0747b370964596bf6e3792c85b2d711c6 100644
(file)
--- a/
src/GEOMImpl/GEOMImpl_ILocalOperations.cxx
+++ b/
src/GEOMImpl/GEOMImpl_ILocalOperations.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
14
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-45,15
+45,11
@@
#include <GEOM_Function.hxx>
#include <GEOM_PythonDump.hxx>
#include <GEOM_Function.hxx>
#include <GEOM_PythonDump.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include "utilities.h"
#include "utilities.h"
-#include <OpUtil.hxx>
#include <Utils_ExceptHandlers.hxx>
#include <TFunction_DriverTable.hxx>
#include <TFunction_Driver.hxx>
#include <Utils_ExceptHandlers.hxx>
#include <TFunction_DriverTable.hxx>
#include <TFunction_Driver.hxx>
-#include <TFunction_Logbook.hxx>
#include <TDF_Tool.hxx>
#include <TopExp.hxx>
#include <TDF_Tool.hxx>
#include <TopExp.hxx>
@@
-68,8
+64,8
@@
* constructor:
*/
//=============================================================================
* constructor:
*/
//=============================================================================
-GEOMImpl_ILocalOperations::GEOMImpl_ILocalOperations (GEOM_Engine* theEngine
, int theDocID
)
-: GEOM_IOperations(theEngine
, theDocID
)
+GEOMImpl_ILocalOperations::GEOMImpl_ILocalOperations (GEOM_Engine* theEngine)
+: GEOM_IOperations(theEngine)
{
MESSAGE("GEOMImpl_ILocalOperations::GEOMImpl_ILocalOperations");
}
{
MESSAGE("GEOMImpl_ILocalOperations::GEOMImpl_ILocalOperations");
}
@@
-96,7
+92,7
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletAll
SetErrorCode(KO);
//Add a new Fillet object
SetErrorCode(KO);
//Add a new Fillet object
- Handle(GEOM_Object) aFillet = GetEngine()->AddObject(G
etDocID(), G
EOM_FILLET);
+ Handle(GEOM_Object) aFillet = GetEngine()->AddObject(GEOM_FILLET);
//Add a new Fillet function
Handle(GEOM_Function) aFunction =
//Add a new Fillet function
Handle(GEOM_Function) aFunction =
@@
-116,17
+112,14
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletAll
//Compute the Fillet value
try {
//Compute the Fillet value
try {
-#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
OCC_CATCH_SIGNALS;
-#endif
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Fillet driver failed");
return NULL;
}
}
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Fillet driver failed");
return NULL;
}
}
- catch (Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
- SetErrorCode(aFail->GetMessageString());
+ catch (Standard_Failure& aFail) {
+ SetErrorCode(aFail.GetMessageString());
return NULL;
}
return NULL;
}
@@
-149,7
+142,7
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletEdges
SetErrorCode(KO);
//Add a new Fillet object
SetErrorCode(KO);
//Add a new Fillet object
- Handle(GEOM_Object) aFillet = GetEngine()->AddObject(G
etDocID(), G
EOM_FILLET);
+ Handle(GEOM_Object) aFillet = GetEngine()->AddObject(GEOM_FILLET);
//Add a new Fillet function
Handle(GEOM_Function) aFunction =
//Add a new Fillet function
Handle(GEOM_Function) aFunction =
@@
-177,17
+170,14
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletEdges
//Compute the Fillet value
try {
//Compute the Fillet value
try {
-#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
OCC_CATCH_SIGNALS;
-#endif
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Fillet driver failed");
return NULL;
}
}
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Fillet driver failed");
return NULL;
}
}
- catch (Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
- SetErrorCode(aFail->GetMessageString());
+ catch (Standard_Failure& aFail) {
+ SetErrorCode(aFail.GetMessageString());
return NULL;
}
return NULL;
}
@@
-218,7
+208,7
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletEdgesR1R2
SetErrorCode(KO);
//Add a new Fillet object
SetErrorCode(KO);
//Add a new Fillet object
- Handle(GEOM_Object) aFillet = GetEngine()->AddObject(G
etDocID(), G
EOM_FILLET);
+ Handle(GEOM_Object) aFillet = GetEngine()->AddObject(GEOM_FILLET);
//Add a new Fillet function
Handle(GEOM_Function) aFunction =
//Add a new Fillet function
Handle(GEOM_Function) aFunction =
@@
-247,17
+237,14
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletEdgesR1R2
//Compute the Fillet value
try {
//Compute the Fillet value
try {
-#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
OCC_CATCH_SIGNALS;
-#endif
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Fillet driver failed");
return NULL;
}
}
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Fillet driver failed");
return NULL;
}
}
- catch (Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
- SetErrorCode(aFail->GetMessageString());
+ catch (Standard_Failure& aFail) {
+ SetErrorCode(aFail.GetMessageString());
return NULL;
}
return NULL;
}
@@
-289,7
+276,7
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletFaces
SetErrorCode(KO);
//Add a new Fillet object
SetErrorCode(KO);
//Add a new Fillet object
- Handle(GEOM_Object) aFillet = GetEngine()->AddObject(G
etDocID(), G
EOM_FILLET);
+ Handle(GEOM_Object) aFillet = GetEngine()->AddObject(GEOM_FILLET);
//Add a new Fillet function
Handle(GEOM_Function) aFunction =
//Add a new Fillet function
Handle(GEOM_Function) aFunction =
@@
-317,17
+304,14
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletFaces
//Compute the Fillet value
try {
//Compute the Fillet value
try {
-#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
OCC_CATCH_SIGNALS;
-#endif
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Fillet driver failed");
return NULL;
}
}
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Fillet driver failed");
return NULL;
}
}
- catch (Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
- SetErrorCode(aFail->GetMessageString());
+ catch (Standard_Failure& aFail) {
+ SetErrorCode(aFail.GetMessageString());
return NULL;
}
return NULL;
}
@@
-358,7
+342,7
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletFacesR1R2
SetErrorCode(KO);
//Add a new Fillet object
SetErrorCode(KO);
//Add a new Fillet object
- Handle(GEOM_Object) aFillet = GetEngine()->AddObject(G
etDocID(), G
EOM_FILLET);
+ Handle(GEOM_Object) aFillet = GetEngine()->AddObject(GEOM_FILLET);
//Add a new Fillet function
Handle(GEOM_Function) aFunction =
//Add a new Fillet function
Handle(GEOM_Function) aFunction =
@@
-387,17
+371,14
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletFacesR1R2
//Compute the Fillet value
try {
//Compute the Fillet value
try {
-#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
OCC_CATCH_SIGNALS;
-#endif
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Fillet driver failed");
return NULL;
}
}
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Fillet driver failed");
return NULL;
}
}
- catch (Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
- SetErrorCode(aFail->GetMessageString());
+ catch (Standard_Failure& aFail) {
+ SetErrorCode(aFail.GetMessageString());
return NULL;
}
return NULL;
}
@@
-428,7
+409,7
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFillet2D
SetErrorCode(KO);
//Add a new Fillet object
SetErrorCode(KO);
//Add a new Fillet object
- Handle(GEOM_Object) aFillet2D = GetEngine()->AddObject(G
etDocID(), G
EOM_FILLET_2D);
+ Handle(GEOM_Object) aFillet2D = GetEngine()->AddObject(GEOM_FILLET_2D);
//Add a new Fillet function
Handle(GEOM_Function) aFunction =
//Add a new Fillet function
Handle(GEOM_Function) aFunction =
@@
-456,17
+437,14
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFillet2D
//Compute the Fillet value
try {
//Compute the Fillet value
try {
-#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
OCC_CATCH_SIGNALS;
-#endif
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("2D Fillet driver failed");
return NULL;
}
}
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("2D Fillet driver failed");
return NULL;
}
}
- catch (Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
- SetErrorCode(aFail->GetMessageString());
+ catch (Standard_Failure& aFail) {
+ SetErrorCode(aFail.GetMessageString());
return NULL;
}
return NULL;
}
@@
-498,7
+476,7
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFillet1D
SetErrorCode(KO);
//Add a new Fillet object
SetErrorCode(KO);
//Add a new Fillet object
- Handle(GEOM_Object) aFillet1D = GetEngine()->AddObject(G
etDocID(), G
EOM_FILLET_1D);
+ Handle(GEOM_Object) aFillet1D = GetEngine()->AddObject(GEOM_FILLET_1D);
//Add a new Fillet function
Handle(GEOM_Function) aFunction =
//Add a new Fillet function
Handle(GEOM_Function) aFunction =
@@
-527,17
+505,14
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFillet1D
//Compute the Fillet value
try {
//Compute the Fillet value
try {
-#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
OCC_CATCH_SIGNALS;
-#endif
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("1D Fillet driver failed");
return NULL;
}
}
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("1D Fillet driver failed");
return NULL;
}
}
- catch (Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
- SetErrorCode(aFail->GetMessageString());
+ catch (Standard_Failure& aFail) {
+ SetErrorCode(aFail.GetMessageString());
return NULL;
}
return NULL;
}
@@
-568,7
+543,7
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferAll (Handle(GEOM_Objec
SetErrorCode(KO);
//Add a new Chamfer object
SetErrorCode(KO);
//Add a new Chamfer object
- Handle(GEOM_Object) aChamfer = GetEngine()->AddObject(G
etDocID(), G
EOM_CHAMFER);
+ Handle(GEOM_Object) aChamfer = GetEngine()->AddObject(GEOM_CHAMFER);
//Add a new Chamfer function
Handle(GEOM_Function) aFunction =
//Add a new Chamfer function
Handle(GEOM_Function) aFunction =
@@
-588,17
+563,14
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferAll (Handle(GEOM_Objec
//Compute the Chamfer value
try {
//Compute the Chamfer value
try {
-#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
OCC_CATCH_SIGNALS;
-#endif
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Chamfer driver failed");
return NULL;
}
}
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Chamfer driver failed");
return NULL;
}
}
- catch (Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
- SetErrorCode(aFail->GetMessageString());
+ catch (Standard_Failure& aFail) {
+ SetErrorCode(aFail.GetMessageString());
return NULL;
}
return NULL;
}
@@
-622,7
+594,7
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdge
SetErrorCode(KO);
//Add a new Chamfer object
SetErrorCode(KO);
//Add a new Chamfer object
- Handle(GEOM_Object) aChamfer = GetEngine()->AddObject(G
etDocID(), G
EOM_CHAMFER);
+ Handle(GEOM_Object) aChamfer = GetEngine()->AddObject(GEOM_CHAMFER);
//Add a new Chamfer function
Handle(GEOM_Function) aFunction =
//Add a new Chamfer function
Handle(GEOM_Function) aFunction =
@@
-645,17
+617,14
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdge
//Compute the Chamfer value
try {
//Compute the Chamfer value
try {
-#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
OCC_CATCH_SIGNALS;
-#endif
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Chamfer driver failed");
return NULL;
}
}
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Chamfer driver failed");
return NULL;
}
}
- catch (Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
- SetErrorCode(aFail->GetMessageString());
+ catch (Standard_Failure& aFail) {
+ SetErrorCode(aFail.GetMessageString());
return NULL;
}
return NULL;
}
@@
-680,7
+649,7
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdgeAD
SetErrorCode(KO);
//Add a new Chamfer object
SetErrorCode(KO);
//Add a new Chamfer object
- Handle(GEOM_Object) aChamfer = GetEngine()->AddObject(G
etDocID(), G
EOM_CHAMFER);
+ Handle(GEOM_Object) aChamfer = GetEngine()->AddObject(GEOM_CHAMFER);
//Add a new Chamfer function
Handle(GEOM_Function) aFunction =
//Add a new Chamfer function
Handle(GEOM_Function) aFunction =
@@
-703,17
+672,14
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdgeAD
//Compute the Chamfer value
try {
//Compute the Chamfer value
try {
-#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
OCC_CATCH_SIGNALS;
-#endif
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Chamfer driver failed");
return NULL;
}
}
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Chamfer driver failed");
return NULL;
}
}
- catch (Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
- SetErrorCode(aFail->GetMessageString());
+ catch (Standard_Failure& aFail) {
+ SetErrorCode(aFail.GetMessageString());
return NULL;
}
return NULL;
}
@@
-737,7
+703,7
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferFaces
SetErrorCode(KO);
//Add a new Chamfer object
SetErrorCode(KO);
//Add a new Chamfer object
- Handle(GEOM_Object) aChamfer = GetEngine()->AddObject(G
etDocID(), G
EOM_CHAMFER);
+ Handle(GEOM_Object) aChamfer = GetEngine()->AddObject(GEOM_CHAMFER);
//Add a new Chamfer function
Handle(GEOM_Function) aFunction =
//Add a new Chamfer function
Handle(GEOM_Function) aFunction =
@@
-766,17
+732,14
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferFaces
//Compute the Chamfer value
try {
//Compute the Chamfer value
try {
-#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
OCC_CATCH_SIGNALS;
-#endif
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Chamfer driver failed");
return NULL;
}
}
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Chamfer driver failed");
return NULL;
}
}
- catch (Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
- SetErrorCode(aFail->GetMessageString());
+ catch (Standard_Failure& aFail) {
+ SetErrorCode(aFail.GetMessageString());
return NULL;
}
return NULL;
}
@@
-808,7
+771,7
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferFacesAD
SetErrorCode(KO);
//Add a new Chamfer object
SetErrorCode(KO);
//Add a new Chamfer object
- Handle(GEOM_Object) aChamfer = GetEngine()->AddObject(G
etDocID(), G
EOM_CHAMFER);
+ Handle(GEOM_Object) aChamfer = GetEngine()->AddObject(GEOM_CHAMFER);
//Add a new Chamfer function
Handle(GEOM_Function) aFunction =
//Add a new Chamfer function
Handle(GEOM_Function) aFunction =
@@
-837,17
+800,14
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferFacesAD
//Compute the Chamfer value
try {
//Compute the Chamfer value
try {
-#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
OCC_CATCH_SIGNALS;
-#endif
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Chamfer driver failed");
return NULL;
}
}
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Chamfer driver failed");
return NULL;
}
}
- catch (Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
- SetErrorCode(aFail->GetMessageString());
+ catch (Standard_Failure& aFail) {
+ SetErrorCode(aFail.GetMessageString());
return NULL;
}
return NULL;
}
@@
-879,7
+839,7
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdges
SetErrorCode(KO);
//Add a new Chamfer object
SetErrorCode(KO);
//Add a new Chamfer object
- Handle(GEOM_Object) aChamfer = GetEngine()->AddObject(G
etDocID(), G
EOM_CHAMFER);
+ Handle(GEOM_Object) aChamfer = GetEngine()->AddObject(GEOM_CHAMFER);
//Add a new Chamfer function
Handle(GEOM_Function) aFunction =
//Add a new Chamfer function
Handle(GEOM_Function) aFunction =
@@
-909,17
+869,14
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdges
//Compute the Chamfer value
try {
//Compute the Chamfer value
try {
-#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
OCC_CATCH_SIGNALS;
-#endif
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Chamfer driver failed");
return NULL;
}
}
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Chamfer driver failed");
return NULL;
}
}
- catch (Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
- SetErrorCode(aFail->GetMessageString());
+ catch (Standard_Failure& aFail) {
+ SetErrorCode(aFail.GetMessageString());
return NULL;
}
return NULL;
}
@@
-951,7
+908,7
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdgesAD
SetErrorCode(KO);
//Add a new Chamfer object
SetErrorCode(KO);
//Add a new Chamfer object
- Handle(GEOM_Object) aChamfer = GetEngine()->AddObject(G
etDocID(), G
EOM_CHAMFER);
+ Handle(GEOM_Object) aChamfer = GetEngine()->AddObject(GEOM_CHAMFER);
//Add a new Chamfer function
Handle(GEOM_Function) aFunction =
//Add a new Chamfer function
Handle(GEOM_Function) aFunction =
@@
-981,17
+938,14
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdgesAD
//Compute the Chamfer value
try {
//Compute the Chamfer value
try {
-#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
OCC_CATCH_SIGNALS;
-#endif
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Chamfer driver failed");
return NULL;
}
}
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Chamfer driver failed");
return NULL;
}
}
- catch (Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
- SetErrorCode(aFail->GetMessageString());
+ catch (Standard_Failure& aFail) {
+ SetErrorCode(aFail.GetMessageString());
return NULL;
}
return NULL;
}
@@
-1024,7
+978,7
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeArchimede (Handle(GEOM_Object
SetErrorCode(KO);
//Add a new Archimede object
SetErrorCode(KO);
//Add a new Archimede object
- Handle(GEOM_Object) aChamfer = GetEngine()->AddObject(G
etDocID(), G
EOM_ARCHIMEDE);
+ Handle(GEOM_Object) aChamfer = GetEngine()->AddObject(GEOM_ARCHIMEDE);
//Add a new Archimede function
Handle(GEOM_Function) aFunction = aChamfer->AddFunction(GEOMImpl_ArchimedeDriver::GetID(), ARCHIMEDE_TYPE);
//Add a new Archimede function
Handle(GEOM_Function) aFunction = aChamfer->AddFunction(GEOMImpl_ArchimedeDriver::GetID(), ARCHIMEDE_TYPE);
@@
-1045,17
+999,14
@@
Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeArchimede (Handle(GEOM_Object
//Compute the Archimede value
try {
//Compute the Archimede value
try {
-#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
OCC_CATCH_SIGNALS;
-#endif
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Archimede driver failed");
return NULL;
}
}
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Archimede driver failed");
return NULL;
}
}
- catch (Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
- SetErrorCode(aFail->GetMessageString());
+ catch (Standard_Failure& aFail) {
+ SetErrorCode(aFail.GetMessageString());
return NULL;
}
return NULL;
}
@@
-1104,7
+1055,7
@@
Standard_Integer GEOMImpl_ILocalOperations::GetSubShapeIndex (Handle(GEOM_Object
if (aGen) {
GEOMImpl_IShapesOperations* anIShapesOperations =
if (aGen) {
GEOMImpl_IShapesOperations* anIShapesOperations =
- aGen->GetIShapesOperations(
GetDocID()
);
+ aGen->GetIShapesOperations();
anInd = anIShapesOperations->GetSubShapeIndex(theShape, theSubShape);
SetErrorCode(anIShapesOperations->GetErrorCode());
}
anInd = anIShapesOperations->GetSubShapeIndex(theShape, theSubShape);
SetErrorCode(anIShapesOperations->GetErrorCode());
}