Merge branch 'master' into V7_5_BR

[modules/geom.git] / src / GEOMImpl / GEOMImpl_ICylinder.hxx

diff --git a/src/GEOMImpl/GEOMImpl_ICylinder.hxx b/src/GEOMImpl/GEOMImpl_ICylinder.hxx
index 0955df29c4297699fb39f72cc43a9e455bc1a6cc..c092c950eea5f4c4c02642c0aff56ba14197603e 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_ICylinder.hxx
+++ b/src/GEOMImpl/GEOMImpl_ICylinder.hxx
@@ -24,14 +24,12 @@
 //
 #include "GEOM_Function.hxx"
 
-#define CYL_ARG_PNT 1
-#define CYL_ARG_VEC 2
-#define CYL_ARG_R   3
-#define CYL_ARG_H   4
+#define CYL_ARG_R   1
+#define CYL_ARG_H   2
+#define CYL_ARG_PNT 3
+#define CYL_ARG_VEC 4
 #define CYL_ARG_A   5
 
-
-
 class GEOMImpl_ICylinder
 {
  public:
@@ -45,10 +43,6 @@ class GEOMImpl_ICylinder
   void SetH(double theH) { _func->SetReal(CYL_ARG_H, theH); }
 
   double GetH() { return _func->GetReal(CYL_ARG_H); }
-  
-  void SetA(double theA) { _func->SetReal(CYL_ARG_A, theA); }
-
-  double GetA() { return _func->GetReal(CYL_ARG_A); }
 
   void SetPoint(Handle(GEOM_Function) theRefPoint) { _func->SetReference(CYL_ARG_PNT, theRefPoint); }
 
@@ -57,6 +51,10 @@ class GEOMImpl_ICylinder
   void SetVector(Handle(GEOM_Function) theRefVector) { _func->SetReference(CYL_ARG_VEC, theRefVector); }
 
   Handle(GEOM_Function) GetVector() { return _func->GetReference(CYL_ARG_VEC); }
+  
+  void SetA(double theA) { _func->SetReal(CYL_ARG_A, theA); }
+
+  double GetA() { return _func->GetReal(CYL_ARG_A); }
 
  private: