refs# 1917 + protection against null shapes wires in GetMiddlePoint()

[modules/hydro.git] / src / HYDROPy / HYDROData_Zone.sip

diff --git a/src/HYDROPy/HYDROData_Zone.sip b/src/HYDROPy/HYDROData_Zone.sip
index 31e1dd2c711ba9d9431615a83a4f34edcbbf6437..ff034d86b1799fc1498d10b6819d06cf21656042 100644 (file)
--- a/src/HYDROPy/HYDROData_Zone.sip
+++ b/src/HYDROPy/HYDROData_Zone.sip
@@ -52,25 +52,12 @@ public:
 
 public:      
 
-  /**
-   * Sets the merging type for conflict altitudes.
-   * By default it is set to Merge_ZMIN.
-   */
   void SetMergeType( const MergeType& theType );
-
-  /**
-   * Returns the merging type for conflict altitudes.
-   */
   MergeType GetMergeType() const;
 
-
-  /**
-   * Sets the reference altitude to resolve the conflict.
-   * This object is used only in case of "Merge_Object" merge type.
-   */
-  void SetMergeAltitude( HYDROData_IAltitudeObject theAltitude ) [void (const Handle_HYDROData_IAltitudeObject&)];
+  void SetMergeAltitude( HYDROData_IAltitudeObject theAltitude )
+  [void (const opencascade::handle<HYDROData_IAltitudeObject>&)];
   %MethodCode
-
     Handle(HYDROData_IAltitudeObject) aRefAltitude =
       Handle(HYDROData_IAltitudeObject)::DownCast( createHandle( a0 ) );
     if ( !aRefAltitude.IsNull() )
@@ -80,49 +67,30 @@ public:
                       sipCpp->SetMergeObject( aRefAltitude );
       Py_END_ALLOW_THREADS
     }
-
   %End
 
-  /**
-   * Returns the reference altitude to resolve the conflict.
-   */
-  HYDROData_IAltitudeObject GetMergeAltitude() const [Handle_HYDROData_IAltitudeObject ()];
+  HYDROData_IAltitudeObject GetMergeAltitude() const [opencascade::handle<HYDROData_IAltitudeObject> ()];
   %MethodCode
-
     Handle(HYDROData_IAltitudeObject) aRefAltitude;
-    
     Py_BEGIN_ALLOW_THREADS
     Handle(HYDROData_Entity) aRefObject = sipSelfWasArg ? sipCpp->HYDROData_Zone::GetMergeObject() : 
                                                           sipCpp->GetMergeObject();
        aRefAltitude = Handle(HYDROData_IAltitudeObject)::DownCast( aRefObject );
     Py_END_ALLOW_THREADS
-    
     sipRes = (HYDROData_IAltitudeObject*)createPointer( aRefAltitude );
-  
   %End
 
-  /**
-   * Removes the reference altitude for resolving the conflict.
-   */
   void RemoveMergeAltitude();
   %MethodCode
-
     Py_BEGIN_ALLOW_THREADS
       sipSelfWasArg ? sipCpp->HYDROData_Zone::RemoveMergeObject() : 
                       sipCpp->RemoveMergeObject();
     Py_END_ALLOW_THREADS
-
   %End
 
-  /**
-   * Sets the reference object to resolve the conflict.
-   * This object is used only in case of "Merge_Object" merge type.
-   */
-  void SetMergeObject( HYDROData_Entity theObject ) [void (const Handle_HYDROData_Entity&)];
+  void SetMergeObject( HYDROData_Entity theObject ) [void (const opencascade::handle<HYDROData_Entity>&)];
   %MethodCode
-
-    Handle(HYDROData_Entity) aRefObject =
-      Handle(HYDROData_Entity)::DownCast( createHandle( a0 ) );
+    Handle(HYDROData_Entity) aRefObject = createHandle( a0 );
     if ( !aRefObject.IsNull() )
     {
       Py_BEGIN_ALLOW_THREADS
@@ -130,39 +98,24 @@ public:
                       sipCpp->SetMergeObject( aRefObject );
       Py_END_ALLOW_THREADS
     }
-
   %End
 
-  /**
-   * Returns the reference object to resolve the conflict.
-   */
-  HYDROData_Entity GetMergeObject() const [Handle_HYDROData_Entity ()];
+  HYDROData_Entity GetMergeObject() const [opencascade::handle<HYDROData_Entity> ()];
   %MethodCode
-
     Handle(HYDROData_Entity) aRefObject;
-    
     Py_BEGIN_ALLOW_THREADS
     aRefObject = sipSelfWasArg ? sipCpp->HYDROData_Zone::GetMergeObject() : 
                                  sipCpp->GetMergeObject();
     Py_END_ALLOW_THREADS
-    
     sipRes = (HYDROData_Entity*)createPointer( aRefObject );
-  
   %End
 
-  /**
-   * Removes the reference object for resolving the conflict.
-   */
   void RemoveMergeObject();
 
-  /**
-   * Add new one object for zone.
-   */
-  void AddObject( HYDROData_Entity theObject ) [void (const Handle_HYDROData_Entity&)];
+  void AddObject( HYDROData_Entity theObject ) [void (const opencascade::handle<HYDROData_Entity>&)];
   %MethodCode
 
-    Handle(HYDROData_Entity) anObj =
-      Handle(HYDROData_Entity)::DownCast( createHandle( a0 ) );
+    Handle(HYDROData_Entity) anObj = createHandle( a0 );
     if ( !anObj.IsNull() )
     {
       Py_BEGIN_ALLOW_THREADS
@@ -173,42 +126,14 @@ public:
 
   %End
 
-  /**
-   * Returns all objects of zone.
-   */
   HYDROData_SequenceOfObjects GetObjects() const;
 
-  /**
-   * Removes all objects from zone.
-   */
   void RemoveObjects();
-
-
-  /**
-   * Sets the interpolator for zone. By default it is NULL and original
-   * interpolation algorithms are used to calculate points altitudes.
-   * If you set interpolator it won't be stored in the data model structure,
-   * it will be deleted during that time as this zone will be freed.
-   */
   void SetInterpolator( HYDROData_IInterpolator* theInter );
-
-  /**
-   * * Returns the interpolator of zone object.
-   */
   HYDROData_IInterpolator* GetInterpolator() const;
 
 protected:
 
-  /**
-   * Creates new object in the internal data structure. Use higher level objects 
-   * to create objects with real content.
-   */
   HYDROData_Zone();
-
-  /**
-   * Destructs properties of the object and object itself, removes it from the document.
-   */
   ~HYDROData_Zone();
 };
-
-