Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor changes.
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_Bathymetry.cxx
diff --git
a/src/HYDROData/HYDROData_Bathymetry.cxx
b/src/HYDROData/HYDROData_Bathymetry.cxx
index 0de3988706ac0c61cb333fec23a297d3f042ee10..3d5e9ca53eb9ab7d9418c5a42708a711ae2527a5 100644
(file)
--- a/
src/HYDROData/HYDROData_Bathymetry.cxx
+++ b/
src/HYDROData/HYDROData_Bathymetry.cxx
@@
-15,6
+15,11
@@
#include <QPolygonF>
#include <QStringList>
#include <QPolygonF>
#include <QStringList>
+#define _TIMER
+#ifdef _TIMER
+#include <OSD_Timer.hxx>
+#endif
+
#define PYTHON_BATHYMETRY_ID "KIND_BATHYMETRY"
#define PYTHON_BATHYMETRY_ID "KIND_BATHYMETRY"
@@
-34,7
+39,7
@@
QStringList HYDROData_Bathymetry::DumpToPython( MapOfTreatedObjects& theTreatedO
{
QStringList aResList;
{
QStringList aResList;
- Handle(HYDROData_Document) aDocument = HYDROData_Document::Document(
this
);
+ Handle(HYDROData_Document) aDocument = HYDROData_Document::Document(
myLab
);
if ( aDocument.IsNull() )
return aResList;
if ( aDocument.IsNull() )
return aResList;
@@
-352,13
+357,18
@@
bool HYDROData_Bathymetry::importFromXYZFile( QFile& theFile,
// 2. X(float) Y(float) Z(float)
// ...
// 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;
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;
if ( aValues.length() < 3 )
return false;
@@
-370,9
+380,10
@@
bool HYDROData_Bathymetry::importFromXYZFile( QFile& theFile,
bool isXOk = false, isYOk = false, isZOk = false;
bool isXOk = false, isYOk = false, isZOk = false;
+ // We automaticaly convert the z value to a negative number
aPoint.SetX( anX.toDouble( &isXOk ) );
aPoint.SetY( anY.toDouble( &isYOk ) );
aPoint.SetX( anX.toDouble( &isXOk ) );
aPoint.SetY( anY.toDouble( &isYOk ) );
- aPoint.SetZ( aZ.toDouble( &isZOk ) );
+ aPoint.SetZ(
-
aZ.toDouble( &isZOk ) );
if ( !isXOk || !isYOk || !isZOk )
return false;
if ( !isXOk || !isYOk || !isZOk )
return false;
@@
-380,6
+391,12
@@
bool HYDROData_Bathymetry::importFromXYZFile( QFile& theFile,
thePoints << aPoint;
}
thePoints << aPoint;
}
+#ifdef _TIMER
+ aTimer.Stop();
+ std::ofstream stream( "W:/HYDRO/WORK/log.txt", std::ofstream::out );
+ aTimer.Show( stream );
+#endif
+
return true;
}
return true;
}