Merge remote-tracking branch 'origin/pre/IMPS_2016' into BR_HYDRO_IMPS_2016

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

diff --git a/src/HYDROData/HYDROData_Channel.cxx b/src/HYDROData/HYDROData_Channel.cxx
index 79fd3d2564e24830b202419a2eb4579fc084c94a..09ba1c648d875557d293ebf4c927ec17431314ae 100644 (file)
--- a/src/HYDROData/HYDROData_Channel.cxx
+++ b/src/HYDROData/HYDROData_Channel.cxx
@@ -280,23 +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 = false;
-  /*TODO: 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()
@@ -326,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 );
@@ -451,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;
 }