X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Profile.cxx;h=217c49c9981db2e5471b2412470258b21bfb8ca8;hb=bfb47f35b807312281b69a52494b9147c22759dd;hp=6fbfd97a90ddce334d6147278c4c26107294f785;hpb=13de13fcc64a32cb0f455ec3245251f98df0e990;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Profile.cxx b/src/HYDROData/HYDROData_Profile.cxx
old mode 100755
new mode 100644
index 6fbfd97a..217c49c9
--- a/src/HYDROData/HYDROData_Profile.cxx
+++ b/src/HYDROData/HYDROData_Profile.cxx
@@ -29,6 +29,11 @@
 #include <BRepBuilderAPI_MakeWire.hxx>
 #include <BRepBuilderAPI_MakePolygon.hxx>
 
+#include <BRepExtrema_ExtCC.hxx>
+
+#include <BRep_Tool.hxx>
+
+#include <gp_Lin.hxx>
 #include <gp_XY.hxx>
 #include <gp_XYZ.hxx>
 #include <gp_Pnt2d.hxx>
@@ -36,8 +41,10 @@
 #include <TDataStd_AsciiString.hxx>
 #include <TDataStd_RealArray.hxx>
 
+#include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Wire.hxx>
+#include <TopoDS_Iterator.hxx>
 
 #include <OSD_File.hxx>
 #include <OSD_Protection.hxx>
@@ -49,7 +56,7 @@ IMPLEMENT_STANDARD_HANDLE(HYDROData_Profile, HYDROData_Object)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Profile, HYDROData_Object)
 
 HYDROData_Profile::HYDROData_Profile()
-: HYDROData_Object()
+: HYDROData_Object( Geom_3d )
 {
 }
 
