Data Exchange - Clear up Step from Static_Interface #283

Remove unused Interface_Static includes
Update SchemaName method signatures

diff --git a/src/APIHeaderSection/APIHeaderSection_MakeHeader.cxx b/src/APIHeaderSection/APIHeaderSection_MakeHeader.cxx
index d88a972fe795376d7f947ed6b90a118d09f94218..7dbc8038d18f238d8214d5ef183560a1a5aaf334 100644 (file)
--- 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 45b424c06acad1a3f2bd617b6411d4c1e66e6e32..e9e00add302d499565f74e9aed9ee88a1a484055 100644 (file)
--- 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 1ad457243c0e6ccb219d712fead47b5cdac9fdc8..a02b35b2b85df5a536a21263eca0ee57d010bc53 100644 (file)
--- a/src/DESTEP/DESTEP_Parameters.hxx
+++ b/src/DESTEP/DESTEP_Parameters.hxx
@@ -186,7 +186,7 @@ public:
   WriteMode_PrecisionMode WritePrecisionMode = WriteMode_PrecisionMode_Average; //<! Specifies the mode of writing the resolution value into the STEP file
   double WritePrecisionVal = 0.0001; //<! Resolution value for an STEP file when WriteMode_PrecisionMode is Greatest
   WriteMode_Assembly WriteAssembly = WriteMode_Assembly_Auto; //<! Writing assembly mode
-  WriteMode_StepSchema WriteSchema = WriteMode_StepSchema_AP214CD; //<! Defines the version of schema used for the output STEP file
+  WriteMode_StepSchema WriteSchema = WriteMode_StepSchema_AP214IS; //<! Defines the version of schema used for the output STEP file
   RWMode_Tessellated WriteTessellated = RWMode_Tessellated_OnNoBRep; //!< Defines whether tessellated shapes should be translated
   TCollection_AsciiString WriteProductName; //<! Defines the text string that will be used for field 'name' of PRODUCT entities written to the STEP file
   bool WriteSurfaceCurMode = true; //<! Indicates whether parametric curves (curves in parametric space of surface) should be written into the STEP file

diff --git a/src/HeaderSection/HeaderSection_Protocol.cxx b/src/HeaderSection/HeaderSection_Protocol.cxx
index c43908ce37e054557ba8ad97f1ed70932953623b..02062233e84f0b6585662d30b44fe991f4dd431c 100644 (file)
--- a/src/HeaderSection/HeaderSection_Protocol.cxx
+++ b/src/HeaderSection/HeaderSection_Protocol.cxx
@@ -35,5 +35,5 @@ Handle(Standard_Type)& atype) const
        else    return 0;
 }
 
-Standard_CString HeaderSection_Protocol::SchemaName() const
+Standard_CString HeaderSection_Protocol::SchemaName(const Handle(Interface_InterfaceModel)&) const
        {       return schemaName; }

diff --git a/src/HeaderSection/HeaderSection_Protocol.hxx b/src/HeaderSection/HeaderSection_Protocol.hxx
index 3a4a69abd0422d13a729f7de36aef0520c1d9ea3..c5710917ecb0bc909d51bd7f8e8671a2744abd6a 100644 (file)
--- a/src/HeaderSection/HeaderSection_Protocol.hxx
+++ b/src/HeaderSection/HeaderSection_Protocol.hxx
@@ -40,7 +40,7 @@ public:
   //! Returns a Case Number for each of the HeaderSection 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)&) const Standard_OVERRIDE;
 
 
 

diff --git a/src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx b/src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx
index 25b7def2844dd19dca91e142fcb10eaa79566a16..4e28609c1c0da60d744d7f0bbb3c9a012ff9cdfa 100644 (file)
--- a/src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx
+++ b/src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx
@@ -22,7 +22,6 @@
 #include "RWStepAP214_ReadWriteModule.pxx"
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
-#include <StepAP214_Protocol.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepData_WriterLib.hxx>
@@ -2375,9 +2374,6 @@ static NCollection_DataMap<TCollection_AsciiString, Standard_Integer> 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 cb7f2348a2538c1a7f2c4a0d09327858eca3828d..538fc133c0d17ed2b173e16621f0eef45f6aaba3 100644 (file)
--- a/src/STEPCAFControl/STEPCAFControl_Reader.cxx
+++ b/src/STEPCAFControl/STEPCAFControl_Reader.cxx
@@ -22,7 +22,6 @@
 #include <Interface_EntityIterator.hxx>
 #include <StepData_StepModel.hxx>
 #include <HeaderSection_FileSchema.hxx>
