The method GetObjPyName is introduced in the Entity.

diff --git a/src/HYDROData/HYDROData_AltitudeObject.cxx b/src/HYDROData/HYDROData_AltitudeObject.cxx
index 0898db1db55e0ecb71ac3de7ec590bd716986a74..ba0a87013bc1704a3277a339daeb463471ddabb9 100644 (file)
--- a/src/HYDROData/HYDROData_AltitudeObject.cxx
+++ b/src/HYDROData/HYDROData_AltitudeObject.cxx
@@ -19,7 +19,7 @@ HYDROData_AltitudeObject::~HYDROData_AltitudeObject()
 QStringList HYDROData_AltitudeObject::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
-  QString aName = GetName();
+  QString aName = GetObjPyName();
 
   // TODO
 

diff --git a/src/HYDROData/HYDROData_Bathymetry.cxx b/src/HYDROData/HYDROData_Bathymetry.cxx
index d9132207c2fc24ac8d68fda340e8e7fb75591082..9bdfd1cfd54a5fc2a5a47fcb50bcbf656348fe28 100644 (file)
--- a/src/HYDROData/HYDROData_Bathymetry.cxx
+++ b/src/HYDROData/HYDROData_Bathymetry.cxx
@@ -41,7 +41,7 @@ HYDROData_Bathymetry::~HYDROData_Bathymetry()
 QStringList HYDROData_Bathymetry::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
-  QString aBathymetryName = GetName();
+  QString aBathymetryName = GetObjPyName();
 
   aResList << QString( "%1.SetAltitudesInverted( %2 );" )
               .arg( aBathymetryName ).arg( IsAltitudesInverted() );

diff --git a/src/HYDROData/HYDROData_CalculationCase.cxx b/src/HYDROData/HYDROData_CalculationCase.cxx
index 6bc7bbfc534b021c60266cb1e1a5cc8073df5dd1..7beedc8dc2d056a1c44810a2dccf00180f366845 100644 (file)
--- a/src/HYDROData/HYDROData_CalculationCase.cxx
+++ b/src/HYDROData/HYDROData_CalculationCase.cxx
@@ -107,7 +107,7 @@ void HYDROData_CalculationCase::SetName( const QString& theName )
 QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
-  QString aCalculName = GetName();
+  QString aCalculName = GetObjPyName();
 
   HYDROData_SequenceOfObjects aGeomObjects = GetGeometryObjects();
   HYDROData_SequenceOfObjects::Iterator anIter( aGeomObjects );

diff --git a/src/HYDROData/HYDROData_Channel.cxx b/src/HYDROData/HYDROData_Channel.cxx
index d0d643762dd3a2e9f00caa2a8c4618f205370b09..2159ce7f9d5fbf17a67657ee9045538536b851b7 100644 (file)
--- a/src/HYDROData/HYDROData_Channel.cxx
+++ b/src/HYDROData/HYDROData_Channel.cxx
@@ -46,9 +46,13 @@ HYDROData_Channel::~HYDROData_Channel()
 QStringList HYDROData_Channel::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
-  QString aName = GetName();
+  QString aName = GetObjPyName();
 
-  // TODO
+  Handle(HYDROData_Polyline3D) aRefGideLine = GetGuideLine();
+  setPythonReferenceObject( theTreatedObjects, aResList, aRefGideLine, "SetGuideLine" );
+
+  Handle(HYDROData_Profile) aRefProfile = GetProfile();
+  setPythonReferenceObject( theTreatedObjects, aResList, aRefProfile, "SetProfile" );
 
   aResList << QString( "" );
   aResList << QString( "%1.Update();" ).arg( aName );

diff --git a/src/HYDROData/HYDROData_Confluence.cxx b/src/HYDROData/HYDROData_Confluence.cxx
index 378ccc6d7f437cb43eadad06c9bee469bf6531ce..64883f888580fcb2d84d0d8e55b0e734d7265746 100644 (file)
--- a/src/HYDROData/HYDROData_Confluence.cxx
+++ b/src/HYDROData/HYDROData_Confluence.cxx
@@ -23,7 +23,7 @@ HYDROData_Confluence::~HYDROData_Confluence()
 QStringList HYDROData_Confluence::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
