mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-09 13:22:24 +03:00
0027349: XtControl_Reader is not thread-safe
Support of profiles for norms is removed Getting rid of thread-unsafe static variables. Sequence is not thread-safe. Replacing it with Vector. Updating samples due to previous changes. Resolving conflict with system environment.
This commit is contained in:
@@ -29,7 +29,7 @@ IMPLEMENT_STANDARD_RTTIEXT(STEPCAFControl_Controller,STEPControl_Controller)
|
||||
STEPCAFControl_Controller::STEPCAFControl_Controller ()
|
||||
{
|
||||
Handle(STEPCAFControl_ActorWrite) ActWrite = new STEPCAFControl_ActorWrite;
|
||||
theAdaptorWrite = ActWrite;
|
||||
myAdaptorWrite = ActWrite;
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
|
@@ -531,7 +531,7 @@ Standard_Boolean STEPCAFControl_Reader::Transfer (STEPControl_Reader &reader,
|
||||
STEPCAFControl_DataMapOfShapePD ShapePDMap;
|
||||
STEPCAFControl_DataMapOfPDExternFile PDFileMap;
|
||||
Handle(Interface_InterfaceModel) Model = reader.Model();
|
||||
Handle(Transfer_TransientProcess) TP = reader.WS()->TransferReader()->TransientProcess();
|
||||
const Handle(Transfer_TransientProcess) &TP = reader.WS()->TransferReader()->TransientProcess();
|
||||
Standard_Integer nb = Model->NbEntities();
|
||||
|
||||
Handle(TColStd_HSequenceOfTransient) SeqPDS = new TColStd_HSequenceOfTransient;
|
||||
@@ -936,8 +936,6 @@ Standard_Boolean STEPCAFControl_Reader::ReadColors (const Handle(XSControl_WorkS
|
||||
// search for SR along model
|
||||
if (aSR.IsNull())
|
||||
break;
|
||||
Handle(XSControl_TransferReader) TR = WS->TransferReader();
|
||||
Handle(Transfer_TransientProcess) TP = TR->TransientProcess();
|
||||
Interface_EntityIterator subs = WS->HGraph()->Graph().Sharings( aSR );
|
||||
Handle(StepShape_ShapeDefinitionRepresentation) aSDR;
|
||||
for (subs.Start(); subs.More(); subs.Next()) {
|
||||
@@ -1134,9 +1132,9 @@ Standard_Boolean STEPCAFControl_Reader::ReadNames (const Handle(XSControl_WorkSe
|
||||
const XCAFDoc_DataMapOfShapeLabel &ShapeLabelMap) const
|
||||
{
|
||||
// get starting data
|
||||
Handle(Interface_InterfaceModel) Model = WS->Model();
|
||||
Handle(XSControl_TransferReader) TR = WS->TransferReader();
|
||||
Handle(Transfer_TransientProcess) TP = TR->TransientProcess();
|
||||
const Handle(Interface_InterfaceModel) &Model = WS->Model();
|
||||
const Handle(XSControl_TransferReader) &TR = WS->TransferReader();
|
||||
const Handle(Transfer_TransientProcess) &TP = TR->TransientProcess();
|
||||
Handle(XCAFDoc_ShapeTool) STool = XCAFDoc_DocumentTool::ShapeTool( Doc->Main() );
|
||||
if ( STool.IsNull() ) return Standard_False;
|
||||
STEPConstruct_Tool Tool ( WS );
|
||||
@@ -1243,9 +1241,8 @@ Standard_Boolean STEPCAFControl_Reader::ReadValProps (const Handle(XSControl_Wor
|
||||
const XCAFDoc_DataMapOfShapeLabel &ShapeLabelMap) const
|
||||
{
|
||||
// get starting data
|
||||
Handle(Interface_InterfaceModel) Model = WS->Model();
|
||||
Handle(XSControl_TransferReader) TR = WS->TransferReader();
|
||||
Handle(Transfer_TransientProcess) TP = TR->TransientProcess();
|
||||
const Handle(XSControl_TransferReader) &TR = WS->TransferReader();
|
||||
const Handle(Transfer_TransientProcess) &TP = TR->TransientProcess();
|
||||
Handle(XCAFDoc_ShapeTool) STool = XCAFDoc_DocumentTool::ShapeTool( Doc->Main() );
|
||||
if ( STool.IsNull() ) return Standard_False;
|
||||
|
||||
@@ -1374,9 +1371,9 @@ Standard_Boolean STEPCAFControl_Reader::ReadValProps (const Handle(XSControl_Wor
|
||||
Standard_Boolean STEPCAFControl_Reader::ReadLayers (const Handle(XSControl_WorkSession) &WS,
|
||||
Handle(TDocStd_Document)& Doc) const
|
||||
{
|
||||
Handle(Interface_InterfaceModel) Model = WS->Model();
|
||||
Handle(XSControl_TransferReader) TR = WS->TransferReader();
|
||||
Handle(Transfer_TransientProcess) TP = TR->TransientProcess();
|
||||
const Handle(Interface_InterfaceModel) &Model = WS->Model();
|
||||
const Handle(XSControl_TransferReader) &TR = WS->TransferReader();
|
||||
const Handle(Transfer_TransientProcess) &TP = TR->TransientProcess();
|
||||
Handle(XCAFDoc_ShapeTool) STool = XCAFDoc_DocumentTool::ShapeTool( Doc->Main() );
|
||||
if ( STool.IsNull() ) return Standard_False;
|
||||
Handle(XCAFDoc_LayerTool) LTool = XCAFDoc_DocumentTool::LayerTool( Doc->Main() );
|
||||
@@ -2063,8 +2060,8 @@ static Standard_Boolean setDatumToXCAF(const Handle(StepDimTol_Datum)& theDat,
|
||||
{
|
||||
Handle(XCAFDoc_ShapeTool) aSTool = XCAFDoc_DocumentTool::ShapeTool( theDoc->Main() );
|
||||
Handle(XCAFDoc_DimTolTool) aDGTTool = XCAFDoc_DocumentTool::DimTolTool( theDoc->Main() );
|
||||
Handle(XSControl_TransferReader) aTR = theWS->TransferReader();
|
||||
Handle(Transfer_TransientProcess) aTP = aTR->TransientProcess();
|
||||
const Handle(XSControl_TransferReader) &aTR = theWS->TransferReader();
|
||||
const Handle(Transfer_TransientProcess) &aTP = aTR->TransientProcess();
|
||||
const Interface_Graph& aGraph = aTP->Graph();
|
||||
Handle(XCAFDoc_Datum) aDat;
|
||||
TDF_Label aShL;
|
||||
@@ -2296,8 +2293,8 @@ static Standard_Boolean readDatumsAP242(const Handle(Standard_Transient)& theEnt
|
||||
{
|
||||
Handle(XCAFDoc_ShapeTool) aSTool = XCAFDoc_DocumentTool::ShapeTool( theDoc->Main() );
|
||||
Handle(XCAFDoc_DimTolTool) aDGTTool = XCAFDoc_DocumentTool::DimTolTool( theDoc->Main() );
|
||||
Handle(XSControl_TransferReader) aTR = theWS->TransferReader();
|
||||
Handle(Transfer_TransientProcess) aTP = aTR->TransientProcess();
|
||||
const Handle(XSControl_TransferReader) &aTR = theWS->TransferReader();
|
||||
const Handle(Transfer_TransientProcess) &aTP = aTR->TransientProcess();
|
||||
const Interface_Graph& aGraph = aTP->Graph();
|
||||
|
||||
Interface_EntityIterator anIter = aGraph.Shareds(theEnt);
|
||||
@@ -2453,8 +2450,8 @@ static TDF_Label createGDTObjectInXCAF(const Handle(Standard_Transient)& theEnt,
|
||||
|
||||
Handle(XCAFDoc_ShapeTool) aSTool = XCAFDoc_DocumentTool::ShapeTool( theDoc->Main() );
|
||||
Handle(XCAFDoc_DimTolTool) aDGTTool = XCAFDoc_DocumentTool::DimTolTool( theDoc->Main() );
|
||||
Handle(XSControl_TransferReader) aTR = theWS->TransferReader();
|
||||
Handle(Transfer_TransientProcess) aTP = aTR->TransientProcess();
|
||||
const Handle(XSControl_TransferReader) &aTR = theWS->TransferReader();
|
||||
const Handle(Transfer_TransientProcess) &aTP = aTR->TransientProcess();
|
||||
const Interface_Graph& aGraph = aTP->Graph();
|
||||
Standard_Boolean isAllAround = Standard_False;
|
||||
Standard_Boolean isAllOver = Standard_False;
|
||||
@@ -2881,8 +2878,8 @@ static void setDimObjectToXCAF(const Handle(Standard_Transient)& theEnt,
|
||||
{
|
||||
Handle(XCAFDoc_ShapeTool) aSTool = XCAFDoc_DocumentTool::ShapeTool( theDoc->Main() );
|
||||
Handle(XCAFDoc_DimTolTool) aDGTTool = XCAFDoc_DocumentTool::DimTolTool( theDoc->Main() );
|
||||
Handle(XSControl_TransferReader) aTR = theWS->TransferReader();
|
||||
Handle(Transfer_TransientProcess) aTP = aTR->TransientProcess();
|
||||
const Handle(XSControl_TransferReader) &aTR = theWS->TransferReader();
|
||||
const Handle(Transfer_TransientProcess) &aTP = aTR->TransientProcess();
|
||||
const Interface_Graph& aGraph = aTP->Graph();
|
||||
Handle(XCAFDimTolObjects_DimensionObject) aDimObj;
|
||||
if(!theEnt->IsKind(STANDARD_TYPE(StepShape_DimensionalSize)) &&
|
||||
@@ -3376,8 +3373,8 @@ static void setGeomTolObjectToXCAF(const Handle(Standard_Transient)& theEnt,
|
||||
{
|
||||
Handle(XCAFDoc_ShapeTool) aSTool = XCAFDoc_DocumentTool::ShapeTool( theDoc->Main() );
|
||||
Handle(XCAFDoc_DimTolTool) aDGTTool = XCAFDoc_DocumentTool::DimTolTool( theDoc->Main() );
|
||||
Handle(XSControl_TransferReader) aTR = theWS->TransferReader();
|
||||
Handle(Transfer_TransientProcess) aTP = aTR->TransientProcess();
|
||||
const Handle(XSControl_TransferReader) &aTR = theWS->TransferReader();
|
||||
const Handle(Transfer_TransientProcess) &aTP = aTR->TransientProcess();
|
||||
const Interface_Graph& aGraph = aTP->Graph();
|
||||
Handle(XCAFDoc_GeomTolerance) aGTol;
|
||||
if(!theTolL.FindAttribute(XCAFDoc_GeomTolerance::GetID(), aGTol))
|
||||
@@ -3529,15 +3526,13 @@ static void setGeomTolObjectToXCAF(const Handle(Standard_Transient)& theEnt,
|
||||
Standard_Boolean STEPCAFControl_Reader::ReadGDTs(const Handle(XSControl_WorkSession)& theWS,
|
||||
Handle(TDocStd_Document)& theDoc) const
|
||||
{
|
||||
Handle(Interface_InterfaceModel) aModel = theWS->Model();
|
||||
const Handle(Interface_InterfaceModel) &aModel = theWS->Model();
|
||||
Handle(StepData_StepModel) aSM = Handle(StepData_StepModel)::DownCast(aModel);
|
||||
Interface_EntityIterator anI = aSM->Header();
|
||||
Handle(HeaderSection_FileSchema) aH;
|
||||
for(anI.Start(); anI.More() && aH.IsNull();anI.Next())
|
||||
aH = Handle(HeaderSection_FileSchema)::DownCast(anI.Value());
|
||||
Handle(XCAFDoc_ShapeTool) aSTool = XCAFDoc_DocumentTool::ShapeTool( theDoc->Main() );
|
||||
Handle(XSControl_TransferReader) aTR = theWS->TransferReader();
|
||||
Handle(Transfer_TransientProcess) aTP = aTR->TransientProcess();
|
||||
Handle(XCAFDoc_DimTolTool) aDGTTool = XCAFDoc_DocumentTool::DimTolTool( theDoc->Main() );
|
||||
if ( aDGTTool.IsNull() ) return Standard_False;
|
||||
|
||||
@@ -3611,10 +3606,9 @@ Standard_Boolean STEPCAFControl_Reader::ReadMaterials(const Handle(XSControl_Wor
|
||||
Handle(TDocStd_Document)& Doc,
|
||||
const Handle(TColStd_HSequenceOfTransient) &SeqPDS) const
|
||||
{
|
||||
Handle(Interface_InterfaceModel) Model = WS->Model();
|
||||
const Handle(XSControl_TransferReader) &TR = WS->TransferReader();
|
||||
const Handle(Transfer_TransientProcess) &TP = TR->TransientProcess();
|
||||
Handle(XCAFDoc_ShapeTool) STool = XCAFDoc_DocumentTool::ShapeTool( Doc->Main() );
|
||||
Handle(XSControl_TransferReader) TR = WS->TransferReader();
|
||||
Handle(Transfer_TransientProcess) TP = TR->TransientProcess();
|
||||
Handle(XCAFDoc_MaterialTool) MatTool = XCAFDoc_DocumentTool::MaterialTool( Doc->Main() );
|
||||
if(MatTool.IsNull()) return Standard_False;
|
||||
|
||||
|
@@ -637,11 +637,10 @@ Standard_Boolean STEPCAFControl_Writer::Transfer (STEPControl_Writer &writer,
|
||||
WriteMaterials(writer.WS(),sublabels);
|
||||
|
||||
// register all MDGPRs in model
|
||||
const Handle(Interface_InterfaceModel) &Model = writer.WS()->Model();
|
||||
MoniTool_DataMapIteratorOfDataMapOfShapeTransient anItr(myMapCompMDGPR);
|
||||
for (; anItr.More(); anItr.Next()) {
|
||||
Handle(Interface_InterfaceModel) Model = writer.WS()->Model();
|
||||
for (; anItr.More(); anItr.Next())
|
||||
Model->AddWithRefs( anItr.Value() );
|
||||
}
|
||||
}
|
||||
|
||||
if ( multi ) { // external refs
|
||||
@@ -666,8 +665,8 @@ Standard_Boolean STEPCAFControl_Writer::Transfer (STEPControl_Writer &writer,
|
||||
|
||||
if ( Interface_Static::IVal("write.stepcaf.subshapes.name") )
|
||||
{
|
||||
Handle(XSControl_TransferWriter) TW = this->ChangeWriter().WS()->TransferWriter();
|
||||
Handle(Transfer_FinderProcess) FP = TW->FinderProcess();
|
||||
const Handle(XSControl_TransferWriter) &TW = this->ChangeWriter().WS()->TransferWriter();
|
||||
const Handle(Transfer_FinderProcess) &FP = TW->FinderProcess();
|
||||
|
||||
for ( int i = 1; i <= labels.Length(); i++ )
|
||||
{
|
||||
@@ -803,8 +802,8 @@ Standard_Boolean STEPCAFControl_Writer::WriteExternRefs (const Handle(XSControl_
|
||||
{
|
||||
if ( labels.Length() <=0 ) return Standard_False;
|
||||
|
||||
Handle(XSControl_TransferWriter) TW = WS->TransferWriter();
|
||||
Handle(Transfer_FinderProcess) FP = TW->FinderProcess();
|
||||
const Handle(XSControl_TransferWriter) &TW = WS->TransferWriter();
|
||||
const Handle(Transfer_FinderProcess) &FP = TW->FinderProcess();
|
||||
STEPConstruct_ExternRefs EFTool ( WS );
|
||||
Standard_Integer schema = Interface_Static::IVal("write.step.schema");
|
||||
for ( Standard_Integer k=1; k <= labels.Length(); k++ ) {
|
||||
@@ -1255,8 +1254,8 @@ Standard_Boolean STEPCAFControl_Writer::WriteColors (const Handle(XSControl_Work
|
||||
}
|
||||
else {
|
||||
// create SDR and add to model.
|
||||
Handle(XSControl_TransferWriter) TW = WS->TransferWriter();
|
||||
Handle(Transfer_FinderProcess) FP = TW->FinderProcess();
|
||||
const Handle(XSControl_TransferWriter) &TW = WS->TransferWriter();
|
||||
const Handle(Transfer_FinderProcess) &FP = TW->FinderProcess();
|
||||
Handle(TransferBRep_ShapeMapper) mapper = TransferBRep::ShapeMapper ( FP, S );
|
||||
Handle(StepShape_ContextDependentShapeRepresentation) CDSR;
|
||||
if ( FP->FindTypedTransient(mapper,
|
||||
@@ -1330,11 +1329,8 @@ Standard_Boolean STEPCAFControl_Writer::WriteNames (const Handle(XSControl_WorkS
|
||||
if ( labels.Length() <=0 ) return Standard_False;
|
||||
|
||||
// get working data
|
||||
Handle(Interface_InterfaceModel) Model = WS->Model();
|
||||
Handle(XSControl_TransferWriter) TW = WS->TransferWriter();
|
||||
Handle(Transfer_FinderProcess) FP = TW->FinderProcess();
|
||||
// Handle(XCAFDoc_ShapeTool) STool = XCAFDoc_DocumentTool::ShapeTool( labels(1) );
|
||||
// if ( STool.IsNull() ) return Standard_False;
|
||||
const Handle(XSControl_TransferWriter) &TW = WS->TransferWriter();
|
||||
const Handle(Transfer_FinderProcess) &FP = TW->FinderProcess();
|
||||
|
||||
// Iterate on requested shapes
|
||||
for ( Standard_Integer i=1; i <= labels.Length(); i++ ) {
|
||||
@@ -1547,9 +1543,9 @@ Standard_Boolean STEPCAFControl_Writer::WriteLayers (const Handle(XSControl_Work
|
||||
if ( labels.Length() <=0 ) return Standard_False;
|
||||
|
||||
// get working data
|
||||
Handle(Interface_InterfaceModel) Model = WS->Model();
|
||||
Handle(XSControl_TransferWriter) TW = WS->TransferWriter();
|
||||
Handle(Transfer_FinderProcess) FP = TW->FinderProcess();
|
||||
const Handle(Interface_InterfaceModel) &Model = WS->Model();
|
||||
const Handle(XSControl_TransferWriter) &TW = WS->TransferWriter();
|
||||
const Handle(Transfer_FinderProcess) &FP = TW->FinderProcess();
|
||||
Handle(XCAFDoc_LayerTool) LTool = XCAFDoc_DocumentTool::LayerTool( labels(1) );
|
||||
if (LTool.IsNull() ) return Standard_False;
|
||||
|
||||
@@ -1682,8 +1678,8 @@ static Standard_Boolean getProDefinitionOfNAUO(const Handle(XSControl_WorkSessio
|
||||
if ( theShape.IsNull() )
|
||||
return Standard_False;
|
||||
// get CDSR
|
||||
Handle(XSControl_TransferWriter) TW = WS->TransferWriter();
|
||||
Handle(Transfer_FinderProcess) FP = TW->FinderProcess();
|
||||
const Handle(XSControl_TransferWriter) &TW = WS->TransferWriter();
|
||||
const Handle(Transfer_FinderProcess) &FP = TW->FinderProcess();
|
||||
Handle(StepShape_ContextDependentShapeRepresentation) CDSR;
|
||||
Handle(TransferBRep_ShapeMapper) mapper = TransferBRep::ShapeMapper ( FP, theShape );
|
||||
if (!FP->FindTypedTransient(mapper,
|
||||
@@ -1852,8 +1848,8 @@ static Standard_Boolean createSHUOStyledItem (const XCAFPrs_Style& style,
|
||||
Handle(StepVisual_StyledItem) override; //null styled item
|
||||
|
||||
// find the repr item of the shape
|
||||
Handle(XSControl_TransferWriter) TW = WS->TransferWriter();
|
||||
Handle(Transfer_FinderProcess) FP = TW->FinderProcess();
|
||||
const Handle(XSControl_TransferWriter) &TW = WS->TransferWriter();
|
||||
const Handle(Transfer_FinderProcess) &FP = TW->FinderProcess();
|
||||
Handle(TransferBRep_ShapeMapper) mapper = TransferBRep::ShapeMapper ( FP, Sh );
|
||||
Handle(StepShape_ContextDependentShapeRepresentation) CDSR;
|
||||
FP->FindTypedTransient(mapper,
|
||||
@@ -1963,20 +1959,15 @@ Standard_Boolean STEPCAFControl_Writer::WriteSHUOs (const Handle(XSControl_WorkS
|
||||
if ( labels.Length() <=0 ) return Standard_False;
|
||||
|
||||
// get working data
|
||||
Handle(Interface_InterfaceModel) Model = WS->Model();
|
||||
Handle(XSControl_TransferWriter) TW = WS->TransferWriter();
|
||||
Handle(Transfer_FinderProcess) FP = TW->FinderProcess();
|
||||
Handle(XCAFDoc_ColorTool) CTool = XCAFDoc_DocumentTool::ColorTool( labels(1) );
|
||||
if (CTool.IsNull() )
|
||||
return Standard_False;
|
||||
// map of transfered SHUO
|
||||
TColStd_MapOfTransient aMapOfMainSHUO;
|
||||
// TColStd_IndexedDataMapOfTransientTransient aIndxMapOfSHUOEnt;
|
||||
// Iterate on requested shapes
|
||||
for ( Standard_Integer i=1; i <= labels.Length(); i++ ) {
|
||||
TDF_Label L = labels.Value(i);
|
||||
if ( ! myLabels.IsBound ( L ) ) continue; // not recorded as translated, skip
|
||||
// TopoDS_Shape S = myLabels.Find ( L );
|
||||
if ( XCAFDoc_ShapeTool::IsAssembly ( L ) ) {
|
||||
TDF_LabelSequence seq;
|
||||
XCAFDoc_ShapeTool::GetComponents ( L, seq );
|
||||
@@ -2250,9 +2241,9 @@ static Handle(StepRepr_ShapeAspect) WriteShapeAspect (const Handle(XSControl_Wor
|
||||
Handle(StepAP242_GeometricItemSpecificUsage)& theGISU)
|
||||
{
|
||||
// Get working data
|
||||
Handle(Interface_InterfaceModel) Model = WS->Model();
|
||||
Handle(XSControl_TransferWriter) TW = WS->TransferWriter();
|
||||
Handle(Transfer_FinderProcess) FP = TW->FinderProcess();
|
||||
const Handle(Interface_InterfaceModel) &Model = WS->Model();
|
||||
const Handle(XSControl_TransferWriter) &TW = WS->TransferWriter();
|
||||
const Handle(Transfer_FinderProcess) &FP = TW->FinderProcess();
|
||||
const Handle(Interface_HGraph) aHGraph = WS->HGraph();
|
||||
if (aHGraph.IsNull())
|
||||
return NULL;
|
||||
@@ -2328,7 +2319,7 @@ static void WritePresentation(const Handle(XSControl_WorkSession) &WS,
|
||||
if (thePresentation.IsNull())
|
||||
return;
|
||||
// Get working data
|
||||
Handle(Interface_InterfaceModel) aModel = WS->Model();
|
||||
const Handle(Interface_InterfaceModel) &aModel = WS->Model();
|
||||
|
||||
// Presentation
|
||||
Handle(StepVisual_TessellatedGeometricSet) aGeomSet = STEPCAFControl_GDTProperty::GetTessellation(thePresentation);
|
||||
@@ -2399,9 +2390,9 @@ static Handle(StepDimTol_Datum) WriteDatumAP242(const Handle(XSControl_WorkSessi
|
||||
const Handle(StepDimTol_Datum) theWrittenDatum)
|
||||
{
|
||||
// Get working data
|
||||
Handle(Interface_InterfaceModel) Model = WS->Model();
|
||||
Handle(XSControl_TransferWriter) TW = WS->TransferWriter();
|
||||
Handle(Transfer_FinderProcess) FP = TW->FinderProcess();
|
||||
const Handle(Interface_InterfaceModel) &Model = WS->Model();
|
||||
const Handle(XSControl_TransferWriter) &TW = WS->TransferWriter();
|
||||
const Handle(Transfer_FinderProcess) &FP = TW->FinderProcess();
|
||||
const Handle(Interface_HGraph) aHGraph = WS->HGraph();
|
||||
if (aHGraph.IsNull())
|
||||
return NULL;
|
||||
@@ -2600,7 +2591,7 @@ static void WriteDimValues(const Handle(XSControl_WorkSession) &WS,
|
||||
const StepShape_DimensionalCharacteristic theDimension)
|
||||
{
|
||||
// Get working data
|
||||
Handle(Interface_InterfaceModel) aModel = WS->Model();
|
||||
const Handle(Interface_InterfaceModel) &aModel = WS->Model();
|
||||
XCAFDimTolObjects_DimensionModifiersSequence aModifiers = theObject->GetModifiers();
|
||||
Handle(Standard_Transient) aDim = theDimension.Value();
|
||||
Standard_Boolean isAngle = aDim->IsKind(STANDARD_TYPE(StepShape_AngularLocation)) ||
|
||||
@@ -2806,7 +2797,7 @@ static Handle(StepDimTol_HArray1OfDatumSystemOrReference) WriteDatumSystem(const
|
||||
const Handle(StepRepr_RepresentationContext)& theRC)
|
||||
{
|
||||
// Get working data
|
||||
Handle(Interface_InterfaceModel) Model = WS->Model();
|
||||
const Handle(Interface_InterfaceModel) &Model = WS->Model();
|
||||
const Handle(Interface_HGraph) aHGraph = WS->HGraph();
|
||||
if (aHGraph.IsNull())
|
||||
return NULL;
|
||||
@@ -2979,7 +2970,7 @@ static void WriteToleranceZone (const Handle(XSControl_WorkSession) &WS,
|
||||
const Handle(StepRepr_RepresentationContext)& theRC)
|
||||
{
|
||||
// Get working data
|
||||
Handle(Interface_InterfaceModel) Model = WS->Model();
|
||||
const Handle(Interface_InterfaceModel) &Model = WS->Model();
|
||||
if (theEntity.IsNull() || theObject.IsNull())
|
||||
return;
|
||||
|
||||
@@ -3029,7 +3020,7 @@ static void WriteGeomTolerance (const Handle(XSControl_WorkSession) &WS,
|
||||
const Handle(StepRepr_RepresentationContext)& theRC)
|
||||
{
|
||||
// Get working data
|
||||
Handle(Interface_InterfaceModel) Model = WS->Model();
|
||||
const Handle(Interface_InterfaceModel) &Model = WS->Model();
|
||||
Handle(XCAFDoc_GeomTolerance) aGTAttr;
|
||||
if (!theGeomTolL.FindAttribute(XCAFDoc_GeomTolerance::GetID(), aGTAttr))
|
||||
return;
|
||||
@@ -3209,9 +3200,9 @@ Standard_Boolean STEPCAFControl_Writer::WriteDGTs (const Handle(XSControl_WorkSe
|
||||
if ( labels.Length() <=0 ) return Standard_False;
|
||||
|
||||
// get working data
|
||||
Handle(Interface_InterfaceModel) Model = WS->Model();
|
||||
Handle(XSControl_TransferWriter) TW = WS->TransferWriter();
|
||||
Handle(Transfer_FinderProcess) FP = TW->FinderProcess();
|
||||
const Handle(Interface_InterfaceModel) &Model = WS->Model();
|
||||
const Handle(XSControl_TransferWriter) &TW = WS->TransferWriter();
|
||||
const Handle(Transfer_FinderProcess) &FP = TW->FinderProcess();
|
||||
|
||||
const Handle(Interface_HGraph) aHGraph = WS->HGraph();
|
||||
if(aHGraph.IsNull())
|
||||
@@ -3565,9 +3556,7 @@ Standard_Boolean STEPCAFControl_Writer::WriteDGTsAP242 (const Handle(XSControl_W
|
||||
const TDF_LabelSequence &labels ) const
|
||||
{
|
||||
// Get working data
|
||||
Handle(Interface_InterfaceModel) aModel = WS->Model();
|
||||
Handle(XSControl_TransferWriter) TW = WS->TransferWriter();
|
||||
Handle(Transfer_FinderProcess) FP = TW->FinderProcess();
|
||||
const Handle(Interface_InterfaceModel) &aModel = WS->Model();
|
||||
|
||||
const Handle(Interface_HGraph) aHGraph = WS->HGraph();
|
||||
if(aHGraph.IsNull())
|
||||
@@ -3833,9 +3822,9 @@ Standard_Boolean STEPCAFControl_Writer::WriteMaterials (const Handle(XSControl_W
|
||||
if ( labels.Length() <=0 ) return Standard_False;
|
||||
|
||||
// get working data
|
||||
Handle(Interface_InterfaceModel) Model = WS->Model();
|
||||
Handle(XSControl_TransferWriter) TW = WS->TransferWriter();
|
||||
Handle(Transfer_FinderProcess) FP = TW->FinderProcess();
|
||||
const Handle(Interface_InterfaceModel) &Model = WS->Model();
|
||||
const Handle(XSControl_TransferWriter) &TW = WS->TransferWriter();
|
||||
const Handle(Transfer_FinderProcess) &FP = TW->FinderProcess();
|
||||
|
||||
const Handle(Interface_HGraph) aHGraph = WS->HGraph();
|
||||
if(aHGraph.IsNull())
|
||||
|
Reference in New Issue
Block a user