X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Channel.cxx;h=bf269244d08bd6abe8d4fce10332fff9432d07b7;hb=c7cf59e092fe050003d1e556715e3ac97acf6bd4;hp=1f2b6355977729c948959611a4d951ab31d74295;hpb=f2cd9ebfca8f8f58c6e98e30d2ebb387488016cc;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Channel.cxx b/src/HYDROData/HYDROData_Channel.cxx
index 1f2b6355..bf269244 100644
--- a/src/HYDROData/HYDROData_Channel.cxx
+++ b/src/HYDROData/HYDROData_Channel.cxx
@@ -1,3 +1,24 @@
+// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include "HYDROData_Channel.h"
 
@@ -19,7 +40,6 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Wire.hxx>
 #include <TopoDS_Vertex.hxx>
-#include <TopoDS_Face.hxx>
 
 //#define DEB_CHANNEL 1
 #ifdef DEB_CHANNEL
@@ -85,22 +105,18 @@ TopoDS_Shape HYDROData_Channel::GetShape3D() const
   return getShape3D();
 }
 
-void HYDROData_Channel::Update()
+bool HYDROData_Channel::CreatePresentations( const Handle(HYDROData_Polyline3D)& theGuideLine,
+                                            const Handle(HYDROData_Profile)&    theProfile,
+                                            PrsDefinition&                      thePrs )
 {
-  HYDROData_ArtificialObject::Update();
-
-  Handle(HYDROData_Polyline3D) aGuideLine = GetGuideLine();
-  Handle(HYDROData_Profile) aProfile = GetProfile();
-  if ( aGuideLine.IsNull() || aProfile.IsNull() )
-    return;
+  if ( theGuideLine.IsNull() || theProfile.IsNull() )
+    return false;
 
   // build 3d shape 
-  TopoDS_Wire aPathWire = TopoDS::Wire(aGuideLine->GetShape3D());
-  if(aPathWire.IsNull())
-    return;
-  TopoDS_Wire aProfileWire = TopoDS::Wire( aProfile->GetShape3D() );
-  if(aProfileWire.IsNull())
-    return;
+  TopoDS_Wire aPathWire = TopoDS::Wire( theGuideLine->GetShape3D() );
+  TopoDS_Wire aProfileWire = TopoDS::Wire( theProfile->GetShape3D() );
+  if ( aPathWire.IsNull() || aProfileWire.IsNull() )
+    return false;
 
 #ifdef DEB_CHANNEL
   BRepTools::Write( aPathWire, "guideline.brep" );
@@ -109,45 +125,57 @@ void HYDROData_Channel::Update()
 
   HYDROData_Canal3dAnd2d aChannelConstructor( aProfileWire, aPathWire );
   if( aChannelConstructor.GetStatus() != 0 )
-    return;
+    return false;
 
   aChannelConstructor.Create3dPresentation();
   aChannelConstructor.Create2dPresentation();
-  SetShape3D( aChannelConstructor.Get3dPresentation() );
-  SetTopShape( aChannelConstructor.Get2dPresentation() );
+  thePrs.myPrs3D = aChannelConstructor.Get3dPresentation();
+  thePrs.myPrs2D = aChannelConstructor.Get2dPresentation();
+
+  thePrs.myLeftBank = aChannelConstructor.GetLeftBank();
+  thePrs.myRightBank = aChannelConstructor.GetRightBank();
+  thePrs.myInlet = aChannelConstructor.GetInlet();
+  thePrs.myOutlet = aChannelConstructor.GetOutlet();
 
 #ifdef DEB_CHANNEL
-  BRepTools::Write( aChannelConstructor.Get2dPresentation(), "channel2d.brep" );
-  BRepTools::Write( aChannelConstructor.Get3dPresentation(), "channel3d.brep" );
+  BRepTools::Write( thePrs.myPrs2D, "channel2d.brep" );
+  BRepTools::Write( thePrs.myPrs3D, "channel3d.brep" );
+  HYDROData_ShapesTool::DumpShapeSubShapes( std::cout, "Top shape edges:", thePrs.myPrs2D, TopAbs_EDGE );
+  HYDROData_ShapesTool::DumpShapeSubShapes( std::cout, "Left bank edges:", thePrs.myLeftBank, TopAbs_EDGE );
+  HYDROData_ShapesTool::DumpShapeSubShapes( std::cout, "Right bank edges:", thePrs.myRightBank, TopAbs_EDGE );
+  HYDROData_ShapesTool::DumpShapeSubShapes( std::cout, "Inlet edges:", thePrs.myInlet, TopAbs_EDGE );
+  HYDROData_ShapesTool::DumpShapeSubShapes( std::cout, "Outlet edges:", thePrs.myOutlet, TopAbs_EDGE );
 #endif
 
-  TopAbs_ShapeEnum aType = GetTopShape().ShapeType();
+  return true;
+}
 
