X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Obstacle.cxx;h=29b0a64c4a9e8505f6fe2acce5a707be77d6ee8e;hb=926110b557c276a493e3b6066bb0a598b124d36b;hp=60b4143a4213c96d8a25deb0ebe0b4343b25d69a;hpb=5500f6abe47e1ba07ba709a7a26e2e4a11699c00;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Obstacle.cxx b/src/HYDROData/HYDROData_Obstacle.cxx index 60b4143a..29b0a64c 100644 --- a/src/HYDROData/HYDROData_Obstacle.cxx +++ b/src/HYDROData/HYDROData_Obstacle.cxx @@ -78,7 +78,6 @@ #define _DEVDEBUG_ #include "HYDRO_trace.hxx" -IMPLEMENT_STANDARD_HANDLE(HYDROData_Obstacle,HYDROData_ArtificialObject) IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Obstacle,HYDROData_ArtificialObject) @@ -104,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( "" ); } @@ -130,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;