-#include <Interface_Static.hxx>
 #include <Message_ProgressScope.hxx>
 #include <NCollection_DataMap.hxx>
 #include <OSD_Path.hxx>

diff --git a/src/STEPCAFControl/STEPCAFControl_Writer.cxx b/src/STEPCAFControl/STEPCAFControl_Writer.cxx
index 95f83aa338955f36e88603b4a7986799b2f91d8c..0499de443300b81d4eb9565ba9471c575256d891 100644 (file)
--- a/src/STEPCAFControl/STEPCAFControl_Writer.cxx
+++ b/src/STEPCAFControl/STEPCAFControl_Writer.cxx
@@ -32,7 +32,6 @@
 #include <Message_ProgressScope.hxx>
 #include <MoniTool_DataMapIteratorOfDataMapOfShapeTransient.hxx>
 #include <OSD_Path.hxx>
-#include <StepAP214_Protocol.hxx>
 #include <StepAP242_DraughtingModelItemAssociation.hxx>
 #include <StepAP242_GeometricItemSpecificUsage.hxx>
 #include <StepBasic_ConversionBasedUnitAndLengthUnit.hxx>

diff --git a/src/STEPConstruct/STEPConstruct_ContextTool.cxx b/src/STEPConstruct/STEPConstruct_ContextTool.cxx
index e7da67e011af25f5432e6a8ad1165a2daf7d76a4..6c9a230cfe5ca42c0d36cd1045e7f3748a585e9c 100644 (file)
--- a/src/STEPConstruct/STEPConstruct_ContextTool.cxx
+++ b/src/STEPConstruct/STEPConstruct_ContextTool.cxx
@@ -19,7 +19,6 @@
 
 #include <GeomToStep_MakeAxis2Placement3d.hxx>
 #include <Interface_Macros.hxx>
-#include <Interface_Static.hxx>
 #include <StepAP203_CcDesignApproval.hxx>
 #include <StepAP203_CcDesignDateAndTimeAssignment.hxx>
 #include <StepAP203_CcDesignPersonAndOrganizationAssignment.hxx>
@@ -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 3e8c03c3f71687611d41fe705b0b507ca1a7ed95..f91d776e22f616b1a03535a75c7de4c3bae48c31 100644 (file)
--- 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 <Interface_Static.hxx>
 #include <StepBasic_ApplicationContext.hxx>
 #include <StepBasic_DesignContext.hxx>
 #include <StepBasic_MechanicalContext.hxx>

diff --git a/src/STEPConstruct/STEPConstruct_Styles.cxx b/src/STEPConstruct/STEPConstruct_Styles.cxx
index d2e40692808bc9772edaf7bf1dcc72a537b48d3b..0f626c7cf363fc17f5ab39d0cfef1c14017ec333 100644 (file)
--- a/src/STEPConstruct/STEPConstruct_Styles.cxx
+++ b/src/STEPConstruct/STEPConstruct_Styles.cxx
@@ -17,7 +17,6 @@
 
 #include <APIHeaderSection_MakeHeader.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <Interface_Static.hxx>
 #include <Quantity_Color.hxx>
 #include <StepBasic_MeasureValueMember.hxx>
 #include <STEPConstruct.hxx>

diff --git a/src/STEPConstruct/STEPConstruct_UnitContext.cxx b/src/STEPConstruct/STEPConstruct_UnitContext.cxx
index 7de1ffc6541c3d8d797a0be2b62ea50549833cc8..00837fd93c5bcae238f12ca949f80afdb831c4e4 100644 (file)
--- 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 <Interface_Static.hxx>
 #include <StepBasic_ConversionBasedUnitAndAreaUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndLengthUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndPlaneAngleUnit.hxx>

