Dump of profile is implemented.

diff --git a/src/HYDROData/HYDROData_AltitudeObject.cxx b/src/HYDROData/HYDROData_AltitudeObject.cxx
index 941582f90dc12c569d0109cb427094331a8a643a..0898db1db55e0ecb71ac3de7ec590bd716986a74 100644 (file)
--- a/src/HYDROData/HYDROData_AltitudeObject.cxx
+++ b/src/HYDROData/HYDROData_AltitudeObject.cxx
@@ -19,10 +19,14 @@ HYDROData_AltitudeObject::~HYDROData_AltitudeObject()
 QStringList HYDROData_AltitudeObject::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
-  QString anAltitudeName = GetName();
+  QString aName = GetName();
 
   // TODO
 
+  aResList << QString( "" );
+  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 7ac8a23762e49f32211bf8d08b93184cc35a0a45..d9132207c2fc24ac8d68fda340e8e7fb75591082 100644 (file)
--- a/src/HYDROData/HYDROData_Bathymetry.cxx
+++ b/src/HYDROData/HYDROData_Bathymetry.cxx
@@ -50,6 +50,10 @@ QStringList HYDROData_Bathymetry::DumpToPython( MapOfTreatedObjects& theTreatedO
   aResList << QString( "%1.ImportFromFile( \"%2\" );" )
               .arg( aBathymetryName ).arg( aFilePath.ToCString() );
 
+  aResList << QString( "" );
+  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 7ee3bd8cfb085eab23fb50f1982d3685d6de8b30..9813ae94d501d1f80e61fef10b951c96067d4dfd 100644 (file)
--- a/src/HYDROData/HYDROData_CalculationCase.cxx
+++ b/src/HYDROData/HYDROData_CalculationCase.cxx
@@ -137,6 +137,10 @@ QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTre
     // TODO
   }
 
+  aResList << QString( "" );
+  aResList << QString( "%1.Update();" ).arg( aCalculName );
+  aResList << QString( "" );
+
   return aResList;
 }
 

diff --git a/src/HYDROData/HYDROData_Channel.cxx b/src/HYDROData/HYDROData_Channel.cxx
index b2e9d1ccaf333e7b83f27ddb7d3063cfec7c894d..d0d643762dd3a2e9f00caa2a8c4618f205370b09 100644 (file)
--- a/src/HYDROData/HYDROData_Channel.cxx
+++ b/src/HYDROData/HYDROData_Channel.cxx
@@ -46,9 +46,14 @@ HYDROData_Channel::~HYDROData_Channel()
 QStringList HYDROData_Channel::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
+  QString aName = GetName();
 
   // TODO
 
+  aResList << QString( "" );
+  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 5d20481c3a822ecada5e24b8146a55304ccfb6b7..378ccc6d7f437cb43eadad06c9bee469bf6531ce 100644 (file)
--- a/src/HYDROData/HYDROData_Confluence.cxx
+++ b/src/HYDROData/HYDROData_Confluence.cxx
@@ -23,9 +23,14 @@ HYDROData_Confluence::~HYDROData_Confluence()
 QStringList HYDROData_Confluence::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
+  QString aName = GetName();
 
   // TODO
 
+  aResList << QString( "" );
+  aResList << QString( "%1.Update();" ).arg( aName );
+  aResList << QString( "" );
+
   return aResList;
 }
 

diff --git a/src/HYDROData/HYDROData_Digue.cxx b/src/HYDROData/HYDROData_Digue.cxx
index 8fb46694a37b6f4f9b7db6bbcdbf52d8b5e529f0..1312e1d755922545c061c578cccc7b748cf2b3ab 100644 (file)
--- a/src/HYDROData/HYDROData_Digue.cxx
+++ b/src/HYDROData/HYDROData_Digue.cxx
@@ -24,9 +24,14 @@ 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;
 }
 

