diff --git a/src/APIHeaderSection/APIHeaderSection_MakeHeader.cxx b/src/APIHeaderSection/APIHeaderSection_MakeHeader.cxx index d88a972fe7..7dbc8038d1 100644 --- a/src/APIHeaderSection/APIHeaderSection_MakeHeader.cxx +++ b/src/APIHeaderSection/APIHeaderSection_MakeHeader.cxx @@ -164,7 +164,7 @@ void APIHeaderSection_MakeHeader::Apply Handle(StepData_Protocol) stepro = Handle(StepData_Protocol)::DownCast ( model->Protocol()); if (!stepro.IsNull()) sch = new TCollection_HAsciiString - (stepro->SchemaName()); + (stepro->SchemaName(model)); if (!sch.IsNull()) schid->SetValue (1,sch); } header.AddItem(fs); diff --git a/src/DESTEP/DESTEP_ConfigurationNode.cxx b/src/DESTEP/DESTEP_ConfigurationNode.cxx index 45b424c06a..e9e00add30 100644 --- a/src/DESTEP/DESTEP_ConfigurationNode.cxx +++ b/src/DESTEP/DESTEP_ConfigurationNode.cxx @@ -461,7 +461,7 @@ TCollection_AsciiString DESTEP_ConfigurationNode::Save() const aResult += "!\n"; aResult += "!Defines the version of schema used for the output STEP file\n"; aResult += - "!Default value: 1 or AP214CD. Available values: 1 or AP214CD, 2 or AP214DIS, 3 or AP203, "; + "!Default value: 4 or AP214IS. Available values: 1 or AP214CD, 2 or AP214DIS, 3 or AP203, "; aResult += "4 or AP214IS, 5 or AP242DIS\n"; aResult += aScope + "write.schema :\t " + InternalParameters.WriteSchema + "\n"; aResult += "!\n"; diff --git a/src/DESTEP/DESTEP_Parameters.hxx b/src/DESTEP/DESTEP_Parameters.hxx index 1ad457243c..a02b35b2b8 100644 --- a/src/DESTEP/DESTEP_Parameters.hxx +++ b/src/DESTEP/DESTEP_Parameters.hxx @@ -186,7 +186,7 @@ public: WriteMode_PrecisionMode WritePrecisionMode = WriteMode_PrecisionMode_Average; // #include -#include #include #include #include @@ -2375,9 +2374,6 @@ static NCollection_DataMap typeshor; RWStepAP214_ReadWriteModule::RWStepAP214_ReadWriteModule () { -// Handle(StepAP214_Protocol) protocol = new StepAP214_Protocol; -// StepData_WriterLib::SetGlobal(Handle(RWStepAP214_ReadWriteModule)::DownCast(This()),protocol); -// Interface_ReaderLib::SetGlobal(Handle(RWStepAP214_ReadWriteModule)::DownCast(This()),protocol); if (!typenums.IsEmpty()) return; typenums.Bind (Reco_CartesianPoint, 59); typenums.Bind (Reco_VertexPoint, 316); diff --git a/src/STEPCAFControl/STEPCAFControl_Reader.cxx b/src/STEPCAFControl/STEPCAFControl_Reader.cxx index cb7f2348a2..538fc133c0 100644 --- a/src/STEPCAFControl/STEPCAFControl_Reader.cxx +++ b/src/STEPCAFControl/STEPCAFControl_Reader.cxx @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/src/STEPCAFControl/STEPCAFControl_Writer.cxx b/src/STEPCAFControl/STEPCAFControl_Writer.cxx index 95f83aa338..0499de4433 100644 --- a/src/STEPCAFControl/STEPCAFControl_Writer.cxx +++ b/src/STEPCAFControl/STEPCAFControl_Writer.cxx @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include diff --git a/src/STEPConstruct/STEPConstruct_ContextTool.cxx b/src/STEPConstruct/STEPConstruct_ContextTool.cxx index e7da67e011..6c9a230cfe 100644 --- a/src/STEPConstruct/STEPConstruct_ContextTool.cxx +++ b/src/STEPConstruct/STEPConstruct_ContextTool.cxx @@ -19,7 +19,6 @@ #include #include -#include #include #include #include @@ -316,136 +315,6 @@ void STEPConstruct_ContextTool::SetACname (const Handle(TCollection_HAsciiString GetAPD()->Application()->SetApplication (name); } -/* -//======================================================================= -//function : SetACapplication -//purpose : -//======================================================================= - -void STEPConstruct_ContextTool::SetACapplication (const Handle(TCollection_HAsciiString)& application) -{ - GetPDC()->Formation()->OfProduct()->FrameOfReferenceValue(1) - ->FrameOfReference()->SetApplication(application); - -} -*/ - -// -------------------------------- -// Product Related Product Category -// -------------------------------- - -/* - -//======================================================================= -//function : GetPRPC -//purpose : -//======================================================================= - -Handle(StepBasic_ProductRelatedProductCategory) STEPConstruct_ContextTool::GetPRPC() -{ - return thePRPC; -} - -//======================================================================= -//function : AddPRPC -//purpose : -//======================================================================= - -void STEPConstruct_ContextTool::AddPRPC (const Standard_Boolean enforce) -{ - Standard_Boolean noprpc = thePRPC.IsNull(); - if (noprpc || enforce) { - //:i3 abv 1 Sep 98: ProSTEP TR9: generate PRODUCT_TYPE (derived) instead of PRPC - switch (Interface_Static::IVal("write.step.schema")) { //j4 - default: - case 1: - thePRPC = new StepBasic_ProductType; - thePRPC->SetName (new TCollection_HAsciiString("part")); - break; - case 4: - case 2: - thePRPC = new StepBasic_ProductRelatedProductCategory; - thePRPC->SetName (new TCollection_HAsciiString("part")); - break; - case 3: - thePRPC = new StepBasic_ProductRelatedProductCategory; - thePRPC->SetName (new TCollection_HAsciiString("detail")); // !!!!! or "assembly" - break; - } - thePRPC->UnSetDescription(); //:i3 - } -// if (noprpc || enforce) aStepModel->AddWithRefs(thePRPC); -} - -//======================================================================= -//function : SetPRPCName -//purpose : -//======================================================================= - -void STEPConstruct_ContextTool::SetPRPCName(const Handle(TCollection_HAsciiString)& aName) -{ - GetPRPC()->SetName(aName); -} - -//======================================================================= -//function : GetPRPCName -//purpose : -//======================================================================= - -Handle(TCollection_HAsciiString) STEPConstruct_ContextTool::GetPRPCName() -{ - if (GetPRPC().IsNull()) return new TCollection_HAsciiString(""); - return GetPRPC()->Name(); -} - -//======================================================================= -//function : SetPRPCDescription -//purpose : -//======================================================================= - -void STEPConstruct_ContextTool::SetPRPCDescription (const Handle(TCollection_HAsciiString)& aDescription) -{ - Handle(StepBasic_ProductRelatedProductCategory) aPRPC = GetPRPC(); - aPRPC->SetDescription(aDescription); -// aPRPC->HasDescription(Standard_True); -} - -//======================================================================= -//function : GetPRPCDescription -//purpose : -//======================================================================= - -Handle(TCollection_HAsciiString) STEPConstruct_ContextTool::GetPRPCDescription() -{ - Handle(StepBasic_ProductRelatedProductCategory) aPRPC = GetPRPC(); - if (!aPRPC.IsNull() && aPRPC->HasDescription()) - return aPRPC->Description(); - else { - return new TCollection_HAsciiString(""); - } -} - -// ================================================================ -// -// Settings from an already done SDR (see SDRtool) -// -// ================================================================ - -void STEPConstruct_ContextTool::SetSDR (const Handle(StepShape_ShapeDefinitionRepresentation)& sdr) -{ -// SDR partage des choses avec le contexte ... On raccroche les wagons - Handle(StepBasic_Product) theProduct = - sdr->Definition()->Definition().ProductDefinition()->Formation()->OfProduct(); - Handle(StepBasic_ApplicationContext) theAppli = - theProduct->FrameOfReferenceValue(1)->FrameOfReference(); - Handle(StepBasic_HArray1OfProduct) ProdList = - new StepBasic_HArray1OfProduct(1,1); - ProdList->SetValue(1,theProduct); - thePRPC->SetProducts (ProdList); - theAPD->SetApplication (theAppli); -} -*/ - //======================================================================= //function : GetDefaultAxis //purpose : diff --git a/src/STEPConstruct/STEPConstruct_Part.cxx b/src/STEPConstruct/STEPConstruct_Part.cxx index 3e8c03c3f7..f91d776e22 100644 --- a/src/STEPConstruct/STEPConstruct_Part.cxx +++ b/src/STEPConstruct/STEPConstruct_Part.cxx @@ -16,7 +16,6 @@ //:j4 gka 16.03.99 S4134 // abv 20.11.99 renamed from StepPDR_SDRtool -#include #include #include #include diff --git a/src/STEPConstruct/STEPConstruct_Styles.cxx b/src/STEPConstruct/STEPConstruct_Styles.cxx index d2e4069280..0f626c7cf3 100644 --- a/src/STEPConstruct/STEPConstruct_Styles.cxx +++ b/src/STEPConstruct/STEPConstruct_Styles.cxx @@ -17,7 +17,6 @@ #include #include -#include #include #include #include diff --git a/src/STEPConstruct/STEPConstruct_UnitContext.cxx b/src/STEPConstruct/STEPConstruct_UnitContext.cxx index 7de1ffc654..00837fd93c 100644 --- a/src/STEPConstruct/STEPConstruct_UnitContext.cxx +++ b/src/STEPConstruct/STEPConstruct_UnitContext.cxx @@ -17,7 +17,6 @@ //abv 17.11.99: renamed from StepPDR_MakeUnitAndToleranceContext and merged with STEPControl_Unit //abv 30.02.00: ability to write file in units other than MM -#include #include #include #include diff --git a/src/STEPConstruct/STEPConstruct_ValidationProps.cxx b/src/STEPConstruct/STEPConstruct_ValidationProps.cxx index 10f0c33641..c7c4fe68f3 100644 --- a/src/STEPConstruct/STEPConstruct_ValidationProps.cxx +++ b/src/STEPConstruct/STEPConstruct_ValidationProps.cxx @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include diff --git a/src/STEPControl/STEPControl_ActorRead.cxx b/src/STEPControl/STEPControl_ActorRead.cxx index e1a5c1fa7b..5e1286d056 100644 --- a/src/STEPControl/STEPControl_ActorRead.cxx +++ b/src/STEPControl/STEPControl_ActorRead.cxx @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -549,9 +548,9 @@ static void getSDR(const Handle(StepRepr_ProductDefinitionShape)& PDS, // Flag indicating whether SDRs associated with the product`s main SDR // by SRRs (which correspond to hybrid model representation in AP203 since 1998) // should be taken into account - Standard_Integer readSRR = aStepModel->InternalParameters.ReadRelationship; + const bool readSRR = aStepModel->InternalParameters.ReadRelationship; - Standard_Integer readConstructiveGeomRR = aStepModel->InternalParameters.ReadConstrRelation; + const bool readConstructiveGeomRR = aStepModel->InternalParameters.ReadConstrRelation; // Flag indicating whether SDRs associated with the product`s main SDR // by SAs (which correspond to hybrid model representation in AP203 before 1998) // should be taken into account @@ -1656,18 +1655,18 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity aResult = TransferBRep::ShapeResult(shbinder); aBuilder.Add(aCund, aResult); } + // translate possible shapes related by SRRs, which corresponds to // way of writing hybrid models in AP203 since 1998, and AP209 - Standard_Integer aReadSRR = Interface_Static::IVal("read.step.shape.relationship"); - Standard_Integer aReadConstructiveGeomRR = Interface_Static::IVal("read.step.constructivegeom.relationship"); - if (aReadSRR) + Handle(StepData_StepModel) aStepModel = Handle(StepData_StepModel)::DownCast(TP->Model()); + if (aStepModel->InternalParameters.ReadRelationship) { const Interface_Graph& aGraph = TP->Graph(); Standard_Integer aSRRnum = 0; for (Interface_EntityIterator aSubsIt(aGraph.Sharings(maprep)); aSubsIt.More(); aSubsIt.Next()) ++aSRRnum; Message_ProgressScope aPS(aPSRoot.Next(), "Part", aSRRnum); - TopoDS_Shape aNewResult = TransferRelatedSRR(TP, maprep, Standard_False, aReadConstructiveGeomRR, theLocalFactors, aCund, aPS); + TopoDS_Shape aNewResult = TransferRelatedSRR(TP, maprep, Standard_False, aStepModel->InternalParameters.ReadConstrRelation, theLocalFactors, aCund, aPS); if (!aNewResult.IsNull()) { aResult = aNewResult; @@ -2176,7 +2175,7 @@ void STEPControl_ActorRead::SetModel(const Handle(Interface_InterfaceModel)& the TopoDS_Shape STEPControl_ActorRead::TransferRelatedSRR(const Handle(Transfer_TransientProcess)& theTP, const Handle(StepShape_ShapeRepresentation)& theRep, const Standard_Boolean theUseTrsf, - const Standard_Integer theReadConstructiveGeomRR, + const Standard_Boolean theReadConstructiveGeomRR, const StepData_Factors& theLocalFactors, TopoDS_Compound& theCund, Message_ProgressScope& thePS) diff --git a/src/STEPControl/STEPControl_ActorRead.hxx b/src/STEPControl/STEPControl_ActorRead.hxx index af4641d836..7637c2937b 100644 --- a/src/STEPControl/STEPControl_ActorRead.hxx +++ b/src/STEPControl/STEPControl_ActorRead.hxx @@ -207,7 +207,7 @@ private: Standard_EXPORT TopoDS_Shape TransferRelatedSRR(const Handle(Transfer_TransientProcess)& theTP, const Handle(StepShape_ShapeRepresentation)& theRep, const Standard_Boolean theUseTrsf, - const Standard_Integer theReadConstructiveGeomRR, + const Standard_Boolean theReadConstructiveGeomRR, const StepData_Factors& theLocalFactors, TopoDS_Compound& theCund, Message_ProgressScope& thePS); diff --git a/src/STEPControl/STEPControl_ActorWrite.cxx b/src/STEPControl/STEPControl_ActorWrite.cxx index 6231ba17a1..69c6c6a38f 100644 --- a/src/STEPControl/STEPControl_ActorWrite.cxx +++ b/src/STEPControl/STEPControl_ActorWrite.cxx @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/src/STEPControl/STEPControl_Reader.cxx b/src/STEPControl/STEPControl_Reader.cxx index ffe2f804d2..0c208598f9 100644 --- a/src/STEPControl/STEPControl_Reader.cxx +++ b/src/STEPControl/STEPControl_Reader.cxx @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include diff --git a/src/StepAP214/StepAP214_Protocol.cxx b/src/StepAP214/StepAP214_Protocol.cxx index 20841eb3ec..3008522eb6 100644 --- a/src/StepAP214/StepAP214_Protocol.cxx +++ b/src/StepAP214/StepAP214_Protocol.cxx @@ -26,6 +26,7 @@ static Standard_CString schemaAP203 = "CONFIG_CONTROL_DESIGN"; static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERING_MIM_LF. {1 0 10303 442 1 1 4 }"; #include +#include #include #include @@ -399,7 +400,6 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI #include #include #include -#include #include #include #include @@ -1592,19 +1592,29 @@ Handle(Standard_Type)& atype) const //purpose : //======================================================================= -Standard_CString StepAP214_Protocol::SchemaName() const -{ - switch (Interface_Static::IVal("write.step.schema")) { //:j4 - default: - case 1 : return schemaAP214CD; break; - case 2 : return schemaAP214DIS; break; - case 3 : return schemaAP203; break; - case 4: return schemaAP214IS; break; - case 5 : return schemaAP242DIS; break; +Standard_CString StepAP214_Protocol::SchemaName( + const Handle(Interface_InterfaceModel)& theModel) const +{ + Handle(StepData_StepModel) aModel1 = Handle(StepData_StepModel)::DownCast(theModel); + const DESTEP_Parameters::WriteMode_StepSchema aSchema = + aModel1.IsNull() ? DESTEP_Parameters::WriteMode_StepSchema_AP214IS + : aModel1->InternalParameters.WriteSchema; + switch (aSchema) + { + case DESTEP_Parameters::WriteMode_StepSchema_AP203: + return schemaAP203; + case DESTEP_Parameters::WriteMode_StepSchema_AP214IS: + return schemaAP214IS; + case DESTEP_Parameters::WriteMode_StepSchema_AP242DIS: + return schemaAP242DIS; + case DESTEP_Parameters::WriteMode_StepSchema_AP214CD: + return schemaAP214CD; + case DESTEP_Parameters::WriteMode_StepSchema_AP214DIS: + default: + return schemaAP214DIS; } } - //======================================================================= //function : NbResources //purpose : diff --git a/src/StepAP214/StepAP214_Protocol.hxx b/src/StepAP214/StepAP214_Protocol.hxx index 988c55c8b5..83a1516bc3 100644 --- a/src/StepAP214/StepAP214_Protocol.hxx +++ b/src/StepAP214/StepAP214_Protocol.hxx @@ -42,7 +42,7 @@ public: //! Returns a Case Number for each of the StepAP214 Entities Standard_EXPORT virtual Standard_Integer TypeNumber (const Handle(Standard_Type)& atype) const Standard_OVERRIDE; - Standard_EXPORT virtual Standard_CString SchemaName() const Standard_OVERRIDE; + Standard_EXPORT virtual Standard_CString SchemaName(const Handle(Interface_InterfaceModel)& theModel) const Standard_OVERRIDE; //! Returns count of Protocol used as Resources (level one) Standard_EXPORT virtual Standard_Integer NbResources() const Standard_OVERRIDE; diff --git a/src/StepData/StepData.cxx b/src/StepData/StepData.cxx index a0e6c519e5..6293f68190 100644 --- a/src/StepData/StepData.cxx +++ b/src/StepData/StepData.cxx @@ -14,7 +14,6 @@ #include #include -#include #include #include #include @@ -28,11 +27,6 @@ StaticHandleA(StepData_Protocol,theheader); void StepData::Init () { -// InitHandleVoid(StepData_Protocol,proto); -// InitHandleVoid(StepData_DefaultGeneral,stmod); -//:S4136 Interface_Static::Init("step","step.readaccept.void",'i',"1"); -// if (proto.IsNull()) proto = new StepData_Protocol; -// if (stmod.IsNull()) stmod = new StepData_DefaultGeneral; } Handle(StepData_Protocol) StepData::Protocol () diff --git a/src/StepData/StepData_FileProtocol.cxx b/src/StepData/StepData_FileProtocol.cxx index 6a264f7c88..c0726a70ee 100644 --- a/src/StepData/StepData_FileProtocol.cxx +++ b/src/StepData/StepData_FileProtocol.cxx @@ -63,5 +63,5 @@ Standard_Boolean StepData_FileProtocol::GlobalCheck(const Interface_Graph& G, } - Standard_CString StepData_FileProtocol::SchemaName () const + Standard_CString StepData_FileProtocol::SchemaName (const Handle(Interface_InterfaceModel)&) const { return thename; } diff --git a/src/StepData/StepData_FileProtocol.hxx b/src/StepData/StepData_FileProtocol.hxx index 8223f637c7..b12f7ed36e 100644 --- a/src/StepData/StepData_FileProtocol.hxx +++ b/src/StepData/StepData_FileProtocol.hxx @@ -70,7 +70,7 @@ public: //! To be redefined by each sub-class //! Here, SchemaName returns "" (empty String) //! was C++ : return const - Standard_EXPORT virtual Standard_CString SchemaName() const Standard_OVERRIDE; + Standard_EXPORT virtual Standard_CString SchemaName(const Handle(Interface_InterfaceModel)& theModel) const Standard_OVERRIDE; diff --git a/src/StepData/StepData_Protocol.cxx b/src/StepData/StepData_Protocol.cxx index 330299ccd7..8a9c223c25 100644 --- a/src/StepData/StepData_Protocol.cxx +++ b/src/StepData/StepData_Protocol.cxx @@ -68,7 +68,7 @@ Standard_Integer StepData_Protocol::TypeNumber } -Standard_CString StepData_Protocol::SchemaName () const +Standard_CString StepData_Protocol::SchemaName (const Handle(Interface_InterfaceModel)&) const { return thename; } diff --git a/src/StepData/StepData_Protocol.hxx b/src/StepData/StepData_Protocol.hxx index 65f975efef..96e5886bf4 100644 --- a/src/StepData/StepData_Protocol.hxx +++ b/src/StepData/StepData_Protocol.hxx @@ -67,7 +67,7 @@ public: //! To be redefined by each sub-class //! Here, SchemaName returns "(DEFAULT)" //! was C++ : return const - Standard_EXPORT virtual Standard_CString SchemaName() const; + Standard_EXPORT virtual Standard_CString SchemaName(const Handle(Interface_InterfaceModel)& theModel) const; //! Creates an empty Model for Step Norm Standard_EXPORT Handle(Interface_InterfaceModel) NewModel() const Standard_OVERRIDE; diff --git a/src/StepData/StepData_StepModel.cxx b/src/StepData/StepData_StepModel.cxx index d85a128dd6..45d6af443f 100644 --- a/src/StepData/StepData_StepModel.cxx +++ b/src/StepData/StepData_StepModel.cxx @@ -26,7 +26,6 @@ #include #include #include -#include #include IMPLEMENT_STANDARD_RTTIEXT(StepData_StepModel,Interface_InterfaceModel) diff --git a/src/StepData/StepData_StepReaderData.cxx b/src/StepData/StepData_StepReaderData.cxx index ac5dc827fd..9d95cc3998 100644 --- a/src/StepData/StepData_StepReaderData.cxx +++ b/src/StepData/StepData_StepReaderData.cxx @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include diff --git a/src/StepSelect/StepSelect_StepType.cxx b/src/StepSelect/StepSelect_StepType.cxx index d7fdae70c5..7bd40957dc 100644 --- a/src/StepSelect/StepSelect_StepType.cxx +++ b/src/StepSelect/StepSelect_StepType.cxx @@ -42,13 +42,13 @@ static TCollection_AsciiString lastvalue; thelib.AddProtocol (theproto); thename.Clear(); thename.AssignCat ("Step Type (Schema "); - thename.AssignCat (theproto->SchemaName()); + thename.AssignCat (theproto->SchemaName(nullptr)); thename.AssignCat (")"); } Standard_CString StepSelect_StepType::Value (const Handle(Standard_Transient)& ent, - const Handle(Interface_InterfaceModel)& /*model*/) const + const Handle(Interface_InterfaceModel)& model) const { static Standard_Mutex aMutex; Standard_Mutex::Sentry aSentry(aMutex); @@ -58,7 +58,7 @@ static TCollection_AsciiString lastvalue; Standard_Boolean ok = thelib.Select (ent,module,CN); if (!ok) { lastvalue.AssignCat ("..NOT FROM SCHEMA "); - lastvalue.AssignCat (theproto->SchemaName()); + lastvalue.AssignCat (theproto->SchemaName(model)); lastvalue.AssignCat (".."); } else { Standard_Boolean plex = module->IsComplex(CN); diff --git a/src/StepToTopoDS/StepToTopoDS_Builder.cxx b/src/StepToTopoDS/StepToTopoDS_Builder.cxx index 49991f88a1..7e13999562 100644 --- a/src/StepToTopoDS/StepToTopoDS_Builder.cxx +++ b/src/StepToTopoDS/StepToTopoDS_Builder.cxx @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include diff --git a/src/StepToTopoDS/StepToTopoDS_TranslateCompositeCurve.cxx b/src/StepToTopoDS/StepToTopoDS_TranslateCompositeCurve.cxx index f0a3dfb2e1..4da63eeb00 100644 --- a/src/StepToTopoDS/StepToTopoDS_TranslateCompositeCurve.cxx +++ b/src/StepToTopoDS/StepToTopoDS_TranslateCompositeCurve.cxx @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/src/StepToTopoDS/StepToTopoDS_TranslateEdgeLoop.cxx b/src/StepToTopoDS/StepToTopoDS_TranslateEdgeLoop.cxx index d745683b8c..e8b1ffd9e7 100644 --- a/src/StepToTopoDS/StepToTopoDS_TranslateEdgeLoop.cxx +++ b/src/StepToTopoDS/StepToTopoDS_TranslateEdgeLoop.cxx @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include diff --git a/src/TopoDSToStep/TopoDSToStep_MakeBrepWithVoids.cxx b/src/TopoDSToStep/TopoDSToStep_MakeBrepWithVoids.cxx index b9d1a24327..7071d6d26c 100644 --- a/src/TopoDSToStep/TopoDSToStep_MakeBrepWithVoids.cxx +++ b/src/TopoDSToStep/TopoDSToStep_MakeBrepWithVoids.cxx @@ -16,7 +16,6 @@ #include -#include #include #include #include diff --git a/src/TopoDSToStep/TopoDSToStep_MakeFacetedBrep.cxx b/src/TopoDSToStep/TopoDSToStep_MakeFacetedBrep.cxx index 6add10078b..845f237151 100644 --- a/src/TopoDSToStep/TopoDSToStep_MakeFacetedBrep.cxx +++ b/src/TopoDSToStep/TopoDSToStep_MakeFacetedBrep.cxx @@ -16,7 +16,6 @@ #include -#include #include #include #include diff --git a/src/TopoDSToStep/TopoDSToStep_MakeManifoldSolidBrep.cxx b/src/TopoDSToStep/TopoDSToStep_MakeManifoldSolidBrep.cxx index 4c4604a05e..3b3e9655e5 100644 --- a/src/TopoDSToStep/TopoDSToStep_MakeManifoldSolidBrep.cxx +++ b/src/TopoDSToStep/TopoDSToStep_MakeManifoldSolidBrep.cxx @@ -16,7 +16,6 @@ #include -#include #include #include #include diff --git a/src/TopoDSToStep/TopoDSToStep_MakeShellBasedSurfaceModel.cxx b/src/TopoDSToStep/TopoDSToStep_MakeShellBasedSurfaceModel.cxx index be09e59488..362c647116 100644 --- a/src/TopoDSToStep/TopoDSToStep_MakeShellBasedSurfaceModel.cxx +++ b/src/TopoDSToStep/TopoDSToStep_MakeShellBasedSurfaceModel.cxx @@ -15,7 +15,6 @@ // commercial license or contractual agreement. -#include #include #include #include diff --git a/src/TopoDSToStep/TopoDSToStep_MakeStepEdge.cxx b/src/TopoDSToStep/TopoDSToStep_MakeStepEdge.cxx index b5696cc101..fb25dbe9a3 100644 --- a/src/TopoDSToStep/TopoDSToStep_MakeStepEdge.cxx +++ b/src/TopoDSToStep/TopoDSToStep_MakeStepEdge.cxx @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/src/TopoDSToStep/TopoDSToStep_MakeStepFace.cxx b/src/TopoDSToStep/TopoDSToStep_MakeStepFace.cxx index 55776f1fa2..1818d12239 100644 --- a/src/TopoDSToStep/TopoDSToStep_MakeStepFace.cxx +++ b/src/TopoDSToStep/TopoDSToStep_MakeStepFace.cxx @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include diff --git a/src/TopoDSToStep/TopoDSToStep_MakeStepVertex.cxx b/src/TopoDSToStep/TopoDSToStep_MakeStepVertex.cxx index 20531b118d..1cdaa2792f 100644 --- a/src/TopoDSToStep/TopoDSToStep_MakeStepVertex.cxx +++ b/src/TopoDSToStep/TopoDSToStep_MakeStepVertex.cxx @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/src/TopoDSToStep/TopoDSToStep_Tool.cxx b/src/TopoDSToStep/TopoDSToStep_Tool.cxx index f9cf2b620e..cdb1b30370 100644 --- a/src/TopoDSToStep/TopoDSToStep_Tool.cxx +++ b/src/TopoDSToStep/TopoDSToStep_Tool.cxx @@ -16,7 +16,6 @@ #include -#include #include #include #include diff --git a/tests/de_wrapper/configuration/A3 b/tests/de_wrapper/configuration/A3 index a2654a75e6..e026ca550b 100644 --- a/tests/de_wrapper/configuration/A3 +++ b/tests/de_wrapper/configuration/A3 @@ -181,7 +181,7 @@ provider.STEP.OCC.read.metadata : 1 provider.STEP.OCC.write.precision.mode : 0 provider.STEP.OCC.write.precision.val : 0.0001 provider.STEP.OCC.write.assembly : 2 -provider.STEP.OCC.write.schema : 1 +provider.STEP.OCC.write.schema : 4 provider.STEP.OCC.write.tessellated : 2 provider.STEP.OCC.write.product.name : provider.STEP.OCC.write.surfacecurve.mode : 1 diff --git a/tests/de_wrapper/configuration/A4 b/tests/de_wrapper/configuration/A4 index 222674c9bf..ef54dc7034 100644 --- a/tests/de_wrapper/configuration/A4 +++ b/tests/de_wrapper/configuration/A4 @@ -126,7 +126,7 @@ provider.STEP.OCC.read.metadata : 1 provider.STEP.OCC.write.precision.mode : 0 provider.STEP.OCC.write.precision.val : 0.0001 provider.STEP.OCC.write.assembly : 2 -provider.STEP.OCC.write.schema : 1 +provider.STEP.OCC.write.schema : 4 provider.STEP.OCC.write.tessellated : 2 provider.STEP.OCC.write.product.name : provider.STEP.OCC.write.surfacecurve.mode : 1