diff --git a/src/STEPConstruct/STEPConstruct_ValidationProps.cxx b/src/STEPConstruct/STEPConstruct_ValidationProps.cxx
index 10f0c336414131f27fc15c00a618c448a270b361..c7c4fe68f3e5d59b954dd22494e1f440455bda0a 100644 (file)
--- a/src/STEPConstruct/STEPConstruct_ValidationProps.cxx
+++ b/src/STEPConstruct/STEPConstruct_ValidationProps.cxx
@@ -19,7 +19,6 @@
 #include <gp_Pnt.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <Interface_Macros.hxx>
-#include <Interface_Static.hxx>
 #include <Message.hxx>
 #include <StepBasic_DerivedUnit.hxx>
 #include <StepBasic_DerivedUnitElement.hxx>

diff --git a/src/STEPControl/STEPControl_ActorRead.cxx b/src/STEPControl/STEPControl_ActorRead.cxx
index e1a5c1fa7be2d1288363656c1c61a569236f889d..5e1286d0562ab149a46ecfbd4f94d029286a081e 100644 (file)
--- a/src/STEPControl/STEPControl_ActorRead.cxx
+++ b/src/STEPControl/STEPControl_ActorRead.cxx
@@ -27,7 +27,6 @@
 #include <Interface_Graph.hxx>
 #include <Interface_InterfaceModel.hxx>
 #include <Interface_Macros.hxx>
-#include <Interface_Static.hxx>
 #include <Message_Messenger.hxx>
 #include <Message_ProgressScope.hxx>
 #include <OSD_Timer.hxx>
@@ -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 af4641d8360ce2212d1d46cdb246a664111f6260..7637c2937b12de9f1ef6eea83e48c47904f545a1 100644 (file)
--- 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 6231ba17a1b1b73a763f304db4291052e77f114c..69c6c6a38f02c815e2ad805626900a94f648161b 100644 (file)
--- a/src/STEPControl/STEPControl_ActorWrite.cxx
+++ b/src/STEPControl/STEPControl_ActorWrite.cxx
@@ -28,7 +28,6 @@
 #include <GeomToStep_MakeAxis2Placement3d.hxx>
 #include <Interface_Macros.hxx>
 #include <Interface_MSG.hxx>
-#include <Interface_Static.hxx>
 #include <Message_ProgressScope.hxx>
 #include <ShapeAnalysis_ShapeTolerance.hxx>
 #include <ShapeProcess_ShapeContext.hxx>

diff --git a/src/STEPControl/STEPControl_Reader.cxx b/src/STEPControl/STEPControl_Reader.cxx
index ffe2f804d29cd601cea85ffcbc727a4d049defd8..0c208598f99d1ec0abec8b99c11249f2dbe7c5f0 100644 (file)
--- a/src/STEPControl/STEPControl_Reader.cxx
+++ b/src/STEPControl/STEPControl_Reader.cxx
@@ -15,7 +15,6 @@
 #include <IFSelect_WorkLibrary.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <Interface_Graph.hxx>
-#include <Interface_Static.hxx>
 #include <Message.hxx>
 #include <Message_Messenger.hxx>
 #include <StepBasic_ApplicationContext.hxx>

diff --git a/src/StepAP214/StepAP214_Protocol.cxx b/src/StepAP214/StepAP214_Protocol.cxx
index 20841eb3ec104ddf46809990b14b36135b70cad7..3008522eb6ff7de5ba40e4fd4a69428bdf210851 100644 (file)
--- 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 <HeaderSection_Protocol.hxx>
+#include <StepData_StepModel.hxx>
 
 #include <StepShape_AdvancedBrepShapeRepresentation.hxx>
 #include <StepShape_AdvancedFace.hxx>
@@ -399,7 +400,6 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepShape_ExtrudedFaceSolid.hxx>
 #include <StepShape_RevolvedFaceSolid.hxx>
 #include <StepShape_SweptFaceSolid.hxx>
-#include <Interface_Static.hxx>
 #include <StepBasic_AreaUnit.hxx>
 #include <StepBasic_VolumeUnit.hxx>
 #include <StepBasic_SiUnitAndAreaUnit.hxx>
