OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0026607: Wrong value of area.

Browse Source 
Test case for issue CR26607

Fix regressions

Correction of test cases for issue CR26607
This commit is contained in:
ifv 2015-10-01 13:48:27 +03:00 committed by bugmaster
parent 0e14656b30
commit 5b0f2540d7
128 changed files with 292 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
src/BRepGProp/BRepGProp.cxx
View File

@ -47,7 +47,7 @@ void BRepGProp::LinearProperties(const TopoDS_Shape& S, GProp_GProps& SProps){
SProps = GProp_GProps(P);
BRepAdaptor_Curve BAC;
// Standard_Integer n,i;
// Standard_Integer n,i;
TopExp_Explorer ex;
for (ex.Init(S,TopAbs_EDGE); ex.More(); ex.Next()) {
BAC.Initialize(TopoDS::Edge(ex.Current()));
@ -72,7 +72,9 @@ static Standard_Real surfaceProperties(const TopoDS_Shape& S, GProp_GProps& Prop
for (ex.Init(S,TopAbs_FACE), i = 1; ex.More(); ex.Next(), i++) {
const TopoDS_Face& F = TopoDS::Face(ex.Current());
BF.Load(F);
if(!BF.NaturalRestriction()) BD.Init(F);
TopoDS_Iterator aWIter(F);
Standard_Boolean IsNatRestr = !aWIter.More();
if(!IsNatRestr) BD.Init(F);
if(Eps < 1.0) {
G.Perform(BF, BD, Eps);
Error = G.GetEpsilon();
@ -83,7 +85,7 @@ static Standard_Real surfaceProperties(const TopoDS_Shape& S, GProp_GProps& Prop
#endif
}
} else {
if(BF.NaturalRestriction()) G.Perform(BF);
if(IsNatRestr) G.Perform(BF);
else G.Perform(BF, BD);
}
Props.Add(G);
@ -133,20 +135,22 @@ static Standard_Real volumeProperties(const TopoDS_Shape& S, GProp_GProps& Props
const TopoDS_Face& F = TopoDS::Face(ex.Current());
if ((F.Orientation() == TopAbs_FORWARD) || (F.Orientation() == TopAbs_REVERSED)){
BF.Load(F);
if(!BF.NaturalRestriction()) BD.Init(F);
TopoDS_Iterator aWIter(F);
Standard_Boolean IsNatRestr = !aWIter.More();
if(!IsNatRestr) BD.Init(F);
if(Eps < 1.0) {
G.Perform(BF, BD, Eps);
Error = G.GetEpsilon();
if(ErrorMax < Error) {
ErrorMax = Error;
G.Perform(BF, BD, Eps);
Error = G.GetEpsilon();
if(ErrorMax < Error) {
ErrorMax = Error;
#ifdef OCCT_DEBUG
iErrorMax = i;
iErrorMax = i;
#endif
}
}
}
else {
if(BF.NaturalRestriction()) G.Perform(BF);
else G.Perform(BF, BD);
if(IsNatRestr) G.Perform(BF);
else G.Perform(BF, BD);
}
Props.Add(G);
#ifdef OCCT_DEBUG
@ -178,7 +182,7 @@ void BRepGProp::VolumeProperties(const TopoDS_Shape& S, GProp_GProps& Props, co
//=======================================================================
Standard_Real BRepGProp::VolumeProperties(const TopoDS_Shape& S, GProp_GProps& Props,
const Standard_Real Eps, const Standard_Boolean OnlyClosed)
const Standard_Real Eps, const Standard_Boolean OnlyClosed)
{
// find the origin
gp_Pnt P(0,0,0); P.Transform(S.Location());
@ -193,13 +197,13 @@ Standard_Real BRepGProp::VolumeProperties(const TopoDS_Shape& S, GProp_GProps& P
for (i = 1; ex.More(); ex.Next(), i++) {
const TopoDS_Shape& Sh = ex.Current();
if(BRep_Tool::IsClosed(Sh)) {
Error = volumeProperties(Sh,Props,Eps);
if(ErrorMax < Error) {
ErrorMax = Error;
Error = volumeProperties(Sh,Props,Eps);
if(ErrorMax < Error) {
ErrorMax = Error;
#ifdef OCCT_DEBUG
iErrorMax = i;
iErrorMax = i;
#endif
}
}
}
}
} else ErrorMax = volumeProperties(S,Props,Eps);
@ -218,15 +222,15 @@ Standard_Real BRepGProp::VolumeProperties(const TopoDS_Shape& S, GProp_GProps& P
//=======================================================================
static Standard_Real volumePropertiesGK(const TopoDS_Shape &theShape,
GProp_GProps &theProps,
const Standard_Real theTol,
const Standard_Boolean IsUseSpan,
const Standard_Boolean CGFlag,
const Standard_Boolean IFlag)
GProp_GProps &theProps,
const Standard_Real theTol,
const Standard_Boolean IsUseSpan,
const Standard_Boolean CGFlag,
const Standard_Boolean IFlag)
{
TopExp_Explorer anExp;
anExp.Init(theShape, TopAbs_FACE);
Standard_Real aTol = theTol;
// Compute properties.
@ -243,21 +247,23 @@ static Standard_Real volumePropertiesGK(const TopoDS_Shape &theShape,
TopoDS_Face aFace = TopoDS::Face(anExp.Current());
if (aFace.Orientation() == TopAbs_FORWARD ||
aFace.Orientation() == TopAbs_REVERSED) {
aPropFace.Load(aFace);
aFace.Orientation() == TopAbs_REVERSED) {
aPropFace.Load(aFace);
if(aPropFace.NaturalRestriction())
aLocalError = aVProps.Perform(aPropFace, aTol, CGFlag, IFlag);
else {
aPropDomain.Init(aFace);
aLocalError = aVProps.Perform(aPropFace, aPropDomain, aTol, CGFlag, IFlag);
}
TopoDS_Iterator aWIter(aFace);
Standard_Boolean IsNatRestr = !aWIter.More();
if(IsNatRestr)
aLocalError = aVProps.Perform(aPropFace, aTol, CGFlag, IFlag);
else {
aPropDomain.Init(aFace);
aLocalError = aVProps.Perform(aPropFace, aPropDomain, aTol, CGFlag, IFlag);
}
if (aLocalError < 0.)
return aLocalError;
if (aLocalError < 0.)
return aLocalError;
anError += aLocalError;
theProps.Add(aVProps);
anError += aLocalError;
theProps.Add(aVProps);
}
}
@ -270,12 +276,12 @@ static Standard_Real volumePropertiesGK(const TopoDS_Shape &theShape,
//=======================================================================
Standard_Real BRepGProp::VolumePropertiesGK(const TopoDS_Shape &S,
GProp_GProps &Props,
const Standard_Real Eps,
const Standard_Boolean OnlyClosed,
const Standard_Boolean IsUseSpan,
const Standard_Boolean CGFlag,
const Standard_Boolean IFlag)
GProp_GProps &Props,
const Standard_Real Eps,
const Standard_Boolean OnlyClosed,
const Standard_Boolean IsUseSpan,
const Standard_Boolean CGFlag,
const Standard_Boolean IFlag)
{
gp_Pnt P(0,0,0);
Standard_Real anError = 0.;
@ -297,7 +303,7 @@ Standard_Real BRepGProp::VolumePropertiesGK(const TopoDS_Shape &S,
BRepCheck_Status aStatus = aChecker.Closed(Standard_False);
if(aStatus == BRepCheck_NoError)
aClosedShells.Append(aShell);
aClosedShells.Append(aShell);
}
@ -315,11 +321,11 @@ Standard_Real BRepGProp::VolumePropertiesGK(const TopoDS_Shape &S,
aLocalError = volumePropertiesGK(aShell, Props, aTol, IsUseSpan, CGFlag, IFlag);
if (aLocalError < 0)
return aLocalError;
return aLocalError;
anError += aLocalError;
}
} else
anError = volumePropertiesGK(S, Props, Eps, IsUseSpan, CGFlag, IFlag);
@ -334,12 +340,12 @@ Standard_Real BRepGProp::VolumePropertiesGK(const TopoDS_Shape &S,
//=======================================================================
static Standard_Real volumePropertiesGK(const TopoDS_Shape &theShape,
GProp_GProps &theProps,
const gp_Pln &thePln,
const Standard_Real theTol,
const Standard_Boolean IsUseSpan,
const Standard_Boolean CGFlag,
const Standard_Boolean IFlag)
GProp_GProps &theProps,
const gp_Pln &thePln,
const Standard_Real theTol,
const Standard_Boolean IsUseSpan,
const Standard_Boolean CGFlag,
const Standard_Boolean IFlag)
{
TopExp_Explorer anExp;
anExp.Init(theShape, TopAbs_FACE);
@ -360,21 +366,23 @@ static Standard_Real volumePropertiesGK(const TopoDS_Shape &theShape,
TopoDS_Face aFace = TopoDS::Face(anExp.Current());
if (aFace.Orientation() == TopAbs_FORWARD ||
aFace.Orientation() == TopAbs_REVERSED) {
aPropFace.Load(aFace);
aFace.Orientation() == TopAbs_REVERSED) {
aPropFace.Load(aFace);
if(aPropFace.NaturalRestriction())
aLocalError = aVProps.Perform(aPropFace, thePln, aTol, CGFlag, IFlag);
else {
aPropDomain.Init(aFace);
aLocalError = aVProps.Perform(aPropFace, aPropDomain, thePln, aTol, CGFlag, IFlag);
}
TopoDS_Iterator aWIter(aFace);
Standard_Boolean IsNatRestr = !aWIter.More();
if(IsNatRestr)
aLocalError = aVProps.Perform(aPropFace, thePln, aTol, CGFlag, IFlag);
else {
aPropDomain.Init(aFace);
aLocalError = aVProps.Perform(aPropFace, aPropDomain, thePln, aTol, CGFlag, IFlag);
}
if (aLocalError < 0.)
return aLocalError;
if (aLocalError < 0.)
return aLocalError;
anError += aLocalError;
theProps.Add(aVProps);
anError += aLocalError;
theProps.Add(aVProps);
}
}
@ -387,13 +395,13 @@ static Standard_Real volumePropertiesGK(const TopoDS_Shape &theShape,
//=======================================================================
Standard_Real BRepGProp::VolumePropertiesGK(const TopoDS_Shape &S,
GProp_GProps &Props,
const gp_Pln &thePln,
const Standard_Real Eps,
const Standard_Boolean OnlyClosed,
const Standard_Boolean IsUseSpan,
const Standard_Boolean CGFlag,
const Standard_Boolean IFlag)
GProp_GProps &Props,
const gp_Pln &thePln,
const Standard_Real Eps,
const Standard_Boolean OnlyClosed,
const Standard_Boolean IsUseSpan,
const Standard_Boolean CGFlag,
const Standard_Boolean IFlag)
{
gp_Pnt P(0,0,0);
Standard_Real anError = 0.;
@ -415,7 +423,7 @@ Standard_Real BRepGProp::VolumePropertiesGK(const TopoDS_Shape &S,
BRepCheck_Status aStatus = aChecker.Closed(Standard_False);
if(aStatus == BRepCheck_NoError)
aClosedShells.Append(aShell);
aClosedShells.Append(aShell);
}
@ -433,7 +441,7 @@ Standard_Real BRepGProp::VolumePropertiesGK(const TopoDS_Shape &S,
aLocalError = volumePropertiesGK(aShell, Props, thePln, aTol, IsUseSpan, CGFlag, IFlag);
if (aLocalError < 0)
return aLocalError;
return aLocalError;
anError += aLocalError;
}

3
src/BRepGProp/BRepGProp_Face.hxx
View File

@ -65,6 +65,9 @@ public:
//! Returns Standard_True if the face is not trimmed.
Standard_Boolean NaturalRestriction() const;
//! Returns the TopoDS face.
const TopoDS_Face& GetFace() const;
//! Returns the value of the boundary curve of the face.
gp_Pnt2d Value2d (const Standard_Real U) const;

10
src/BRepGProp/BRepGProp_Face.lxx
View File

@ -48,6 +48,16 @@ inline Standard_Boolean BRepGProp_Face::NaturalRestriction() const
{
return BRep_Tool::NaturalRestriction(mySurface.Face());
}
//
//=======================================================================
//function : GetFace
//purpose : Returns TopoDS Face.
//=======================================================================
inline const TopoDS_Face& BRepGProp_Face::GetFace() const
{
return mySurface.Face();
}
//=======================================================================
//function : Value2d

8
src/BRepGProp/BRepGProp_Gauss.cxx
View File

@ -584,7 +584,9 @@ Standard_Real BRepGProp_Gauss::Compute(
//
const Standard_Integer NumSubs = SUBS_POWER;
const Standard_Boolean isNaturalRestriction = theSurface.NaturalRestriction();
const TopoDS_Face& aF = theSurface.GetFace();
TopoDS_Iterator aWIter(aF);
const Standard_Boolean isNaturalRestriction = !aWIter.More(); //theSurface.NaturalRestriction();
Standard_Real CIx, CIy, CIz, CIxy, CIxz, CIyz;
Standard_Real CDim[2], CIxx[2], CIyy[2], CIzz[2];
@ -1111,9 +1113,11 @@ void BRepGProp_Gauss::Compute(BRepGProp_Face& theSurface,
{
theSurface.Load(theDomain.Value());
const Standard_Integer NbCGaussgp_Pnts =
Standard_Integer NbCGaussgp_Pnts =
Min(theSurface.IntegrationOrder(), math::GaussPointsMax());
NbCGaussgp_Pnts = Max(NbCGaussgp_Pnts, NbGaussgp_Pnts);
math_Vector GaussCP(1, NbCGaussgp_Pnts);
math_Vector GaussCW(1, NbCGaussgp_Pnts);
math::GaussPoints (NbCGaussgp_Pnts, GaussCP);

2
tests/blend/bfuseblend/B7
View File

@ -6,4 +6,4 @@ tscale s1 0 0 0 SCALE1
tscale s2 0 0 0 SCALE1
bfuseblend result s1 s2 1*SCALE1
set square 53457.8
set square 52754.1

2
tests/blend/buildevol/F1
View File

@ -9,4 +9,4 @@ mkevol result s
updatevol s_3 0 1*SCALE1 1 2*SCALE1 2 1*SCALE1
buildevol
set square 78053.9
set square 76962.6

2
tests/blend/encoderegularity/A3
View File

@ -9,4 +9,4 @@ blend result m 10 m_5 10 m_6 \
explode result Sh
renamevar result_1 result
set square 5824.68
set square 5884.39

2
tests/blend/simple/U5
View File

@ -10,4 +10,4 @@ tscale s 0 0 0 SCALE2
explode s E
blend result s 2.5*SCALE2 s_6
set square 652.96
set square 638.478

2
tests/bugs/modalg_1/buc60531_1
View File

@ -10,6 +10,6 @@ checkshape pl1
bcut result r1 pl1
set square 115935
set square 119983
set 2dviewer 0

2
tests/bugs/modalg_1/buc60533
View File

@ -66,5 +66,5 @@ copy r_1 result
# An exception was caught Standard_ConstructionError:
# ** Exception ** Standard_ConstructionError:
set square 1.65227e+07
set square 1.59518e+07
set 2dviewer 0

2
tests/bugs/modalg_1/buc60555_1
View File

@ -33,5 +33,5 @@ if { $MaxFaceTolerance > 1 || $MaxEdgeTolerance > 1 || $MaxVertexTolerance > 1 }
puts "Tolerance of shape is less then 1.0"
}
set square 4.10276e+007
set square 4.21741e+007
set 2dviewer 0

2
tests/bugs/modalg_1/buc60555_2
View File

@ -50,5 +50,5 @@ if { $MaxFaceTolerance > 1 || $MaxEdgeTolerance > 1 || $MaxVertexTolerance > 1 }
} else {
puts "Tolerance of shape is less then 1.0"
}
set square 3.92639e+007
set square 4.03996e+007
set 2dviewer 0

2
tests/bugs/modalg_1/bug10160_6
View File

@ -39,7 +39,7 @@ puts "CPU_user_time=${CPU_user_time}"
set CPU_user_time [expr ${CPU_user_time} / ${NbTests}]
puts "CPU_user_time=${CPU_user_time}"
set square 3.61484e+07
set square 3.65961e+07
# Analysis of "nbshapes res"
set nb_v_good 121

2
tests/bugs/modalg_1/bug10160_7
View File

@ -40,7 +40,7 @@ puts "CPU_user_time=${CPU_user_time}"
set CPU_user_time [expr ${CPU_user_time} / ${NbTests}]
puts "CPU_user_time=${CPU_user_time}"
set square 3.00597e+07
set square 3.05118e+07
# Analysis of "nbshapes res"
set nb_v_good 61

2
tests/bugs/modalg_1/bug13140
View File

@ -11,7 +11,7 @@ restore [locate_data_file OCC13140_Profile.brep] Profile
pipe result Spine Profile
set square 3.48689
set square 3.68518
set good_vertex 2
set good_edge 3
set good_wire 1

2
tests/bugs/modalg_2/bug21261_16
View File

@ -12,7 +12,7 @@ restore [locate_data_file OCC21261-1988_ellipsepipesrf_1.brep] s
thickshell result s -5
set square 17366.2
set square 17592.2
set nb_v_good 4
set nb_e_good 8

2
tests/bugs/modalg_2/bug22586
View File

@ -19,4 +19,4 @@ if { [catch { OCC22586 shape result } catch_result] } {
}
set 3dviewer 1
set square 11275.7
set square 10975

2
tests/bugs/modalg_2/bug22727
View File

@ -14,7 +14,7 @@ tscale t 0.0507219 -0.0399294 -0.00324254 1000
explode t e
blend result t 2. t_3
set square 3471.94
set square 3545.26
set nb_v_good 12
set nb_e_good 14

4
tests/bugs/modalg_2/bug22818_1
View File

@ -1,5 +1,3 @@
puts "TODO OCC23832 ALL: Error : area by triangles differs from the actual area by"
puts "================"
puts "OCC22818"
puts "================"
@ -24,7 +22,7 @@ don f1
revol result f1 0 10 0 0 0 1 180
checkshape result
set square 823.385
set square 673.385
set nb_v_good 3
set nb_e_good 8

4
tests/bugs/modalg_2/bug22818_2
View File

@ -1,5 +1,3 @@
puts "TODO OCC23832 ALL: Error : area by triangles differs from the actual area by"
puts "================"
puts "OCC22818"
puts "================"
@ -25,7 +23,7 @@ don f1
revol result f1 0 10 0 0 0 1 180
checkshape result
set square 186.072
set square 161.072
set nb_v_good 3
set nb_e_good 8

4
tests/bugs/modalg_2/bug22864
View File

@ -95,7 +95,5 @@ if {${status} == 0} {
puts "Faulty ${BugNumber}"
}
set square 6606.88
set square 8464.91
set 2dviewer 0

3
tests/bugs/modalg_4/bug636
View File

@ -26,6 +26,5 @@ if [catch { buildsweep result } catch_result] {
puts "OCC636 OK: function buildsweep works properly"
}
set square 3836.92
set square 3934.22
set 2dviewer 0

2
tests/bugs/modalg_5/bug22981
View File

@ -12,7 +12,7 @@ explode t
thrusections result 0 0 t_1 t_2
thrusections result 0 0 t_2 t_3 t_4 t_5 t_6 t_7 t_8 t_9 t_10 t_11
set square 6733.76
set square 6234.87
set 2dviewer 0

2
tests/bugs/modalg_5/bug23706_2
View File

@ -19,7 +19,7 @@ offset o1 ss 2
mkface res o1
set info [sprops res]
regexp {Mass +: +([-0-9.+eE]+)} $info full sq
set sq_check 248.667
set sq_check 240.865
if { [expr 1.*abs($sq_check - $sq)/$sq_check] > 0.01 } {
puts "Error : The square of result shape is $sq"

6
tests/bugs/modalg_5/bug23706_3
View File

@ -16,8 +16,4 @@ don result
fit
checkshape result
set square 1.86489
set square 1.67216

2
tests/bugs/modalg_5/bug23870_2
View File

@ -20,7 +20,7 @@ wire profile profile
pipe result spine profile 2 approx
set square 8997.97
set square 8772.95
set nb_v_good 2
set nb_e_good 3

21
tests/bugs/modalg_6/bug26607 Normal file
View File

@ -0,0 +1,21 @@
puts "=========="
puts "OCC26607"
puts "=========="
puts ""
###########################################
# Wrong value of area.
###########################################
box b1 10 10 10
box b2 20 0 0 10 10 10
explode b1 f
explode b2 f
explode b1_5
explode b2_5
mksurface s b1_5
mkface fs s
add b1_5_1 fs
add b2_5_1 fs
checkarea fs -200 1e-06 0.01

2
tests/bugs/moddata_3/bug20866
View File

@ -26,7 +26,7 @@ if [catch { buildsweep result } ] {
puts "Faulty ${BugNumber} : buildsweep is wrong"
} else {
set square 1.87535e+06
set square 1.94998e+06
set nb_v_good 161
set nb_e_good 299

2
tests/bugs/vis/bug22188
View File

@ -75,7 +75,7 @@ if { ${deflection_percent} > ${percent_max} } {
puts "deflection: OK ${BugNumber}"
}
set square 33561.4
set square 32416.7
set nb_v_good 2
set nb_e_good 3

2
tests/bugs/vis/bug288_10
View File

@ -10,7 +10,7 @@ set BugNumber OCC288
restore [locate_data_file shading_151.brep] result
set square 54328.8
set square 52620.1
set nb_v_good 20
set nb_e_good 37

2
tests/bugs/xde/bug22492
View File

@ -19,7 +19,7 @@ stepread $imagedir/${test_image}.step sc2 *
tpcompound sc2
renamevar sc2 result
set square 285636
set square 271280
set nb_v_good 2
set nb_e_good 3

2
tests/bugs/xde/bug22805
View File

@ -20,6 +20,6 @@ if { [regexp {This shape seems to be valid} $info]} {
}
renamevar result_1 result
set square 15121.2
set square 14447.5
set 3dviewer 0

6
tests/heal/data/advanced/U9
View File

@ -1,6 +1,6 @@
if { [string compare $command "ShapeConvertRev"] == 0 } {
puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
}
#if { [string compare $command "ShapeConvertRev"] == 0 } {
# puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
#}
if {[string compare $command "SplitAngle"] == 0 } {
puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_3 "
}

6
tests/heal/data/advanced/V4
View File

@ -1,6 +1,6 @@
if { [string compare $command "ShapeConvertRev"] == 0 } {
puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
}
#if { [string compare $command "ShapeConvertRev"] == 0 } {
# puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
#}
restore [locate_data_file BORNIER80.brep] a

6
tests/heal/data/advanced/V5
View File

@ -1,6 +1,6 @@
if { [string compare $command "ShapeConvertRev"] == 0 } {
puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
}
#if { [string compare $command "ShapeConvertRev"] == 0 } {
# puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
#}
if {[string compare $command "SplitAngle"] == 0 } {
puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_4 "
}

6
tests/heal/data/advanced/Y3
View File

@ -1,5 +1,5 @@
if { [string compare $command "ShapeConvertRev"] == 0 } {
puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
}
#if { [string compare $command "ShapeConvertRev"] == 0 } {
# puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
#}
restore [locate_data_file METABO11.brep] a

6
tests/heal/data/advanced/Y5
View File

@ -1,5 +1,5 @@
if { [string compare $command "ShapeConvertRev"] == 0 } {
puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
}
#if { [string compare $command "ShapeConvertRev"] == 0 } {
# puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
#}
restore [locate_data_file METABO2.brep] a

6
tests/heal/data/advanced/Z7
View File

@ -1,5 +1,5 @@
if {[string compare $command "ShapeConvertRev"] == 0 } {
puts "TODO OCC23127 ALL: Error : The area of the resulting shape is "
}
#if {[string compare $command "ShapeConvertRev"] == 0 } {
# puts "TODO OCC23127 ALL: Error : The area of the resulting shape is "
#}
restore [locate_data_file PB_COPCOLL.brep] a

6
tests/heal/data/advanced/ZB1
View File

@ -1,5 +1,5 @@
if { [string compare $command "ShapeConvertRev"] == 0 } {
puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
}
#if { [string compare $command "ShapeConvertRev"] == 0 } {
# puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
#}
restore [locate_data_file SFR2.brep] a

6
tests/heal/data/advanced/ZB5
View File

@ -1,5 +1,5 @@
if { [string compare $command "ShapeConvertRev"] == 0 } {
puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
}
#if { [string compare $command "ShapeConvertRev"] == 0 } {
# puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
#}
restore [locate_data_file TOP01245_2.brep] a

1
tests/heal/data/standard/A5
View File

@ -1,2 +1,3 @@
restore [locate_data_file arx.rle] a
set rel_tol 0.015

6
tests/heal/data/standard/C8
View File

@ -1,5 +1,5 @@
if { [string compare $command "ShapeConvertRev"] == 0 } {
puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
}
#if { [string compare $command "ShapeConvertRev"] == 0 } {
# puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
#}
restore [locate_data_file heal-Face1.rle] a

6
tests/heal/data/standard/E5
View File

@ -1,5 +1,5 @@
if { [string compare $command "ShapeConvertRev"] == 0 } {
puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
}
#if { [string compare $command "ShapeConvertRev"] == 0 } {
# puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
#}
restore [locate_data_file ma-test2.rle] a

6
tests/heal/data/standard/ZW1
View File

@ -1,6 +1,6 @@
if { [string compare $command "ShapeConvertRev"] == 0 } {
puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
}
#if { [string compare $command "ShapeConvertRev"] == 0 } {
# puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
#}
restore [locate_data_file heal-Face1.rle] a

6
tests/heal/data/standard/ZZ4
View File

@ -1,5 +1,5 @@
if { [string compare $command "ShapeConvertRev"] == 0 } {
puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
}
#if { [string compare $command "ShapeConvertRev"] == 0 } {
# puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
#}
restore [locate_data_file BUG-CAPAR.brep] a

1
tests/heal/surface_to_revolution_advanced/begin
View File

@ -1,2 +1,3 @@
set command ShapeConvertRev
set rel_tol 0.01

3
tests/heal/surface_to_revolution_advanced/end
View File

@ -15,9 +15,8 @@ if { $nb_plane != 0 || $nb_other_surf != 0 || $nb_curve != 0 || $nb_pcurve != 0}
regexp {Mass +: +([-0-9.+eE]+)} [sprops a] full mass
regexp {Mass +: +([-0-9.+eE]+)} [sprops result] full m
if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > 0.01) || ($mass == 0 && $m != 0) } {
if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > $rel_tol) || ($mass == 0 && $m != 0) } {
puts "Error : The area of the resulting shape is $m"
} else {
puts "The areas of the initial and the resulting shape are equal"
}

1
tests/heal/surface_to_revolution_standard/begin
View File

@ -1,2 +1,3 @@
set command ShapeConvertRev
set rel_tol 0.01

5
tests/heal/surface_to_revolution_standard/end
View File

@ -15,9 +15,8 @@ if { $nb_plane != 0 || $nb_other_surf != 0 || $nb_curve != 0 || $nb_pcurve != 0}
regexp {Mass +: +([-0-9.+eE]+)} [sprops a] full mass
regexp {Mass +: +([-0-9.+eE]+)} [sprops result] full m
if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > 0.01) || ($mass == 0 && $m != 0) } {
if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > $rel_tol) || ($mass == 0 && $m != 0) } {
puts "Error : The area of the resulting shape is $m"
} else {
puts "The areas the initial and the resulting shape are equal"
puts "The areas of the initial and the resulting shape are equal"
}

6
tests/mesh/data/advanced/B4
View File

@ -1,3 +1,7 @@
set TheFileName OCC22188.brep
set bug_area "OCC22687"
set rel_tol 3.3
if { [string compare $command "shading"] == 0 } {
set rel_tol 0.793
} else {
set rel_tol 0.052
}

6
tests/mesh/data/standard/K4
View File

@ -1,3 +1,7 @@
set TheFileName shading_094.brep
set bug_area "OCC22687"
set rel_tol 3.5
if { [string compare $command "shading"] == 0 } {
set rel_tol 0.21
} else {
set rel_tol 0.67
}

2
tests/mesh/data/standard/K9
View File

@ -1,3 +1,3 @@
set TheFileName shading_099.brep
set bug_area "OCC22687"
set rel_tol 1.5
set rel_tol 0.298

6
tests/mesh/data/standard/M3
View File

@ -1,3 +1,7 @@
set TheFileName shading_111.brep
set bug_area "OCC22687"
set rel_tol 2.8
if { [string compare $command "shading"] == 0 } {
set rel_tol 0.317
} else {
set rel_tol 0.103
}

6
tests/mesh/data/standard/M4
View File

@ -1,3 +1,7 @@
set TheFileName shading_112.brep
set bug_area "OCC22687"
set rel_tol 10.9
if { [string compare $command "shading"] == 0 } {
set rel_tol 1.71
} else {
set rel_tol 1.55
}

6
tests/mesh/data/standard/O5
View File

@ -1,5 +1,9 @@
set TheFileName shading_131.brep
set bug_area "OCC22687"
set rel_tol 1.34
set bug_withouttri "OCC22687"
set nbwithouttri(ALL) 1
if { [string compare $command "shading"] == 0 } {
set rel_tol 0.13
} else {
set rel_tol 0.21
}

6
tests/mesh/data/standard/Q7
View File

@ -1,3 +1,7 @@
set TheFileName shading_151.brep
set bug_area "OCC22687"
set rel_tol 3.15
if { [string compare $command "shading"] == 0 } {
set rel_tol 0.018
} else {
set rel_tol 0.631
}

2
tests/pipe/specific/K3
View File

@ -19,7 +19,7 @@ set setsweepOptions ""
set addsweepOptions ""
set buildsweepOptions ""
set square 32077.2
set square 30253.5
set nb_v_good 3
set nb_e_good 5

2
tests/pipe/specific/K5
View File

@ -19,7 +19,7 @@ set setsweepOptions ""
set addsweepOptions "-T"
set buildsweepOptions ""
set square 33790.1
set square 32349.5
set nb_v_good 3
set nb_e_good 5

2
tests/pipe/specific/K6
View File

@ -19,7 +19,7 @@ set setsweepOptions ""
set addsweepOptions "-T"
set buildsweepOptions "-R"
set square 34911.3
set square 33467.5
set nb_v_good 3
set nb_e_good 8

2
tests/pipe/specific/K9
View File

@ -19,7 +19,7 @@ set setsweepOptions ""
set addsweepOptions "-R"
set buildsweepOptions ""
set square 32119.4
set square 30131.6
set nb_v_good 3
set nb_e_good 5

2
tests/pipe/specific/L2
View File

@ -19,7 +19,7 @@ set setsweepOptions ""
set addsweepOptions "-T -R"
set buildsweepOptions ""
set square 33656
set square 32064.4
set nb_v_good 3
set nb_e_good 5

2
tests/pipe/specific/L3
View File

@ -19,7 +19,7 @@ set setsweepOptions ""
set addsweepOptions "-T -R"
set buildsweepOptions "-R"
set square 37899.3
set square 36309.2
set nb_v_good 4
set nb_e_good 9

2
tests/pipe/specific/L6
View File

@ -19,7 +19,7 @@ set setsweepOptions "-FR"
set addsweepOptions ""
set buildsweepOptions ""
set square 29675.6
set square 27860.8
set nb_v_good 3
set nb_e_good 5

2
tests/pipe/specific/L8
View File

@ -19,7 +19,7 @@ set setsweepOptions "-FR"
set addsweepOptions "-T"
set buildsweepOptions ""
set square 31762.6
set square 30617.5
set nb_v_good 3
set nb_e_good 5

2
tests/pipe/specific/M1
View File

@ -19,7 +19,7 @@ set setsweepOptions "-FR"
set addsweepOptions "-R"
set buildsweepOptions ""
set square 32119.4
set square 30131.6
set nb_v_good 3
set nb_e_good 5

2
tests/pipe/specific/M3
View File

@ -19,7 +19,7 @@ set setsweepOptions "-FR"
set addsweepOptions "-T -R"
set buildsweepOptions ""
set square 34023.2
set square 32800.5
set nb_v_good 3
set nb_e_good 5

2
tests/pipe/specific/M5
View File

@ -19,7 +19,7 @@ set setsweepOptions "-CF"
set addsweepOptions ""
set buildsweepOptions ""
set square 32077.2
set square 30253.5
set nb_v_good 3
set nb_e_good 5

2
tests/pipe/specific/M7
View File

@ -19,7 +19,7 @@ set setsweepOptions "-CF"
set addsweepOptions "-T"
set buildsweepOptions ""
set square 33790.1
set square 32349.5
set nb_v_good 3
set nb_e_good 5

2
tests/pipe/specific/M8
View File

@ -19,7 +19,7 @@ set setsweepOptions "-CF"
set addsweepOptions "-T"
set buildsweepOptions "-R"
set square 34911.3
set square 33467.5
set nb_v_good 3
set nb_e_good 8

2
tests/pipe/specific/N2
View File

@ -19,7 +19,7 @@ set setsweepOptions "-CF"
set addsweepOptions "-R"
set buildsweepOptions ""
set square 32119.4
set square 30131.6
set nb_v_good 3
set nb_e_good 5

2
tests/pipe/specific/N3
View File

@ -19,7 +19,7 @@ set setsweepOptions "-CF"
set addsweepOptions "-T -R"
set buildsweepOptions "-R"
set square 37899.3
set square 36309.2
set nb_v_good 4
set nb_e_good 9

2
tests/pipe/specific/N6
View File

@ -19,7 +19,7 @@ set setsweepOptions ""
set addsweepOptions ""
set buildsweepOptions ""
set square 29697.4
set square 28006.9
set nb_v_good 15
set nb_e_good 25

2
tests/pipe/specific/N8
View File

@ -19,7 +19,7 @@ set setsweepOptions ""
set addsweepOptions "-T"
set buildsweepOptions ""
set square 30656.7
set square 29295.4
set nb_v_good 15
set nb_e_good 25

2
tests/pipe/specific/O1
View File

@ -19,7 +19,7 @@ set setsweepOptions ""
set addsweepOptions "-R"
set buildsweepOptions ""
set square 29764.3
set square 27924.2
set nb_v_good 15
set nb_e_good 25

2
tests/pipe/specific/O3
View File

@ -19,7 +19,7 @@ set setsweepOptions ""
set addsweepOptions "-T -R"
set buildsweepOptions ""
set square 30745.8
set square 29267.5
set nb_v_good 15
set nb_e_good 25

2
tests/pipe/specific/O5
View File

@ -19,7 +19,7 @@ set setsweepOptions "-FR"
set addsweepOptions ""
set buildsweepOptions ""
set square 27506.6
set square 25814.6
set nb_v_good 15
set nb_e_good 25

2
tests/pipe/specific/O7
View File

@ -19,7 +19,7 @@ set setsweepOptions "-FR"
set addsweepOptions "-T"
set buildsweepOptions ""
set square 27367.2
set square 25419.9
set nb_v_good 15
set nb_e_good 25

2
tests/pipe/specific/O9
View File

@ -19,7 +19,7 @@ set setsweepOptions "-FR"
set addsweepOptions "-R"
set buildsweepOptions ""
set square 29732.8
set square 27882.1
set nb_v_good 15
set nb_e_good 25

2
tests/pipe/specific/P2
View File

@ -19,7 +19,7 @@ set setsweepOptions "-FR"
set addsweepOptions "-T -R"
set buildsweepOptions ""
set square 29264.2
set square 27282.7
set nb_v_good 15
set nb_e_good 25

2
tests/pipe/specific/P4
View File

@ -19,7 +19,7 @@ set setsweepOptions "-CF"
set addsweepOptions ""
set buildsweepOptions ""
set square 29697.4
set square 28006.9
set nb_v_good 15
set nb_e_good 25

2
tests/pipe/specific/P6
View File

@ -19,7 +19,7 @@ set setsweepOptions "-CF"
set addsweepOptions "-T"
set buildsweepOptions ""
set square 30656.7
set square 29295.4
set nb_v_good 15
set nb_e_good 25

2
tests/pipe/specific/P8
View File

@ -19,7 +19,7 @@ set setsweepOptions "-CF"
set addsweepOptions "-R"
set buildsweepOptions ""
set square 29764.3
set square 27924.2
set nb_v_good 15
set nb_e_good 25

2
tests/pipe/specific/Q1
View File

@ -19,7 +19,7 @@ set setsweepOptions "-CF"
set addsweepOptions "-T -R"
set buildsweepOptions ""
set square 30745.8
set square 29267.5
set nb_v_good 15
set nb_e_good 25

2
tests/pipe/specific/Q3
View File

@ -19,7 +19,7 @@ set setsweepOptions ""
set addsweepOptions ""
set buildsweepOptions ""
set square 28767.8
set square 27135.6
set nb_v_good 12
set nb_e_good 20

2
tests/pipe/specific/Q5
View File

@ -19,7 +19,7 @@ set setsweepOptions ""
set addsweepOptions "-T"
set buildsweepOptions ""
set square 29829.6
set square 28434.6
set nb_v_good 12
set nb_e_good 20

2
tests/pipe/specific/Q7
View File

@ -19,7 +19,7 @@ set setsweepOptions ""
set addsweepOptions "-R"
set buildsweepOptions ""
set square 29069.5
set square 27289.6
set nb_v_good 12
set nb_e_good 20

2
tests/pipe/specific/Q9
View File

@ -19,7 +19,7 @@ set setsweepOptions ""
set addsweepOptions "-T -R"
set buildsweepOptions ""
set square 30024.7
set square 28489.1
set nb_v_good 12
set nb_e_good 20

2
tests/pipe/specific/R2
View File

@ -19,7 +19,7 @@ set setsweepOptions "-FR"
set addsweepOptions ""
set buildsweepOptions ""
set square 27154.8
set square 25522.2
set nb_v_good 12
set nb_e_good 20

2
tests/pipe/specific/R4
View File

@ -19,7 +19,7 @@ set setsweepOptions "-FR"
set addsweepOptions "-T"
set buildsweepOptions ""
set square 28422
set square 27210.9
set nb_v_good 12
set nb_e_good 20

2
tests/pipe/specific/R6
View File

@ -19,7 +19,7 @@ set setsweepOptions "-FR"
set addsweepOptions "-R"
set buildsweepOptions ""
set square 29081.3
set square 27294.9
set nb_v_good 12
set nb_e_good 20

2
tests/pipe/specific/R8
View File

@ -19,7 +19,7 @@ set setsweepOptions "-FR"
set addsweepOptions "-T -R"
set buildsweepOptions ""
set square 30243.2
set square 28939
set nb_v_good 12
set nb_e_good 20

2
tests/pipe/specific/S1
View File

@ -19,7 +19,7 @@ set setsweepOptions "-CF"
set addsweepOptions ""
set buildsweepOptions ""
set square 28767.8
set square 27135.6
set nb_v_good 12
set nb_e_good 20

2
tests/pipe/specific/S3
View File

@ -19,7 +19,7 @@ set setsweepOptions "-CF"
set addsweepOptions "-T"
set buildsweepOptions ""
set square 29829.6
set square 28434.6
set nb_v_good 12
set nb_e_good 20

2
tests/pipe/specific/S5
View File

@ -19,7 +19,7 @@ set setsweepOptions "-CF"
set addsweepOptions "-R"
set buildsweepOptions ""
set square 29069.5
set square 27289.6
set nb_v_good 12
set nb_e_good 20

2
tests/pipe/standard/A2
View File

@ -7,4 +7,4 @@ mkedge w w
wire w w
pipe result w profile
set square 7516.8
set square 7833.49

2
tests/pipe/standard/A3
View File

@ -6,4 +6,4 @@ mkedge w w
wire w w
pipe result w profile
set square 113874
set square 168406

2
tests/pipe/standard/A4
View File

@ -7,4 +7,4 @@ mkedge w w
wire w w
pipe result w profile
set square 8385.98
set square 8497.19

2
tests/pipe/standard/A5
View File

@ -7,4 +7,4 @@ mkedge w w
wire w w
pipe result w profile
set square 7767.04
set square 7262.6

2
tests/pipe/standard/B2
View File

@ -7,4 +7,4 @@ mkedge w w
wire w w
pipe result w profile
set square 12789.7
set square 12045

2
tests/pipe/standard/B3
View File

@ -7,4 +7,4 @@ mkedge w w
wire w w
pipe result w profile
set square 5094.14
set square 4755.96

Some files were not shown because too many files have changed in this diff Show More