diff --git a/src/HYDROData/HYDROData_Document.cxx b/src/HYDROData/HYDROData_Document.cxx
index a96ac998efc70fc15f7d9d9752e24a7a586245a4..4c2fb49f33ef636d89915bd5d66f183fd7f80325 100644 (file)
--- a/src/HYDROData/HYDROData_Document.cxx
+++ b/src/HYDROData/HYDROData_Document.cxx
@@ -232,7 +232,7 @@ QStringList HYDROData_Document::DumpToPython( MapOfTreatedObjects& theTreatedObj
 
   QStringList aResScript;
 
-  aResScript << QString( "from HYDROpy import *" );
+  aResScript << QString( "from HYDROPy import *" );
   aResScript << QString( "from PyQt4.QtCore import *" );
   aResScript << QString( "from PyQt4.QtGui import *" );
   aResScript << QString( "" );

diff --git a/src/HYDROData/HYDROData_Image.cxx b/src/HYDROData/HYDROData_Image.cxx
index 108ba6423376de5e85fe0770c329df86571a041e..da75db7692bacae52aac61968f2ec3163ad14bbb 100644 (file)
--- a/src/HYDROData/HYDROData_Image.cxx
+++ b/src/HYDROData/HYDROData_Image.cxx
@@ -136,6 +136,8 @@ QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObject
     aResList << QString( "%1.Update();" ).arg( anImageName );
   }
 
+  aResList << QString( "" );
+
   return aResList;
 }
 

diff --git a/src/HYDROData/HYDROData_ImmersibleZone.cxx b/src/HYDROData/HYDROData_ImmersibleZone.cxx
index 69cfebddb62a427bf78febfa141b28d78ef53c7f..3cca1c65e0980dcfd97e7aee38beda98c83a4d62 100644 (file)
--- a/src/HYDROData/HYDROData_ImmersibleZone.cxx
+++ b/src/HYDROData/HYDROData_ImmersibleZone.cxx
@@ -65,6 +65,10 @@ QStringList HYDROData_ImmersibleZone::DumpToPython( MapOfTreatedObjects& theTrea
   Handle(HYDROData_PolylineXY) aRefPolyline = GetPolyline();
   setPythonReferenceObject( theTreatedObjects, aResList, aRefPolyline, "SetPolyline" );
 
+  aResList << QString( "" );
+  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 5572a892024d6d53856251a2b60da0396d277f24..295ad00c65761d0e0aceac44c74849421ced4770 100644 (file)
--- a/src/HYDROData/HYDROData_Obstacle.cxx
+++ b/src/HYDROData/HYDROData_Obstacle.cxx
@@ -53,9 +53,14 @@ HYDROData_Obstacle::~HYDROData_Obstacle()
 QStringList HYDROData_Obstacle::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
+  QString aName = GetName();
 
   // TODO
 
+  aResList << QString( "" );
+  aResList << QString( "%1.Update();" ).arg( aName );
+  aResList << QString( "" );
+
   return aResList;
 }
 

diff --git a/src/HYDROData/HYDROData_ObstacleAltitude.cxx b/src/HYDROData/HYDROData_ObstacleAltitude.cxx
index 0b62773b7ad4f7d374835652bab6647433f51137..3b535e316d6f33c83dab5935ba6cdbb1b3d73abb 100644 (file)
--- a/src/HYDROData/HYDROData_ObstacleAltitude.cxx
+++ b/src/HYDROData/HYDROData_ObstacleAltitude.cxx
@@ -19,9 +19,14 @@ HYDROData_ObstacleAltitude::~HYDROData_ObstacleAltitude()
 QStringList HYDROData_ObstacleAltitude::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
+  QString aName = GetName();
 
   // TODO
 
+  aResList << QString( "" );
+  aResList << QString( "%1.Update();" ).arg( aName );
+  aResList << QString( "" );
+
   return aResList;
 }
 

