X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Obstacle.h;h=bbf690a2259e77a775c52ead1e9429e06e2a7504;hb=d398a8be8e0b0259b476b358d53d234ce4c82379;hp=194dae8bc9d000bdebc80ef115d73b2570958d88;hpb=97e331dedb6c4a834944e0c47e44e8d7e258edd4;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Obstacle.h b/src/HYDROData/HYDROData_Obstacle.h
index 194dae8b..bbf690a2 100644
--- a/src/HYDROData/HYDROData_Obstacle.h
+++ b/src/HYDROData/HYDROData_Obstacle.h
@@ -1,3 +1,20 @@
+// Copyright (C) 2014-2015  EDF-R&D
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef HYDROData_Obstacle_HeaderFile
 #define HYDROData_Obstacle_HeaderFile
@@ -20,7 +37,8 @@ protected:
   {
     DataTag_First = HYDROData_ArtificialObject::DataTag_First + 100, ///< first tag, to reserve
     DataTag_GeomObjectEntry, ///< study entry of the imported GEOM object
-    DataTag_FilePath ///< imported file path
+    DataTag_FilePath,        ///< imported file path
+    DataTag_Translation,     ///< translation coefficients
   };
 
 public:
@@ -34,7 +52,8 @@ public:
   /**
    * Dump object to Python script representation.
    */
-  HYDRODATA_EXPORT virtual QStringList DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const;
+  HYDRODATA_EXPORT virtual QStringList DumpToPython( const QString& thePyScriptPath,
+                                                     MapOfTreatedObjects& theTreatedObjects ) const;
 
   /**
    * Update the immersible zone object.
@@ -42,25 +61,22 @@ public:
    */
   HYDRODATA_EXPORT virtual void Update();
 
-  /**
-   * Returns the top shape of the object.
-   */
-  HYDRODATA_EXPORT virtual TopoDS_Shape GetTopShape() const;
+  HYDRODATA_EXPORT virtual void UpdateLocalCS( double theDx, double theDy );
 
   /**
-   * Returns the 3d shape of the object.
+   * Checks that object has 2D presentation. Reimlemented to retun true.
    */
-  HYDRODATA_EXPORT virtual TopoDS_Shape GetShape3D() const;
+  HYDRODATA_EXPORT virtual bool IsHas2dPrs() const;
 
   /**
    * Returns default filling color for new obstacle.
    */
-  HYDRODATA_EXPORT static QColor DefaultFillingColor();
+  HYDRODATA_EXPORT virtual QColor DefaultFillingColor() const;
 
   /**
    * Returns default border color for new obstacle.
    */
-  HYDRODATA_EXPORT static QColor DefaultBorderColor();
+  HYDRODATA_EXPORT virtual QColor DefaultBorderColor() const;
 
 
   /**
@@ -83,13 +99,6 @@ public:
    */
   HYDRODATA_EXPORT virtual bool ImportFromFile( const QString& theFilePath );
 
-  /**
-   * Imports shape from IOR.
-   * \param theIOR the IOR of Geom object
-   * \return \c true if shape has been successfully imported
-   */
-  HYDRODATA_EXPORT virtual bool ImportFromGeomIOR( const QString& theIOR );
-
   /**
    * Stores the file path of the imported file.
    * \param theFilePath file path
@@ -101,29 +110,38 @@ public:
    */
   HYDRODATA_EXPORT QString GetFilePath() const;
 
-   /**
+  
+  /**
+   * Imports shape from IOR.
+   * \param theIOR the IOR of Geom object
+   * \return \c true if shape has been successfully imported
+   */
+  HYDRODATA_EXPORT virtual bool ImportFromGeomIOR( const TCollection_AsciiString& theIOR );
+
+  /**
    * Stores the study entry of the imported GEOM object.
    * \param theEntry GEOM object entry
    */
-  HYDRODATA_EXPORT void SetGeomObjectEntry( const QString& theEntry );
+  HYDRODATA_EXPORT void SetGeomObjectEntry( const TCollection_AsciiString& theEntry );
 
   /**
    * Returns the imported GEOM object entry.
    */
-  HYDRODATA_EXPORT QString GetGeomObjectEntry() const;
-
-protected:
+  HYDRODATA_EXPORT TCollection_AsciiString GetGeomObjectEntry() const;
 
   /**
-   * Returns default filling color for new object.
+   * Returns the imported GEOM object name.
    */
-  HYDRODATA_EXPORT virtual QColor getDefaultFillingColor() const;
+  HYDRODATA_EXPORT TCollection_AsciiString GetGeomObjectName() const;
 
   /**
-   * Returns default border color for new object.
+   * Translate the obstacle to the given distance.
    */
-  HYDRODATA_EXPORT virtual QColor getDefaultBorderColor() const;
+  HYDRODATA_EXPORT void Translate( const double theDx,
+                                   const double theDy,
+                                   const double theDz );
 
+protected:
   /**
    * Returns the type of child altitude object.
    * Reimplemented to create obstacle altitude object.
@@ -132,27 +150,6 @@ protected:
 
 private:
 
-  /**
-   * Create all necessary child group objects.
-   */
-  HYDRODATA_EXPORT void createGroupObjects();
-
-protected:
-
-  friend class HYDROData_Iterator;
-
-  /**
-   * Creates new object in the internal data structure. Use higher level objects 
-   * to create objects with real content.
-   */
-  HYDRODATA_EXPORT HYDROData_Obstacle();
-
-  /**
-   * Destructs properties of the object and object itself, removes it from the document.
-   */
-  virtual HYDRODATA_EXPORT ~HYDROData_Obstacle();
-
-private:
   /**
    * Imports shape from the BREP file.
    * \param theFilePath the path to file
@@ -173,6 +170,37 @@ private:
    * \return shape as TopoDS_Shape (null shape if import was failed)
    */
   TopoDS_Shape ImportSTEP( const QString& theFilePath ) const;
+
+  /**
+   * Create all necessary child group objects.
+   */
+  void createGroupObjects();
+
+  /**
+   * Sets the translation coefficients.
+   */
+  void setTranslation( const double theDx, const double theDy, const double theDz );
+
+  /**
+   * Returns the translation coefficients.
+   */
+  bool getTranslation( double& theDx, double& theDy, double& theDz ) const;
+
+protected:
+
+  friend class HYDROData_Iterator;
+
+  /**
+   * Creates new object in the internal data structure. Use higher level objects 
+   * to create objects with real content.
+   */
+  HYDRODATA_EXPORT HYDROData_Obstacle();
+
+  /**
+   * Destructs properties of the object and object itself, removes it from the document.
+   */
+  virtual HYDRODATA_EXPORT ~HYDROData_Obstacle();
+
 };
 
 #endif