From da81e0e4a04a6fc271d537aff51492050f64779e Mon Sep 17 00:00:00 2001 From: rnc Date: Thu, 19 Jul 2012 13:49:13 +0000 Subject: [PATCH] EDF 2281: Dump fix --- src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx index 410f3838c..fc39655cf 100644 --- a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx @@ -48,7 +48,7 @@ #include #include // #include -//#include +// #include /*@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@*/ #include @@ -2240,7 +2240,7 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeFilletWithPosition(double theR1, dou //============================================================================= /*! * This function allows to create a disk already divided into blocks. It can be - * use to create divided pipes for later meshing in hexaedra. + * used to create divided pipes for later meshing in hexaedra. * \param theR Radius of the disk * \param theRatio Relative size of the central square diagonal against the disk diameter * \return New GEOM_Object, containing the created shape. @@ -2301,9 +2301,20 @@ Handle(GEOM_Object) GEOMImpl_IAdvancedOperations::MakeDividedDisk (double theR, Handle(GEOM_Object) GEOMImpl_IAdvancedOperations::MakeDividedCylinder (double theR, double theH) { SetErrorCode(KO); + + //Add a new object + Handle(GEOM_Object) aShape = GetEngine()->AddObject(GetDocID(), GEOM_DIVIDEDCYLINDER); Handle(GEOM_Object) aBaseShape = MakeDividedDisk(theR, 50.0, 1); - Handle(GEOM_Object) aShape = my3DPrimOperations->MakePrismDXDYDZ(aBaseShape,0.0,0.0,theH, -1.0); + aBaseShape->GetLastFunction()->SetDescription(""); // Erase dump of MakeDividedDisk + + aShape = my3DPrimOperations->MakePrismDXDYDZ(aBaseShape,0.0,0.0,theH, -1.0); + + Handle(GEOM_Function) aFunction = aShape->GetLastFunction(); + aFunction->SetDescription(""); // Erase dump of MakePrismDXDYDZ + + //Make a Python command + GEOM::TPythonDump(aFunction) << aShape << " = geompy.MakeDividedCylinder(" << theR << ", " << theH << ")"; SetErrorCode(OK); -- 2.39.2