X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Channel.cxx;h=79fd3d2564e24830b202419a2eb4579fc084c94a;hb=110c68a935c71ebdb6f305fa992f1e6c989ab859;hp=9a8fae8657a8a4250d6aa3263216fb65d23de6a4;hpb=e744ba34fd38d6744d11b54cd15b6f86350695b2;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Channel.cxx b/src/HYDROData/HYDROData_Channel.cxx
index 9a8fae86..79fd3d25 100644
--- a/src/HYDROData/HYDROData_Channel.cxx
+++ b/src/HYDROData/HYDROData_Channel.cxx
@@ -59,7 +59,7 @@
 #include <TopoDS_Wire.hxx>
 #include <TopoDS_Vertex.hxx>
 
-//#define DEB_CHANNEL 1
+#define DEB_CHANNEL 1
 #ifdef DEB_CHANNEL
 #include <BRepTools.hxx>
 #endif
@@ -67,6 +67,9 @@
 #include <QColor>
 #include <QStringList>
 
+#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+
 IMPLEMENT_STANDARD_HANDLE(HYDROData_Channel,HYDROData_ArtificialObject)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Channel,HYDROData_ArtificialObject)
 
@@ -80,19 +83,22 @@ 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( "%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;
@@ -115,7 +121,8 @@ HYDROData_SequenceOfObjects HYDROData_Channel::GetAllReferenceObjects() const
 
 bool HYDROData_Channel::CreatePresentations( const Handle(HYDROData_Polyline3D)& theGuideLine,
                                              const Handle(HYDROData_Profile)&    theProfile,
-                                             PrsDefinition&                      thePrs )
+                                             PrsDefinition&                      thePrs,
+                                             double                              theEquiDistance )
 {
   // Check input parameters
   if ( theGuideLine.IsNull() || theProfile.IsNull() ) {
@@ -129,8 +136,14 @@ bool HYDROData_Channel::CreatePresentations( const Handle(HYDROData_Polyline3D)&
   }
 
 #ifdef DEB_CHANNEL
-  BRepTools::Write( aPathWire, "guideline.brep" );
-  BRepTools::Write( aProfileWire, "profile.brep" );
+  std::string brepName = "guideline_";
+  brepName += theGuideLine->GetName().toStdString();
+  brepName += ".brep";
+  BRepTools::Write( aPathWire, brepName.c_str() );
+  brepName = "profile_";
+  brepName += theGuideLine->GetName().toStdString();
+  brepName += ".brep";
+  BRepTools::Write( aProfileWire, brepName.c_str() );
 #endif
 
   // Pre-processing
@@ -145,18 +158,18 @@ bool HYDROData_Channel::CreatePresentations( const Handle(HYDROData_Polyline3D)&
   int aNbPoints = aPolylinePoints.Length();
   */
 
-  HYDROData_Polyline3D::Polyline3DPoints aPolylinePoints3D = theGuideLine->GetPoints();
+  HYDROData_Polyline3D::Polyline3DPoints aPolylinePoints3D = theGuideLine->GetPoints( theEquiDistance );
   int aNbPoints = aPolylinePoints3D.Length();
-  if ( aNbPoints < 2 ) {
+  if ( aNbPoints < 2 )
     return false;
-  }
   
   // Get tangent in each point of the guide line ( 2D )
   TColgp_Array1OfDir aTangents( 1, aNbPoints );
 
   HYDROData_IPolyline::SectionType aSectionType = aPolylineXY->GetSectionType( 0 );
   
-  if ( aSectionType == HYDROData_IPolyline::SECTION_POLYLINE ) {
+  if( aSectionType == HYDROData_IPolyline::SECTION_POLYLINE )
+  {
     for ( int i = 1; i <= aNbPoints; ++i ) {
       gp_XYZ aPnt = aPolylinePoints3D.Value( i );
       aPnt.SetZ( 0. );
@@ -267,8 +280,9 @@ bool HYDROData_Channel::CreatePresentations( const Handle(HYDROData_Polyline3D)&
   // Create presentation
   HYDROData_Stream::PrsDefinition aPrs;
   Handle(TopTools_HArray1OfShape) anArrOf2DProfiles; // we don't need 2D profiles for channel/digue presentation
-  bool aRes = HYDROData_Stream::CreatePresentations( anArrayOfFPnt, anArrayOfLPnt,
-                                                     anArrOfProfiles, anArrOf2DProfiles, aPrs );
+  bool aRes = false;
+  /*TODO: HYDROData_Stream::CreatePresentations( anArrayOfFPnt, anArrayOfLPnt,
+                                                     anArrOfProfiles, anArrOf2DProfiles, aPrs );*/
   if ( aRes ) {
     thePrs.myPrs3D = aPrs.myPrs3D;
     thePrs.myPrs2D = TopoDS::Face( aPrs.myPrs2D );
@@ -293,7 +307,8 @@ void HYDROData_Channel::Update()
   Handle(HYDROData_Profile) aProfile = GetProfile();
 
   PrsDefinition aResultPrs;
-  if ( !CreatePresentations( aGuideLine, aProfile, aResultPrs ) )
+  double anEquiDistance = GetEquiDistance();
+  if ( !CreatePresentations( aGuideLine, aProfile, aResultPrs, anEquiDistance ) )
     return;
 
   SetShape3D( aResultPrs.myPrs3D );
@@ -436,7 +451,9 @@ void HYDROData_Channel::RemoveProfile()
 
 ObjectKind HYDROData_Channel::getAltitudeObjectType() const
 {
-  return KIND_STREAM_ALTITUDE;
+  DEBTRACE("HYDROData_Channel::getAltitudeObjectType");
+  return KIND_CHANNEL_ALTITUDE;
+  //return KIND_STREAM_ALTITUDE;
 }
 
 TopoDS_Shape HYDROData_Channel::GetLeftShape() const
@@ -450,3 +467,14 @@ TopoDS_Shape HYDROData_Channel::GetRightShape() const
   HYDROData_SequenceOfObjects aGroups = GetGroups();
   return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 2);
 }
+
+void HYDROData_Channel::SetEquiDistance( double theEquiDistance )
+{
+  double anEquiDistance = theEquiDistance > 0 ? theEquiDistance : 1E-3;
+  SetDouble( DataTag_EquiDistance, theEquiDistance );
+}
+
+double HYDROData_Channel::GetEquiDistance() const
+{
+  return GetDouble( DataTag_EquiDistance, 1.0 );
+}