X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Image.h;h=7860f41bfbad391ad6269c582e6f073ea8645c8c;hb=81c9f5cdf82909d0aebd2c491c50fa7516cc80b7;hp=da11061653ac0ce1bc57058881cca94dcba29538;hpb=5cae7e874afd2fc1b6f61023e8ebd33a933db3c7;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Image.h b/src/HYDROData/HYDROData_Image.h
index da110616..7860f41b 100644
--- a/src/HYDROData/HYDROData_Image.h
+++ b/src/HYDROData/HYDROData_Image.h
@@ -22,8 +22,9 @@ public:
 
   enum TransformationMode
   {
-    ManualLambert = 0,
+    ManualGeodesic = 0,
     ManualCartesian,
+    CartesianFromFile,
     ReferenceImage
   };
 
@@ -59,9 +60,13 @@ public:
    * Reimplemented to update an Image object in the data structure.
    * Call this method whenever you made changes for operator or reference objects.
    * If it is changed, sets "MustBeUpdated" flag to other depended images.
-   * \param theIsForce force reupdating of data object
    */
-  HYDRODATA_EXPORT virtual void Update( const bool theIsForce = true );
+  HYDRODATA_EXPORT virtual void Update();
+
+  /**
+   * Checks that object has 2D presentation. Reimlemented to retun true.
+   */
+  HYDRODATA_EXPORT virtual bool IsHas2dPrs() const;
 
   /**
    * Returns data of object wrapped to QVariant.
@@ -70,6 +75,12 @@ public:
    */
   HYDRODATA_EXPORT virtual QVariant GetDataVariant();
 
+  /**
+   * Returns the list of all reference objects of this object.
+   */
+  HYDRODATA_EXPORT virtual HYDROData_SequenceOfObjects GetAllReferenceObjects() const;
+
+
   /**
    * Stores the image
    * \param theImage new image
@@ -122,6 +133,17 @@ public:
   HYDRODATA_EXPORT bool IsByTwoPoints() const;
 
 
+  /**
+   * Removes all references from this image.
+   */
+  HYDRODATA_EXPORT bool HasReferences() const;
+
+  /**
+   * Removes all references from this image.
+   */
+  HYDRODATA_EXPORT void RemoveAllReferences();
+
+
   /**
    * Stores the transformation points in local cs of image
    * \param thePointA point A
@@ -130,7 +152,8 @@ public:
    */
   HYDRODATA_EXPORT void SetLocalPoints( const QPoint& thePointA,
                                         const QPoint& thePointB,
-                                        const QPoint& thePointC = QPoint( INT_MIN, INT_MIN ) );
+                                        const QPoint& thePointC = QPoint( INT_MIN, INT_MIN ),
+                                        const bool    theIsUpdate = true );
 
   /**
    * Returns the transformation points in local cs of image
@@ -159,7 +182,8 @@ public:
   HYDRODATA_EXPORT void SetGlobalPoints( const TransformationMode& theMode,
                                          const QPointF&            thePointA,
                                          const QPointF&            thePointB,
-                                         const QPointF&            thePointC = QPoint( INT_MIN, INT_MIN ) );
+                                         const QPointF&            thePointC = QPoint( INT_MIN, INT_MIN ),
+                                         const bool                theIsUpdate = true  );
 
   /**
    * Returns the transformation points in global cs
@@ -174,6 +198,13 @@ public:
                                          QPointF&            thePointB,
                                          QPointF&            thePointC ) const;
 
+  /**
+   * Get transformation points from the file and stores them in global cs
+   * \param theFileName the image georeferencement file name
+   * \return true in case of success
+   */
+  HYDRODATA_EXPORT bool SetGlobalPointsFromFile( const QString& theFileName );
+
   /**
    * Returns true if global points has been set before
    */
@@ -190,7 +221,8 @@ public:
   HYDRODATA_EXPORT void SetReferencePoints( const Handle(HYDROData_Image)& theRefImage,
                                             const QPointF&                 thePointA,
                                             const QPointF&                 thePointB,
-                                            const QPointF&                 thePointC = QPoint( INT_MIN, INT_MIN ) );
+                                            const QPointF&                 thePointC = QPoint( INT_MIN, INT_MIN ),
+                                            const bool                     theIsUpdate = true );
 
   /**
    * Returns the transformation points in reference image local cs
@@ -222,6 +254,11 @@ public:
    */
   HYDRODATA_EXPORT Handle(HYDROData_Image) GetTrsfReferenceImage() const;
 
+  /**
+   * Removes the reference image for transformation
+   */
+  HYDRODATA_EXPORT void RemoveTrsfReferenceImage();
+
 
   /**
    * Stores the transformation mode
@@ -273,6 +310,7 @@ public:
    */
   HYDRODATA_EXPORT void ClearReferences();
 
+
   /**
    * Stores the operator name
    * \param theOpName name of the operator that must be executed for image update
@@ -297,17 +335,6 @@ public:
    */
   HYDRODATA_EXPORT QByteArray Args() const;
   
-  /**
-   * Sets the "MustBeUpdated" flag: if image is depended on updated features.
-   * \param theFlag is true for images that must be updated, false for up-to-date
-   */
-  HYDRODATA_EXPORT void MustBeUpdated(bool theFlag);
-
-  /**
-   * Returns the "MustBeUpdated" flag: is image must be recomputed or not
-   * \returns false if image is up to date
-   */
-  HYDRODATA_EXPORT bool MustBeUpdated() const;
 
   /**
    * Marks the image as self-splitted.
@@ -335,12 +362,12 @@ protected:
    * Creates new object in the internal data structure. Use higher level objects 
    * to create objects with real content.
    */
-  HYDROData_Image();
+  HYDRODATA_EXPORT HYDROData_Image();
 
   /**
    * Destructs properties of the object and object itself, removes it from the document.
    */
-  ~HYDROData_Image();
+  HYDRODATA_EXPORT ~HYDROData_Image();
 
 };