X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_ShapeFile.cxx;h=2a38a86d1401211f791bddbcf949b289fb6d1c47;hb=8d4dba4a45855249f5eb022e9cc7dcff202bce3c;hp=b928ce8d1491c6214d365d7a8e7da86eb91dabc9;hpb=05d82ada59110252be57aaa774095a18ebdca455;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_ShapeFile.cxx b/src/HYDROData/HYDROData_ShapeFile.cxx
index b928ce8d..2a38a86d 100644
--- a/src/HYDROData/HYDROData_ShapeFile.cxx
+++ b/src/HYDROData/HYDROData_ShapeFile.cxx
@@ -379,7 +379,8 @@ bool HYDROData_ShapeFile::Parse(SHPHandle theHandle, ShapeType theType, int& the
   mySHPObjects.clear();
   SHPGetInfo( theHandle, NULL, &aShapeType, NULL, NULL );
   theShapeTypeOfFile = aShapeType;
-  bool ToRead = (theType == ShapeType_Polyline && (aShapeType == 3 || aShapeType == 13 || aShapeType == 23)) ||
+  bool ToRead = (theType == ShapeType_Polyline && 
+    (aShapeType == 3 || aShapeType == 13 || aShapeType == 23 || aShapeType == 5)) ||
    (theType == ShapeType_Polygon && aShapeType == 5);
   if (ToRead) 
   {
@@ -562,7 +563,7 @@ void HYDROData_ShapeFile::Free()
 
 
 void HYDROData_ShapeFile::ReadSHPPolyXY(Handle(HYDROData_Document) theDocument, SHPObject* anObj, QString theFileName, 
-  int theInd, NCollection_Sequence<Handle(HYDROData_Entity)>& theEntities)
+  int theInd, NCollection_Sequence<Handle(HYDROData_Entity)>& theEntities, bool bReadAsPolyline)
 {
 
   Handle(HYDROData_PolylineXY) aPolylineXY = Handle(HYDROData_PolylineXY)::DownCast( theDocument->CreateObject( KIND_POLYLINEXY ) );
@@ -577,19 +578,28 @@ void HYDROData_ShapeFile::ReadSHPPolyXY(Handle(HYDROData_Document) theDocument,
     else
       EndIndex = anObj->nVertices;
 
-    bool IsClosed = false;
     HYDROData_PolylineXY::SectionType aSectType = HYDROData_PolylineXY::SECTION_POLYLINE; 
-    if (anObj->padfX[StartIndex] == anObj->padfX[EndIndex - 1] &&
-        anObj->padfY[StartIndex] == anObj->padfY[EndIndex - 1] )
+    if (!bReadAsPolyline)
     {
-      IsClosed = true;
-      aPolylineXY->AddSection( TCollection_AsciiString( ("poly_section_" + QString::number(i)).data()->toLatin1()), aSectType, true);
+      bool IsClosed = false;
+      if (anObj->padfX[StartIndex] == anObj->padfX[EndIndex - 1] &&
+        anObj->padfY[StartIndex] == anObj->padfY[EndIndex - 1] )
+      {
+        IsClosed = true;
+        aPolylineXY->AddSection( TCollection_AsciiString( ("poly_section_" + QString::number(i)).data()->toLatin1()), aSectType, true);
+      }
+      else
+        aPolylineXY->AddSection( TCollection_AsciiString( ("poly_section_" + QString::number(i)).data()->toLatin1()), aSectType, false);
+
+      if (IsClosed)
+        EndIndex--;
     }
     else
-      aPolylineXY->AddSection( TCollection_AsciiString( ("poly_section_" + QString::number(i)).data()->toLatin1()), aSectType, false);
-    
-    if (IsClosed)
+    {
+      //polygon; contours always closed
+      aPolylineXY->AddSection( TCollection_AsciiString( ("poly_section_" + QString::number(i)).data()->toLatin1()), aSectType, true);
       EndIndex--;
+    }
     for ( int k = StartIndex; k < EndIndex ; k++ )
     {
       HYDROData_PolylineXY::Point aSectPoint = gp_XY(anObj->padfX[k], anObj->padfY[k]);
@@ -647,7 +657,11 @@ void HYDROData_ShapeFile::ReadSHPPoly3D(Handle(HYDROData_Document) theDocument,
       HYDROData_PolylineXY::Point aSectPoint = gp_XY(anObj->padfX[k], anObj->padfY[k]);
       theDocument->Transform(aSectPoint, true);
       aPolylineXY->AddPoint( i, aSectPoint );
-      aAPoints.Append(gp_XYZ (aSectPoint.X(), aSectPoint.Y(), anObj->padfZ[k]));
+      HYDROData_Bathymetry::AltitudePoint p;
+      p.X = aSectPoint.X();
+      p.Y = aSectPoint.Y();
+      p.Z = anObj->padfZ[k];
+      aAPoints.push_back(p);
     }
   }
 
@@ -675,7 +689,21 @@ void HYDROData_ShapeFile::ReadSHPPoly3D(Handle(HYDROData_Document) theDocument,
 
 }
 
-
+void HYDROData_ShapeFile::GetFreeIndices(std::vector<int>& theAllowedIndexes, QString strName, size_t theObjsSize,
+                                         QStringList theExistingNames, QString theBaseFileName)
+{
+  int anInd = 0;
+  for (;theAllowedIndexes.size() < theObjsSize;)
+  {
+    if (!theExistingNames.contains(theBaseFileName + strName + QString::number(anInd)))
+    {
+      theAllowedIndexes.push_back(anInd);
+      anInd++;
+    }
+    else
+      anInd++;
+  }
+}
 
 int HYDROData_ShapeFile::ImportPolylines(Handle(HYDROData_Document) theDocument, const QString& theFileName, 
   NCollection_Sequence<Handle(HYDROData_Entity)>& theEntities, int& theShapeTypeOfFile)
@@ -702,21 +730,12 @@ int HYDROData_ShapeFile::ImportPolylines(Handle(HYDROData_Document) theDocument,
     return 0;
   if (aHSHP->nShapeType == 3 || aHSHP->nShapeType == 23)
   {
-    anInd = 0;
-    for (;anAllowedIndexes.size() < mySHPObjects.size();)
-    {
-      if (!anExistingNames.contains(aBaseFileName + "_PolyXY_" + QString::number(anInd)))
-      {
-        anAllowedIndexes.push_back(anInd);
-        anInd++;
-      }
-      else
-        anInd++;
-    }
-    
+    size_t anObjsSize = mySHPObjects.size();
+    GetFreeIndices(anAllowedIndexes, "_PolyXY_", anObjsSize, anExistingNames, aBaseFileName);
+ 
     for (size_t i = 0; i < mySHPObjects.size(); i++ )
     {
-      ReadSHPPolyXY(theDocument, mySHPObjects[i], aBaseFileName, anAllowedIndexes[i], theEntities);
+      ReadSHPPolyXY(theDocument, mySHPObjects[i], aBaseFileName, anAllowedIndexes[i], theEntities, false);
     }
     aStat = 1;
   }
@@ -736,9 +755,23 @@ int HYDROData_ShapeFile::ImportPolylines(Handle(HYDROData_Document) theDocument,
         anInd++;
     }
     for (size_t i = 0; i < mySHPObjects.size(); i++ )
+    {
       ReadSHPPoly3D(theDocument, mySHPObjects[i], aBaseFileName, anAllowedIndexes[i], theEntities);
+    }
     aStat = 1;
   }
+  else if (aHSHP->nShapeType == 5)
+  {
+    //import polygon's contours as polylines
+    size_t anObjsSize = mySHPObjects.size();
+    GetFreeIndices(anAllowedIndexes, "_PolyXY_", anObjsSize, anExistingNames, aBaseFileName);
+ 
+    for (size_t i = 0; i < mySHPObjects.size(); i++ )
+    {
+      ReadSHPPolyXY(theDocument, mySHPObjects[i], aBaseFileName, anAllowedIndexes[i], theEntities, true);
+    }
+    aStat = 2;
+  }
   else  
   {
     aStat = 0;