@@ -156,7 +163,7 @@ TopoDS_Shape HYDROData_Profile::GetTopShape() const
 
 TopoDS_Shape HYDROData_Profile::GetShape3D() const
 {
-  TopoDS_Shape aShape = getShape3D();
+  TopoDS_Shape aShape = HYDROData_Object::GetShape3D();
   if( aShape.IsNull() )
     aShape = CreateProfileWire( true );
   return aShape;
@@ -180,30 +187,20 @@ void HYDROData_Profile::Update()
 {
   HYDROData_Object::Update();
 
-  TopoDS_Shape aShape = CreateProfileWire( false );
+  TopoDS_Shape aShape = CreateProfileWire( true );
   SetShape3D( aShape );
 }
 
-QColor HYDROData_Profile::DefaultFillingColor()
+QColor HYDROData_Profile::DefaultFillingColor() const
 {
   return QColor( Qt::transparent );
 }
 
-QColor HYDROData_Profile::DefaultBorderColor()
+QColor HYDROData_Profile::DefaultBorderColor() const
 {
   return QColor( Qt::black );
 }
 
-QColor HYDROData_Profile::getDefaultFillingColor() const
-{
-  return DefaultFillingColor();
-}
-
-QColor HYDROData_Profile::getDefaultBorderColor() const
-{
-  return DefaultBorderColor();
-}
-
 bool HYDROData_Profile::IsValid() const
 {
   gp_XY aFirstPoint, aLastPoint;
@@ -232,7 +229,7 @@ void HYDROData_Profile::SetLeftPoint( const gp_XY& theGPoint, bool IsConvertFrom
   anArray->SetValue( 0, aLPoint.X() );
   anArray->SetValue( 1, aLPoint.Y() );
 
-  SetToUpdate( true );
+  Changed( Geom_3d );
 }
 
 bool HYDROData_Profile::GetLeftPoint( gp_XY& thePoint, bool IsConvertToGlobal,
@@ -244,7 +241,7 @@ bool HYDROData_Profile::GetLeftPoint( gp_XY& thePoint, bool IsConvertToGlobal,
 
   thePoint = GetParametricPoints().First();
 
-  thePoint.SetX( 0 );
+  //thePoint.SetX( 0 );
   thePoint.SetY( 0 ); //default left point of not-georeferenced profile
   TDF_Label aLabel = myLab.FindChild( DataTag_FirstPoint, false );
   if ( aLabel.IsNull() )
@@ -284,7 +281,7 @@ void HYDROData_Profile::SetRightPoint( const gp_XY& theGPoint, bool IsConvertFro
   anArray->SetValue( 0, aLPoint.X() );
   anArray->SetValue( 1, aLPoint.Y() );
 
-  SetToUpdate( true );
+  Changed( Geom_3d );
 }
 
 bool HYDROData_Profile::GetRightPoint( gp_XY& thePoint, bool IsConvertToGlobal,
@@ -295,6 +292,7 @@ bool HYDROData_Profile::GetRightPoint( gp_XY& thePoint, bool IsConvertToGlobal,
     return false;
 
   thePoint = GetParametricPoints().Last();
+  thePoint.SetY( 0 );
 
   TDF_Label aLabel = myLab.FindChild( DataTag_LastPoint, false );
   if ( aLabel.IsNull() )
@@ -328,7 +326,7 @@ void HYDROData_Profile::Invalidate()
   if ( !aLastLabel.IsNull() )
     aLastLabel.ForgetAllAttributes();
 
-  SetToUpdate( true );
+  Changed( Geom_3d );
 }
 
 Handle(HYDROData_ProfileUZ) HYDROData_Profile::GetProfileUZ( const bool theIsCreate ) const
@@ -361,7 +359,7 @@ void HYDROData_Profile::RemovePoints()
   if ( !aProfileUZ.IsNull() )
   {
     aProfileUZ->RemoveSections();
-    SetToUpdate( true );
+    Changed( Geom_3d );
   }
 }
 
@@ -376,7 +374,7 @@ void HYDROData_Profile::SetParametricPoints( const HYDROData_ProfileUZ::PointsLi
     aProfileUZ->AddPoint( 0, aPoint );
   }
 
-  SetToUpdate( true );
+  Changed( Geom_3d );
 }
 
 HYDROData_ProfileUZ::PointsList HYDROData_Profile::GetParametricPoints() const
@@ -435,8 +433,8 @@ HYDROData_Profile::ProfilePoints HYDROData_Profile::GetProfilePoints
   const HYDROData_ProfileUZ::Point& aFirstParPoint = aParametricPoints.First();
   const HYDROData_ProfileUZ::Point& aLastParPoint = aParametricPoints.Last();
 
-  double aGeoDistance = gp_Pnt2d( aFirstPoint ).Distance( aLastPoint );
-  double aParCommonDist = gp_Pnt2d( aFirstParPoint.X(), 0 ).Distance( gp_Pnt2d( aLastParPoint.X(), 0 ) );
+  double aFullLength = aLastPoint.X() - aFirstPoint.X();
+  double aParFullLength = aLastParPoint.X() - aFirstParPoint.X();
 
   // Add first point as is
   aResPoints.Append( ProfilePoint( aFirstPoint.X(), aFirstPoint.Y(), aFirstParPoint.Y() ) );
@@ -446,14 +444,11 @@ HYDROData_Profile::ProfilePoints HYDROData_Profile::GetProfilePoints
   {
     const HYDROData_ProfileUZ::Point& aParPoint = aParametricPoints.Value( i );
 
-    double aParPointDist = gp_Pnt2d( aFirstParPoint.X(), 0 ).Distance( gp_Pnt2d( aParPoint.X(), 0 ) );
-    
-    double aParLen = ( aParPointDist / aParCommonDist ) * aGeoDistance;
+    double aParPointDist = aParPoint.X() - aFirstParPoint.X();
+    double aRatio = aParPointDist / aParFullLength;
 
-    double aRatio = aParLen / ( aGeoDistance - aParLen );
-
-    double aParX = ( aFirstPoint.X() + aRatio * aLastPoint.X() ) / ( 1 + aRatio );
-    double aParY = ( aFirstPoint.Y() + aRatio * aLastPoint.Y() ) / ( 1 + aRatio );
+    double aParX = aFirstPoint.X() * (1-aRatio) + aLastPoint.X() * aRatio;
+    double aParY = aFirstPoint.Y() * (1-aRatio) + aLastPoint.Y() * aRatio;
 
     ProfilePoint aCompPoint( aParX, aParY, aParPoint.Y() );
     aResPoints.Append( aCompPoint );
@@ -532,7 +527,7 @@ int HYDROData_Profile::ImportFromFile( const Handle(HYDROData_Document)& theDoc,
 
     aProfile->SetFilePath( theFileName );
 
-    aProfile->SetBorderColor( HYDROData_Profile::DefaultBorderColor() );
+    aProfile->SetBorderColor( aProfile->DefaultBorderColor() );
   }
 
   return aCreatedProfiles.Length();
@@ -748,3 +743,40 @@ HYDROData_Profile::ProfilePoint HYDROData_Profile::GetBottomPoint() const
   return aBottom;
 }
 
+ HYDROData_Profile::ProfilePoint HYDROData_Profile::GetMiddlePoint( bool CanUseDefault ) const
+ {
+   ProfilePoint aMiddlePoint;
+  
+   gp_XY aLeftPnt, aRightPnt;
+   if ( GetLeftPoint( aLeftPnt, true, CanUseDefault ) && GetRightPoint( aRightPnt, true, CanUseDefault ) ) {
+     gp_XYZ aPnt1( aLeftPnt.X(), aLeftPnt.Y(), 0. );
+     gp_XYZ aPnt2( aRightPnt.X(), aRightPnt.Y(), 0. );
+     gp_Pnt aMiddlePoint2d( 0.5 * ( aPnt1 + aPnt2 ) ); 
+
+     gp_Lin aMidLin( aMiddlePoint2d, gp::DZ() );
+     TopoDS_Edge aMidEdge = BRepLib_MakeEdge( aMidLin );
+
+     TopoDS_Iterator anIt( TopoDS::Wire( GetShape3D() )  );
+     for ( ; anIt.More(); anIt.Next()) {
+       const TopoDS_Edge& anEdge = TopoDS::Edge( anIt.Value() );
+
+       /*
+       Standard_Real aStart, anEnd;
+       Handle(Geom_Curve) aCurve = BRep_Tool::Curve( anEdge, aStart, anEnd );
+       gp_Pnt aMiddlePointOnCurve = aCurve->Value( ( aStart + anEnd ) / 2 );
+       */
+
+       BRepExtrema_ExtCC ExtremaEE( aMidEdge, anEdge);
+       if (ExtremaEE.IsDone() && ExtremaEE.NbExt() != 0) {
+         for ( Standard_Integer i = 1; i <= ExtremaEE.NbExt(); i++ ) {
+           if ( ExtremaEE.SquareDistance(i) <= Precision::Confusion() ) {
+             aMiddlePoint = ExtremaEE.PointOnE1(i).XYZ();
+             break;
+           }
+         }
+       }
+     }
+   }
+
+   return aMiddlePoint;
+ }
\ No newline at end of file