-  QString aName = GetName();
+  QString aName = GetObjPyName();
 
   // TODO
 

diff --git a/src/HYDROData/HYDROData_Digue.cxx b/src/HYDROData/HYDROData_Digue.cxx
index 1312e1d755922545c061c578cccc7b748cf2b3ab..80149acc3e44b99634d32c8dd9d1851605bfb42f 100644 (file)
--- a/src/HYDROData/HYDROData_Digue.cxx
+++ b/src/HYDROData/HYDROData_Digue.cxx
@@ -21,20 +21,6 @@ HYDROData_Digue::~HYDROData_Digue()
 {
 }
 
-QStringList HYDROData_Digue::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
-{
-  QStringList aResList = dumpObjectCreation( theTreatedObjects );
-  QString aName = GetName();
-
-  // TODO
-
-  aResList << QString( "" );
-  aResList << QString( "%1.Update();" ).arg( aName );
-  aResList << QString( "" );
-
-  return aResList;
-}
-
 QColor HYDROData_Digue::DefaultFillingColor()
 {
   return QColor( Qt::red );

diff --git a/src/HYDROData/HYDROData_Digue.h b/src/HYDROData/HYDROData_Digue.h
index fcd8fb77f1f16f679df7ed32f19c7acde965d982..18d114c91ef79cb455c388988700312eff64d179 100644 (file)
--- a/src/HYDROData/HYDROData_Digue.h
+++ b/src/HYDROData/HYDROData_Digue.h
@@ -29,11 +29,6 @@ public:
    */
   HYDRODATA_EXPORT virtual const ObjectKind GetKind() const {return KIND_DIGUE;}
 
-  /**
-   * Dump object to Python script representation.
-   */
-  HYDRODATA_EXPORT virtual QStringList DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const;
-
   /**
    * Returns default filling color for new digue.
    */

diff --git a/src/HYDROData/HYDROData_Entity.cxx b/src/HYDROData/HYDROData_Entity.cxx
index 2e194aa976d180cc95e89397ead2a637bf803a7f..797973eaef0d0f273a94d6efdcd6db55ca93602e 100644 (file)
--- a/src/HYDROData/HYDROData_Entity.cxx
+++ b/src/HYDROData/HYDROData_Entity.cxx
@@ -43,6 +43,11 @@ QString HYDROData_Entity::GetName() const
   return QString();
 }
 