@@ -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 988c55c8b50b17368fe946a927ba9ffcc4e14eb5..83a1516bc3d277dc981daa688a31eabce95b48a9 100644 (file)
--- 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 a0e6c519e51c9a0197c50de8f77a0047c2665973..6293f68190ad3afd0a50676a989714da8f7b818e 100644 (file)
--- a/src/StepData/StepData.cxx
+++ b/src/StepData/StepData.cxx
@@ -14,7 +14,6 @@
 #include <StepData.hxx>
 
 #include <Interface_Macros.hxx>
-#include <Interface_Static.hxx>
 #include <Interface_Statics.hxx>
 #include <StepData_DefaultGeneral.hxx>
 #include <StepData_FileProtocol.hxx>
@@ -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 6a264f7c88c595948dc498363007522c2185470a..c0726a70eed2a43891b16f349fd7cacfb30cf0bb 100644 (file)
--- 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 8223f637c7c68ac8a4e76c5395d7ed2260842be9..b12f7ed36eda1e7b48414f69b249d164dad02efb 100644 (file)
--- 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 330299ccd7d735b892616e8d6ff3f954bfe35df1..8a9c223c25b005ce39b6b016d2b67b511357ef68 100644 (file)
--- 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 65f975efefb3e59bd46f1cba0662c28ec1ae75d8..96e5886bf498bb5bf2b5af9ea85029956a7cf54f 100644 (file)
--- 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 d85a128dd65af3341ba6e260357d19d18bd03dad..45d6af443f89f08a55689ec45ad063c8654cd3cd 100644 (file)
--- a/src/StepData/StepData_StepModel.cxx
+++ b/src/StepData/StepData_StepModel.cxx
@@ -26,7 +26,6 @@
 #include <StepData_StepModel.hxx>
 #include <StepData_StepWriter.hxx>
 #include <TCollection_HAsciiString.hxx>
-#include <Interface_Static.hxx>
 
 #include <stdio.h>
 IMPLEMENT_STANDARD_RTTIEXT(StepData_StepModel,Interface_InterfaceModel)

diff --git a/src/StepData/StepData_StepReaderData.cxx b/src/StepData/StepData_StepReaderData.cxx
index ac5dc827fd3c4413b6692b38fc486cdd00bcd44f..9d95cc3998919601fb87da551cdb2e045fec789d 100644 (file)
--- a/src/StepData/StepData_StepReaderData.cxx
+++ b/src/StepData/StepData_StepReaderData.cxx
@@ -17,7 +17,6 @@
 #include <Interface_Check.hxx>
 #include <Interface_HArray1OfHAsciiString.hxx>
 #include <Interface_Macros.hxx>
-#include <Interface_Static.hxx>
 #include <Interface_ParamList.hxx>
 #include <Message.hxx>
 #include <Message_Messenger.hxx>

diff --git a/src/StepSelect/StepSelect_StepType.cxx b/src/StepSelect/StepSelect_StepType.cxx
index d7fdae70c53179662399d0591f19d409e93e75cb..7bd40957dc47434e94a9a4d9897b4e80da623063 100644 (file)
--- 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 49991f88a1496a03af4a0c62a055917f918b5bd9..7e139995627291aa0ef20b1e196c1dc150268bc4 100644 (file)
--- a/src/StepToTopoDS/StepToTopoDS_Builder.cxx
+++ b/src/StepToTopoDS/StepToTopoDS_Builder.cxx
@@ -29,7 +29,6 @@
 #include <Geom_Curve.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
 #include <Geom_Surface.hxx>
-#include <Interface_Static.hxx>
 #include <Message_Messenger.hxx>
 #include <Message_ProgressScope.hxx>
 #include <Precision.hxx>

diff --git a/src/StepToTopoDS/StepToTopoDS_TranslateCompositeCurve.cxx b/src/StepToTopoDS/StepToTopoDS_TranslateCompositeCurve.cxx
index f0a3dfb2e15b5b09d26339cdf67380b959f23301..4da63eeb00cd06663714f019b5527be4995403af 100644 (file)
--- a/src/StepToTopoDS/StepToTopoDS_TranslateCompositeCurve.cxx
+++ b/src/StepToTopoDS/StepToTopoDS_TranslateCompositeCurve.cxx
@@ -22,7 +22,6 @@
 #include <Geom2d_Curve.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_Surface.hxx>
