else
{
SHPClose( hSHPHandle );
- remove (aFileName.toStdString().c_str());
+ QString aFN = aFileName.simplified();
+ remove (aFN.toStdString().c_str());
+ remove (aFN.replace( ".shp", ".shx", Qt::CaseInsensitive).toStdString().c_str());
}
}
return;
}
-bool HYDROData_ShapeFile::Parse(SHPHandle theHandle, ShapeType theType)
+bool HYDROData_ShapeFile::Parse(SHPHandle theHandle, ShapeType theType, int& theShapeTypeOfFile)
{
int aShapeType;
mySHPObjects.clear();
SHPGetInfo( theHandle, NULL, &aShapeType, NULL, NULL );
+ theShapeTypeOfFile = aShapeType;
bool ToRead = (theType == ShapeType_Polyline && (aShapeType == 3 || aShapeType == 13 || aShapeType == 23)) ||
(theType == ShapeType_Polygon && aShapeType == 5);
if (ToRead)
}
}
-bool HYDROData_ShapeFile::ImportLandCovers(const QString theFileName, QStringList& thePolygonsList, TopTools_SequenceOfShape& theFaces)
+int HYDROData_ShapeFile::ImportLandCovers(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" );
- if (!Parse(myHSHP, HYDROData_ShapeFile::ShapeType_Polygon))
- return false;
+ if (!Parse(myHSHP, HYDROData_ShapeFile::ShapeType_Polygon, theShapeTypeOfFile))
+ return 0;
for (size_t i = 0; i < mySHPObjects.size(); i++)
thePolygonsList.append("polygon_" + QString::number(i + 1));
ReadSHPPolygon(mySHPObjects[i], i, aF);
theFaces.Append(aF);
}
- return true;
+ return 1;
}
else
- return false;
+ return 0;
}
void HYDROData_ShapeFile::Free()
aPolylineObj->SetPolylineXY (aPolylineXY, false);
aPolylineObj->SetAltitudeObject(aBath);
- aPolylineObj->SetBorderColor( HYDROData_Polyline3D::DefaultBorderColor() );
+ aPolylineObj->SetBorderColor( aPolylineObj->DefaultBorderColor() );
aPolylineObj->SetName( aPoly3DName );
aPolylineObj->Update();
-bool HYDROData_ShapeFile::ImportPolylines(Handle(HYDROData_Document) theDocument, const QString& theFileName, NCollection_Sequence<Handle_HYDROData_Entity>& theEntities)
+int HYDROData_ShapeFile::ImportPolylines(Handle(HYDROData_Document) theDocument, const QString& theFileName,
+ NCollection_Sequence<Handle_HYDROData_Entity>& theEntities, int& theShapeTypeOfFile)
{
+ //Free();
+ int aStat = TryOpenShapeFile(theFileName);
+ if (aStat != 0)
+ return aStat;
+
HYDROData_Iterator anIter( theDocument );
int anInd = 0;
QStringList anExistingNames;
QFileInfo aFileInfo(theFileName);
QString aBaseFileName = aFileInfo.baseName();
- if (!Parse(aHSHP, HYDROData_ShapeFile::ShapeType_Polyline))
- return false;
- bool aStat = false;
+ if (!Parse(aHSHP, HYDROData_ShapeFile::ShapeType_Polyline, theShapeTypeOfFile))
+ return 0;
if (aHSHP->nShapeType == 3 || aHSHP->nShapeType == 23)
{
anInd = 0;
{
ReadSHPPolyXY(theDocument, mySHPObjects[i], aBaseFileName, anAllowedIndexes[i], theEntities);
}
- aStat = true;
+ aStat = 1;
}
else if (aHSHP->nShapeType == 13)
{
}
for (size_t i = 0; i < mySHPObjects.size(); i++ )
ReadSHPPoly3D(theDocument, mySHPObjects[i], aBaseFileName, anAllowedIndexes[i], theEntities);
- aStat = true;
+ aStat = 1;
}
else
{
- aStat = false;
+ aStat = 0;
}
for (size_t i = 0; i < mySHPObjects.size(); i++ )
mySHPObjects.clear();
SHPClose(aHSHP);
return aStat;
+}
+
+QString HYDROData_ShapeFile::GetShapeTypeName(int theType)
+{
+ switch (theType)
+ {
+ case 0:
+ return "null shape";
+ case 1:
+ return "point (unsupported by HYDRO)";
+ case 3:
+ return "arc/polyline (supported by HYDRO)";
+ case 5:
+ return "polygon (supported by HYDRO)";
+ case 8:
+ return "multipoint (unsupported by HYDRO)";
+ case 11:
+ return "pointZ (unsupported by HYDRO)";
+ case 13:
+ return "arcZ/polyline (supported by HYDRO)";
+ case 15:
+ return "polygonZ (unsupported by HYDRO)";
+ case 18:
+ return "multipointZ (unsupported by HYDRO)";
+ case 21:
+ return "pointM (unsupported by HYDRO)";
+ case 23:
+ return "arcM/polyline (supported by HYDRO)";
+ case 25:
+ return "polygonM (unsupported by HYDRO)";
+ case 28:
+ return "multipointM (unsupported by HYDRO)";
+ case 31:
+ return "multipatch (unsupported by HYDRO)";
+ default:
+ return "unknown";
+ }
+}
+
+int HYDROData_ShapeFile::TryOpenShapeFile(QString theFileName)
+{
+ QString aSHPfile = theFileName.simplified();
+ QString aSHXfile = theFileName.simplified().replace( ".shp", ".shx", Qt::CaseInsensitive);
+ FILE* pFileSHP = NULL;
+ pFileSHP = fopen (aSHPfile.toAscii().data(), "r");
+ FILE* pFileSHX = NULL;
+ pFileSHX = fopen (aSHXfile.toAscii().data(), "r");
+
+ if (pFileSHP == NULL || pFileSHX == NULL)
+ {
+ if (pFileSHP == NULL)
+ return -1;
+ if (pFileSHX == NULL)
+ return -2;
+ }
+
+ fclose (pFileSHP);
+ fclose (pFileSHX);
+ return 0;
}
\ No newline at end of file