-  // Create groups for channel
-  TopoDS_Wire aLeftBank = aChannelConstructor.GetLeftBank();
-  TopoDS_Wire aRightBank = aChannelConstructor.GetRightBank();
-  TopoDS_Wire anInlet = aChannelConstructor.GetInlet();
-  TopoDS_Wire anOutlet = aChannelConstructor.GetOutlet();
+void HYDROData_Channel::Update()
+{
+  HYDROData_ArtificialObject::Update();
 
-#ifdef DEB_CHANNEL
-  HYDROData_ShapesTool::DumpShapeSubShapes( std::cout, "Top shape edges:", GetTopShape(), TopAbs_EDGE );
-  HYDROData_ShapesTool::DumpShapeSubShapes( std::cout, "Left bank edges:", aLeftBank, TopAbs_EDGE );
-  HYDROData_ShapesTool::DumpShapeSubShapes( std::cout, "Right bank edges:", aRightBank, TopAbs_EDGE );
-  HYDROData_ShapesTool::DumpShapeSubShapes( std::cout, "Inlet edges:", anInlet, TopAbs_EDGE );
-  HYDROData_ShapesTool::DumpShapeSubShapes( std::cout, "Outlet edges:", anOutlet, TopAbs_EDGE );
-#endif
+  Handle(HYDROData_Polyline3D) aGuideLine = GetGuideLine();
+  Handle(HYDROData_Profile) aProfile = GetProfile();
+
+  PrsDefinition aResultPrs;
+  if ( !CreatePresentations( aGuideLine, aProfile, aResultPrs ) )
+    return;
+
+  SetShape3D( aResultPrs.myPrs3D );
+  SetTopShape( aResultPrs.myPrs2D );
 
+  // Create groups for channel
   TopTools_SequenceOfShape aLeftBankEdges;
-  HYDROData_ShapesTool::ExploreShapeToShapes( aLeftBank, TopAbs_EDGE, aLeftBankEdges );
+  HYDROData_ShapesTool::ExploreShapeToShapes( aResultPrs.myLeftBank, TopAbs_EDGE, aLeftBankEdges );
 
   TopTools_SequenceOfShape aRightBankEdges;
-  HYDROData_ShapesTool::ExploreShapeToShapes( aRightBank, TopAbs_EDGE, aRightBankEdges );
+  HYDROData_ShapesTool::ExploreShapeToShapes( aResultPrs.myRightBank, TopAbs_EDGE, aRightBankEdges );
 
   TopTools_SequenceOfShape anInletEdges;
-  HYDROData_ShapesTool::ExploreShapeToShapes( anInlet, TopAbs_EDGE, anInletEdges );
+  HYDROData_ShapesTool::ExploreShapeToShapes( aResultPrs.myInlet, TopAbs_EDGE, anInletEdges );
 
   TopTools_SequenceOfShape anOutletEdges;
-  HYDROData_ShapesTool::ExploreShapeToShapes( anOutlet, TopAbs_EDGE, anOutletEdges );
+  HYDROData_ShapesTool::ExploreShapeToShapes( aResultPrs.myOutlet, TopAbs_EDGE, anOutletEdges );
 
   QString aLeftGroupName = GetName() + "_Left_Bank";