diff --git a/src/HYDROData/HYDROData_Polyline3D.cxx b/src/HYDROData/HYDROData_Polyline3D.cxx
index 3931be8f1bd8a1544054836b3d7975b90e79a018..206dc384b6782a614417d54070e25a40ac3f1a32 100644 (file)
--- a/src/HYDROData/HYDROData_Polyline3D.cxx
+++ b/src/HYDROData/HYDROData_Polyline3D.cxx
@@ -34,9 +34,14 @@ HYDROData_Polyline3D::~HYDROData_Polyline3D()
 QStringList HYDROData_Polyline3D::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
+  QString aName = GetName();
 
   // TODO
 
+  aResList << QString( "" );
+  aResList << QString( "%1.Update();" ).arg( aName );
+  aResList << QString( "" );
+
   return aResList;
 }
 

diff --git a/src/HYDROData/HYDROData_PolylineXY.cxx b/src/HYDROData/HYDROData_PolylineXY.cxx
index f462bff3e378a59f308e24c76cecb83f5c9863b6..f9137e66d6fd0d1520c5821efc922e86800c4160 100755 (executable)
--- a/src/HYDROData/HYDROData_PolylineXY.cxx
+++ b/src/HYDROData/HYDROData_PolylineXY.cxx
@@ -124,7 +124,7 @@ QStringList HYDROData_PolylineXY::DumpToPython( MapOfTreatedObjects& theTreatedO
     aResList << QString( "%1.AddSection( \"%2\", %3, %4 );" ).arg( aPolylineName )
                 .arg( aSectName.ToCString() ).arg( aSectType ).arg( aSectClosure );
 
-    HYDROData_PolylineXY::PointsList aSectPointsList = GetPoints( i );
+    HYDROData_IPolyline::PointsList aSectPointsList = GetPoints( i - 1 );
     for ( int k = 1, aNbPoints = aSectPointsList.Size(); k <= aNbPoints; ++k )
     {
       const Point& aSectPoint = aSectPointsList.Value( k );
@@ -134,6 +134,10 @@ QStringList HYDROData_PolylineXY::DumpToPython( MapOfTreatedObjects& theTreatedO
     }
   }
 
+  aResList << QString( "" );
+  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 03c6ba856d899438800d28680cc2ddc9b5ee8e71..ec1b9d7f809294e56d78206c00419527da3ed493 100755 (executable)
--- a/src/HYDROData/HYDROData_Profile.cxx
+++ b/src/HYDROData/HYDROData_Profile.cxx
@@ -43,8 +43,61 @@ HYDROData_Profile::~HYDROData_Profile()
 QStringList HYDROData_Profile::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
+  QString aName = GetName();
+
+  QColor aFillingColor = GetFillingColor();
+  aResList << QString( "filling_color = QColor( %1, %2, %3, %4 );" )
+              .arg( aFillingColor.red()  ).arg( aFillingColor.green() )
+              .arg( aFillingColor.blue() ).arg( aFillingColor.alpha() );
+  aResList << QString( "%1.SetFillingColor( filling_color );" ).arg( aName );
+  aResList << QString( "" );
+
+  QColor aBorderColor = GetBorderColor();
+  aResList << QString( "border_color = QColor( %1, %2, %3, %4 );" )
+              .arg( aBorderColor.red()  ).arg( aBorderColor.green() )
+              .arg( aBorderColor.blue() ).arg( aBorderColor.alpha() );
+  aResList << QString( "%1.SetBorderColor( border_color );" ).arg( aName );
+  aResList << QString( "" );
+
+  //TCollection_AsciiString aFilePath = GetFilePath();
+  //if ( !aFilePath.IsEmpty() ) 
+  //{
+  //  aResList << QString( "%1.ImportFromFile( \"%2\" );" )
+  //            .arg( aName ).arg( aFilePath.ToCString() );
+  //}
+
+  bool isValid = IsValid();
+  QString aGap = QString().fill( ' ', 11 );
+  
+  aResList << QString( "points = [" );
 
-  //TODO
+  if ( isValid )
+  {
+    HYDROData_Profile::ProfilePoints aPointsList = GetProfilePoints();
+    for ( int k = 1, aNbPoints = aPointsList.Size(); k <= aNbPoints; ++k )
+    {
+      const ProfilePoint& aPoint = aPointsList.Value( k );
+      aResList << QString( aGap + "gp_XYZ( %1, %2, %3 )%4" ).arg( aPoint.X() ).arg( aPoint.Y() ).arg( aPoint.Z() )
+        .arg( ( k < aNbPoints ? "," : "" ) );
+    }
+    aResList << QString( "];" );
+    aResList << QString( "%1.SetProfilePoints( points );" ).arg( aName );
+  }
+  else
+  {
+    HYDROData_IPolyline::PointsList aPointsList = GetParametricPoints();
+    for ( int k = 1, aNbPoints = aPointsList.Size(); k <= aNbPoints; ++k )
+    {
+      const HYDROData_IPolyline::Point& aPoint = aPointsList.Value( k );
+      aResList << QString( aGap + "gp_XY( %1, %2 )%3" ).arg( aPoint.X() ).arg( aPoint.Y() )
+        .arg( ( k < aNbPoints ? "," : "" ) );
+    }
+    aResList << QString( "];" );
+    aResList << QString( "%1.SetParametricPoints( points )" ).arg( aName );
+  }
+  aResList << QString( "" );
+  aResList << QString( "%1.Update();" ).arg( aName );
+  aResList << QString( "" );
 
   return aResList;
 }

