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
Merge master branch into V9_dev.
[modules/geom.git]
/
src
/
GEOMImpl
/
GEOMImpl_ChamferDriver.cxx
diff --git
a/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx
b/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx
index f7582ecfd7a2ab649aa9199666ac9edc8de25772..cf7bd0cc67eef62492d6cbee18aed18fdcc8a2af 100644
(file)
--- a/
src/GEOMImpl/GEOMImpl_ChamferDriver.cxx
+++ b/
src/GEOMImpl/GEOMImpl_ChamferDriver.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-95,7
+95,7
@@
static Standard_Boolean isGoodForChamfer (const TopoDS_Shape& theShape)
//function : Execute
//purpose :
//=======================================================================
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_ChamferDriver::Execute(
TFunction_Logbook
& log) const
+Standard_Integer GEOMImpl_ChamferDriver::Execute(
Handle(TFunction_Logbook)
& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
@@
-217,7
+217,7
@@
Standard_Integer GEOMImpl_ChamferDriver::Execute(TFunction_Logbook& log) const
}
else if (aType == CHAMFER_SHAPE_EDGES || aType == CHAMFER_SHAPE_EDGES_AD)
{
}
else if (aType == CHAMFER_SHAPE_EDGES || aType == CHAMFER_SHAPE_EDGES_AD)
{
- // chamfer on selected edges with leng
ht
param D1 & D2.
+ // chamfer on selected edges with leng
th
param D1 & D2.
int aLen = aCI.GetLength();
int ind = 1;
int aLen = aCI.GetLength();
int ind = 1;
@@
-255,7
+255,7
@@
Standard_Integer GEOMImpl_ChamferDriver::Execute(TFunction_Logbook& log) const
if (!fill.IsDone()) {
StdFail_NotDone::Raise("Chamfer can not be computed on the given shape with the given parameters");
}
if (!fill.IsDone()) {
StdFail_NotDone::Raise("Chamfer can not be computed on the given shape with the given parameters");
}
- aShape =
fill.Shape(
);
+ aShape =
GEOMUtils::ReduceCompound( fill.Shape()
);
if (aShape.IsNull()) return 0;
if (aShape.IsNull()) return 0;
@@
-267,7
+267,7
@@
Standard_Integer GEOMImpl_ChamferDriver::Execute(TFunction_Logbook& log) const
aFunction->SetValue(aShape);
aFunction->SetValue(aShape);
- log
.
SetTouched(Label());
+ log
->
SetTouched(Label());
return 1;
}
return 1;
}
@@
-357,6
+357,4
@@
GetCreationInformation(std::string& theOperationName,
return true;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_ChamferDriver,GEOM_BaseDriver);
-
IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ChamferDriver,GEOM_BaseDriver);
IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ChamferDriver,GEOM_BaseDriver);