From: isn Date: Mon, 18 May 2015 08:20:30 +0000 (+0300) Subject: #refs 521 X-Git-Tag: v1.4.1~21^2~5 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=05f3a89b877698fa4048a25f0cdd1bebf7f45845;p=modules%2Fhydro.git #refs 521 --- diff --git a/src/HYDROData/HYDROData_Bathymetry.cxx b/src/HYDROData/HYDROData_Bathymetry.cxx index e3320ad2..adc140a1 100644 --- a/src/HYDROData/HYDROData_Bathymetry.cxx +++ b/src/HYDROData/HYDROData_Bathymetry.cxx @@ -409,6 +409,8 @@ bool HYDROData_Bathymetry::ImportFromFile( const TCollection_AsciiString& theFil // Try to import the file if ( aFileSuf == "xyz" ) aRes = importFromXYZFile( aFile, aPoints ); + else if ( aFileSuf == "asc" ) + aRes = importFromASCFile( aFile, aPoints ); // Close the file aFile.close(); @@ -496,6 +498,97 @@ bool HYDROData_Bathymetry::importFromXYZFile( QFile& theFile, return true; } +bool HYDROData_Bathymetry::importFromASCFile( QFile& theFile, + AltitudePoints& thePoints ) const +{ + if ( !theFile.isOpen() ) + return false; + + QString aLine; + QStringList aStrList; + + int aNCols; + int aNRows; + double anXllCorner; + double anYllCorner; + double aCellSize; + double aNoDataValue; + + aLine = theFile.readLine().simplified(); + aStrList = aLine.split( ' ', QString::SkipEmptyParts ); + if ( aStrList.length() != 2 && aStrList[0].toLower() != "ncols" ) + return false; + aNCols = aStrList[1].toInt(); + + aLine = theFile.readLine().simplified(); + aStrList = aLine.split( ' ', QString::SkipEmptyParts ); + if ( aStrList.length() != 2 && aStrList[0].toLower() != "nrows" ) + return false; + aNRows = aStrList[1].toInt(); + + aLine = theFile.readLine().simplified(); + aStrList = aLine.split( ' ', QString::SkipEmptyParts ); + if ( aStrList.length() != 2 && aStrList[0].toLower() != "xllcorner" ) + return false; + anXllCorner = aStrList[1].toDouble(); + + aLine = theFile.readLine().simplified(); + aStrList = aLine.split( ' ', QString::SkipEmptyParts ); + if ( aStrList.length() != 2 && aStrList[0].toLower() != "yllcorner" ) + return false; + anYllCorner = aStrList[1].toDouble(); + + aLine = theFile.readLine().simplified(); + aStrList = aLine.split( ' ', QString::SkipEmptyParts ); + if ( aStrList.length() != 2 && aStrList[0].toLower() != "cellsize" ) + return false; + aCellSize = aStrList[1].toDouble(); + + aLine = theFile.readLine().simplified(); + aStrList = aLine.split( ' ', QString::SkipEmptyParts ); + if ( aStrList.length() != 2 && aStrList[0].toLower() != "nodata_value" ) + return false; + aNoDataValue = aStrList[1].toDouble(); + + bool anIsAltitudesInverted = IsAltitudesInverted(); + + int i = 0; + int aStrLength = 0; + while ( !theFile.atEnd() ) + { + aLine = theFile.readLine().simplified(); + aStrList = aLine.split( ' ', QString::SkipEmptyParts ); + + aStrLength = aStrList.length(); + if ( aStrLength == 0 ) + continue; + + if ( aStrLength != aNRows ) + return false; + + for (int j = 0; j < aNCols; j++) + { + if (aStrList[j].toDouble() != aNoDataValue) + { + AltitudePoint aPoint; + aPoint.SetX(anXllCorner + aCellSize*(j + 0.5)); + aPoint.SetY(anYllCorner + aCellSize*(aNRows - i + 0.5)); + aPoint.SetZ(aStrList[j].toDouble()); + + if ( anIsAltitudesInverted ) + aPoint.SetZ( -aPoint.Z() ); + + thePoints.Append(aPoint); + } + } + i++; + + } + + return true; + +} + Handle_HYDROData_PolylineXY HYDROData_Bathymetry::CreateBoundaryPolyline() const { diff --git a/src/HYDROData/HYDROData_Bathymetry.h b/src/HYDROData/HYDROData_Bathymetry.h index fcd4829f..881af2c5 100644 --- a/src/HYDROData/HYDROData_Bathymetry.h +++ b/src/HYDROData/HYDROData_Bathymetry.h @@ -146,6 +146,9 @@ private: bool importFromXYZFile( QFile& theFile, AltitudePoints& thePoints ) const; + bool importFromASCFile( QFile& theFile, + AltitudePoints& thePoints ) const; + protected: friend class HYDROData_Iterator; diff --git a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts index 86277845..42a8aa1f 100644 --- a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts +++ b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts @@ -85,7 +85,7 @@ BATHYMETRY_FILTER - Bathymetry files (*.xyz);;All files (*.* *) + Bathymetry files (*.xyz);;ASC files (*.asc);;All files (*.* *) CASE_BOUNDARY