]> SALOME platform Git repositories - modules/hydro.git/commitdiff
Salome HOME
debug of tests
authorisn <isn@opencascade.com>
Mon, 8 Apr 2019 18:13:09 +0000 (21:13 +0300)
committerisn <isn@opencascade.com>
Mon, 8 Apr 2019 18:14:32 +0000 (21:14 +0300)
src/HYDROData/HYDROData_Channel.cxx
src/HYDROData/HYDROData_DTM.cxx
src/HYDROData/HYDROData_Entity.cxx
src/HYDROData/HYDROData_Profile.cxx

index 1a08a52d628a515bc0150585f20937dffd3126ac..3abe2317594762db4962204097c86ed631d5ab48 100644 (file)
@@ -179,7 +179,7 @@ bool HYDROData_Channel::internalCreatePresentations( bool mode,
   if (mode)
   {
     if (!ReverseXCoord)
-      aProfileWire = TopoDS::Wire( theProfile->GetShape3D(true, false) ); //temp force rebuild
+      aProfileWire = TopoDS::Wire( theProfile->GetShape3D(false, false) ); //temp force rebuild
     else
       aProfileWire = TopoDS::Wire( theProfile->GetShape3D(true, true));
   }
index ec4537bbfb6f28359997262732b5f7572683913a..7349737fd0a534fd77182d3018106c2925c31996 100644 (file)
@@ -864,7 +864,8 @@ void HYDROData_DTM::ProfileDiscretization( const Handle(HYDROData_Profile)& theP
     }
     double xmin, ymin, xmax, ymax;
     intersect_bndbox.Get(xmin, ymin, xmax, ymax);
-    if (Abs(xmax-xmin)>PREC)
+    //if (Abs(xmax-xmin)>PREC)
+    if (intersection_nb >= 1)
     {
       double u_mid, u_wid;
       if( !CalcMidWidth( intersect_bndbox, u_mid, u_wid ) )
index 7084a5be8aab1ff44167dd7d9505b9df658ae4f2..387cd70a7ccb609e44647eaca195b23fbd9e77c8 100644 (file)
@@ -965,7 +965,7 @@ int HYDROData_Entity::GetInteger( int theTag, int theDefValue ) const
   Handle(TDataStd_Integer) anAttr;
   TDF_Label aLabel = myLab.FindChild( theTag );
   if( !aLabel.FindAttribute( TDataStd_Integer::GetID(), anAttr ) )
-    return 0;
+    return theDefValue;
 
   return anAttr->Get();
 }
index f8f8ba20a94879b282f2963f9ce9fb39424c34cf..059f299a3cd2dbc7a25fec168deeba27d82af49b 100644 (file)
@@ -796,7 +796,7 @@ HYDROData_Profile::ProfilePoint HYDROData_Profile::GetBottomPoint(bool IsConvert
      gp_Lin aMidLin( aMiddlePoint2d, gp::DZ() );
      TopoDS_Edge aMidEdge = BRepLib_MakeEdge( aMidLin );
 
-     const TopoDS_Wire& aProf = TopoDS::Wire( GetShape3D() );
+    TopoDS_Shape aProf = TopoDS::Wire( GetShape3D() );
      if (aProf.IsNull())
        return aMiddlePoint;
      TopoDS_Iterator anIt( aProf );