From: eap <eap@opencascade.com>
Date: Wed, 12 Nov 2014 17:06:47 +0000 (+0300)
Subject: Regression of SALOME_TESTS/Grids/geom/imps_07/H9
X-Git-Tag: V7_5_0rc1~4^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e957479789faf3e1a89d8cc3dc7debf902523428;p=modules%2Fgeom.git

Regression of SALOME_TESTS/Grids/geom/imps_07/H9

 Provide creation information for MakeCylinderA()
---

diff --git a/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx b/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx
index 3c91625b3..d7f8a5bee 100644
--- a/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx
@@ -119,7 +119,7 @@ Standard_Integer GEOMImpl_CylinderDriver::Execute(TFunction_Logbook& log) const
       BRepPrimAPI_MakeCylinder MC (anAxes, aCI.GetR(), Abs(aCI.GetH()));
       MC.Build();
       if (!MC.IsDone()) {
-	StdFail_NotDone::Raise("Cylinder can't be computed from the given parameters");
+        StdFail_NotDone::Raise("Cylinder can't be computed from the given parameters");
       }
       aShape = MC.Shape();
       break;
@@ -130,7 +130,7 @@ Standard_Integer GEOMImpl_CylinderDriver::Execute(TFunction_Logbook& log) const
       BRepPrimAPI_MakeCylinder MC (anAxes, aCI.GetR(), Abs(aCI.GetH()), aCI.GetA());
       MC.Build();
       if (!MC.IsDone()) {
-	StdFail_NotDone::Raise("Cylinder can't be computed from the given parameters. Failure.");
+        StdFail_NotDone::Raise("Cylinder can't be computed from the given parameters. Failure.");
       }
       aShape = MC.Shape();
       break;
@@ -169,16 +169,28 @@ GetCreationInformation(std::string&             theOperationName,
     AddParam( theParams, "Radius", aCI.GetR() );
     AddParam( theParams, "Height", aCI.GetH() );
     break;
-  case CONE_PNT_VEC_R1_R2_H:
+  case CYLINDER_R_H_A:
+    AddParam( theParams, "Radius", aCI.GetR() );
+    AddParam( theParams, "Height", aCI.GetH() );
+    AddParam( theParams, "Angle",  aCI.GetA() );
+    break;
+  case CYLINDER_PNT_VEC_R_H:
     AddParam( theParams, "Base Point", aCI.GetPoint() );
     AddParam( theParams, "Vector", aCI.GetVector() );
     AddParam( theParams, "Radius", aCI.GetR() );
     AddParam( theParams, "Height", aCI.GetH() );
     break;
+  case CYLINDER_PNT_VEC_R_H_A:
+    AddParam( theParams, "Base Point", aCI.GetPoint() );
+    AddParam( theParams, "Vector", aCI.GetVector() );
+    AddParam( theParams, "Radius", aCI.GetR() );
+    AddParam( theParams, "Height", aCI.GetH() );
+    AddParam( theParams, "Angle",  aCI.GetA() );
+    break;
   default:
     return false;
   }
-  
+
   return true;
 }
 
diff --git a/src/GEOM_SWIG/geomBuilder.py b/src/GEOM_SWIG/geomBuilder.py
index 27b194dc2..93e6da907 100644
--- a/src/GEOM_SWIG/geomBuilder.py
+++ b/src/GEOM_SWIG/geomBuilder.py
@@ -3022,7 +3022,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen):
         @ManageTransactions("PrimOp")
         def MakeCylinderA(self, thePnt, theAxis, theR, theH, theA, theName=None):
             """
-            Create a a portion of cylinder with given base point, axis, radius, height and angle.
+            Create a portion of cylinder with given base point, axis, radius, height and angle.
 
             Parameters:
                 thePnt Central point of cylinder base.