Merge branch 'master' of https://git.salome-platform.org/git/modules/hydro

diff --git a/src/HYDROData/HYDROData_AltitudeObject.cxx b/src/HYDROData/HYDROData_AltitudeObject.cxx
index 44e21d0866be36649ad57330155f96a4e68f1c33..8dd5033a52b168dca715357510d9059026340e94 100644 (file)
--- 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 24fae3f24dc8ca4e5f4c104b64b409d4d38bf968..15401f0ab37de92ae857dbd226f9c49cfd67242d 100644 (file)
--- 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 e6e62169d8eafafb3e3ed5ff7657e37618908711..986c9b0161abbf40531000924a7a3c5121894597 100644 (file)
--- 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 03013b3ee85cceabf71072839ced9e306d14a75c..99f419199a572746f26f2b525bf92b4e8292dc3f 100644 (file)
--- 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 aec5701b45f4687442beaed45449f770afdfdffe..d40c9a17770a3126c7560b9dcf9fbc39a5e0875c 100644 (file)
--- 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 653ddb8e2dd0686962afd0c40b8858d3f85cd8e1..d34cc54704fa3bd8ac9f9c3aa37eb151a748b9b9 100644 (file)
--- 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 8681cf1e675095a7dfd293161afb90691485adbc..0cdc8f5bacc9a6cbae78510c95c70508611c7e81 100644 (file)
--- 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 287541b1c3131095202b12021f50b2c7b3c0085b..7a3d3602c70e73ea05a6908df680cbfba17bb150 100644 (file)
--- 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 f3b7d6758a17dda7d0fa43fce4cc9c35a206db17..f5716c17e548e247794e5b0402abdc82b9a3cf64 100644 (file)
--- 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_LandCoverMap.cxx b/src/HYDROData/HYDROData_LandCoverMap.cxx
index 8f257c79df3c7a623739ff0c014cf619b1e527f5..1226dbc5a865cdabcbe737ef1ad5e429193a8dea 100644 (file)
--- a/src/HYDROData/HYDROData_LandCoverMap.cxx
+++ b/src/HYDROData/HYDROData_LandCoverMap.cxx
@@ -23,6 +23,7 @@
 #include <HYDROData_ShapeFile.h>
 #include <HYDROData_Document.h>
 #include <HYDROData_StricklerTable.h>
+#include <HYDROData_ShapesTool.h>
 
 #include <BOPAlgo_BOP.hxx>
 #include <BOPAlgo_Builder.hxx>
@@ -1195,3 +1196,10 @@ bool HYDROData_LandCoverMap::CheckLinear()
   }
   return true;
 }
+
+void HYDROData_LandCoverMap::UpdateLocalCS( double theDx, double theDy )
+{
+  TopoDS_Shape aShape = GetShape();
+  TopoDS_Shape aLocatedShape = HYDROData_ShapesTool::Translated( aShape, theDx, theDy, 0 );
+  SetShape( aLocatedShape );
+}

diff --git a/src/HYDROData/HYDROData_LandCoverMap.h b/src/HYDROData/HYDROData_LandCoverMap.h
index cf2fe76fb6f801455b0983c7e9d60bbef0f9aa43..6827d52a0924f46d58d9a61e6e34a5cedc3f7579 100644 (file)
--- a/src/HYDROData/HYDROData_LandCoverMap.h
+++ b/src/HYDROData/HYDROData_LandCoverMap.h
@@ -146,6 +146,8 @@ public:
 
   HYDRODATA_EXPORT bool CheckLinear();
 
+  HYDRODATA_EXPORT virtual void UpdateLocalCS( double theDx, double theDy );
+
 protected:
   void SetShape( const TopoDS_Shape& );
 

diff --git a/src/HYDROData/HYDROData_Obstacle.cxx b/src/HYDROData/HYDROData_Obstacle.cxx
index 9c738a117a80ee24fe011b18b5bf39cd68b5e196..faa6b7cd05189e02ef5c5cfa2baac570686b1c8e 100644 (file)
--- 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 7067348006ac05e783f19761fffc906d62532084..b4f5366295940a5112e97a8c988eb77952f4ddbb 100644 (file)
--- 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 24728efa04d51d255bbd0ce74ae49feb9a8c2085..72e20adb7a9639f936dbb88b706315026b144483 100644 (file)
--- 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 4f69515e8a919ffac14a29a26bf5acca85ba8fbd..1faa2960339b8017faeef9f825ab695161c0fee8 100644 (file)
--- 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 7f28594a41fb0f97ceb8d8e5e665e6012a277efa..1f197c03cc81eff3d5af35978d1a2a4cac28fa17 100644 (file)
--- 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 5f6f828fe406ee267227e23f3c4a181da8f6b201..44833c6afe4f3e00fb309d29f6bc66019d2e34f4 100644 (file)
--- 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 e5c2c347ad828fd4031d1efff57c9a98fa968e26..6cf7c2ccf88ae4cdd923f3e31f14c37abcf39bf3 100644 (file)
--- 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;
 }