#include <BRep_Tool.hxx>
#include <BRepTools.hxx>
#include <Precision.hxx>
-#include <Handle_Geom_Curve.hxx>
-#include <Handle_Geom_Line.hxx>
-#include <Handle_Geom_TrimmedCurve.hxx>
+#include <Geom_Curve.hxx>
+#include <Geom_Line.hxx>
+#include <Geom_TrimmedCurve.hxx>
#include <Geom_TrimmedCurve.hxx>
#include <BRepBuilderAPI_MakeEdge.hxx>
#include <BRepBuilderAPI_MakeWire.hxx>
#include <BRep_Builder.hxx>
#include <BRepAdaptor_Curve.hxx>
#include <GCPnts_QuasiUniformDeflection.hxx>
+#include <TopLoc_Location.hxx>
+#include <Geom_Plane.hxx>
+#include <NCollection_Array1.hxx>
+#include <BRepBndLib.hxx>
+#include <Bnd_Box.hxx>
#ifdef WIN32
#pragma warning( disable: 4996 )
Free();
}
-void HYDROData_ShapeFile::Export(const QString& aFileName,
- NCollection_Sequence<Handle_HYDROData_PolylineXY> aPolyXYSeq,
- NCollection_Sequence<Handle_HYDROData_Polyline3D> aPoly3DSeq,
- QStringList& aNonExpList)
+void HYDROData_ShapeFile::Export(Handle(HYDROData_Document) theDocument,
+ const QString& aFileName,
+ NCollection_Sequence<Handle(HYDROData_PolylineXY)> aPolyXYSeq,
+ NCollection_Sequence<Handle(HYDROData_Polyline3D)> 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)
}
}
-void HYDROData_ShapeFile::Export(const QString& aFileName,
- const Handle_HYDROData_LandCoverMap& aLCM, QStringList& aNonExpList)
+void HYDROData_ShapeFile::Export(Handle(HYDROData_Document) theDocument,
+ const QString& aFileName,
+ const Handle(HYDROData_LandCoverMap)& aLCM,
+ QStringList& aNonExpList,
+ bool bCheckLinear, bool bUseDiscr, double theDefl)
{
- SHPHandle hSHPHandle;
+ if (bCheckLinear && !aLCM->CheckLinear())
+ return;
+ //
+ 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) != 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
{
}
-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<double> x, y;
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());
}
}
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<double> x, y, z;
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())));
}
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())
return 0;
- TopExp_Explorer anEdgeEx(theInputShape, 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 -1;
- }
- else
- return -1;
- }
- }
if (theInputShape.ShapeType() == TopAbs_FACE)
{
- ProcessFace(TopoDS::Face(theInputShape), theShpHandle);
+ ProcessFace(theDocument, TopoDS::Face(theInputShape), theShpHandle, bUseDiscr, theDefl);
}
else if (theInputShape.ShapeType() == TopAbs_COMPOUND)
{
TopoDS_Face aF = TopoDS::Face(Ex.Current());
if (aF.IsNull())
continue;
- ProcessFace(aF, theShpHandle);
+ ProcessFace(theDocument, aF, theShpHandle, bUseDiscr, theDefl);
}
}
else
}
-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)
for (Standard_Integer i = 1; i <= nbE; i++)
{
TopoDS_Edge E = aSEWD->Edge(i);
- if (bUseDiscr)
+ if (!bUseDiscr)
{
TopoDS_Vertex aV = TopExp::LastVertex(E, 1);
if (aV.IsNull())
BRepAdaptor_Curve Cur( E );
GCPnts_QuasiUniformDeflection Discr( Cur, theDefl );
if( !Discr.IsDone() )
- continue; //skip all edge?
- for( int i = 1; i <= Discr.NbPoints(); i++ )
+ continue; //skip edge?
+ double NewDefl = theDefl/2.0;
+ while (Discr.NbPoints() < 2)
+ {
+ Discr.Initialize(Cur, NewDefl);
+ NewDefl = NewDefl/2.0;
+ }
+ //
+ if (E.Orientation() == TopAbs_FORWARD)
{
- gp_Pnt P = Discr.Value( i );
- aPnts.Append(gp_Pnt2d(P.X(), P.Y()));
+ for( int i = 1; i <= Discr.NbPoints(); i++ )
+ {
+ gp_Pnt P = Discr.Value( i );
+ aPnts.Append(gp_Pnt2d(P.X(), P.Y()));
+ }
+ }
+ else
+ {
+ for( int i = Discr.NbPoints(); i > 0; i-- )
+ {
+ gp_Pnt P = Discr.Value( i );
+ aPnts.Append(gp_Pnt2d(P.X(), P.Y()));
+ }
}
}
}
//so just write all points "as-is"
//External wire will be written in clockwise direction
//any other wires (holes) - in anticlockwise direction
- for (int j = 1; j <= aNPnts.Size(); j++)
+ 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(1).X());
- y.push_back( aNPnts(1).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());
}
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)
{
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_Wire W;
TopoDS_Edge E;
int nParts = anObj->nParts;
- gp_Pln pln(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<TopoDS_Wire> allWires;
TopTools_SequenceOfShape aWires;
for ( int i = 0 ; i < nParts ; i++ )
else
EndIndex = anObj->nVertices;
- NCollection_List<TopoDS_Vertex> aVertices;
- gp_Pnt FP (anObj->padfX[StartIndex], anObj->padfY[StartIndex], 0);
- TopoDS_Vertex V = BRepLib_MakeVertex(FP).Vertex();
- aVertices.Append(V);
+ TopoDS_Wire W;
+ BB.MakeWire(W);
+
+ //First point is same as the last point
+ int NbPnts = EndIndex - StartIndex - 1;
+ NCollection_Array1<TopoDS_Vertex> VPoints(0, NbPnts);
+ int j = NbPnts;
+ 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--;
+ }
- for ( int k = StartIndex + 1; k < EndIndex; k++ )
+ for ( int k = 0; k < VPoints.Size() - 1; k++ )
{
- gp_Pnt P1 (anObj->padfX[k - 1], anObj->padfY[k-1], 0); //prev point
- gp_Pnt P2 (anObj->padfX[k], anObj->padfY[k], 0); //current point
+ gp_Pnt P1 = BRep_Tool::Pnt(VPoints(k));
+ gp_Pnt P2 = BRep_Tool::Pnt(VPoints(k + 1));
if (P1.Distance(P2) < Precision::Confusion())
continue;
- TopoDS_Vertex V = BRepLib_MakeVertex(P2).Vertex();
- Handle_Geom_TrimmedCurve aTC = GC_MakeSegment(P1,P2).Value();
- TopoDS_Edge E = BRepLib_MakeEdge(aTC, aVertices.Last(), V).Edge();
- aVertices.Append(V);
- aBuilder.Add(E);
+ 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();
+ else
+ //the last edge => use first and last vertices
+ 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);
}
-
- aBuilder.Build();
- W = TopoDS::Wire(aBuilder.Shape());
- W.Orientation(TopAbs_FORWARD);
- BRepBuilderAPI_MakeFace aDB(pln, W);
- TopoDS_Face aDummyFace = TopoDS::Face(aDB.Shape());
- BRepTopAdaptor_FClass2d FClass(aDummyFace, Precision::PConfusion());
- if ( i == 0 && FClass.PerformInfinitePoint() != TopAbs_OUT)
+ allWires.Append(W);
+ }
+
+ int OutWIndex = -1;
+ if (allWires.Size() > 1)
+ {
+ NCollection_Sequence<Bnd_Box> 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 > 0 && FClass.PerformInfinitePoint() != TopAbs_IN)
+ if ( i != OutWIndex && FClass.PerformInfinitePoint() == TopAbs_OUT)
W.Reverse();
-
- aWires.Append(W);
+ //
+ BB.Add(F, W);
}
- BRepBuilderAPI_MakeFace aFBuilder(pln, TopoDS::Wire(aWires(1)));
- for (int i = 2; i <= aWires.Length(); i++)
- aFBuilder.Add(TopoDS::Wire(aWires(i)));
- F = TopoDS::Face(aFBuilder.Shape());
-
+ //Add surface to the face
+ BB.UpdateFace(F, aPlaneSur, TopLoc_Location(), Precision::Confusion());
+ 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++)
#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
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 ) );
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 );
}
}
void HYDROData_ShapeFile::ReadSHPPoly3D(Handle(HYDROData_Document) theDocument, SHPObject* anObj, QString theFileName,
- int theInd, NCollection_Sequence<Handle_HYDROData_Entity>& theEntities)
+ int theInd, NCollection_Sequence<Handle(HYDROData_Entity)>& theEntities)
{
Handle(HYDROData_PolylineXY) aPolylineXY = Handle(HYDROData_PolylineXY)::DownCast( theDocument->CreateObject( KIND_POLYLINEXY ) );
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);
}
}
}
-
+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)
+ NCollection_Sequence<Handle(HYDROData_Entity)>& theEntities, int& theShapeTypeOfFile, ImportShapeType theShapeTypesToImport)
{
//Free();
int aStat = TryOpenShapeFile(theFileName);
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();
if (!Parse(aHSHP, HYDROData_ShapeFile::ShapeType_Polyline, theShapeTypeOfFile))
return 0;
- if (aHSHP->nShapeType == 3 || aHSHP->nShapeType == 23)
+
+ int sh_type = aHSHP->nShapeType;
+
+ if ((theShapeTypesToImport == HYDROData_ShapeFile::ImportShapeType_All ||
+ theShapeTypesToImport == HYDROData_ShapeFile::ImportShapeType_Polyline)
+ && (sh_type == 3 || sh_type == 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;
}
- else if (aHSHP->nShapeType == 13)
+ else if ((theShapeTypesToImport == HYDROData_ShapeFile::ImportShapeType_All ||
+ theShapeTypesToImport == HYDROData_ShapeFile::ImportShapeType_Polyline3D) && sh_type == 13)
{
anInd = 0;
for (;anAllowedIndexes.size() < mySHPObjects.size();)
anInd++;
}
for (size_t i = 0; i < mySHPObjects.size(); i++ )
+ {
ReadSHPPoly3D(theDocument, mySHPObjects[i], aBaseFileName, anAllowedIndexes[i], theEntities);
+ }
aStat = 1;
}
+ else if ((theShapeTypesToImport == HYDROData_ShapeFile::ImportShapeType_All ||
+ theShapeTypesToImport == HYDROData_ShapeFile::ImportShapeType_Polygon) && sh_type == 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;
{
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)
{
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)
{
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
DBFClose( hDBF );
return true;
-}
\ No newline at end of file
+}
+