-#include <Interface_Static.hxx>
 #include <Precision.hxx>
 #include <ShapeFix_Wire.hxx>
 #include <Standard_ErrorHandler.hxx>

diff --git a/src/StepToTopoDS/StepToTopoDS_TranslateEdgeLoop.cxx b/src/StepToTopoDS/StepToTopoDS_TranslateEdgeLoop.cxx
index d745683b8cd7c9644f3d5fadc913191c7317b5a8..e8b1ffd9e7f39485dcd8ed87d5517ae5536ef52d 100644 (file)
--- a/src/StepToTopoDS/StepToTopoDS_TranslateEdgeLoop.cxx
+++ b/src/StepToTopoDS/StepToTopoDS_TranslateEdgeLoop.cxx
@@ -32,7 +32,6 @@
 #include <Geom_RectangularTrimmedSurface.hxx>
 #include <Geom_Surface.hxx>
 #include <gp_Pnt.hxx>
-#include <Interface_Static.hxx>
 #include <Precision.hxx>
 #include <ShapeAlgo.hxx>
 #include <ShapeAlgo_AlgoContainer.hxx>

diff --git a/src/TopoDSToStep/TopoDSToStep_MakeBrepWithVoids.cxx b/src/TopoDSToStep/TopoDSToStep_MakeBrepWithVoids.cxx
index b9d1a243272f18343ca608f788b830c2491047d1..7071d6d26ce44c939cd9fce8e9e397a3aeb5b8dc 100644 (file)
--- a/src/TopoDSToStep/TopoDSToStep_MakeBrepWithVoids.cxx
+++ b/src/TopoDSToStep/TopoDSToStep_MakeBrepWithVoids.cxx
@@ -16,7 +16,6 @@
 
 
 #include <BRepClass3d.hxx>
-#include <Interface_Static.hxx>
 #include <Message_ProgressScope.hxx>
 #include <MoniTool_DataMapOfShapeTransient.hxx>
 #include <StdFail_NotDone.hxx>

diff --git a/src/TopoDSToStep/TopoDSToStep_MakeFacetedBrep.cxx b/src/TopoDSToStep/TopoDSToStep_MakeFacetedBrep.cxx
index 6add10078b366450da9f56505693ca382314d2a9..845f237151be71a5850b5ce4faca8b9e5a406a5c 100644 (file)
--- a/src/TopoDSToStep/TopoDSToStep_MakeFacetedBrep.cxx
+++ b/src/TopoDSToStep/TopoDSToStep_MakeFacetedBrep.cxx
@@ -16,7 +16,6 @@
 
 
 #include <BRepClass3d.hxx>
-#include <Interface_Static.hxx>
 #include <Message_ProgressScope.hxx>
 #include <StdFail_NotDone.hxx>
 #include <StepData_Factors.hxx>

diff --git a/src/TopoDSToStep/TopoDSToStep_MakeManifoldSolidBrep.cxx b/src/TopoDSToStep/TopoDSToStep_MakeManifoldSolidBrep.cxx
index 4c4604a05e2f40c38b88b53e013b51c048eed102..3b3e9655e58addcdcf504a2604177064c6a0b9d1 100644 (file)
--- a/src/TopoDSToStep/TopoDSToStep_MakeManifoldSolidBrep.cxx
+++ b/src/TopoDSToStep/TopoDSToStep_MakeManifoldSolidBrep.cxx
@@ -16,7 +16,6 @@
 
 
 #include <BRepClass3d.hxx>
-#include <Interface_Static.hxx>
 #include <Message_ProgressScope.hxx>
 #include <StdFail_NotDone.hxx>
 #include <StepData_Factors.hxx>

diff --git a/src/TopoDSToStep/TopoDSToStep_MakeShellBasedSurfaceModel.cxx b/src/TopoDSToStep/TopoDSToStep_MakeShellBasedSurfaceModel.cxx
index be09e594884ae42a7491ee4f5e3a1bd0a6995ac4..362c6471162e085ddf9e9c39adc7e3a17c029ea6 100644 (file)
--- a/src/TopoDSToStep/TopoDSToStep_MakeShellBasedSurfaceModel.cxx
+++ b/src/TopoDSToStep/TopoDSToStep_MakeShellBasedSurfaceModel.cxx
@@ -15,7 +15,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Interface_Static.hxx>
 #include <MoniTool_DataMapOfShapeTransient.hxx>
 #include <Message_ProgressScope.hxx>
 #include <StdFail_NotDone.hxx>

