OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

Upgrade Alicona core OCCT to version 7.8

Browse Source
This commit is contained in:
abulyche 2022-12-05 14:04:37 +00:00 committed by mzernova
parent 1cb57cafb4
commit f10643306a
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/STEPCAFControl/STEPCAFControl_Reader.cxx
View File

@ -3703,14 +3703,17 @@ static void setDimObjectToXCAF(const Handle(Standard_Transient)& theEnt,
Handle(StepBasic_NamedUnit) NU = anUnit.NamedUnit(); Handle(StepBasic_NamedUnit) NU = anUnit.NamedUnit();
STEPConstruct_UnitContext anUnitCtx; STEPConstruct_UnitContext anUnitCtx;
anUnitCtx.ComputeFactors(NU, theLocalFactors); anUnitCtx.ComputeFactors(NU, theLocalFactors);
if (aMWU->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndLengthMeasureWithUnit))) { if (aMWU->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndPlaneAngleMeasureWithUnitAndQRI)) ||
aVal = aVal * anUnitCtx.LengthFactor(); aMWU->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndPlaneAngleMeasureWithUnit)))
{
}
else
if (aMWU->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndPlaneAngleMeasureWithUnit))) {
convertAngleValue(anUnitCtx, aVal); convertAngleValue(anUnitCtx, aVal);
} }
else if (aMWU->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndLengthMeasureWithUnit)) ||
aMWU->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI)) ||
anUnitCtx.LengthFactor() > 0.)
{
aVal = aVal * anUnitCtx.LengthFactor();
}
Handle(TCollection_HAsciiString) aName = aMWU->Name(); Handle(TCollection_HAsciiString) aName = aMWU->Name();
if (aName->Search("upper") > 0) // upper limit if (aName->Search("upper") > 0) // upper limit
aDim2 = aVal; aDim2 = aVal;
@ -3810,13 +3813,11 @@ static void setDimObjectToXCAF(const Handle(Standard_Transient)& theEnt,
Handle(StepBasic_NamedUnit) NU = anUnit.NamedUnit(); Handle(StepBasic_NamedUnit) NU = anUnit.NamedUnit();
STEPConstruct_UnitContext anUnitCtxUpperBound; STEPConstruct_UnitContext anUnitCtxUpperBound;
anUnitCtxUpperBound.ComputeFactors(NU, theLocalFactors); anUnitCtxUpperBound.ComputeFactors(NU, theLocalFactors);
if (aMWU->IsKind(STANDARD_TYPE(StepBasic_PlaneAngleMeasureWithUnit)) || if (aMWU->IsKind(STANDARD_TYPE(StepBasic_PlaneAngleMeasureWithUnit)))
aMWU->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndPlaneAngleMeasureWithUnitAndQRI)))
{ {
convertAngleValue(anUnitCtxUpperBound, aVal); convertAngleValue(anUnitCtxUpperBound, aVal);
} }
else if ((aMWU->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)) && anUnitCtxUpperBound.LengthFactor() > 0.) || else if (anUnitCtxUpperBound.LengthFactor() > 0.)
aMWU->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI)))
{ {
aVal = aVal * anUnitCtxUpperBound.LengthFactor(); aVal = aVal * anUnitCtxUpperBound.LengthFactor();
} }
@ -3846,13 +3847,11 @@ static void setDimObjectToXCAF(const Handle(Standard_Transient)& theEnt,
NU = anUnit.NamedUnit(); NU = anUnit.NamedUnit();
STEPConstruct_UnitContext anUnitCtxLowerBound; STEPConstruct_UnitContext anUnitCtxLowerBound;
anUnitCtxLowerBound.ComputeFactors(NU, theLocalFactors); anUnitCtxLowerBound.ComputeFactors(NU, theLocalFactors);
if (aMWU->IsKind(STANDARD_TYPE(StepBasic_PlaneAngleMeasureWithUnit)) || if (aMWU->IsKind(STANDARD_TYPE(StepBasic_PlaneAngleMeasureWithUnit)))
aMWU->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndPlaneAngleMeasureWithUnitAndQRI)))
{ {
convertAngleValue(anUnitCtxLowerBound, aVal); convertAngleValue(anUnitCtxLowerBound, aVal);
} }
else if ((aMWU->IsKind(STANDARD_TYPE(StepBasic_MeasureWithUnit)) && anUnitCtxLowerBound.LengthFactor() > 0.) || else if (anUnitCtxUpperBound.LengthFactor() > 0.)
aMWU->IsKind(STANDARD_TYPE(StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI)))
{ {
aVal = aVal * anUnitCtxLowerBound.LengthFactor(); aVal = aVal * anUnitCtxLowerBound.LengthFactor();
} }

