]> SALOME platform Git repositories - modules/hydro.git/commitdiff
Salome HOME
SIP files revision
authorasl <asl@opencascade.com>
Thu, 22 Oct 2015 09:29:31 +0000 (12:29 +0300)
committerasl <asl@opencascade.com>
Thu, 22 Oct 2015 09:29:31 +0000 (12:29 +0300)
src/HYDROPy/HYDROData.sip
src/HYDROPy/HYDROData_AltitudeObject.sip
src/HYDROPy/HYDROData_Application.sip
src/HYDROPy/HYDROData_ArtificialObject.sip
src/HYDROPy/HYDROData_Bathymetry.sip
src/HYDROPy/HYDROData_CalculationCase.sip
src/HYDROPy/HYDROData_Zone.sip

index e0235298104c1c8a62653d7ec2941cc0dcc183a1..84f94621aea2babc40e26865dbe255c6c23ca5d7 100644 (file)
 %Include CAS/gp_XYZ.sip
 %Include CAS/NCollection_Sequence.sip
 %Include CAS/TCollection_AsciiString.sip
-%Include HYDROData_SequenceOfObjects.sip
-%Include HYDROData_IInterpolator.sip
-%Include HYDROData_Entity.sip
-%Include HYDROData_ShapesGroup.sip
-%Include HYDROData_SplittedShapesGroup.sip
-%Include HYDROData_IPolyline.sip
-%Include HYDROData_IAltitudeObject.sip
+
 %Include HYDROData_AltitudeObject.sip
-%Include HYDROData_ObstacleAltitude.sip
-%Include HYDROData_StreamAltitude.sip
-%Include HYDROData_Object.sip
-%Include HYDROData_Profile.sip
-%Include HYDROData_Polyline3D.sip
-%Include HYDROData_ProfileUZ.sip
-%Include HYDROData_PolylineXY.sip
+%Include HYDROData_Application.sip
 %Include HYDROData_ArtificialObject.sip
-%Include HYDROData_Obstacle.sip
+%Include HYDROData_Bathymetry.sip
+%Include HYDROData_CalculationCase.sip
 %Include HYDROData_Channel.sip
-%Include HYDROData_Digue.sip
-%Include HYDROData_NaturalObject.sip
 %Include HYDROData_Confluence.sip
-%Include HYDROData_River.sip
-%Include HYDROData_Stream.sip
+%Include HYDROData_Digue.sip
+%Include HYDROData_Document.sip
+%Include HYDROData_Entity.sip
+%Include HYDROData_IAltitudeObject.sip
+%Include HYDROData_IInterpolator.sip
 %Include HYDROData_Image.sip
-%Include HYDROData_PolylineXY.sip
-%Include HYDROData_Bathymetry.sip
 %Include HYDROData_ImmersibleZone.sip
-%Include HYDROData_Zone.sip
-%Include HYDROData_Region.sip
-%Include HYDROData_CalculationCase.sip
+%Include HYDROData_IPolyline.sip
 %Include HYDROData_IProfilesInterpolator.sip
+%Include HYDROData_LandCoverMap.sip
+%Include HYDROData_NaturalObject.sip
+%Include HYDROData_Object.sip
+%Include HYDROData_Obstacle.sip
+%Include HYDROData_ObstacleAltitude.sip
+%Include HYDROData_PolylineXY.sip
+%Include HYDROData_Polyline3D.sip
+%Include HYDROData_Profile.sip
+%Include HYDROData_ProfileUZ.sip
+%Include HYDROData_Region.sip
+%Include HYDROData_River.sip
+%Include HYDROData_SequenceOfObjects.sip
+%Include HYDROData_ShapesGroup.sip
+%Include HYDROData_SplittedShapesGroup.sip
+%Include HYDROData_Stream.sip
+%Include HYDROData_StreamAltitude.sip
 %Include HYDROData_StricklerTable.sip
-
-%Include HYDROData_Document.sip
-%Include HYDROData_Application.sip
-
+%Include HYDROData_Zone.sip
 
index da99346b7d6124e18c88aa3c03f473f62e5aaf90..3ad15bd33bfd2dbd0f287e1811934364a1f5245c 100644 (file)
@@ -28,15 +28,6 @@ class HYDROData_AltitudeObject : public HYDROData_IAltitudeObject
 %End
 
 protected:
-
-  /**
-   * Creates new object in the internal data structure. Use higher level objects 
-   * to create objects with real content.
-   */
   HYDROData_AltitudeObject();
-
-  /**
-   * Destructs properties of the object and object itself, removes it from the document.
-   */
    ~HYDROData_AltitudeObject();
 };
index d9499915f6a802d9e95c32fb428709ac035dcf12..c34c89768a85d5c88b32c8f3aa009ed621801049 100644 (file)
@@ -27,16 +27,9 @@ class HYDROData_Application
 #include <HYDROData_Application.h>
 %End
 
-public: // useful methods inside of the package
-
-  //! Retuns the application: one per process    
+public:
   static HYDROData_Application* GetApplication();   
 
-public: // Redefined OCAF methods
-  //! Return name of resource (i.e. "Standard")
   const char* ResourcesName();
