X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_LandCoverMap.h;h=1d310ef38735609ec3b90e76d64d675aa8b64c74;hb=fce3f1240b6161d7cb837344078e5943b90eca65;hp=e078ddd0ae0a09f52bf9540368068876caf75439;hpb=f3535c63440d6ca7b7662d92ce6af3526560d56b;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_LandCoverMap.h b/src/HYDROData/HYDROData_LandCoverMap.h
index e078ddd0..1d310ef3 100644
--- a/src/HYDROData/HYDROData_LandCoverMap.h
+++ b/src/HYDROData/HYDROData_LandCoverMap.h
@@ -24,18 +24,21 @@
 #include <NCollection_IndexedDataMap.hxx>
 #include <QString>
 #include <TopoDS_Face.hxx>
+#include <TopExp_Explorer.hxx>
+#include <vector>
+#include <set>
 
-typedef NCollection_IndexedDataMap<TopoDS_Face, QString> HYDROData_MapOfFaceToStricklerType;
+class HYDROData_StricklerTable;
+#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 
-DEFINE_STANDARD_HANDLE( HYDROData_LandCoverMap, HYDROData_Entity )
+typedef NCollection_IndexedDataMap<TopoDS_Face, QString> HYDROData_MapOfFaceToStricklerType;
 
 class TopoDS_Shape;
 class TopoDS_Wire;
 class TopoDS_Iterator;
-class TopTools_ListOfShape;
-class Handle( HYDROData_PolylineXY );
-class Handle( HYDROData_Object );
-class gp_Pnt2d;
+class HYDROData_PolylineXY;
+class HYDROData_Object;
+class gp_XY;
 
 class HYDROData_LandCoverMap : public HYDROData_Entity
 {
@@ -51,12 +54,12 @@ protected:
   };
 
 public:
-  class Iterator
+  class Explorer
   {
   public:
-    Iterator( const HYDROData_LandCoverMap& );
-    HYDRODATA_EXPORT Iterator( const Handle( HYDROData_LandCoverMap )& );
-    HYDRODATA_EXPORT ~Iterator();
+    Explorer( const HYDROData_LandCoverMap& );
+    HYDRODATA_EXPORT Explorer( const Handle( HYDROData_LandCoverMap )& );
+    HYDRODATA_EXPORT ~Explorer();
 
     void Init( const HYDROData_LandCoverMap& );
     HYDRODATA_EXPORT bool More() const;
@@ -68,7 +71,7 @@ public:
     void SetStricklerType( const QString& );
 
   private:
-    TopoDS_Iterator* myIterator;
+    TopExp_Explorer* myExplorer;
     int              myIndex;
     Handle(TDataStd_ExtStringArray) myArray;
   };
@@ -87,22 +90,31 @@ public:
 
   HYDRODATA_EXPORT virtual const ObjectKind GetKind() const;
 
+  HYDRODATA_EXPORT bool ImportSHP( const QString& theSHPFileName,
+                                   const QList<int>& theIndices = QList<int>() );
+ 
+  HYDRODATA_EXPORT bool ExportSHP( const QString& theSHPFileName, bool bUseDiscr = false, double theDefl = 0.1) const;
+
   HYDRODATA_EXPORT DBFStatus ImportDBF( const QString& theDBFFileName, 
                                         const QString& theFieldName, 
                                         const QStringList& DBFValues,
                                         const QStringList& StricklerTypes,
-                                        const QList<int>& theIndices );
- 
+                                        const QList<int>& theIndices = QList<int>() );
+
   HYDRODATA_EXPORT void ExportDBF( const QString& theDBFFileName,
                                    const QString& theFieldName, 
                                    const QStringList& theDBFValues,
                                    const QStringList& theStricklerTypes ) const;
 
-  HYDRODATA_EXPORT bool ExportTelemac( const QString& theFileName, double theDeflection ) const;
+  HYDRODATA_EXPORT bool ExportTelemac( const QString& theFileName,
+                                       double theDeflection,
+                                       const Handle(HYDROData_StricklerTable)& theTable,
+                                       QString& statMessage) const;
 
   HYDRODATA_EXPORT bool Add( const Handle( HYDROData_Object )&, const QString& theType );
   HYDRODATA_EXPORT bool Add( const Handle( HYDROData_PolylineXY )&, const QString& theType );
 
+  using HYDROData_Entity::Remove;
   HYDRODATA_EXPORT bool Remove( const TopoDS_Face& );
   HYDRODATA_EXPORT bool Remove( const TopTools_ListOfShape& );
 
@@ -118,7 +130,8 @@ public:
 
   HYDRODATA_EXPORT QString StricklerType( const TopoDS_Face& ) const;
 
-  HYDRODATA_EXPORT virtual QStringList DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const;
+  HYDRODATA_EXPORT virtual QStringList DumpToPython( const QString& thePyScriptPath,
+                                                     MapOfTreatedObjects& theTreatedObjects ) const;
 
   HYDRODATA_EXPORT int GetLCCount() const;
   HYDRODATA_EXPORT bool IsEmpty() const;
@@ -130,21 +143,40 @@ public:
   HYDRODATA_EXPORT void SetTransparency( double );
   HYDRODATA_EXPORT double GetTransparency() const;
 
-  HYDRODATA_EXPORT TopoDS_Shape RemoveInternal(const TopoDS_Shape& InSh);
+  HYDRODATA_EXPORT void RemoveInternal(TopoDS_Shape& ShToRebuild, NCollection_IndexedDataMap<TopoDS_Face, TopoDS_Face>* aF2FReplace);
+
+  HYDRODATA_EXPORT bool CheckLinear();
+
+  HYDRODATA_EXPORT virtual void UpdateLocalCS( double theDx, double theDy );
+
+  HYDRODATA_EXPORT void ClassifyPoints( const std::vector<gp_XY>& thePoints,
+                                        std::vector<std::set <QString> >& theTypes ) const;
+
+  HYDRODATA_EXPORT void ClassifyPoints( const std::vector<gp_XY>& thePoints,
+                                        const Handle(HYDROData_StricklerTable)& theTable,
+                                        std::vector<int>& theTypes ) const;
+
+  HYDRODATA_EXPORT void ClassifyPoints( const std::vector<gp_XY>& thePoints,
+                                        const Handle(HYDROData_StricklerTable)& theTable, 
+                                        std::vector<double>& theCoeffs, double DefValue, bool UseMax ) const;
 
 protected:
   void SetShape( const TopoDS_Shape& );
 
   bool Add( const TopoDS_Wire&, const QString& );
+
   bool LocalPartition( const TopoDS_Shape&, const QString& theNewType );
+
   static TopoDS_Shape MergeFaces(const TopTools_ListOfShape& theFaces,
-                      bool IsToUnify, double theTolerance = 1E-5 );
+                                 bool IsToUnify,
+                                 TopTools_IndexedDataMapOfShapeListOfShape* theShHistory = NULL, 
+                                 double theTolerance = 1E-5 );
 
 public:
-  DEFINE_STANDARD_RTTI( HYDROData_LandCoverMap );
+  DEFINE_STANDARD_RTTIEXT( HYDROData_LandCoverMap, HYDROData_Entity );
 
 private:
-  friend class Iterator;
+  friend class Explorer;
   friend class test_HYDROData_LandCoverMap;
 };