diff --git a/src/TopoDSToStep/TopoDSToStep_MakeStepEdge.cxx b/src/TopoDSToStep/TopoDSToStep_MakeStepEdge.cxx
index b5696cc101ae6626e4778b99b35961ab0eee337d..fb25dbe9a3e93315b324ce81f675b978122fcede 100644 (file)
--- a/src/TopoDSToStep/TopoDSToStep_MakeStepEdge.cxx
+++ b/src/TopoDSToStep/TopoDSToStep_MakeStepEdge.cxx
@@ -27,7 +27,6 @@
 #include <GeomToStep_MakeCurve.hxx>
 #include <GeomToStep_MakeLine.hxx>
 #include <gp_Vec.hxx>
-#include <Interface_Static.hxx>
 #include <StdFail_NotDone.hxx>
 #include <StepData_Factors.hxx>
 #include <StepData_StepModel.hxx>

diff --git a/src/TopoDSToStep/TopoDSToStep_MakeStepFace.cxx b/src/TopoDSToStep/TopoDSToStep_MakeStepFace.cxx
index 55776f1fa2bf7a3cb80330ead377b49c25ee3ca4..1818d12239822d432865991f61315ddb507e1b17 100644 (file)
--- a/src/TopoDSToStep/TopoDSToStep_MakeStepFace.cxx
+++ b/src/TopoDSToStep/TopoDSToStep_MakeStepFace.cxx
@@ -42,7 +42,6 @@
 #include <Geom_ToroidalSurface.hxx>
 #include <GeomToStep_MakeCurve.hxx>
 #include <GeomToStep_MakeSurface.hxx>
-#include <Interface_Static.hxx>
 #include <Precision.hxx>
 #include <ShapeAlgo.hxx>
 #include <ShapeAlgo_AlgoContainer.hxx>

diff --git a/src/TopoDSToStep/TopoDSToStep_MakeStepVertex.cxx b/src/TopoDSToStep/TopoDSToStep_MakeStepVertex.cxx
index 20531b118d01d8f69b6f10792e7a568d4c93067a..1cdaa2792f747407427de9f111013cc22c36bd3a 100644 (file)
--- a/src/TopoDSToStep/TopoDSToStep_MakeStepVertex.cxx
+++ b/src/TopoDSToStep/TopoDSToStep_MakeStepVertex.cxx
@@ -18,7 +18,6 @@
 #include <BRep_Tool.hxx>
 #include <GeomToStep_MakeCartesianPoint.hxx>
 #include <gp_Pnt.hxx>
-#include <Interface_Static.hxx>
 #include <StdFail_NotDone.hxx>
 #include <StepData_StepModel.hxx>
 #include <StepGeom_CartesianPoint.hxx>

diff --git a/src/TopoDSToStep/TopoDSToStep_Tool.cxx b/src/TopoDSToStep/TopoDSToStep_Tool.cxx
index f9cf2b620ec1480d1cac508dd3e49298ddd6f4be..cdb1b30370ff023a59a1b4c5f61cd2a2cc22de54 100644 (file)
--- a/src/TopoDSToStep/TopoDSToStep_Tool.cxx
+++ b/src/TopoDSToStep/TopoDSToStep_Tool.cxx
@@ -16,7 +16,6 @@
 
 
 #include <BRep_Tool.hxx>
-#include <Interface_Static.hxx>
 #include <StepData_StepModel.hxx>
 #include <StepShape_TopologicalRepresentationItem.hxx>
 #include <TopoDSToStep_Tool.hxx>

diff --git a/tests/de_wrapper/configuration/A3 b/tests/de_wrapper/configuration/A3
index a2654a75e657e75806b64afba0e00fe24295e1c2..e026ca550be25678db29d50cbc2d5027aba522fb 100644 (file)
--- 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 222674c9bf23573e2ec7c4ee87e2153dd67be46a..ef54dc7034971b4802e153756ad0ea1960dd4112 100644 (file)
--- 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