X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Channel.cxx;h=b7f8c7a8a46875e95f32ab729b045ef435eb35aa;hb=e7225e329739e01faed6682de0bc83cf84c28de6;hp=b2e9d1ccaf333e7b83f27ddb7d3063cfec7c894d;hpb=29527ae70e9cc00e9f7017f9ab4f7af4091dbf7f;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Channel.cxx b/src/HYDROData/HYDROData_Channel.cxx
index b2e9d1cc..b7f8c7a8 100644
--- a/src/HYDROData/HYDROData_Channel.cxx
+++ b/src/HYDROData/HYDROData_Channel.cxx
@@ -13,14 +13,12 @@
 #include <BRepOffsetAPI_MakePipeShell.hxx>
 #include <BRepOffsetAPI_MakePipe.hxx>
 #include <BRepCheck_Analyzer.hxx>
-#include <BRepTools.hxx>
 
 #include <TopExp.hxx>
 
 #include <TopoDS.hxx>
 #include <TopoDS_Wire.hxx>
 #include <TopoDS_Vertex.hxx>
-#include <TopoDS_Face.hxx>
 
 //#define DEB_CHANNEL 1
 #ifdef DEB_CHANNEL
@@ -46,8 +44,17 @@ HYDROData_Channel::~HYDROData_Channel()
 QStringList HYDROData_Channel::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
+  QString aName = GetObjPyName();
+
+  Handle(HYDROData_Polyline3D) aRefGideLine = GetGuideLine();
+  setPythonReferenceObject( theTreatedObjects, aResList, aRefGideLine, "SetGuideLine" );
+
+  Handle(HYDROData_Profile) aRefProfile = GetProfile();
+  setPythonReferenceObject( theTreatedObjects, aResList, aRefProfile, "SetProfile" );
 
-  // TODO
+  aResList << QString( "" );
+  aResList << QString( "%1.Update();" ).arg( aName );
+  aResList << QString( "" );
 
   return aResList;
 }
@@ -77,54 +84,77 @@ 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" );
   BRepTools::Write( aProfileWire, "profile.brep" );
+#endif
 
   HYDROData_Canal3dAnd2d aChannelConstructor( aProfileWire, aPathWire );
+  if( aChannelConstructor.GetStatus() != 0 )
+    return false;
+
   aChannelConstructor.Create3dPresentation();
   aChannelConstructor.Create2dPresentation();
-  SetShape3D( aChannelConstructor.Get3dPresentation() );
-  SetTopShape( aChannelConstructor.Get2dPresentation() );
+  thePrs.myPrs3D = aChannelConstructor.Get3dPresentation();
+  thePrs.myPrs2D = aChannelConstructor.Get2dPresentation();
 
-  BRepTools::Write( aChannelConstructor.Get2dPresentation(), "channel2d.brep" );
-  BRepTools::Write( aChannelConstructor.Get3dPresentation(), "channel3d.brep" );
+  thePrs.myLeftBank = aChannelConstructor.GetLeftBank();
+  thePrs.myRightBank = aChannelConstructor.GetRightBank();
+  thePrs.myInlet = aChannelConstructor.GetInlet();
+  thePrs.myOutlet = aChannelConstructor.GetOutlet();
 
-  TopAbs_ShapeEnum aType = GetTopShape().ShapeType();
+#ifdef DEB_CHANNEL
+  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
 
-  // Create groups for channel
-  TopoDS_Wire aLeftBank = aChannelConstructor.GetLeftBank();
-  TopoDS_Wire aRightBank = aChannelConstructor.GetRightBank();
-  TopoDS_Wire anInlet = aChannelConstructor.GetInlet();
-  TopoDS_Wire anOutlet = aChannelConstructor.GetOutlet();
+  return true;
+}
+
+void HYDROData_Channel::Update()
+{
+  HYDROData_ArtificialObject::Update();
+
+  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";
 
@@ -151,6 +181,11 @@ void HYDROData_Channel::Update()
   anOutGroup->SetShapes( anOutletEdges );
 }
 
+bool HYDROData_Channel::IsHas2dPrs() const
+{
+  return true;
+}
+
 QColor HYDROData_Channel::DefaultFillingColor()
 {
   return QColor( Qt::blue );