From 8b6440ab929ac1e3571fbfbb2c7c53c0206c1ce7 Mon Sep 17 00:00:00 2001 From: asl Date: Fri, 11 Dec 2015 08:28:33 +0300 Subject: [PATCH] refs #767: minor corrections of the dump format --- src/HYDROData/HYDROData_AltitudeObject.cxx | 2 +- src/HYDROData/HYDROData_Bathymetry.cxx | 6 +++--- src/HYDROData/HYDROData_CalculationCase.cxx | 8 ++++---- src/HYDROData/HYDROData_Channel.cxx | 4 ++-- src/HYDROData/HYDROData_Confluence.cxx | 2 +- src/HYDROData/HYDROData_Document.cxx | 4 ++-- src/HYDROData/HYDROData_Entity.cxx | 12 ++++++------ src/HYDROData/HYDROData_Image.cxx | 16 ++++++++-------- src/HYDROData/HYDROData_ImmersibleZone.cxx | 2 +- src/HYDROData/HYDROData_Obstacle.cxx | 12 ++++++------ src/HYDROData/HYDROData_Polyline3D.cxx | 6 +++--- src/HYDROData/HYDROData_PolylineXY.cxx | 12 ++++++------ src/HYDROData/HYDROData_Profile.cxx | 8 ++++---- src/HYDROData/HYDROData_River.cxx | 2 +- src/HYDROData/HYDROData_Stream.cxx | 2 +- src/HYDROData/HYDROData_StricklerTable.cxx | 10 +++++----- 16 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/HYDROData/HYDROData_AltitudeObject.cxx b/src/HYDROData/HYDROData_AltitudeObject.cxx index 44e21d08..8dd5033a 100644 --- a/src/HYDROData/HYDROData_AltitudeObject.cxx +++ b/src/HYDROData/HYDROData_AltitudeObject.cxx @@ -42,7 +42,7 @@ QStringList HYDROData_AltitudeObject::DumpToPython( const QString& thePyScriptPa // TODO aResList << QString( "" ); - aResList << QString( "%1.Update();" ).arg( aName ); + aResList << QString( "%1.Update()" ).arg( aName ); aResList << QString( "" ); return aResList; diff --git a/src/HYDROData/HYDROData_Bathymetry.cxx b/src/HYDROData/HYDROData_Bathymetry.cxx index 24fae3f2..15401f0a 100644 --- a/src/HYDROData/HYDROData_Bathymetry.cxx +++ b/src/HYDROData/HYDROData_Bathymetry.cxx @@ -60,15 +60,15 @@ QStringList HYDROData_Bathymetry::DumpToPython( const QString& thePyScriptPath, QStringList aResList = dumpObjectCreation( theTreatedObjects ); QString aBathymetryName = GetObjPyName(); - aResList << QString( "%1.SetAltitudesInverted( %2 );" ) + aResList << QString( "%1.SetAltitudesInverted( %2 )" ) .arg( aBathymetryName ).arg( IsAltitudesInverted() ); TCollection_AsciiString aFilePath = GetFilePath(); - aResList << QString( "%1.ImportFromFile( \"%2\" );" ) + aResList << QString( "%1.ImportFromFile( \"%2\" )" ) .arg( aBathymetryName ).arg( aFilePath.ToCString() ); aResList << QString( "" ); - aResList << QString( "%1.Update();" ).arg( aBathymetryName ); + aResList << QString( "%1.Update()" ).arg( aBathymetryName ); aResList << QString( "" ); return aResList; diff --git a/src/HYDROData/HYDROData_CalculationCase.cxx b/src/HYDROData/HYDROData_CalculationCase.cxx index e6e62169..986c9b01 100644 --- a/src/HYDROData/HYDROData_CalculationCase.cxx +++ b/src/HYDROData/HYDROData_CalculationCase.cxx @@ -154,10 +154,10 @@ QStringList HYDROData_CalculationCase::DumpToPython( const QString& thePyS continue; int aGroupId = aFatherGeom->GetGroupId( aGeomGroup ); - aResList << QString( "%1 = %2.GetGroup( %3 );" ) + aResList << QString( "%1 = %2.GetGroup( %3 )" ) .arg( aGroupName ).arg( aFatherGeom->GetObjPyName() ).arg( aGroupId ); - aResList << QString( "%1.AddGeometryGroup( %2 );" ).arg( aCalculName ).arg( aGroupName ); + aResList << QString( "%1.AddGeometryGroup( %2 )" ).arg( aCalculName ).arg( aGroupName ); } Handle(HYDROData_PolylineXY) aBoundaryPolyline = GetBoundaryPolyline(); @@ -168,7 +168,7 @@ QStringList HYDROData_CalculationCase::DumpToPython( const QString& thePyS aResList << QString( "" ); aResList << "# Start the algorithm of the partition and assignment"; - aResList << QString( "%1.Update();" ).arg( aCalculName ); + aResList << QString( "%1.Update()" ).arg( aCalculName ); if( aMode==MANUAL ) { @@ -194,7 +194,7 @@ QStringList HYDROData_CalculationCase::DumpToPython( const QString& thePyS aResList << QString( "print \"Geom shape:\", %1" ).arg( aGeomShapeName ); aResList << QString( "print \"Geom shape name:\", %1.GetName()" ).arg( aGeomShapeName ); - DumpSampleMeshing( aResList, aStudyName, aGeomShapeName, aCalculName+"_mesh" ); + //DumpSampleMeshing( aResList, aStudyName, aGeomShapeName, aCalculName+"_mesh" ); aResList << QString( "" ); return aResList; diff --git a/src/HYDROData/HYDROData_Channel.cxx b/src/HYDROData/HYDROData_Channel.cxx index 03013b3e..99f41919 100644 --- a/src/HYDROData/HYDROData_Channel.cxx +++ b/src/HYDROData/HYDROData_Channel.cxx @@ -92,10 +92,10 @@ QStringList HYDROData_Channel::DumpToPython( const QString& thePyScriptPath, Handle(HYDROData_Profile) aRefProfile = GetProfile(); setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefProfile, "SetProfile" ); - aResList << QString( "%1.SetEquiDistance( %2 );" ).arg( aName ).arg( GetEquiDistance() ); + aResList << QString( "%1.SetEquiDistance( %2 )" ).arg( aName ).arg( GetEquiDistance() ); aResList << QString( "" ); - aResList << QString( "%1.Update();" ).arg( aName ); + aResList << QString( "%1.Update()" ).arg( aName ); aResList << QString( "" ); return aResList; diff --git a/src/HYDROData/HYDROData_Confluence.cxx b/src/HYDROData/HYDROData_Confluence.cxx index aec5701b..d40c9a17 100644 --- a/src/HYDROData/HYDROData_Confluence.cxx +++ b/src/HYDROData/HYDROData_Confluence.cxx @@ -46,7 +46,7 @@ QStringList HYDROData_Confluence::DumpToPython( const QString& thePyScriptPath, // TODO aResList << QString( "" ); - aResList << QString( "%1.Update();" ).arg( aName ); + aResList << QString( "%1.Update()" ).arg( aName ); aResList << QString( "" ); return aResList; diff --git a/src/HYDROData/HYDROData_Document.cxx b/src/HYDROData/HYDROData_Document.cxx index 653ddb8e..d34cc547 100644 --- a/src/HYDROData/HYDROData_Document.cxx +++ b/src/HYDROData/HYDROData_Document.cxx @@ -322,12 +322,12 @@ QStringList HYDROData_Document::DumpToPython( const QString& thePyScriptPath, aResScript << QString( "import salome" ); aResScript << QString( "" ); aResScript << QString( "def RebuildData( theStudy ):" ); - aResScript << QString( " %1 = HYDROData_Document.Document( theStudy._get_StudyId() );" ).arg( aDocName ); + aResScript << QString( " %1 = HYDROData_Document.Document( theStudy._get_StudyId() )" ).arg( aDocName ); } else { aResScript << QString( "" ); - aResScript << QString( "%1 = HYDROData_Document.Document( theStudy._get_StudyId() );" ).arg( aDocName ); + aResScript << QString( "%1 = HYDROData_Document.Document( theStudy._get_StudyId() )" ).arg( aDocName ); } return aResScript; diff --git a/src/HYDROData/HYDROData_Entity.cxx b/src/HYDROData/HYDROData_Entity.cxx index 8681cf1e..0cdc8f5b 100644 --- a/src/HYDROData/HYDROData_Entity.cxx +++ b/src/HYDROData/HYDROData_Entity.cxx @@ -599,9 +599,9 @@ QStringList HYDROData_Entity::dumpObjectCreation( MapOfTreatedObjects& theTreate QString aDocName = aDocument->GetDocPyName(); QString aName = GetObjPyName(); - aResList << QString( "%1 = %2.CreateObject( %3 );" ) + aResList << QString( "%1 = %2.CreateObject( %3 )" ) .arg( aName ).arg( aDocName ).arg( getPyTypeID() ); - aResList << QString( "%1.SetName( \"%2\" );" ) + aResList << QString( "%1.SetName( \"%2\" )" ) .arg( aName ).arg( GetName() ); aResList << QString( "" ); @@ -611,7 +611,7 @@ QStringList HYDROData_Entity::dumpObjectCreation( MapOfTreatedObjects& theTreate Standard_Integer anObjZLevel = -1; if ( GetZLevel( anObjZLevel ) ) { - aResList << QString( "%1.SetZLevel( %2 );" ) + aResList << QString( "%1.SetZLevel( %2 )" ) .arg( aName ).arg( anObjZLevel ); aResList << QString( "" ); } @@ -668,7 +668,7 @@ void HYDROData_Entity::setPythonReferenceObject( const QString& QString aRefObjName = theRefObject->GetObjPyName(); QString anObjName = GetObjPyName(); - theScript << QString( "%1.%2( %3 );" ) + theScript << QString( "%1.%2( %3 )" ) .arg( anObjName ).arg( theMethod ).arg( aRefObjName ); } @@ -712,7 +712,7 @@ void HYDROData_Entity::setPythonObjectColor( QStringList& theScript, return; //Do not set the color for object if it like default QString anObjName = GetObjPyName(); - theScript << QString( "%1.%2( QColor( %3, %4, %5, %6 ) );" ) + theScript << QString( "%1.%2( QColor( %3, %4, %5, %6 ) )" ) .arg( anObjName ).arg( theMethod ) .arg( theColor.red() ).arg( theColor.green() ) .arg( theColor.blue() ).arg( theColor.alpha() ); @@ -725,7 +725,7 @@ void HYDROData_Entity::findPythonReferenceObject( MapOfTreatedObjects& theTreate if ( aDocument.IsNull() ) return; - theScript << QString( "%1 = %2.FindObjectByName( \"%3\" );" ).arg( GetObjPyName() ) + theScript << QString( "%1 = %2.FindObjectByName( \"%3\" )" ).arg( GetObjPyName() ) .arg( aDocument->GetDocPyName() ) .arg( GetName() ); } diff --git a/src/HYDROData/HYDROData_Image.cxx b/src/HYDROData/HYDROData_Image.cxx index 287541b1..7a3d3602 100644 --- a/src/HYDROData/HYDROData_Image.cxx +++ b/src/HYDROData/HYDROData_Image.cxx @@ -71,7 +71,7 @@ QStringList HYDROData_Image::DumpToPython( const QString& thePyScriptPath, if ( !aFilePath.isEmpty() ) { aResList << QString( "" ); - aResList << QString( "%1.LoadImage( \"%2\" );" ) + aResList << QString( "%1.LoadImage( \"%2\" )" ) .arg( anImageName ).arg( aFilePath ); aResList << QString( "" ); @@ -91,12 +91,12 @@ QStringList HYDROData_Image::DumpToPython( const QString& thePyScriptPath, if ( !anIsByTwoPoints ) { aResList.last().append( "," ); - aResList << QString( aGap + "QPoint( %1, %2 ) );" ) + aResList << QString( aGap + "QPoint( %1, %2 ) )" ) .arg( aLocalPointC.x() ).arg( aLocalPointC.y() ); } else { - aResList.last().append( " );" ); + aResList.last().append( " )" ); } aResList << QString( "" ); } @@ -116,12 +116,12 @@ QStringList HYDROData_Image::DumpToPython( const QString& thePyScriptPath, if ( !anIsByTwoPoints ) { aResList.last().append( "," ); - aResList << QString( aGap + "QPointF( %1, %2 ) );" ) + aResList << QString( aGap + "QPointF( %1, %2 ) )" ) .arg( aTrsfPointC.x() ).arg( aTrsfPointC.y() ); } else { - aResList.last().append( " );" ); + aResList.last().append( " )" ); } if ( aTransformationMode == ReferenceImage ) @@ -140,7 +140,7 @@ QStringList HYDROData_Image::DumpToPython( const QString& thePyScriptPath, { aResList << QString( "" ); - aResList << QString( "%1.SetOperatorName( \"%2\" );" ) + aResList << QString( "%1.SetOperatorName( \"%2\" )" ) .arg( anImageName ).arg( anOperatorName ); ImageComposer_Operator* anImageOp = @@ -156,7 +156,7 @@ QStringList HYDROData_Image::DumpToPython( const QString& thePyScriptPath, aResList << anOpArgs; aResList << QString( "" ); - aResList << QString( "%1.SetArgs( %2 );" ) + aResList << QString( "%1.SetArgs( %2 )" ) .arg( anImageName ).arg( anOpArgsArrayName ); } } @@ -176,7 +176,7 @@ QStringList HYDROData_Image::DumpToPython( const QString& thePyScriptPath, } aResList << QString( "" ); - aResList << QString( "%1.Update();" ).arg( anImageName ); + aResList << QString( "%1.Update()" ).arg( anImageName ); return aResList; } diff --git a/src/HYDROData/HYDROData_ImmersibleZone.cxx b/src/HYDROData/HYDROData_ImmersibleZone.cxx index f3b7d675..f5716c17 100644 --- a/src/HYDROData/HYDROData_ImmersibleZone.cxx +++ b/src/HYDROData/HYDROData_ImmersibleZone.cxx @@ -72,7 +72,7 @@ QStringList HYDROData_ImmersibleZone::DumpToPython( const QString& thePyScriptPa aResList << QString( "" ); - aResList << QString( "%1.Update();" ).arg( aZoneName ); + aResList << QString( "%1.Update()" ).arg( aZoneName ); aResList << QString( "" ); return aResList; diff --git a/src/HYDROData/HYDROData_Obstacle.cxx b/src/HYDROData/HYDROData_Obstacle.cxx index 9c738a11..faa6b7cd 100644 --- a/src/HYDROData/HYDROData_Obstacle.cxx +++ b/src/HYDROData/HYDROData_Obstacle.cxx @@ -101,24 +101,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 +127,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; diff --git a/src/HYDROData/HYDROData_Polyline3D.cxx b/src/HYDROData/HYDROData_Polyline3D.cxx index 70673480..b4f53662 100644 --- a/src/HYDROData/HYDROData_Polyline3D.cxx +++ b/src/HYDROData/HYDROData_Polyline3D.cxx @@ -85,7 +85,7 @@ QStringList HYDROData_Polyline3D::DumpToPython( const QString& thePyScriptPath, QString aProfileName = aProfile->GetObjPyName(); if ( !aProfileName.isEmpty() ) { - aResList << QString( "%1.SetProfileUZ( %2.GetProfileUZ() );" ) + aResList << QString( "%1.SetProfileUZ( %2.GetProfileUZ() )" ) .arg( aPolylineName ).arg( aProfileName ); } } @@ -105,7 +105,7 @@ QStringList HYDROData_Polyline3D::DumpToPython( const QString& thePyScriptPath, QString aProfileName = aProfile->GetObjPyName(); if ( !aProfileName.isEmpty() ) { - aResList << QString( "%1.SetChildProfileUZ( %2.GetProfileUZ() );" ) + aResList << QString( "%1.SetChildProfileUZ( %2.GetProfileUZ() )" ) .arg( aPolylineName ).arg( aProfileName ); } } @@ -116,7 +116,7 @@ QStringList HYDROData_Polyline3D::DumpToPython( const QString& thePyScriptPath, } aResList << QString( "" ); - aResList << QString( "%1.Update();" ).arg( aPolylineName ); + aResList << QString( "%1.Update()" ).arg( aPolylineName ); aResList << QString( "" ); return aResList; diff --git a/src/HYDROData/HYDROData_PolylineXY.cxx b/src/HYDROData/HYDROData_PolylineXY.cxx index 24728efa..72e20adb 100644 --- a/src/HYDROData/HYDROData_PolylineXY.cxx +++ b/src/HYDROData/HYDROData_PolylineXY.cxx @@ -156,13 +156,13 @@ QStringList HYDROData_PolylineXY::DumpToPython( const QString& thePyScript if ( !aGeomObjectEntry.IsEmpty() ) { QString aSalomeObjName = HYDROData_Tool::GenerateNameForPython( theTreatedObjects, "polyline_sobj" ); - aResList << QString( "%1 = salome.myStudy.FindObjectID( \"%2\" );" ) + aResList << QString( "%1 = salome.myStudy.FindObjectID( \"%2\" )" ) .arg( aSalomeObjName ).arg( aGeomObjectEntry.ToCString() ); - aResList << QString( "%1.ImportFromGeomIOR( %2.GetIOR() );" ) + aResList << QString( "%1.ImportFromGeomIOR( %2.GetIOR() )" ) .arg( aPolylineName ).arg( aSalomeObjName ); - aResList << QString( "%1.SetGeomObjectEntry( \"%2\" );" ) + aResList << QString( "%1.SetGeomObjectEntry( \"%2\" )" ) .arg( aPolylineName ).arg( aGeomObjectEntry.ToCString() ); } } @@ -180,7 +180,7 @@ QStringList HYDROData_PolylineXY::DumpToPython( const QString& thePyScript const SectionType& aSectType = aSectTypes.Value( i ); bool aSectClosure = aSectClosures.Value( i ); - aResList << QString( "%1.AddSection( \"%2\", %3, %4 );" ).arg( aPolylineName ) + aResList << QString( "%1.AddSection( \"%2\", %3, %4 )" ).arg( aPolylineName ) .arg( aSectName.ToCString() ).arg( aSectType ).arg( aSectClosure ); HYDROData_IPolyline::PointsList aSectPointsList = GetPoints( i - 1 ); @@ -190,13 +190,13 @@ QStringList HYDROData_PolylineXY::DumpToPython( const QString& thePyScript QString anXStr = QString::number( aSectPoint.X(), 'f', 2 ); QString anYStr = QString::number( aSectPoint.Y(), 'f', 2 ); - aResList << QString( "%1.AddPoint( %2, gp_XY( %3, %4 ) );" ).arg( aPolylineName ) + aResList << QString( "%1.AddPoint( %2, gp_XY( %3, %4 ) )" ).arg( aPolylineName ) .arg( i - 1 ).arg( anXStr ).arg( anYStr ); } } } aResList << QString( "" ); - aResList << QString( "%1.Update();" ).arg( aPolylineName ); + aResList << QString( "%1.Update()" ).arg( aPolylineName ); aResList << QString( "" ); return aResList; diff --git a/src/HYDROData/HYDROData_Profile.cxx b/src/HYDROData/HYDROData_Profile.cxx index 4f69515e..1faa2960 100644 --- a/src/HYDROData/HYDROData_Profile.cxx +++ b/src/HYDROData/HYDROData_Profile.cxx @@ -71,7 +71,7 @@ QStringList HYDROData_Profile::DumpToPython( const QString& thePyScriptPat //TCollection_AsciiString aFilePath = GetFilePath(); //if ( !aFilePath.IsEmpty() ) //{ - // aResList << QString( "%1.ImportFromFile( \"%2\" );" ) + // aResList << QString( "%1.ImportFromFile( \"%2\" )" ) // .arg( aName ).arg( aFilePath.ToCString() ); //} @@ -114,7 +114,7 @@ QStringList HYDROData_Profile::DumpToPython( const QString& thePyScriptPat aResList << aPntsDefinition; - aResList << QString( "%1.%3( %2 );" ) + aResList << QString( "%1.%3( %2 )" ) .arg( aProfileName ).arg( aPntsListName ) .arg( anIsValidProfile ? "SetProfilePoints" : "SetParametricPoints" ); @@ -128,13 +128,13 @@ QStringList HYDROData_Profile::DumpToPython( const QString& thePyScriptPat HYDROData_IPolyline::SectionType aSecType = aPrf->GetSectionType( 0 ); if ( aSecType != HYDROData_IPolyline::SECTION_POLYLINE ) { - aResList << QString( "%1.GetProfileUZ().SetSectionType( 0, %2 );" ) + aResList << QString( "%1.GetProfileUZ().SetSectionType( 0, %2 )" ) .arg( aProfileName ).arg( "HYDROData_IPolyline.SECTION_SPLINE" ); aResList << QString( "" ); } } - aResList << QString( "%1.Update();" ).arg( aProfileName ); + aResList << QString( "%1.Update()" ).arg( aProfileName ); aResList << QString( "" ); return aResList; diff --git a/src/HYDROData/HYDROData_River.cxx b/src/HYDROData/HYDROData_River.cxx index 7f28594a..1f197c03 100644 --- a/src/HYDROData/HYDROData_River.cxx +++ b/src/HYDROData/HYDROData_River.cxx @@ -46,7 +46,7 @@ QStringList HYDROData_River::DumpToPython( const QString& thePyScriptPath, // TODO aResList << QString( "" ); - aResList << QString( "%1.Update();" ).arg( aName ); + aResList << QString( "%1.Update()" ).arg( aName ); aResList << QString( "" ); return aResList; diff --git a/src/HYDROData/HYDROData_Stream.cxx b/src/HYDROData/HYDROData_Stream.cxx index 5f6f828f..44833c6a 100644 --- a/src/HYDROData/HYDROData_Stream.cxx +++ b/src/HYDROData/HYDROData_Stream.cxx @@ -126,7 +126,7 @@ QStringList HYDROData_Stream::DumpToPython( const QString& thePyScriptPath } aResList << QString( "" ); - aResList << QString( "%1.Update();" ).arg( aName ); + aResList << QString( "%1.Update()" ).arg( aName ); aResList << QString( "" ); return aResList; diff --git a/src/HYDROData/HYDROData_StricklerTable.cxx b/src/HYDROData/HYDROData_StricklerTable.cxx index e5c2c347..6cf7c2cc 100644 --- a/src/HYDROData/HYDROData_StricklerTable.cxx +++ b/src/HYDROData/HYDROData_StricklerTable.cxx @@ -210,7 +210,7 @@ QStringList HYDROData_StricklerTable::DumpToPython( const QString& thePyScriptPa QString aPyName = GetObjPyName(); QString anAttrName = GetAttrName(); - aResList << QString( "%1.SetAttrName( \"%2\" );" ).arg( aPyName ).arg( anAttrName ); + aResList << QString( "%1.SetAttrName( \"%2\" )" ).arg( aPyName ).arg( anAttrName ); aResList << QString( "" ); Handle(TDataStd_NamedData) aMap = Map(); @@ -220,19 +220,19 @@ QStringList HYDROData_StricklerTable::DumpToPython( const QString& thePyScriptPa { QString aType = HYDROData_Tool::toQString( it.Key() ); Standard_Real aValue = it.Value(); - aResList << QString( "%1.Set( u\"%2\", %3 );" ).arg( aPyName ).arg( aType ).arg( aValue ); + aResList << QString( "%1.Set( u\"%2\", %3 )" ).arg( aPyName ).arg( aType ).arg( aValue ); QString anAttrValue = GetAttrValue( aType ); - aResList << QString( "%1.SetAttrValue( u\"%2\", \"%3\" );" ).arg( aPyName ).arg( aType ).arg( anAttrValue ); + aResList << QString( "%1.SetAttrValue( u\"%2\", \"%3\" )" ).arg( aPyName ).arg( aType ).arg( anAttrValue ); QColor aColor = GetColor( aType ); - aResList << QString( "%1.SetColor( u\"%2\", QColor( %3, %4, %5 ) );" ). + aResList << QString( "%1.SetColor( u\"%2\", QColor( %3, %4, %5 ) )" ). arg( aPyName ).arg( aType ).arg( aColor.red() ).arg( aColor.green() ).arg( aColor.blue() ); aResList << QString(); } } aResList << QString( "" ); - aResList << QString( "%1.Update();" ).arg( aPyName ); + aResList << QString( "%1.Update()" ).arg( aPyName ); return aResList; } -- 2.39.2