+QString HYDROData_Entity::GetObjPyName() const
+{
+  return GetName().replace(" ", "_");
+}
+
 void HYDROData_Entity::SetName(const QString& theName)
 {
   TDataStd_Name::Set(myLab, TCollection_ExtendedString(theName.toLatin1().constData()));
@@ -63,12 +68,12 @@ QStringList HYDROData_Entity::dumpObjectCreation( MapOfTreatedObjects& theTreate
     return aResList;
 
   QString aDocName = aDocument->GetDocPyName();
-  QString aName = GetName();
+  QString aName = GetObjPyName();
 
   aResList << QString( "%1 = %2.CreateObject( %3 );" )
               .arg( aName ).arg( aDocName ).arg( getPyTypeID() );
   aResList << QString( "%1.SetName( \"%2\" );" )
-              .arg( aName ).arg( aName );
+              .arg( aName ).arg( GetName() );
   aResList << QString( "" );
 
   return aResList;
@@ -497,7 +502,7 @@ void HYDROData_Entity::setPythonReferenceObject( MapOfTreatedObjects&
   if ( theRefObject.IsNull() )
     return;
 
-  QString aRefObjName = theRefObject->GetName();
+  QString aRefObjName = theRefObject->GetObjPyName();
   if ( aRefObjName.isEmpty() )
     return;
 
@@ -523,7 +528,7 @@ void HYDROData_Entity::setPythonReferenceObject( MapOfTreatedObjects&
   if ( anIsToSetObject )
   {
     theScript << QString( "%1.%2( %3 );" )
-                 .arg( GetName() ).arg( theMethod ).arg( aRefObjName );
+                 .arg( GetObjPyName() ).arg( theMethod ).arg( aRefObjName );
   }
 }
 

diff --git a/src/HYDROData/HYDROData_Entity.h b/src/HYDROData/HYDROData_Entity.h
index a0af6b11e1d2a50d979411cb7aec74a9fa856ca6..b1b36333541cddccfe41815c90ac61ee44a5e4b6 100644 (file)
--- a/src/HYDROData/HYDROData_Entity.h
+++ b/src/HYDROData/HYDROData_Entity.h
@@ -94,6 +94,11 @@ public:
    */
   HYDRODATA_EXPORT virtual void SetName( const QString& theName );
 
+  /**
+   * Returns the name of this object valid for Python script.
+   */
+  HYDRODATA_EXPORT virtual QString GetObjPyName() const;
+
   /**
    * Dump object to Python script representation.
    * Base implementation returns empty list,

diff --git a/src/HYDROData/HYDROData_Image.cxx b/src/HYDROData/HYDROData_Image.cxx
index da75db7692bacae52aac61968f2ec3163ad14bbb..ef915a0045f10cc6d415c783a052ad44d4ff7318 100644 (file)
--- a/src/HYDROData/HYDROData_Image.cxx
+++ b/src/HYDROData/HYDROData_Image.cxx
@@ -40,7 +40,7 @@ HYDROData_Image::~HYDROData_Image()
 QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
-  QString anImageName = GetName();
+  QString anImageName = GetObjPyName();
 
   QString aFilePath = GetFilePath();
   if ( !aFilePath.isEmpty() )

diff --git a/src/HYDROData/HYDROData_ImmersibleZone.cxx b/src/HYDROData/HYDROData_ImmersibleZone.cxx
index 3cca1c65e0980dcfd97e7aee38beda98c83a4d62..3232ae96eeb2f7afcf9f6498fa044378d980336e 100644 (file)
--- a/src/HYDROData/HYDROData_ImmersibleZone.cxx
+++ b/src/HYDROData/HYDROData_ImmersibleZone.cxx
@@ -43,7 +43,7 @@ HYDROData_ImmersibleZone::~HYDROData_ImmersibleZone()
 QStringList HYDROData_ImmersibleZone::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
-  QString aZoneName = GetName();
+  QString aZoneName = GetObjPyName();
 
   QColor aFillingColor = GetFillingColor();
   aResList << QString( "filling_color = QColor( %1, %2, %3, %4 );" )

diff --git a/src/HYDROData/HYDROData_Obstacle.cxx b/src/HYDROData/HYDROData_Obstacle.cxx
index 295ad00c65761d0e0aceac44c74849421ced4770..2b8c7cb6f0829e386ef118f38eae33013fa89c16 100644 (file)
--- a/src/HYDROData/HYDROData_Obstacle.cxx
+++ b/src/HYDROData/HYDROData_Obstacle.cxx
@@ -53,7 +53,7 @@ HYDROData_Obstacle::~HYDROData_Obstacle()
 QStringList HYDROData_Obstacle::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
-  QString aName = GetName();
+  QString aName = GetObjPyName();
 
   // TODO
 

diff --git a/src/HYDROData/HYDROData_ObstacleAltitude.cxx b/src/HYDROData/HYDROData_ObstacleAltitude.cxx
index 3b535e316d6f33c83dab5935ba6cdbb1b3d73abb..d6310ff0182e25b76f097460ee4ed9d6938aacec 100644 (file)
--- a/src/HYDROData/HYDROData_ObstacleAltitude.cxx
+++ b/src/HYDROData/HYDROData_ObstacleAltitude.cxx
@@ -19,7 +19,7 @@ HYDROData_ObstacleAltitude::~HYDROData_ObstacleAltitude()
 QStringList HYDROData_ObstacleAltitude::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
-  QString aName = GetName();
+  QString aName = GetObjPyName();
 
   // TODO
 

diff --git a/src/HYDROData/HYDROData_Polyline3D.cxx b/src/HYDROData/HYDROData_Polyline3D.cxx
index 206dc384b6782a614417d54070e25a40ac3f1a32..6239b431bfb24027bc578ebc2625d39a72711e63 100644 (file)
--- a/src/HYDROData/HYDROData_Polyline3D.cxx
+++ b/src/HYDROData/HYDROData_Polyline3D.cxx
@@ -34,9 +34,16 @@ HYDROData_Polyline3D::~HYDROData_Polyline3D()
 QStringList HYDROData_Polyline3D::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
-  QString aName = GetName();
+  QString aName = GetObjPyName();
 
-  // TODO
+  Handle(HYDROData_PolylineXY) aRefPolyline = GetPolylineXY();
+  setPythonReferenceObject( theTreatedObjects, aResList, aRefPolyline, "SetPolylineXY" );
+
+  Handle(HYDROData_ProfileUZ) aRefProfile = GetProfileUZ();
+  setPythonReferenceObject( theTreatedObjects, aResList, aRefProfile, "SetProfileUZ" );
+
+  Handle(HYDROData_IAltitudeObject) aRefBathymetry = GetAltitudeObject();
+  setPythonReferenceObject( theTreatedObjects, aResList, aRefBathymetry, "SetAltitudeObject" );
 
   aResList << QString( "" );
   aResList << QString( "%1.Update();" ).arg( aName );

diff --git a/src/HYDROData/HYDROData_PolylineXY.cxx b/src/HYDROData/HYDROData_PolylineXY.cxx
index fd53ca013db9873502750e7b5dd8e8ef92dfe858..d418144a2e1865ef4b2fa25d71411bc399ed1274 100755 (executable)
--- a/src/HYDROData/HYDROData_PolylineXY.cxx
+++ b/src/HYDROData/HYDROData_PolylineXY.cxx
@@ -107,7 +107,7 @@ HYDROData_PolylineXY::~HYDROData_PolylineXY()
 QStringList HYDROData_PolylineXY::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
-  QString aPolylineName = GetName();
+  QString aPolylineName = GetObjPyName();
 
   // Set polilyne data
   NCollection_Sequence<TCollection_AsciiString>           aSectNames;

diff --git a/src/HYDROData/HYDROData_Profile.cxx b/src/HYDROData/HYDROData_Profile.cxx
index 8efcf23b572df25eff7cbe6a045aff05ba840350..6d0d68571bebd1c3266ae42f8c4c29681583de53 100755 (executable)
--- a/src/HYDROData/HYDROData_Profile.cxx
+++ b/src/HYDROData/HYDROData_Profile.cxx
@@ -43,7 +43,7 @@ HYDROData_Profile::~HYDROData_Profile()
 QStringList HYDROData_Profile::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
-  QString aName = GetName();
+  QString aName = GetObjPyName();
 
   QColor aFillingColor = GetFillingColor();
   aResList << QString( "filling_color = QColor( %1, %2, %3, %4 );" )

diff --git a/src/HYDROData/HYDROData_ProfileUZ.cxx b/src/HYDROData/HYDROData_ProfileUZ.cxx
index 492252980a9bd71df7508e7ec6afb975c724ebaa..8247cba5c64255dacdfc4933be416e3362ca48df 100755 (executable)
--- a/src/HYDROData/HYDROData_ProfileUZ.cxx
+++ b/src/HYDROData/HYDROData_ProfileUZ.cxx
@@ -31,7 +31,7 @@ HYDROData_ProfileUZ::~HYDROData_ProfileUZ()
 QStringList HYDROData_ProfileUZ::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
-  QString aName = GetName();
+  QString aName = GetObjPyName();
 
   // Set polilyne data
   const TCollection_AsciiString& aSectName = GetSectionName( 0 );

diff --git a/src/HYDROData/HYDROData_Region.cxx b/src/HYDROData/HYDROData_Region.cxx
index 6548310b060f65b8cff10effb770b90a8f9aede1..03c91d34ab557e81cc434e99b342247dadbb0e6a 100644 (file)
--- a/src/HYDROData/HYDROData_Region.cxx
+++ b/src/HYDROData/HYDROData_Region.cxx
@@ -44,7 +44,7 @@ HYDROData_Region::~HYDROData_Region()
 QStringList HYDROData_Region::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
-  QString aRegionName = GetName();
+  QString aRegionName = GetObjPyName();
 
   HYDROData_SequenceOfObjects aZones = GetZones();
   HYDROData_SequenceOfObjects::Iterator anIter( aZones );

diff --git a/src/HYDROData/HYDROData_River.cxx b/src/HYDROData/HYDROData_River.cxx
index 88d1bbce4bf49bdf2f0f68281cacc4a1fa6bfa15..bd22befb4a40028ef89a9136d2a0afef15d1818c 100644 (file)
--- a/src/HYDROData/HYDROData_River.cxx
+++ b/src/HYDROData/HYDROData_River.cxx
@@ -23,7 +23,7 @@ HYDROData_River::~HYDROData_River()
 QStringList HYDROData_River::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
-  QString aName = GetName();
+  QString aName = GetObjPyName();
 
   // TODO
 

diff --git a/src/HYDROData/HYDROData_Stream.cxx b/src/HYDROData/HYDROData_Stream.cxx
index 312657aedf5f2144c7c2d00ddbb241df0cf15213..fbe9212b3b94d89cb156c23d547c3acd52d87759 100644 (file)
--- a/src/HYDROData/HYDROData_Stream.cxx
+++ b/src/HYDROData/HYDROData_Stream.cxx
@@ -86,7 +86,7 @@ HYDROData_Stream::~HYDROData_Stream()
 QStringList HYDROData_Stream::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
-  QString aName = GetName();
+  QString aName = GetObjPyName();
 
   // TODO
 

diff --git a/src/HYDROData/HYDROData_StreamAltitude.cxx b/src/HYDROData/HYDROData_StreamAltitude.cxx
index ce2d971a63ef0122020ca242dadbad2a649746c0..0b70548d926db68482e3d8a51dd87d22ba6f8daf 100644 (file)
--- a/src/HYDROData/HYDROData_StreamAltitude.cxx
+++ b/src/HYDROData/HYDROData_StreamAltitude.cxx
@@ -47,7 +47,7 @@ HYDROData_StreamAltitude::~HYDROData_StreamAltitude()
 QStringList HYDROData_StreamAltitude::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
-  QString aName = GetName();
+  QString aName = GetObjPyName();
 
   // TODO
 

diff --git a/src/HYDROData/HYDROData_Zone.cxx b/src/HYDROData/HYDROData_Zone.cxx
index 4d96a6493ecf801c2b4cc122f8f6a08cd109bfed..d9789f00fca254fa0d74c655589531ad7a4d5f89 100644 (file)
--- a/src/HYDROData/HYDROData_Zone.cxx
+++ b/src/HYDROData/HYDROData_Zone.cxx
@@ -44,7 +44,7 @@ QStringList HYDROData_Zone::DumpToPython( MapOfTreatedObjects& theTreatedObjects
 
   // How can we get the shape? Mb Update() method to intersect the shapes of reference objects?
   // TODO:  TopoDS_Shape aRefShape = GetShape();
-  QString aName = GetName();
+  QString aName = GetObjPyName();
   aResList << QString( "" );
   aResList << QString( "%1.Update();" ).arg( aName );
   aResList << QString( "" );