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

0028250: Data Exchange - Wrong number of geometric tolerance modifiers.

Browse Source 
fix some copy paste mistakes,
update test cases.
This commit is contained in:
ika 2016-12-20 13:25:02 +03:00 committed by kgv
parent b6826918fe
commit 51663cb434
9 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx
View File

@ -89,7 +89,7 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol::ReadStep
Handle(StepDimTol_HArray1OfGeometricToleranceModifier) aModifiers; Handle(StepDimTol_HArray1OfGeometricToleranceModifier) aModifiers;
Standard_Integer sub = 0; Standard_Integer sub = 0;
if ( data->ReadSubList (num, 1, "modifiers", ach, sub) ) { if ( data->ReadSubList (num, 1, "modifiers", ach, sub) ) {
Standard_Integer nb0 = data->NbParams(sub5); Standard_Integer nb0 = data->NbParams(sub);
aModifiers = new StepDimTol_HArray1OfGeometricToleranceModifier (1, nb0); aModifiers = new StepDimTol_HArray1OfGeometricToleranceModifier (1, nb0);
Standard_Integer num2 = sub; Standard_Integer num2 = sub;
for ( Standard_Integer i0=1; i0 <= nb0; i0++ ) { for ( Standard_Integer i0=1; i0 <= nb0; i0++ ) {

2
src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx
View File

@ -84,7 +84,7 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod::ReadStep
Handle(StepDimTol_HArray1OfGeometricToleranceModifier) aModifiers; Handle(StepDimTol_HArray1OfGeometricToleranceModifier) aModifiers;
Standard_Integer sub = 0; Standard_Integer sub = 0;
if ( data->ReadSubList (num, 1, "modifiers", ach, sub) ) { if ( data->ReadSubList (num, 1, "modifiers", ach, sub) ) {
Standard_Integer nb0 = data->NbParams(sub5); Standard_Integer nb0 = data->NbParams(sub);
aModifiers = new StepDimTol_HArray1OfGeometricToleranceModifier (1, nb0); aModifiers = new StepDimTol_HArray1OfGeometricToleranceModifier (1, nb0);
Standard_Integer num2 = sub; Standard_Integer num2 = sub;
for ( Standard_Integer i0=1; i0 <= nb0; i0++ ) { for ( Standard_Integer i0=1; i0 <= nb0; i0++ ) {

2
src/STEPCAFControl/STEPCAFControl_Writer.cxx
View File

@ -3237,7 +3237,7 @@ static void WriteGeomTolerance (const Handle(XSControl_WorkSession) &WS,
Standard_Integer aModifNb = aModifiers.Length(); Standard_Integer aModifNb = aModifiers.Length();
if (anObject->GetMaterialRequirementModifier() != XCAFDimTolObjects_GeomToleranceMatReqModif_None) if (anObject->GetMaterialRequirementModifier() != XCAFDimTolObjects_GeomToleranceMatReqModif_None)
aModifNb++; aModifNb++;
for (Standard_Integer i = 1; i < aModifiers.Length(); i++) for (Standard_Integer i = 1; i <= aModifiers.Length(); i++)
if (aModifiers.Value(i) == XCAFDimTolObjects_GeomToleranceModif_All_Around || if (aModifiers.Value(i) == XCAFDimTolObjects_GeomToleranceModif_All_Around ||
aModifiers.Value(i) == XCAFDimTolObjects_GeomToleranceModif_All_Over) aModifiers.Value(i) == XCAFDimTolObjects_GeomToleranceModif_All_Over)
aModifNb--; aModifNb--;

14
src/XDEDRAW/XDEDRAW_GDTs.cxx
View File

@ -428,10 +428,20 @@ static Standard_Integer DumpNbDGTs (Draw_Interpretor& di, Standard_Integer argc,
Handle(XCAFDimTolObjects_GeomToleranceObject) anObject = aGTAttr->GetObject(); Handle(XCAFDimTolObjects_GeomToleranceObject) anObject = aGTAttr->GetObject();
if (anObject.IsNull()) if (anObject.IsNull())
continue; continue;
if (anObject->GetModifiers().Length() > 0 || if (anObject->GetMaterialRequirementModifier() != XCAFDimTolObjects_GeomToleranceMatReqModif_None) {
anObject->GetMaterialRequirementModifier() != XCAFDimTolObjects_GeomToleranceMatReqModif_None) {
nbWithModif++; nbWithModif++;
} }
else if (anObject->GetModifiers().Length() > 0) {
Standard_Boolean isHasModif = Standard_False;
for (Standard_Integer i = 1; i <= anObject->GetModifiers().Length(); i++)
if (anObject->GetModifiers().Value(i) != XCAFDimTolObjects_GeomToleranceModif_All_Around &&
anObject->GetModifiers().Value(i) != XCAFDimTolObjects_GeomToleranceModif_All_Over) {
isHasModif = Standard_True;
break;
}
if (isHasModif)
nbWithModif++;
}
if (anObject->GetMaxValueModifier() != 0) { if (anObject->GetMaxValueModifier() != 0) {
nbWithMaxTol++; nbWithMaxTol++;
} }

2
tests/gdt/export/A1
View File

@ -10,7 +10,7 @@ set ref_data {
NbOfWithPath : 0 NbOfWithPath : 0
NbOfCommonLabels : 0 NbOfCommonLabels : 0
NbOfTolerances : 6 NbOfTolerances : 6
NbOfGTWithModifiers : 1 NbOfGTWithModifiers : 0
NbOfGTWithMaxTolerance : 0 NbOfGTWithMaxTolerance : 0
NbOfGTWithDatums : 5 NbOfGTWithDatums : 5
NbOfDatumFeature : 3 NbOfDatumFeature : 3

2
tests/gdt/export/B1
View File

@ -10,7 +10,7 @@ set ref_data {
NbOfWithPath : 0 NbOfWithPath : 0
NbOfCommonLabels : 0 NbOfCommonLabels : 0
NbOfTolerances : 33 NbOfTolerances : 33
NbOfGTWithModifiers : 23 NbOfGTWithModifiers : 17
NbOfGTWithMaxTolerance : 0 NbOfGTWithMaxTolerance : 0
NbOfGTWithDatums : 30 NbOfGTWithDatums : 30
NbOfDatumFeature : 10 NbOfDatumFeature : 10

2
tests/gdt/export/B2
View File

@ -10,7 +10,7 @@ set ref_data {
NbOfWithPath : 0 NbOfWithPath : 0
NbOfCommonLabels : 0 NbOfCommonLabels : 0
NbOfTolerances : 33 NbOfTolerances : 33
NbOfGTWithModifiers : 23 NbOfGTWithModifiers : 17
NbOfGTWithMaxTolerance : 0 NbOfGTWithMaxTolerance : 0
NbOfGTWithDatums : 30 NbOfGTWithDatums : 30
NbOfDatumFeature : 10 NbOfDatumFeature : 10

2
tests/gdt/export/B4
View File

@ -10,7 +10,7 @@ set ref_data {
NbOfWithPath : 0 NbOfWithPath : 0
NbOfCommonLabels : 0 NbOfCommonLabels : 0
NbOfTolerances : 31 NbOfTolerances : 31
NbOfGTWithModifiers : 8 NbOfGTWithModifiers : 6
NbOfGTWithMaxTolerance : 0 NbOfGTWithMaxTolerance : 0
NbOfGTWithDatums : 30 NbOfGTWithDatums : 30
NbOfDatumFeature : 6 NbOfDatumFeature : 6

2
tests/gdt/export/B5
View File

@ -10,7 +10,7 @@ set ref_data {
NbOfWithPath : 0 NbOfWithPath : 0
NbOfCommonLabels : 0 NbOfCommonLabels : 0
NbOfTolerances : 31 NbOfTolerances : 31
NbOfGTWithModifiers : 8 NbOfGTWithModifiers : 6
NbOfGTWithMaxTolerance : 0 NbOfGTWithMaxTolerance : 0
NbOfGTWithDatums : 30 NbOfGTWithDatums : 30
NbOfDatumFeature : 6 NbOfDatumFeature : 6