X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=blobdiff_plain;f=src%2FIGESData%2FIGESData_GlobalSection.cxx;h=f1337c6cbc0e7241f0045489418daacd9384d583;hb=44d9ae897cb19f5b1420b656d3b0b7bb0c52b21c;hpb=b8f2022a1157abb0608f63012b35e1c12c9c2dc6 diff --git a/src/IGESData/IGESData_GlobalSection.cxx b/src/IGESData/IGESData_GlobalSection.cxx index b602480793..f1337c6cbc 100755 --- a/src/IGESData/IGESData_GlobalSection.cxx +++ b/src/IGESData/IGESData_GlobalSection.cxx @@ -124,28 +124,6 @@ void IGESData_GlobalSection::Init(const Handle(Interface_ParamSet)& params, Standard_Integer nbp = params->NbParams(); - // Sending of message : Incorrect number of parameters (following the IGES version) - // Version less than 5.3 - if (theIGESVersion < 11) - if ((nbp < 24) || (nbp > 25)) { - // 24 or 25 parameters are expected (parameter 25 is not required) - Message_Msg Msg39 ("XSTEP_39"); - Msg39.Arg(24); - Msg39.Arg(25); - if (nbp < 24) ach->SendFail(Msg39); - else ach->SendWarning(Msg39); - } - - // Version 5.3 - else if ((nbp < 25) || (nbp > 26)) { - // 25 or 26 parameters are expected (parameter 25 is not required) - Message_Msg Msg39 ("XSTEP_39"); - Msg39.Arg(25); - Msg39.Arg(26); - if (nbp < 25) ach->SendFail(Msg39); - else ach->SendWarning(Msg39); - } - for (Standard_Integer i = 1; i <= nbp; i ++) { Standard_Integer intval = 0; Standard_Real realval = 0.0; Handle(TCollection_HAsciiString) strval; // doit repartir a null @@ -227,6 +205,29 @@ void IGESData_GlobalSection::Init(const Handle(Interface_ParamSet)& params, default : break; } } + + // Sending of message : Incorrect number of parameters (following the IGES version) + // Version less than 5.3 + if (theIGESVersion < 11) + { + if ((nbp < 24) || (nbp > 25)) { + // 24 or 25 parameters are expected (parameter 25 is not required) + Message_Msg Msg39 ("XSTEP_39"); + Msg39.Arg(24); + Msg39.Arg(25); + if (nbp < 24) ach->SendFail(Msg39); + else ach->SendWarning(Msg39); + } + } + // Version 5.3 + else if ((nbp < 25) || (nbp > 26)) { + // 25 or 26 parameters are expected (parameter 25 is not required) + Message_Msg Msg39 ("XSTEP_39"); + Msg39.Arg(25); + Msg39.Arg(26); + if (nbp < 25) ach->SendFail(Msg39); + else ach->SendWarning(Msg39); + } //:45 by abv 11.12.97: if UnitFlag is not defined in the file, // restore it from UnitName. Repris par CKY 13-FEV-1998