X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Channel.cxx;h=526589c534ddbc005c9bf3c861e65cd29b350adf;hb=8d4dba4a45855249f5eb022e9cc7dcff202bce3c;hp=ce33425827b78c59c072a28b8a7de57ced23a9cf;hpb=cde2ec476486fcd7c9b7b38ce814c648d73e7fd3;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Channel.cxx b/src/HYDROData/HYDROData_Channel.cxx
index ce334258..526589c5 100644
--- a/src/HYDROData/HYDROData_Channel.cxx
+++ b/src/HYDROData/HYDROData_Channel.cxx
@@ -54,6 +54,7 @@
 #include <TColStd_Array1OfReal.hxx>
 
 #include <TopTools_HArray1OfShape.hxx>
+#include <TopTools_SequenceOfShape.hxx>
 
 #include <TopoDS.hxx>
 #include <TopoDS_Wire.hxx>
@@ -70,7 +71,6 @@
 #define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 
-IMPLEMENT_STANDARD_HANDLE(HYDROData_Channel,HYDROData_ArtificialObject)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Channel,HYDROData_ArtificialObject)
 
 
@@ -95,8 +95,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( "" );
-  aResList << QString( "%1.Update();" ).arg( aName );
+  aResList << QString( "%1.Update()" ).arg( aName );
   aResList << QString( "" );
 
   return aResList;
@@ -119,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() ) {
@@ -155,8 +158,7 @@ bool HYDROData_Channel::CreatePresentations( const Handle(HYDROData_Polyline3D)&
   int aNbPoints = aPolylinePoints.Length();
   */
 
-  double aEqDistance = 1; // TODO: to pass via properties and OCAF
-  HYDROData_Polyline3D::Polyline3DPoints aPolylinePoints3D = theGuideLine->GetPoints( aEqDistance );
+  HYDROData_Polyline3D::Polyline3DPoints aPolylinePoints3D = theGuideLine->GetPoints( theEquiDistance );
   int aNbPoints = aPolylinePoints3D.Length();
   if ( aNbPoints < 2 )
     return false;
@@ -278,22 +280,26 @@ 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 );
-  if ( aRes ) {
-    thePrs.myPrs3D = aPrs.myPrs3D;
-    thePrs.myPrs2D = TopoDS::Face( aPrs.myPrs2D );
-    BRepBuilderAPI_MakeWire aMakeWire( aPrs.myLeftBank ) ;
-    thePrs.myLeftBank = aMakeWire.Wire();
-    aMakeWire = BRepBuilderAPI_MakeWire( aPrs.myRightBank );
-    thePrs.myRightBank = aMakeWire.Wire();
-    aMakeWire = BRepBuilderAPI_MakeWire( aPrs.myInlet );
-    thePrs.myInlet = aMakeWire.Wire();
-    aMakeWire = BRepBuilderAPI_MakeWire( aPrs.myOutlet );
-    thePrs.myOutlet = aMakeWire.Wire();
-  }
 
-  return aRes;
+  HYDROData_Stream::CreatePresentations( anArrayOfFPnt, anArrayOfLPnt, anArrOfProfiles, aPrs );
+  thePrs.myInlet =  aPrs.myInlet;       
+  thePrs.myOutlet =  aPrs.myOutlet; 
+  thePrs.myLeftBank = aPrs.myLeftBank; 
+  thePrs.myRightBank = aPrs.myRightBank;
+  thePrs.myPrs2D = TopoDS::Face(aPrs.myPrs2D); 
+  thePrs.myPrs3D = aPrs.myPrs3D; 
+
+  //thePrs.myPrs2D = TopoDS::Face( aPrs.myPrs2D );
+  //BRepBuilderAPI_MakeWire aMakeWire( aPrs.myLeftBank ) ;
+  //thePrs.myLeftBank = aMakeWire.Wire();
+  //aMakeWire = BRepBuilderAPI_MakeWire( aPrs.myRightBank );
+  //thePrs.myRightBank = aMakeWire.Wire();
+  //aMakeWire = BRepBuilderAPI_MakeWire( aPrs.myInlet );
+  //thePrs.myInlet = aMakeWire.Wire();
+  //aMakeWire = BRepBuilderAPI_MakeWire( aPrs.myOutlet );
+  //thePrs.myOutlet = aMakeWire.Wire();
+
+  return true;
 }
 
 void HYDROData_Channel::Update()
@@ -304,7 +310,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 );
@@ -322,9 +329,9 @@ void HYDROData_Channel::Update()
 
   TopTools_SequenceOfShape anOutletEdges;
   HYDROData_ShapesTool::ExploreShapeToShapes( aResultPrs.myOutlet, TopAbs_EDGE, anOutletEdges );
-
+    
+  RemoveGroupObjects();
   QString aLeftGroupName = GetName() + "_Left_Bank";
-
   Handle(HYDROData_ShapesGroup) aLeftGroup = createGroupObject();
   aLeftGroup->SetName( aLeftGroupName );
   aLeftGroup->SetShapes( aLeftBankEdges );
@@ -447,7 +454,7 @@ void HYDROData_Channel::RemoveProfile()
 
 ObjectKind HYDROData_Channel::getAltitudeObjectType() const
 {
-  DEBTRACE("HYDROData_Channel::getAltitudeObjectType");
+  //DEBTRACE("HYDROData_Channel::getAltitudeObjectType");
   return KIND_CHANNEL_ALTITUDE;
   //return KIND_STREAM_ALTITUDE;
 }
@@ -463,3 +470,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 );
+}