diff --git a/src/HYDROData/HYDROData_ProfileUZ.cxx b/src/HYDROData/HYDROData_ProfileUZ.cxx
index 649c8096a824f2998204787f15d24015218032c8..09fc5234de188ee49bcd28eb8e02cc8cac57873c 100755 (executable)
--- a/src/HYDROData/HYDROData_ProfileUZ.cxx
+++ b/src/HYDROData/HYDROData_ProfileUZ.cxx
@@ -28,6 +28,35 @@ HYDROData_ProfileUZ::~HYDROData_ProfileUZ()
 {
 }
 
+QStringList HYDROData_ProfileUZ::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+{
+  QStringList aResList = dumpObjectCreation( theTreatedObjects );
+  QString aName = GetName();
+
+  // Set polilyne data
+  const TCollection_AsciiString& aSectName = GetSectionName( 0 );
+  const SectionType& aSectType = GetSectionType( 0 );
+  bool aSectClosure = IsClosedSection( 0 );
+
+  aResList << QString( "%1.AddSection( \"%2\", %3, %4 );" ).arg( aName )
+              .arg( aSectName.ToCString() ).arg( aSectType ).arg( aSectClosure );
+
+  HYDROData_IPolyline::PointsList aSectPointsList = GetPoints( 0 );
+  for ( int k = 1, aNbPoints = aSectPointsList.Size(); k <= aNbPoints; ++k )
+  {
+    const Point& aSectPoint = aSectPointsList.Value( k );
+
+    aResList << QString( "%1.AddPoint( 0, QPointF( %2, %3 ) );" ).arg( aName )
+      .arg( aSectPoint.X() ).arg( aSectPoint.Y() );
+  }
+
+  aResList << QString( "" );
+  aResList << QString( "%1.Update();" ).arg( aName );
+  aResList << QString( "" );
+
+  return aResList;
+}
+
 TopoDS_Shape HYDROData_ProfileUZ::GetShape() const
 {
   // TODO

diff --git a/src/HYDROData/HYDROData_ProfileUZ.h b/src/HYDROData/HYDROData_ProfileUZ.h
index 0e1dcd0d54892d29908675717db31e13894cb624..e948b4d323c733cc0e806bea88c3188126eef1fe 100644 (file)
--- a/src/HYDROData/HYDROData_ProfileUZ.h
+++ b/src/HYDROData/HYDROData_ProfileUZ.h
@@ -30,6 +30,11 @@ public:
    */
   HYDRODATA_EXPORT virtual const ObjectKind GetKind() const {return KIND_PROFILEUZ;}
 
+  /**
+   * Dump object to Python script representation.
+   */
+  HYDRODATA_EXPORT virtual QStringList DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const;
+
 public:
 
   /**

diff --git a/src/HYDROData/HYDROData_Region.cxx b/src/HYDROData/HYDROData_Region.cxx
index b5e05cb7e779dc7403f9303924f987c6d0190f5e..406993746966327df83abb31f0c2c5134f9b5179 100644 (file)
--- a/src/HYDROData/HYDROData_Region.cxx
+++ b/src/HYDROData/HYDROData_Region.cxx
@@ -55,6 +55,9 @@ QStringList HYDROData_Region::DumpToPython( MapOfTreatedObjects& theTreatedObjec
     if ( !aRefZone.IsNull() )
       setPythonReferenceObject( theTreatedObjects, aResList, aRefZone, "AddZone" );
   }
+
+  aResList << QString( "" );
+  aResList << QString( "%1.Update();" ).arg( aRegionName );
   aResList << QString( "" );
 
   return aResList;

diff --git a/src/HYDROData/HYDROData_River.cxx b/src/HYDROData/HYDROData_River.cxx
index 27be9ea99109af1c31da2b0da07c1be0ba51b113..88d1bbce4bf49bdf2f0f68281cacc4a1fa6bfa15 100644 (file)
--- a/src/HYDROData/HYDROData_River.cxx
+++ b/src/HYDROData/HYDROData_River.cxx
@@ -23,9 +23,14 @@ HYDROData_River::~HYDROData_River()
 QStringList HYDROData_River::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
+  QString aName = GetName();
 
   // TODO
 
+  aResList << QString( "" );
+  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 07bf9971d8766716400f9259232a658b484eab71..312657aedf5f2144c7c2d00ddbb241df0cf15213 100644 (file)
--- a/src/HYDROData/HYDROData_Stream.cxx
+++ b/src/HYDROData/HYDROData_Stream.cxx
@@ -86,9 +86,14 @@ HYDROData_Stream::~HYDROData_Stream()
 QStringList HYDROData_Stream::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
+  QString aName = GetName();
 
   // TODO
 
+  aResList << QString( "" );
+  aResList << QString( "%1.Update();" ).arg( aName );
+  aResList << QString( "" );
+
   return aResList;
 }
 

diff --git a/src/HYDROData/HYDROData_StreamAltitude.cxx b/src/HYDROData/HYDROData_StreamAltitude.cxx
index bbcbb566e4f26ac0848811878b90f3d5f9f25d5b..ce2d971a63ef0122020ca242dadbad2a649746c0 100644 (file)
--- a/src/HYDROData/HYDROData_StreamAltitude.cxx
+++ b/src/HYDROData/HYDROData_StreamAltitude.cxx
@@ -47,9 +47,14 @@ HYDROData_StreamAltitude::~HYDROData_StreamAltitude()
 QStringList HYDROData_StreamAltitude::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
+  QString aName = GetName();
 
   // TODO
 
+  aResList << QString( "" );
+  aResList << QString( "%1.Update();" ).arg( aName );
+  aResList << QString( "" );
+
   return aResList;
 }
 

diff --git a/src/HYDROData/HYDROData_Zone.cxx b/src/HYDROData/HYDROData_Zone.cxx
index f90f02873d021154215d5a7f5f194dbea5b8a0df..4d96a6493ecf801c2b4cc122f8f6a08cd109bfed 100644 (file)
--- a/src/HYDROData/HYDROData_Zone.cxx
+++ b/src/HYDROData/HYDROData_Zone.cxx
@@ -44,6 +44,10 @@ 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();
+  aResList << QString( "" );
+  aResList << QString( "%1.Update();" ).arg( aName );
+  aResList << QString( "" );
 
   return aResList;
 }