-  //! Constructor
-  //! Use method GetInstance() method to obtain 
-  //! the static instance of the object (or derive your own application)
   HYDROData_Application();
-};
\ No newline at end of file
+};
index 87526ec3ae21acc244a5572bb6ae3178a79ada71..0720b6c32ca06d90bf4836a8bab71bee00bed1b6 100644 (file)
@@ -52,20 +52,7 @@ class HYDROData_ArtificialObject : public HYDROData_Object /Abstract/
     }
 %End
 
-public:
-
-
 protected:
-
-  /**
-   * Creates new object in the internal data structure. Use higher level objects 
-   * to create objects with real content.
-   */
   HYDROData_ArtificialObject();
-
-  /**
-   * Destructs properties of the object and object itself, removes it from the document.
-   */
   virtual ~HYDROData_ArtificialObject();
-  
 };
index d9e4e10828ea9bc39732ad14cfc929382d60f2b9..e23029181dddbc9b9476af8227dab068511e0733 100644 (file)
@@ -44,62 +44,19 @@ class HYDROData_Bathymetry : public HYDROData_IAltitudeObject
 %End
 
 public:      
-  // Public methods to work with Bathymetry altitudes.
-
-  /**
-   * Replace current altitude points by new one.
-   * \param thePoints the altitude points list
-   */
-  virtual void             SetAltitudePoints( const HYDROData_Bathymetry::AltitudePoints& );
-
-  /**
-   * Returns altitude points list.
-   * \return points list
-   */
+  virtual void SetAltitudePoints( const HYDROData_Bathymetry::AltitudePoints& );
   HYDROData_Bathymetry::AltitudePoints GetAltitudePoints() const;
 
-  /**
-   * Remove all altitude points.
-   */
-  void             RemoveAltitudePoints();
-
+  void RemoveAltitudePoints();
 
 public:
-  // Public methods to work with files.
-
-  /**
-   * Set flag indicating needs to invert altitude values
-   * \param theIsInverted new invert value
-   * \param theIsUpdate flag indicating necessity to update points
-   */
-  void             SetAltitudesInverted( const bool theIsInverted,
-                                         const bool theIsUpdate = true );
-
-  /**
-   * Returns flag indicating needs to invert altitude values.
-   */
-  bool             IsAltitudesInverted() const;
-
-  /**
-   * Imports Bathymetry data from file. The supported file types:
-   *  - xyz
-   * \param theFileName the path to file
-   * \return \c true if file has been successfully read
-   */
-  bool             ImportFromFile( const TCollection_AsciiString& theFileName );
+  void SetAltitudesInverted( const bool theIsInverted, const bool theIsUpdate = true );
+  bool IsAltitudesInverted() const;
 
+  bool ImportFromFile( const TCollection_AsciiString& theFileName );
 
 protected:
-
-  /**
-   * Creates new object in the internal data structure. Use higher level objects 
-   * to create objects with real content.
-   */
   HYDROData_Bathymetry();
-
-  /**
-   * Destructs properties of the object and object itself, removes it from the document.
-   */
   ~HYDROData_Bathymetry();
 };
 
index c1ebd5ce2309b61fae11cf41d8abc5c8c826f75d..9ed401988486480b14b05c1d982e02a555b70fb9 100644 (file)
@@ -108,7 +108,8 @@ public:
   /**
    * Removes reference geometry object from calculation case.
    */
-  void RemoveGeometryObject( HYDROData_Object theObject ) [void ( const Handle_HYDROData_Object& )];
+  void RemoveGeometryObject( HYDROData_Object theObject )
+  [void ( const Handle_HYDROData_Object& )];
   %MethodCode
     Handle(HYDROData_Object) aRef =
       Handle(HYDROData_Object)::DownCast( createHandle( a0 ) );
index 31e1dd2c711ba9d9431615a83a4f34edcbbf6437..070354cd7262a66a1f079c6fb0ba54f4da2cc0b3 100644 (file)
@@ -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 Handle_HYDROData_IAltitudeObject&)];
   %MethodCode
-
     Handle(HYDROData_IAltitudeObject) aRefAltitude =
       Handle(HYDROData_IAltitudeObject)::DownCast( createHandle( a0 ) );
     if ( !aRefAltitude.IsNull() )
@@ -80,47 +67,29 @@ public:
                       sipCpp->SetMergeObject( aRefAltitude );
       Py_END_ALLOW_THREADS
     }
-
   %End
 
-  /**
-   * Returns the reference altitude to resolve the conflict.
-   */
   HYDROData_IAltitudeObject GetMergeAltitude() const [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&)];
   %MethodCode
-
     Handle(HYDROData_Entity) aRefObject =
       Handle(HYDROData_Entity)::DownCast( createHandle( a0 ) );
     if ( !aRefObject.IsNull() )
@@ -130,34 +99,20 @@ public:
                       sipCpp->SetMergeObject( aRefObject );
       Py_END_ALLOW_THREADS
     }
-
   %End
 
-  /**
-   * Returns the reference object to resolve the conflict.
-   */
   HYDROData_Entity GetMergeObject() const [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&)];
   %MethodCode
 
@@ -173,42 +128,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();
 };
-
-