From 1e9678f435f343a94052b27b4a4ce165d6bd0d51 Mon Sep 17 00:00:00 2001 From: adv Date: Fri, 29 Nov 2013 10:24:46 +0000 Subject: [PATCH] The import from file improved. --- src/HYDROData/HYDROData_Bathymetry.cxx | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/HYDROData/HYDROData_Bathymetry.cxx b/src/HYDROData/HYDROData_Bathymetry.cxx index 0b61749c..3d5e9ca5 100644 --- a/src/HYDROData/HYDROData_Bathymetry.cxx +++ b/src/HYDROData/HYDROData_Bathymetry.cxx @@ -15,6 +15,11 @@ #include #include +#define _TIMER +#ifdef _TIMER +#include +#endif + #define PYTHON_BATHYMETRY_ID "KIND_BATHYMETRY" @@ -352,13 +357,18 @@ bool HYDROData_Bathymetry::importFromXYZFile( QFile& theFile, // 2. X(float) Y(float) Z(float) // ... +#ifdef _TIMER + OSD_Timer aTimer; + aTimer.Start(); +#endif + while ( !theFile.atEnd() ) { QString aLine = theFile.readLine().simplified(); if ( aLine.isEmpty() ) continue; - QStringList aValues = aLine.split( QRegExp( "\\s+" ), QString::SkipEmptyParts ); + QStringList aValues = aLine.split( ' ', QString::SkipEmptyParts ); if ( aValues.length() < 3 ) return false; @@ -381,6 +391,12 @@ bool HYDROData_Bathymetry::importFromXYZFile( QFile& theFile, thePoints << aPoint; } +#ifdef _TIMER + aTimer.Stop(); + std::ofstream stream( "W:/HYDRO/WORK/log.txt", std::ofstream::out ); + aTimer.Show( stream ); +#endif + return true; } -- 2.39.2