Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...

[modules/hydro.git] / src / HYDROData / HYDROData_Channel.cxx

diff --git a/src/HYDROData/HYDROData_Channel.cxx b/src/HYDROData/HYDROData_Channel.cxx
index c49d1121e8978af0b9ff20aa5cdddd11bbd6e3be..cd4800b425a3ae9a488280cd910d9659eaf9b5f5 100644 (file)
--- a/src/HYDROData/HYDROData_Channel.cxx
+++ b/src/HYDROData/HYDROData_Channel.cxx
@@ -25,7 +25,6 @@
 #include "HYDROData_Projection.h"
 #include "HYDROData_ShapesGroup.h"
 #include "HYDROData_ShapesTool.h"
-#include "HYDROData_Pipes.h"
 #include "HYDROData_Stream.h"
 #include "HYDROData_Tool.h"
 
@@ -81,16 +80,17 @@ HYDROData_Channel::~HYDROData_Channel()
 {
 }
 
-QStringList HYDROData_Channel::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+QStringList HYDROData_Channel::DumpToPython( const QString& thePyScriptPath,
+                                             MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
   QString aName = GetObjPyName();
 
   Handle(HYDROData_Polyline3D) aRefGideLine = GetGuideLine();
-  setPythonReferenceObject( theTreatedObjects, aResList, aRefGideLine, "SetGuideLine" );
+  setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefGideLine, "SetGuideLine" );
 
   Handle(HYDROData_Profile) aRefProfile = GetProfile();
-  setPythonReferenceObject( theTreatedObjects, aResList, aRefProfile, "SetProfile" );
+  setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefProfile, "SetProfile" );
 
   aResList << QString( "" );
   aResList << QString( "%1.Update();" ).arg( aName );
@@ -114,16 +114,6 @@ HYDROData_SequenceOfObjects HYDROData_Channel::GetAllReferenceObjects() const
   return aResSeq;
 }
 
-TopoDS_Shape HYDROData_Channel::GetTopShape() const
-{
-  return getTopShape();
-}
-
-TopoDS_Shape HYDROData_Channel::GetShape3D() const
-{
-  return getShape3D();
-}
-
 bool HYDROData_Channel::CreatePresentations( const Handle(HYDROData_Polyline3D)& theGuideLine,
                                              const Handle(HYDROData_Profile)&    theProfile,
                                              PrsDefinition&                      thePrs )
@@ -353,26 +343,16 @@ bool HYDROData_Channel::IsHas2dPrs() const
   return true;
 }
 
-QColor HYDROData_Channel::DefaultFillingColor()
+QColor HYDROData_Channel::DefaultFillingColor() const
 {
   return QColor( Qt::blue );
 }
 
-QColor HYDROData_Channel::DefaultBorderColor()
+QColor HYDROData_Channel::DefaultBorderColor() const
 {
   return QColor( Qt::transparent );
 }
 
-QColor HYDROData_Channel::getDefaultFillingColor() const
-{
-  return DefaultFillingColor();
-}
-
-QColor HYDROData_Channel::getDefaultBorderColor() const
-{
-  return DefaultBorderColor();
-}
-
 bool HYDROData_Channel::SetGuideLine( const Handle(HYDROData_Polyline3D)& theGuideLine )
 {
   Handle(HYDROData_Polyline3D) aPrevGuideLine = GetGuideLine();