X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Obstacle.cxx;h=29b0a64c4a9e8505f6fe2acce5a707be77d6ee8e;hb=f86cf7ecf17dbae2a1d84e0ebbab07c732208c2f;hp=9c738a117a80ee24fe011b18b5bf39cd68b5e196;hpb=743e3da9cea294eb30ea8b16e7f6992a39a8a50a;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Obstacle.cxx b/src/HYDROData/HYDROData_Obstacle.cxx index 9c738a11..29b0a64c 100644 --- a/src/HYDROData/HYDROData_Obstacle.cxx +++ b/src/HYDROData/HYDROData_Obstacle.cxx @@ -75,7 +75,9 @@ #include -IMPLEMENT_STANDARD_HANDLE(HYDROData_Obstacle,HYDROData_ArtificialObject) +#define _DEVDEBUG_ +#include "HYDRO_trace.hxx" + IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Obstacle,HYDROData_ArtificialObject) @@ -101,24 +103,24 @@ QStringList HYDROData_Obstacle::DumpToPython( const QString& thePyScriptPa if ( !aGeomObjectEntry.IsEmpty() ) { QString aSalomeObjName = HYDROData_Tool::GenerateNameForPython( theTreatedObjects, "obstacle_sobj" ); - // aResList << QString( "%1 = theStudy.FindObjectID( \"%2\" );" ) + // aResList << QString( "%1 = theStudy.FindObjectID( \"%2\" )" ) // .arg( aSalomeObjName ).arg( aGeomObjectEntry.ToCString() ); QString aGeomObjectName( GetGeomObjectName().ToCString() ); if ( !aGeomObjectName.isEmpty() ) { aResList << QString( "%1 = theStudy.FindObjectByName( \"%2\", \"GEOM\" )[0];" ) .arg( aSalomeObjName ).arg( aGeomObjectName ); - aResList << QString( "%1.ImportFromGeomIOR( %2.GetIOR() );" ) + aResList << QString( "%1.ImportFromGeomIOR( %2.GetIOR() )" ) .arg( anObstacleName ).arg( aSalomeObjName ); - aResList << QString( "%1.SetGeomObjectEntry( %2.GetID() );" ) + aResList << QString( "%1.SetGeomObjectEntry( %2.GetID() )" ) .arg( anObstacleName ).arg( aSalomeObjName ); } aResList << QString( "" ); } else if ( !aFilePath.isEmpty() ) { - aResList << QString( "%1.ImportFromFile( \"%2\" );" ) + aResList << QString( "%1.ImportFromFile( \"%2\" )" ) .arg( anObstacleName ).arg( aFilePath ); aResList << QString( "" ); } @@ -127,12 +129,12 @@ QStringList HYDROData_Obstacle::DumpToPython( const QString& thePyScriptPa double aDx, aDy, aDz; if ( getTranslation( aDx, aDy, aDz ) ) { - aResList << QString( "%1.Translate( %2, %3, %4 );" ) + aResList << QString( "%1.Translate( %2, %3, %4 )" ) .arg( anObstacleName ).arg( aDx ).arg( aDy ).arg( aDz ); aResList << QString( "" ); } - aResList << QString( "%1.Update();" ).arg( anObstacleName ); + aResList << QString( "%1.Update()" ).arg( anObstacleName ); aResList << QString( "" ); return aResList; @@ -476,6 +478,7 @@ TopoDS_Shape HYDROData_Obstacle::ImportSTEP( const QString& theFilePath ) const ObjectKind HYDROData_Obstacle::getAltitudeObjectType() const { + DEBTRACE("HYDROData_Obstacle::getAltitudeObjectType"); return KIND_OBSTACLE_ALTITUDE; }