X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FHYDROData%2FHYDROData_ShapeFile.cxx;h=2a38a86d1401211f791bddbcf949b289fb6d1c47;hb=148fc44cfb9114849974f209db4c8596e0d97507;hp=42936173613dedc144156dc450b255dd39fbd97a;hpb=c3aaf9774d926aa6095597b4d52a8858dc0898c5;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_ShapeFile.cxx b/src/HYDROData/HYDROData_ShapeFile.cxx index 42936173..2a38a86d 100644 --- a/src/HYDROData/HYDROData_ShapeFile.cxx +++ b/src/HYDROData/HYDROData_ShapeFile.cxx @@ -35,9 +35,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -59,6 +59,8 @@ #include #include #include +#include +#include #ifdef WIN32 #pragma warning( disable: 4996 ) @@ -76,24 +78,25 @@ HYDROData_ShapeFile::~HYDROData_ShapeFile() Free(); } -void HYDROData_ShapeFile::Export(const QString& aFileName, - NCollection_Sequence aPolyXYSeq, - NCollection_Sequence aPoly3DSeq, - QStringList& aNonExpList) +void HYDROData_ShapeFile::Export(Handle(HYDROData_Document) theDocument, + const QString& aFileName, + NCollection_Sequence aPolyXYSeq, + NCollection_Sequence aPoly3DSeq, + QStringList& aNonExpList) { SHPHandle hSHPHandle; if (!aPolyXYSeq.IsEmpty() && aPoly3DSeq.IsEmpty()) { - hSHPHandle = SHPCreate( aFileName.toAscii().data(), SHPT_ARC ); + hSHPHandle = SHPCreate( aFileName.toLatin1().data(), SHPT_ARC ); for (int i = 1; i <= aPolyXYSeq.Size(); i++) - if (WriteObjectPolyXY(hSHPHandle, aPolyXYSeq(i)) != 1) + if (WriteObjectPolyXY(theDocument, hSHPHandle, aPolyXYSeq(i)) != 1) aNonExpList.append(aPolyXYSeq(i)->GetName()); } else if (aPolyXYSeq.IsEmpty() && !aPoly3DSeq.IsEmpty()) { - hSHPHandle = SHPCreate( aFileName.toAscii().data(), SHPT_ARCZ ); + hSHPHandle = SHPCreate( aFileName.toLatin1().data(), SHPT_ARCZ ); for (int i = 1; i <= aPoly3DSeq.Size(); i++) - if (WriteObjectPoly3D(hSHPHandle, aPoly3DSeq(i)) != 1) + if (WriteObjectPoly3D(theDocument, hSHPHandle, aPoly3DSeq(i)) != 1) aNonExpList.append(aPoly3DSeq(i)->GetName()); } if (hSHPHandle->nRecords > 0) @@ -107,25 +110,28 @@ void HYDROData_ShapeFile::Export(const QString& aFileName, } } -void HYDROData_ShapeFile::Export(const QString& aFileName, const Handle_HYDROData_LandCoverMap& aLCM, - QStringList& aNonExpList, bool bCheckLinear, bool bUseDiscr, double theDefl) +void HYDROData_ShapeFile::Export(Handle(HYDROData_Document) theDocument, + const QString& aFileName, + const Handle(HYDROData_LandCoverMap)& aLCM, + QStringList& aNonExpList, + bool bCheckLinear, bool bUseDiscr, double theDefl) { if (bCheckLinear && !aLCM->CheckLinear()) return; // - SHPHandle hSHPHandle; + SHPHandle hSHPHandle = NULL; if ( !aLCM.IsNull() && !aLCM->IsEmpty()) { - hSHPHandle = SHPCreate( aFileName.toAscii().data(), SHPT_POLYGON ); + hSHPHandle = SHPCreate( aFileName.toLatin1().data(), SHPT_POLYGON ); HYDROData_LandCoverMap::Explorer It( aLCM ); for( ; It.More(); It.Next()) { TopoDS_Face aFace = It.Face(); - if (WriteObjectPolygon(hSHPHandle, aFace, bUseDiscr, theDefl) != 1) + if (WriteObjectPolygon(theDocument, hSHPHandle, aFace, bUseDiscr, theDefl) != 1) aNonExpList.append(aLCM->GetName() + "_" + QString::number(It.Index())); } } - if (hSHPHandle->nRecords > 0) + if (hSHPHandle && hSHPHandle->nRecords > 0) SHPClose( hSHPHandle ); else { @@ -137,7 +143,9 @@ void HYDROData_ShapeFile::Export(const QString& aFileName, const Handle_HYDRODat } -int HYDROData_ShapeFile::WriteObjectPolyXY(SHPHandle theShpHandle, Handle_HYDROData_PolylineXY thePoly ) +int HYDROData_ShapeFile::WriteObjectPolyXY(Handle(HYDROData_Document) theDocument, + SHPHandle theShpHandle, + Handle(HYDROData_PolylineXY) thePoly ) { SHPObject *aSHPObj; std::vector x, y; @@ -153,13 +161,17 @@ int HYDROData_ShapeFile::WriteObjectPolyXY(SHPHandle theShpHandle, Handle_HYDROD HYDROData_PolylineXY::PointsList aPointList = thePoly->GetPoints(i); for (int j = 1; j <= aPointList.Size(); j++) { - x.push_back( aPointList(j).X()); - y.push_back( aPointList(j).Y()); + gp_XY P = aPointList(j); + theDocument->Transform(P, false); + x.push_back( P.X()); + y.push_back( P.Y()); } if (thePoly->IsClosedSection(i)) { - x.push_back( aPointList(1).X()); - y.push_back( aPointList(1).Y()); + gp_XY P = aPointList(1); + theDocument->Transform(P, false); + x.push_back( P.X()); + y.push_back( P.Y()); } } @@ -169,7 +181,9 @@ int HYDROData_ShapeFile::WriteObjectPolyXY(SHPHandle theShpHandle, Handle_HYDROD return 1; } -int HYDROData_ShapeFile::WriteObjectPoly3D(SHPHandle theShpHandle, Handle_HYDROData_Polyline3D thePoly ) +int HYDROData_ShapeFile::WriteObjectPoly3D(Handle(HYDROData_Document) theDocument, + SHPHandle theShpHandle, + Handle(HYDROData_Polyline3D) thePoly ) { SHPObject *aSHPObj; std::vector x, y, z; @@ -185,14 +199,18 @@ int HYDROData_ShapeFile::WriteObjectPoly3D(SHPHandle theShpHandle, Handle_HYDROD HYDROData_PolylineXY::PointsList aPointList = thePoly->GetPolylineXY()->GetPoints(i); for (int j = 1; j <= aPointList.Size(); j++) { - x.push_back( aPointList(j).X()); - y.push_back( aPointList(j).Y()); + gp_XY P = aPointList(j); + theDocument->Transform(P, false); + x.push_back( P.X()); + y.push_back( P.Y()); z.push_back(thePoly->GetAltitudeObject()->GetAltitudeForPoint(gp_XY (aPointList(j).X(), aPointList(j).Y()))); } if ( thePoly->GetPolylineXY()->IsClosedSection(i)) { - x.push_back( aPointList(1).X()); - y.push_back( aPointList(1).Y()); + gp_XY P = aPointList(1); + theDocument->Transform(P, false); + x.push_back( P.X()); + y.push_back( P.Y()); z.push_back(thePoly->GetAltitudeObject()->GetAltitudeForPoint(gp_XY (aPointList(1).X(), aPointList(1).Y()))); } @@ -204,7 +222,9 @@ int HYDROData_ShapeFile::WriteObjectPoly3D(SHPHandle theShpHandle, Handle_HYDROD return 1; } -int HYDROData_ShapeFile::WriteObjectPolygon(SHPHandle theShpHandle, const TopoDS_Shape& theInputShape, +int HYDROData_ShapeFile::WriteObjectPolygon(Handle(HYDROData_Document) theDocument, + SHPHandle theShpHandle, + const TopoDS_Shape& theInputShape, bool bUseDiscr, double theDefl) { if (theInputShape.IsNull()) @@ -212,7 +232,7 @@ int HYDROData_ShapeFile::WriteObjectPolygon(SHPHandle theShpHandle, const TopoDS if (theInputShape.ShapeType() == TopAbs_FACE) { - ProcessFace(TopoDS::Face(theInputShape), theShpHandle, bUseDiscr, theDefl); + ProcessFace(theDocument, TopoDS::Face(theInputShape), theShpHandle, bUseDiscr, theDefl); } else if (theInputShape.ShapeType() == TopAbs_COMPOUND) { @@ -222,7 +242,7 @@ int HYDROData_ShapeFile::WriteObjectPolygon(SHPHandle theShpHandle, const TopoDS TopoDS_Face aF = TopoDS::Face(Ex.Current()); if (aF.IsNull()) continue; - ProcessFace(aF, theShpHandle, bUseDiscr, theDefl); + ProcessFace(theDocument, aF, theShpHandle, bUseDiscr, theDefl); } } else @@ -232,7 +252,9 @@ int HYDROData_ShapeFile::WriteObjectPolygon(SHPHandle theShpHandle, const TopoDS } -void HYDROData_ShapeFile::ProcessFace(const TopoDS_Face& theFace, SHPHandle theShpHandle, +void HYDROData_ShapeFile::ProcessFace(Handle(HYDROData_Document) theDocument, + const TopoDS_Face& theFace, + SHPHandle theShpHandle, bool bUseDiscr, double theDefl ) { if (theFace.ShapeType() != TopAbs_FACE) @@ -332,12 +354,16 @@ void HYDROData_ShapeFile::ProcessFace(const TopoDS_Face& theFace, SHPHandle theS //any other wires (holes) - in anticlockwise direction for (int j = aNPnts.Size(); j >= 1; j--) { - x.push_back( aNPnts(j).X()); - y.push_back( aNPnts(j).Y()); + gp_XY P = gp_XY(aNPnts(j).X(), aNPnts(j).Y()); + theDocument->Transform(P, false); + x.push_back( P.X()); + y.push_back( P.Y()); } //first point is same as the last one => closed polygon - x.push_back( aNPnts.Last().X()); - y.push_back( aNPnts.Last().Y()); + gp_XY P = gp_XY(aNPnts.Last().X(), aNPnts.Last().Y()); + theDocument->Transform(P, false); + x.push_back( P.X()); + y.push_back( P.Y()); } @@ -353,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) { @@ -365,17 +392,19 @@ bool HYDROData_ShapeFile::Parse(SHPHandle theHandle, ShapeType theType, int& the return false; } -void HYDROData_ShapeFile::ReadSHPPolygon(SHPObject* anObj, int i, TopoDS_Face& F) +void HYDROData_ShapeFile::ReadSHPPolygon(Handle(HYDROData_Document) theDocument, SHPObject* anObj, int i, TopoDS_Face& F) { if (!anObj) return; TopoDS_Edge E; int nParts = anObj->nParts; - Handle_Geom_Plane aPlaneSur = new Geom_Plane(gp_Pnt(0,0,0), gp_Dir(0,0,1)); + Handle(Geom_Plane) aPlaneSur = new Geom_Plane(gp_Pnt(0,0,0), gp_Dir(0,0,1)); BRep_Builder BB; BB.MakeFace(F); + NCollection_Sequence allWires; + TopTools_SequenceOfShape aWires; for ( int i = 0 ; i < nParts ; i++ ) { @@ -386,7 +415,7 @@ void HYDROData_ShapeFile::ReadSHPPolygon(SHPObject* anObj, int i, TopoDS_Face& F EndIndex = anObj->panPartStart[i + 1]; else EndIndex = anObj->nVertices; - + TopoDS_Wire W; BB.MakeWire(W); @@ -397,6 +426,7 @@ void HYDROData_ShapeFile::ReadSHPPolygon(SHPObject* anObj, int i, TopoDS_Face& F for ( int k = StartIndex; k < EndIndex; k++ ) { gp_Pnt P (anObj->padfX[k], anObj->padfY[k], 0); + theDocument->Transform(P, true); VPoints.ChangeValue(j) = BRepLib_MakeVertex(P).Vertex(); j--; } @@ -407,7 +437,7 @@ void HYDROData_ShapeFile::ReadSHPPolygon(SHPObject* anObj, int i, TopoDS_Face& F gp_Pnt P2 = BRep_Tool::Pnt(VPoints(k + 1)); if (P1.Distance(P2) < Precision::Confusion()) continue; - Handle_Geom_TrimmedCurve aTC = GC_MakeSegment(P1, P2).Value(); + Handle(Geom_TrimmedCurve) aTC = GC_MakeSegment(P1, P2).Value(); TopoDS_Edge E; if ( k != VPoints.Size() - 2) E = BRepLib_MakeEdge(aTC, VPoints(k), VPoints(k + 1)).Edge(); @@ -416,11 +446,66 @@ void HYDROData_ShapeFile::ReadSHPPolygon(SHPObject* anObj, int i, TopoDS_Face& F E = BRepLib_MakeEdge(aTC, VPoints.First(), VPoints.Value(VPoints.Upper() - 1)).Edge(); //Add edge to wire //If SHP file is correct then the outer wire and the holes will have the correct orientations + W.Closed (Standard_True); + W.Orientation(TopAbs_FORWARD); BB.Add(W, E); } - //Wire must be closed anyway - W.Closed (BRep_Tool::IsClosed (W)); - W.Orientation(TopAbs_FORWARD); + allWires.Append(W); + } + + int OutWIndex = -1; + if (allWires.Size() > 1) + { + NCollection_Sequence BBs; + //try to find the largest bbox + for (int i = 1; i <= allWires.Size(); i++) + { + TopoDS_Wire W = allWires(i); + Bnd_Box BB; + BRepBndLib::AddClose(W, BB); + BBs.Append(BB); + } + for (int i = 1; i <= BBs.Size(); i++) + { + bool IsIn = false; + for (int j = 1; j <= BBs.Size(); j++) + { + if (i == j) + continue; + Standard_Real iXmax, iXmin, iYmax, iYmin, z0, z1; + Standard_Real jXmax, jXmin, jYmax, jYmin; + BBs(i).Get(iXmin, iYmin, z0, iXmax, iYmax, z1); + BBs(j).Get(jXmin, jYmin, z0, jXmax, jYmax, z1); + if (!(iXmin > jXmin && + iYmin > jYmin && + iXmax < jXmax && + iYmax < jYmax)) + IsIn = true; + } + if (IsIn) + { + OutWIndex = i; + break; + } + } + } + else + OutWIndex = 1; //one wire => no need to check + + for (int i = 1; i <= allWires.Size(); i++) + { + TopoDS_Face DF; + BB.MakeFace(DF); + TopoDS_Wire W = allWires(i); + BB.Add(DF, W); + BB.UpdateFace(DF, aPlaneSur, TopLoc_Location(), Precision::Confusion()); + // + BRepTopAdaptor_FClass2d FClass(DF, Precision::PConfusion()); + if ( i == OutWIndex && FClass.PerformInfinitePoint() == TopAbs_IN) + W.Reverse(); + if ( i != OutWIndex && FClass.PerformInfinitePoint() == TopAbs_OUT) + W.Reverse(); + // BB.Add(F, W); } @@ -429,13 +514,13 @@ void HYDROData_ShapeFile::ReadSHPPolygon(SHPObject* anObj, int i, TopoDS_Face& F F.Closed(Standard_True); } -int HYDROData_ShapeFile::ImportPolygons(const QString theFileName, QStringList& thePolygonsList, TopTools_SequenceOfShape& theFaces, int& theShapeTypeOfFile) +int HYDROData_ShapeFile::ImportPolygons(Handle(HYDROData_Document) theDocument, const QString theFileName, QStringList& thePolygonsList, TopTools_SequenceOfShape& theFaces, int& theShapeTypeOfFile) { Free(); int Stat = TryOpenShapeFile(theFileName); if (Stat != 0) return Stat; - myHSHP = SHPOpen( theFileName.toAscii().data(), "rb" ); + myHSHP = SHPOpen( theFileName.toLatin1().data(), "rb" ); if (!Parse(myHSHP, HYDROData_ShapeFile::ShapeType_Polygon, theShapeTypeOfFile)) return 0; for (size_t i = 0; i < mySHPObjects.size(); i++) @@ -450,7 +535,7 @@ int HYDROData_ShapeFile::ImportPolygons(const QString theFileName, QStringList& #endif for (size_t i = 0; i < mySHPObjects.size(); i++) { - ReadSHPPolygon(mySHPObjects[i], i, aF); + ReadSHPPolygon(theDocument, mySHPObjects[i], i, aF); theFaces.Append(aF); } #ifdef OSD_TIMER @@ -478,7 +563,7 @@ void HYDROData_ShapeFile::Free() void HYDROData_ShapeFile::ReadSHPPolyXY(Handle(HYDROData_Document) theDocument, SHPObject* anObj, QString theFileName, - int theInd, NCollection_Sequence& theEntities) + int theInd, NCollection_Sequence& theEntities, bool bReadAsPolyline) { Handle(HYDROData_PolylineXY) aPolylineXY = Handle(HYDROData_PolylineXY)::DownCast( theDocument->CreateObject( KIND_POLYLINEXY ) ); @@ -493,24 +578,32 @@ 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()->toAscii()), 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()->toAscii()), 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; - aSectPoint.SetX( anObj->padfX[k] ); - aSectPoint.SetY( anObj->padfY[k] ); + HYDROData_PolylineXY::Point aSectPoint = gp_XY(anObj->padfX[k], anObj->padfY[k]); + theDocument->Transform(aSectPoint, true); aPolylineXY->AddPoint( i, aSectPoint ); } @@ -525,7 +618,7 @@ void HYDROData_ShapeFile::ReadSHPPolyXY(Handle(HYDROData_Document) theDocument, } void HYDROData_ShapeFile::ReadSHPPoly3D(Handle(HYDROData_Document) theDocument, SHPObject* anObj, QString theFileName, - int theInd, NCollection_Sequence& theEntities) + int theInd, NCollection_Sequence& theEntities) { Handle(HYDROData_PolylineXY) aPolylineXY = Handle(HYDROData_PolylineXY)::DownCast( theDocument->CreateObject( KIND_POLYLINEXY ) ); @@ -552,20 +645,23 @@ void HYDROData_ShapeFile::ReadSHPPoly3D(Handle(HYDROData_Document) theDocument, anObj->padfZ[StartIndex] == anObj->padfZ[EndIndex - 1]) { IsClosed = true; - aPolylineXY->AddSection( TCollection_AsciiString( ("poly_section_" + QString::number(i)).data()->toAscii()), aSectType, 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()->toAscii()), aSectType, false ); + aPolylineXY->AddSection( TCollection_AsciiString( ("poly_section_" + QString::number(i)).data()->toLatin1()), aSectType, false ); if (IsClosed) EndIndex--; for ( int k = StartIndex ; k < EndIndex ; k++ ) { - HYDROData_PolylineXY::Point aSectPoint; - aSectPoint.SetX( anObj->padfX[k] ); - aSectPoint.SetY( anObj->padfY[k] ); + HYDROData_PolylineXY::Point aSectPoint = gp_XY(anObj->padfX[k], anObj->padfY[k]); + theDocument->Transform(aSectPoint, true); aPolylineXY->AddPoint( i, aSectPoint ); - aAPoints.Append(gp_XYZ (anObj->padfX[k], anObj->padfY[k], anObj->padfZ[k])); + HYDROData_Bathymetry::AltitudePoint p; + p.X = aSectPoint.X(); + p.Y = aSectPoint.Y(); + p.Z = anObj->padfZ[k]; + aAPoints.push_back(p); } } @@ -593,10 +689,24 @@ void HYDROData_ShapeFile::ReadSHPPoly3D(Handle(HYDROData_Document) theDocument, } - +void HYDROData_ShapeFile::GetFreeIndices(std::vector& 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& theEntities, int& theShapeTypeOfFile) + NCollection_Sequence& theEntities, int& theShapeTypeOfFile) { //Free(); int aStat = TryOpenShapeFile(theFileName); @@ -611,7 +721,7 @@ int HYDROData_ShapeFile::ImportPolylines(Handle(HYDROData_Document) theDocument, anExistingNames.push_back(anIter.Current()->GetName()); SHPHandle aHSHP; - aHSHP = SHPOpen( theFileName.toAscii().data(), "rb" ); + aHSHP = SHPOpen( theFileName.toLatin1().data(), "rb" ); QFileInfo aFileInfo(theFileName); QString aBaseFileName = aFileInfo.baseName(); @@ -620,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; } @@ -654,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; @@ -711,10 +826,15 @@ int HYDROData_ShapeFile::TryOpenShapeFile(QString theFileName) { QString aSHPfile = theFileName.simplified(); QString aSHXfile = theFileName.simplified().replace( theFileName.simplified().size() - 4, 4, ".shx"); + + QString anExt = theFileName.split('.', QString::SkipEmptyParts).back(); + if (anExt.toLower() != "shp") + return -3; + FILE* pFileSHP = NULL; - pFileSHP = fopen (aSHPfile.toAscii().data(), "r"); + pFileSHP = fopen (aSHPfile.toLatin1().data(), "r"); FILE* pFileSHX = NULL; - pFileSHX = fopen (aSHXfile.toAscii().data(), "r"); + pFileSHX = fopen (aSHXfile.toLatin1().data(), "r"); if (pFileSHP == NULL || pFileSHX == NULL) { @@ -735,7 +855,7 @@ bool HYDROData_ShapeFile::CheckDBFFileExisting(const QString& theSHPFilePath, QS QString aSHPfile = theSHPFilePath.simplified(); QString aDBFfile = theSHPFilePath.simplified().replace( theSHPFilePath.simplified().size() - 4, 4, ".dbf"); FILE* pFileDBF = NULL; - pFileDBF = fopen (aDBFfile.toAscii().data(), "r"); + pFileDBF = fopen (aDBFfile.toLatin1().data(), "r"); if (pFileDBF == NULL) { @@ -750,7 +870,7 @@ bool HYDROData_ShapeFile::CheckDBFFileExisting(const QString& theSHPFilePath, QS bool HYDROData_ShapeFile::DBF_OpenDBF(const QString& thePathToDBFFile) { - myHDBF = DBFOpen( thePathToDBFFile.toAscii().data(), "r" ); + myHDBF = DBFOpen( thePathToDBFFile.toLatin1().data(), "r" ); if(myHDBF != NULL) return true; else