X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Channel.cxx;h=0f31fc1f1ac737f96bbd000251424402e7e918d7;hb=e7e76450be3fadf6ad263f78e10ceb8cd1f70deb;hp=14ac7fb6e94bda367fe9f2617240d7c84a0aadf7;hpb=21cfaf7ae27087a9fe7f719d8a62df0a28102da9;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Channel.cxx b/src/HYDROData/HYDROData_Channel.cxx index 14ac7fb6..0f31fc1f 100644 --- a/src/HYDROData/HYDROData_Channel.cxx +++ b/src/HYDROData/HYDROData_Channel.cxx @@ -27,8 +27,10 @@ #include "HYDROData_ShapesTool.h" #include "HYDROData_Stream.h" #include "HYDROData_Tool.h" +#include "HYDROData_ChannelAltitude.h" #include +#include #include #include @@ -54,11 +56,14 @@ #include #include +#include #include #include #include +#include + #define DEB_CHANNEL 1 #ifdef DEB_CHANNEL #include @@ -70,7 +75,6 @@ #define _DEVDEBUG_ #include "HYDRO_trace.hxx" -IMPLEMENT_STANDARD_HANDLE(HYDROData_Channel,HYDROData_ArtificialObject) IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Channel,HYDROData_ArtificialObject) @@ -84,7 +88,7 @@ HYDROData_Channel::~HYDROData_Channel() } QStringList HYDROData_Channel::DumpToPython( const QString& thePyScriptPath, - MapOfTreatedObjects& theTreatedObjects ) const + MapOfTreatedObjects& theTreatedObjects ) const { QStringList aResList = dumpObjectCreation( theTreatedObjects ); QString aName = GetObjPyName(); @@ -92,8 +96,25 @@ QStringList HYDROData_Channel::DumpToPython( const QString& thePyScriptPath, Handle(HYDROData_Polyline3D) aRefGideLine = GetGuideLine(); setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefGideLine, "SetGuideLine" ); - Handle(HYDROData_Profile) aRefProfile = GetProfile(); - setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefProfile, "SetProfile" ); + bool mode = GetProfileMode(); + QString aMode = mode ? "True" : "False" ; + aResList << QString( "%1.SetProfileMode( %2 )" ).arg( aName ).arg( aMode ); + + if (mode) + { + Handle(HYDROData_Profile) aRefProfile = GetProfile(); + setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefProfile, "SetProfile" ); + } + else + { + QString aLC = QString::number( GetLCValue(), 'f', 3 ); + QString aDeltaZ = QString::number( GetDeltaZValue(), 'f', 3 ); + QString aCoteZ = QString::number( GetCoteZValue(), 'f', 3 ); + + aResList << QString( "%1.SetLCValue( %2 )" ).arg( aName ).arg( aLC ); + aResList << QString( "%1.SetDeltaZValue( %2 )" ).arg( aName ).arg( aDeltaZ ); + aResList << QString( "%1.SetCoteZValue( %2 )" ).arg( aName ).arg( aCoteZ ); + } aResList << QString( "%1.SetEquiDistance( %2 )" ).arg( aName ).arg( GetEquiDistance() ); @@ -102,6 +123,7 @@ QStringList HYDROData_Channel::DumpToPython( const QString& thePyScriptPath, aResList << QString( "" ); return aResList; + } HYDROData_SequenceOfObjects HYDROData_Channel::GetAllReferenceObjects() const @@ -122,15 +144,63 @@ HYDROData_SequenceOfObjects HYDROData_Channel::GetAllReferenceObjects() const bool HYDROData_Channel::CreatePresentations( const Handle(HYDROData_Polyline3D)& theGuideLine, const Handle(HYDROData_Profile)& theProfile, PrsDefinition& thePrs, - double theEquiDistance ) + double theEquiDistance, + bool ReverseXCoord) +{ + return internalCreatePresentations( true, theGuideLine, theProfile, TopoDS_Wire(), gp_Pnt(), thePrs, theEquiDistance, ReverseXCoord); +} + +bool HYDROData_Channel::CreatePresentations( const Handle(HYDROData_Polyline3D)& theGuideLine, + double LC, + double deltaZ, + double coteZ, + PrsDefinition& thePrs, + double theEquiDistance, + bool ReverseXCoord) +{ + Handle(HYDROData_Profile) theProfile; + TopoDS_Wire W; + gp_Pnt MP; + + gp_Pnt2d A1(-0.75*LC, coteZ-LC/2.0), A2(0.75*LC, coteZ -LC/2.0), B1(-LC/2.0, coteZ), B2(LC/2.0, coteZ), C(0, coteZ+deltaZ); + gp_Pnt A1_3d(A1.X(), 0, A1.Y()), A2_3d(A2.X(), 0, A2.Y()), B1_3d(B1.X(), 0, B1.Y()), B2_3d(B2.X(), 0, B2.Y()), C_3d(C.X(), 0, C.Y()); + BRepLib_MakePolygon PM; + PM.Add(A1_3d); + PM.Add(B1_3d); + PM.Add(C_3d); + PM.Add(B2_3d); + PM.Add(A2_3d); + W = PM.Wire(); + return internalCreatePresentations( false, theGuideLine, theProfile, W, MP, thePrs, theEquiDistance, ReverseXCoord); +} + +bool HYDROData_Channel::internalCreatePresentations( bool mode, + const Handle(HYDROData_Polyline3D)& theGuideLine, + const Handle(HYDROData_Profile)& theProfile, + const TopoDS_Wire& theProfWire, + const gp_Pnt& theMiddlePnt, + PrsDefinition& thePrs, + double theEquiDistance, + bool ReverseXCoord) { // Check input parameters - if ( theGuideLine.IsNull() || theProfile.IsNull() ) { + if ( theGuideLine.IsNull() ) + { return false; } + if (mode && theProfile.IsNull() || !mode && theProfWire.IsNull() ) + return false; TopoDS_Wire aPathWire = TopoDS::Wire( theGuideLine->GetShape3D() ); - TopoDS_Wire aProfileWire = TopoDS::Wire( theProfile->GetShape3D() ); + TopoDS_Wire aProfileWire = theProfWire; + //ignore ReverseXCoord if mode is false + if (mode) + { + if (!ReverseXCoord) + aProfileWire = TopoDS::Wire( theProfile->GetShape3D(false, false) ); //temp force rebuild + else + aProfileWire = TopoDS::Wire( theProfile->GetShape3D(true, true)); + } if ( aPathWire.IsNull() || aProfileWire.IsNull() ) { return false; } @@ -223,7 +293,11 @@ bool HYDROData_Channel::CreatePresentations( const Handle(HYDROData_Polyline3D)& } // Get the profile middle point ( 3D ) - gp_Pnt aMiddlePoint( theProfile->GetMiddlePoint( true ) ); + gp_Pnt aMiddlePoint = theMiddlePnt; + if (mode) + { + aMiddlePoint = theProfile->GetMiddlePoint( true ); + } // Translate the profile to each point on the guide line ( 3D ) Handle(TColgp_HArray1OfPnt) anArrayOfFPnt = new TColgp_HArray1OfPnt(1, aNbPoints ); @@ -280,22 +354,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() @@ -303,12 +381,30 @@ void HYDROData_Channel::Update() HYDROData_ArtificialObject::Update(); Handle(HYDROData_Polyline3D) aGuideLine = GetGuideLine(); - Handle(HYDROData_Profile) aProfile = GetProfile(); PrsDefinition aResultPrs; double anEquiDistance = GetEquiDistance(); - if ( !CreatePresentations( aGuideLine, aProfile, aResultPrs, anEquiDistance ) ) - return; + + bool invDirection = false; + Handle(HYDROData_IAltitudeObject) anObjAltitude = GetAltitudeObject(); + Handle(HYDROData_ChannelAltitude) aChannelAlt = Handle(HYDROData_ChannelAltitude)::DownCast(anObjAltitude); + if (!aChannelAlt.IsNull()) + invDirection = aChannelAlt->GetInvertDirection(); + + if (GetProfileMode()) + { + Handle(HYDROData_Profile) aProfile = GetProfile(); + if ( !CreatePresentations( aGuideLine, aProfile, aResultPrs, anEquiDistance, invDirection ) ) + return; + } + else + { + double lc = GetLCValue(); + double deltaz = GetDeltaZValue(); + double cotez = GetCoteZValue(); + if ( !CreatePresentations( aGuideLine, lc, deltaz, cotez, aResultPrs, anEquiDistance, invDirection ) ) + return; + } SetShape3D( aResultPrs.myPrs3D ); SetTopShape( aResultPrs.myPrs2D ); @@ -325,9 +421,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 ); @@ -450,7 +546,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; } @@ -477,3 +573,43 @@ double HYDROData_Channel::GetEquiDistance() const { return GetDouble( DataTag_EquiDistance, 1.0 ); } + +void HYDROData_Channel::SetLCValue( double val ) +{ + SetDouble( DataTag_LC, val ); +} + +double HYDROData_Channel::GetLCValue() const +{ + return GetDouble( DataTag_LC, 1.0 ); +} + +void HYDROData_Channel::SetDeltaZValue( double val ) +{ + SetDouble( DataTag_DeltaZ, val ); +} + +double HYDROData_Channel::GetDeltaZValue() const +{ + return GetDouble( DataTag_DeltaZ, 1.0 ); +} + +void HYDROData_Channel::SetCoteZValue( double val ) +{ + SetDouble( DataTag_CoteZ, val ); +} + +double HYDROData_Channel::GetCoteZValue() const +{ + return GetDouble( DataTag_CoteZ, 1.0 ); +} + +void HYDROData_Channel::SetProfileMode( bool mode ) +{ + SetInteger( DataTag_ProfileMode, (bool)mode ); +} + +bool HYDROData_Channel::GetProfileMode() const +{ + return (bool)GetInteger( DataTag_ProfileMode, 1 ); +}