2
src/TopLoc/TopLoc_Location.hxx
View File

@ -153,7 +153,7 @@ Standard_Boolean operator != (const TopLoc_Location& Other) const
static Standard_Real ScalePrec() static Standard_Real ScalePrec()
{ {
return 1.e-14; return 1.e-13;
} }
protected: protected:

6
tests/bugs/step/bug33095
View File

@ -10,12 +10,14 @@ catch { Close D_m }
# Read file in mm # Read file in mm
ReadStep D_mm [locate_data_file bug33095_cad_with_pmi.stp] ReadStep D_mm [locate_data_file bug33095_cad_with_pmi.stp]
set plusMinusTol_mm [XGetDimensionPlusMinusTol D_mm 0:1:4:77] set plusMinusTol_mm [XGetDimensionPlusMinusTol D_mm 0:1:4:77]
set dim_value_mm [XGetDimensionValue D_mm 0:1:4:77]
# Read file in m # Read file in m
XNewDoc D_m XNewDoc D_m
XSetLengthUnit D_m m XSetLengthUnit D_m m
ReadStep D_m [locate_data_file bug33095_cad_with_pmi.stp] ReadStep D_m [locate_data_file bug33095_cad_with_pmi.stp]
set plusMinusTol_m [XGetDimensionPlusMinusTol D_m 0:1:4:77] set plusMinusTol_m [XGetDimensionPlusMinusTol D_m 0:1:4:77]
set dim_value_m [XGetDimensionValue D_m 0:1:4:77]
# Checking # Checking
regexp {lower +([-0-9.+eE]+) +upper +([-0-9.+eE]+)} $plusMinusTol_m full lower_m upper_m regexp {lower +([-0-9.+eE]+) +upper +([-0-9.+eE]+)} $plusMinusTol_m full lower_m upper_m
@ -23,6 +25,7 @@ regexp {lower +([-0-9.+eE]+) +upper +([-0-9.+eE]+)} $plusMinusTol_mm full lower_
set lower_m_to_mm [expr {$lower_m * 1000}] set lower_m_to_mm [expr {$lower_m * 1000}]
set upper_m_to_mm [expr {$upper_m * 1000}] set upper_m_to_mm [expr {$upper_m * 1000}]
set value_m_to_mm [expr {$dim_value_m * 1000}]
if {[expr {abs($lower_m_to_mm - $lower_mm)}] > 1e-2} { if {[expr {abs($lower_m_to_mm - $lower_mm)}] > 1e-2} {
puts "Error: incorrect scaling lower toleranse value" puts "Error: incorrect scaling lower toleranse value"
@ -30,3 +33,6 @@ if {[expr {abs($lower_m_to_mm - $lower_mm)}] > 1e-2} {
if {[expr {abs($upper_m_to_mm - $upper_mm)}] > 1e-2} { if {[expr {abs($upper_m_to_mm - $upper_mm)}] > 1e-2} {
puts "Error: incorrect scaling upper toleranse value" puts "Error: incorrect scaling upper toleranse value"
} }
if {[expr {abs($value_m_to_mm - $dim_value_mm)}] > 1e-2} {
puts "Error: incorrect scaling main dimension value"
}