Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...

[modules/hydro.git] / src / HYDROData / HYDROData_LandCoverMap.cxx

diff --git a/src/HYDROData/HYDROData_LandCoverMap.cxx b/src/HYDROData/HYDROData_LandCoverMap.cxx
index 74775ac9563b8705686ddcaa7a4d864dd31258ab..9d9d21e5e063dfc8e8bf0c6f5fe2ddbf55cfb564 100644 (file)
--- a/src/HYDROData/HYDROData_LandCoverMap.cxx
+++ b/src/HYDROData/HYDROData_LandCoverMap.cxx
@@ -55,6 +55,10 @@
 #include <BRepCheck_Shell.hxx>
 #include <BRepCheck_ListOfStatus.hxx>
 #include <TopTools_SequenceOfShape.hxx>
+#include <Handle_Geom_Curve.hxx>
+#include <Handle_Geom_Line.hxx>
+#include <Handle_Geom_TrimmedCurve.hxx>
+#include <Geom_TrimmedCurve.hxx>
 
 
 #include <QFile>
@@ -465,10 +469,25 @@ bool HYDROData_LandCoverMap::Add( const Handle( HYDROData_Object )& theObject, c
     return false;
 
   TopoDS_Shape aShape = theObject->GetTopShape();
-  if( aShape.ShapeType()!=TopAbs_FACE )
-    return false;
+  TopoDS_Face aFace;
+
+  if( aShape.ShapeType() ==TopAbs_FACE )
+  {
+    aFace = TopoDS::Face(aShape);
+  }
+  else if ( aShape.ShapeType() ==TopAbs_COMPOUND )
+  {
+    TopoDS_Iterator It(aShape);
+    for (; It.More(); It.Next())
+      if (It.Value().ShapeType() == TopAbs_FACE)
+      {
+        aFace = TopoDS::Face(It.Value());
+        break;
+      }
+  }
 
-  TopoDS_Face aFace = TopoDS::Face( aShape );
+  if (aFace.IsNull())
+    return false;
   return LocalPartition( aFace, theType );
 }
 
@@ -588,16 +607,23 @@ bool HYDROData_LandCoverMap::Split( const TopoDS_Shape& theShape )
 bool HYDROData_LandCoverMap::Merge( const TopTools_ListOfShape& theFaces, const QString& theType )
 {
   // 1. to fuse the faces into the new face
-  TopoDS_Shape aMergedFace = MergeFaces( theFaces, true );
-  if( !aMergedFace.IsNull() && aMergedFace.ShapeType()==TopAbs_FACE )
-  {
+  TopoDS_Shape aMergedFace = MergeFaces( theFaces, true );  
+  bool aStat = true;
+  if( !aMergedFace.IsNull() )
+  { 
     // 2. to remove the merged faces from the current map
     Remove( theFaces );
-
-    // 3. to add the face into the map
-    return LocalPartition( TopoDS::Face( aMergedFace ), theType );
+    TopExp_Explorer Exp(aMergedFace, TopAbs_FACE);
+    for( ; Exp.More(); Exp.Next() )
+    {
+      const TopoDS_Face& aCF = TopoDS::Face(Exp.Current());
+      // 3. to add the face into the map
+      aStat = aStat && LocalPartition( aCF, theType );
+    }
   }
-  return false;
+  else
+    aStat = false;
+  return aStat;
 }
 
 /**
@@ -830,6 +856,7 @@ bool HYDROData_LandCoverMap::LocalPartition( const TopoDS_Shape& theNewShape, co
     QString aSType = anIt.StricklerType();
     //std::cout << "from " << anIt.Face() << ": " << anIt.StricklerType() << std::endl;
     TopTools_ListOfShape aModified = aBuilder.Modified( anIt.Face() );
+    //
     if( aModified.Extent() == 0 )
       aModified.Append( anIt.Face() );
 
@@ -941,7 +968,7 @@ QStringList HYDROData_LandCoverMap::DumpToPython( const QString&       thePyScri
   QString aDbfFileName = thePyScriptPath;
   aDbfFileName.replace( ".py", ".dbf" );
 
-  ExportSHP( aShpFileName, true, 1 );
+  ExportSHP( aShpFileName, true, 0.1 );
 
   QString anAttr = "CODE_06"; //TODO: some custom choice
   QStringList anAttrValues, aTypes;
@@ -1061,3 +1088,28 @@ bool HYDROData_LandCoverMap::ExportSHP( const QString& theSHPFileName, bool bUse
     return false;
 }
 
+bool HYDROData_LandCoverMap::CheckLinear()
+{
+  TopoDS_Shape InpShape = GetShape();
+  TopExp_Explorer anEdgeEx(InpShape, TopAbs_EDGE);
+  for (; anEdgeEx.More(); anEdgeEx.Next()) 
+  {
+    TopoDS_Edge E = TopoDS::Edge(anEdgeEx.Current());
+    double aFP, aLP;
+    Handle_Geom_Curve aCur = BRep_Tool::Curve(E, aFP, aLP);
+    Handle(Geom_Line) aLine = Handle(Geom_Line)::DownCast(aCur);
+    if (aLine.IsNull())
+    {
+      Handle(Geom_TrimmedCurve) aTC = Handle(Geom_TrimmedCurve)::DownCast(aCur);
+      if (!aTC.IsNull())
+      {
+        Handle(Geom_Line) aLine = Handle(Geom_Line)::DownCast(aTC->BasisCurve());
+        if (aLine.IsNull())
+          return false;
+      }
+      else
+        return false;
+    }
+  }
+  return true;
+}