OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0033054: Configuration - link errors due to missing references to new TKXDE toolkit

Browse Source 
src/OS/DataExchange.tcl - added missing new toolkits.
TKRWMesh - added missing reference to TKTopAlgo (for using BRepLib_PointCloudShape).
Removed redundant dependency from TKBinXCAF.
DRAWEXE - added missing references for a static build.

THE_CONFIGURATION_SCOPE definition has been corrected to postpoine calling constructor till the first variable usage.
Fixed compiler warning at SelectMgr_Frustum<3>::DumpJson() due to misleading Standard_EXPORT for an inline template method definition.
This commit is contained in:
kgv 2022-07-06 21:32:46 +03:00 committed by smoskvin
parent c2eed2a326
commit dee5eb82b5
18 changed files with 109 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/DE/DE_Wrapper.cxx
View File

@ -27,7 +27,14 @@
IMPLEMENT_STANDARD_RTTIEXT(DE_Wrapper, Standard_Transient) IMPLEMENT_STANDARD_RTTIEXT(DE_Wrapper, Standard_Transient)
static const TCollection_AsciiString THE_CONFIGURATION_SCOPE = "global"; namespace
{
static const TCollection_AsciiString& THE_CONFIGURATION_SCOPE()
{
static const TCollection_AsciiString aScope ("global");
return aScope;
}
}
//======================================================================= //=======================================================================
// function : DE_Wrapper // function : DE_Wrapper
@ -253,7 +260,7 @@ Standard_Boolean DE_Wrapper::Load(const TCollection_AsciiString& theResource,
Standard_Boolean DE_Wrapper::Load(const Handle(DE_ConfigurationContext)& theResource, Standard_Boolean DE_Wrapper::Load(const Handle(DE_ConfigurationContext)& theResource,
const Standard_Boolean theIsRecursive) const Standard_Boolean theIsRecursive)
{ {
GlobalParameters.LengthUnit = theResource->RealVal("general.length.unit", GlobalParameters.LengthUnit, THE_CONFIGURATION_SCOPE); GlobalParameters.LengthUnit = theResource->RealVal("general.length.unit", GlobalParameters.LengthUnit, THE_CONFIGURATION_SCOPE());
if (theIsRecursive) if (theIsRecursive)
{ {
for (DE_ConfigurationFormatMap::Iterator aFormatIter(myConfiguration); for (DE_ConfigurationFormatMap::Iterator aFormatIter(myConfiguration);
@ -326,7 +333,7 @@ TCollection_AsciiString DE_Wrapper::Save(const Standard_Boolean theIsRecursive,
aFormatIter.More(); aFormatIter.Next()) aFormatIter.More(); aFormatIter.Next())
{ {
const TCollection_AsciiString& aFormat = aFormatIter.Key(); const TCollection_AsciiString& aFormat = aFormatIter.Key();
aResult += THE_CONFIGURATION_SCOPE + '.' + "priority" + '.' + aFormat + " :\t "; aResult += THE_CONFIGURATION_SCOPE() + '.' + "priority" + '.' + aFormat + " :\t ";
for (DE_ConfigurationVendorMap::Iterator aVendorIter(aFormatIter.Value()); for (DE_ConfigurationVendorMap::Iterator aVendorIter(aFormatIter.Value());
aVendorIter.More(); aVendorIter.Next()) aVendorIter.More(); aVendorIter.Next())
{ {
@ -337,7 +344,7 @@ TCollection_AsciiString DE_Wrapper::Save(const Standard_Boolean theIsRecursive,
} }
aResult += "!Global parameters. Used for all providers\n"; aResult += "!Global parameters. Used for all providers\n";
aResult += "!Length scale unit value. Should be more the 0. Default value: 1.0(MM)\n"; aResult += "!Length scale unit value. Should be more the 0. Default value: 1.0(MM)\n";
aResult += THE_CONFIGURATION_SCOPE + ".general.length.unit :\t " + GlobalParameters.LengthUnit + "\n"; aResult += THE_CONFIGURATION_SCOPE() + ".general.length.unit :\t " + GlobalParameters.LengthUnit + "\n";
if (theIsRecursive) if (theIsRecursive)
{ {
for (DE_ConfigurationFormatMap::Iterator aFormatIter(myConfiguration); for (DE_ConfigurationFormatMap::Iterator aFormatIter(myConfiguration);
@ -525,7 +532,7 @@ Standard_Boolean DE_Wrapper::findProvider(const TCollection_AsciiString& thePath
//======================================================================= //=======================================================================
void DE_Wrapper::sort(const Handle(DE_ConfigurationContext)& theResource) void DE_Wrapper::sort(const Handle(DE_ConfigurationContext)& theResource)
{ {
const TCollection_AsciiString aScope(THE_CONFIGURATION_SCOPE + '.' + "priority"); const TCollection_AsciiString aScope(THE_CONFIGURATION_SCOPE() + '.' + "priority");
NCollection_List<Handle(DE_ConfigurationNode)> aVendors; NCollection_List<Handle(DE_ConfigurationNode)> aVendors;
for (DE_ConfigurationFormatMap::Iterator aFormatIter(myConfiguration); for (DE_ConfigurationFormatMap::Iterator aFormatIter(myConfiguration);
aFormatIter.More(); aFormatIter.Next()) aFormatIter.More(); aFormatIter.Next())

13
src/DEBRepCascade/DEBRepCascade_ConfigurationNode.cxx
View File

@ -19,7 +19,14 @@
IMPLEMENT_STANDARD_RTTIEXT(DEBRepCascade_ConfigurationNode, DE_ConfigurationNode) IMPLEMENT_STANDARD_RTTIEXT(DEBRepCascade_ConfigurationNode, DE_ConfigurationNode)
static const TCollection_AsciiString THE_CONFIGURATION_SCOPE = "provider"; namespace
{
static const TCollection_AsciiString& THE_CONFIGURATION_SCOPE()
{
static const TCollection_AsciiString aScope = "provider";
return aScope;
}
}
//======================================================================= //=======================================================================
// function : DEBRepCascade_ConfigurationNode // function : DEBRepCascade_ConfigurationNode
@ -48,7 +55,7 @@ DEBRepCascade_ConfigurationNode::DEBRepCascade_ConfigurationNode(const Handle(DE
//======================================================================= //=======================================================================
bool DEBRepCascade_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource) bool DEBRepCascade_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource)
{ {
TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor(); TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor();
InternalParameters.WriteBinary = InternalParameters.WriteBinary =
theResource->BooleanVal("write.binary", InternalParameters.WriteBinary, aScope); theResource->BooleanVal("write.binary", InternalParameters.WriteBinary, aScope);
@ -72,7 +79,7 @@ TCollection_AsciiString DEBRepCascade_ConfigurationNode::Save() const
TCollection_AsciiString aResult; TCollection_AsciiString aResult;
aResult += "!*****************************************************************************\n"; aResult += "!*****************************************************************************\n";
aResult = aResult + "!Configuration Node " + " Vendor: " + GetVendor() + " Format: " + GetFormat() + "\n"; aResult = aResult + "!Configuration Node " + " Vendor: " + GetVendor() + " Format: " + GetFormat() + "\n";
TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor() + "."; TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor() + ".";
aResult += "!\n"; aResult += "!\n";
aResult += "!Write parameters:\n"; aResult += "!Write parameters:\n";

13
src/DEXCAFCascade/DEXCAFCascade_ConfigurationNode.cxx
View File

@ -19,7 +19,14 @@
IMPLEMENT_STANDARD_RTTIEXT(DEXCAFCascade_ConfigurationNode, DE_ConfigurationNode) IMPLEMENT_STANDARD_RTTIEXT(DEXCAFCascade_ConfigurationNode, DE_ConfigurationNode)
static const TCollection_AsciiString THE_CONFIGURATION_SCOPE = "provider"; namespace
{
static const TCollection_AsciiString& THE_CONFIGURATION_SCOPE()
{
static const TCollection_AsciiString aScope = "provider";
return aScope;
}
}
//======================================================================= //=======================================================================
// function : DEXCAFCascade_ConfigurationNode // function : DEXCAFCascade_ConfigurationNode
@ -48,7 +55,7 @@ DEXCAFCascade_ConfigurationNode::DEXCAFCascade_ConfigurationNode(const Handle(DE
//======================================================================= //=======================================================================
bool DEXCAFCascade_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource) bool DEXCAFCascade_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource)
{ {
TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor(); TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor();
InternalParameters.ReadAppendMode = (PCDM_ReaderFilter::AppendMode) InternalParameters.ReadAppendMode = (PCDM_ReaderFilter::AppendMode)
theResource->IntegerVal("read.append.mode", InternalParameters.ReadAppendMode, aScope); theResource->IntegerVal("read.append.mode", InternalParameters.ReadAppendMode, aScope);
@ -67,7 +74,7 @@ TCollection_AsciiString DEXCAFCascade_ConfigurationNode::Save() const
TCollection_AsciiString aResult; TCollection_AsciiString aResult;
aResult += "!*****************************************************************************\n"; aResult += "!*****************************************************************************\n";
aResult = aResult + "!Configuration Node " + " Vendor: " + GetVendor() + " Format: " + GetFormat() + "\n"; aResult = aResult + "!Configuration Node " + " Vendor: " + GetVendor() + " Format: " + GetFormat() + "\n";
TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor() + "."; TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor() + ".";
aResult += "!\n"; aResult += "!\n";
aResult += "!Read parameters:\n"; aResult += "!Read parameters:\n";

5
src/DRAWEXE/EXTERNLIB_STATIC
View File

@ -7,6 +7,10 @@ TKOpenGlesTest
TKViewerTest TKViewerTest
TKDraw TKDraw
TKMeshVS TKMeshVS
TKXDECascade
TKTObj
TKBinTObj
TKXmlTObj
TKXDESTEP TKXDESTEP
TKSTEP TKSTEP
TKSTEPAttr TKSTEPAttr
@ -18,6 +22,7 @@ TKXSBase
TKVRML TKVRML
TKSTL TKSTL
TKRWMesh TKRWMesh
TKXDE
TKBinXCAF TKBinXCAF
TKXmlXCAF TKXmlXCAF
TKBin TKBin

13
src/IGESCAFControl/IGESCAFControl_ConfigurationNode.cxx
View File

@ -19,7 +19,14 @@
IMPLEMENT_STANDARD_RTTIEXT(IGESCAFControl_ConfigurationNode, DE_ConfigurationNode) IMPLEMENT_STANDARD_RTTIEXT(IGESCAFControl_ConfigurationNode, DE_ConfigurationNode)
static const TCollection_AsciiString THE_CONFIGURATION_SCOPE = "provider"; namespace
{
static const TCollection_AsciiString& THE_CONFIGURATION_SCOPE()
{
static const TCollection_AsciiString aScope = "provider";
return aScope;
}
}
//======================================================================= //=======================================================================
// function : IGESCAFControl_ConfigurationNode // function : IGESCAFControl_ConfigurationNode
@ -48,7 +55,7 @@ IGESCAFControl_ConfigurationNode::IGESCAFControl_ConfigurationNode(const Handle(
//======================================================================= //=======================================================================
bool IGESCAFControl_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource) bool IGESCAFControl_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource)
{ {
TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor(); TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor();
InternalParameters.ReadBSplineContinuity = (ReadMode_BSplineContinuity) InternalParameters.ReadBSplineContinuity = (ReadMode_BSplineContinuity)
theResource->IntegerVal("read.iges.bspline.continuity", InternalParameters.ReadBSplineContinuity, aScope); theResource->IntegerVal("read.iges.bspline.continuity", InternalParameters.ReadBSplineContinuity, aScope);
@ -129,7 +136,7 @@ TCollection_AsciiString IGESCAFControl_ConfigurationNode::Save() const
TCollection_AsciiString aResult; TCollection_AsciiString aResult;
aResult += "!*****************************************************************************\n"; aResult += "!*****************************************************************************\n";
aResult = aResult + "!Configuration Node " + " Vendor: " + GetVendor() + " Format: " + GetFormat() + "\n"; aResult = aResult + "!Configuration Node " + " Vendor: " + GetVendor() + " Format: " + GetFormat() + "\n";
TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor() + "."; TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor() + ".";
aResult += "!\n"; aResult += "!\n";
aResult += "!Common parameters:\n"; aResult += "!Common parameters:\n";

8
src/OS/DataExchange.tcl
View File

@ -15,10 +15,12 @@
;# Liste des toolkits WOK sous forme de full path ;# Liste des toolkits WOK sous forme de full path
;# ;#
proc DataExchange:toolkits { } { proc DataExchange:toolkits { } {
return [list TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES \ return [list TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES \
TKXCAF TKXDEIGES TKXDESTEP \ TKXCAF TKXDEIGES TKXDESTEP \
TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh] TKXDE TKXDECascade \
TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh]
} }
;# ;#
;# Autres UDs a prendre. ;# Autres UDs a prendre.
;# ;#

13
src/RWGltf/RWGltf_ConfigurationNode.cxx
View File

@ -18,7 +18,14 @@
IMPLEMENT_STANDARD_RTTIEXT(RWGltf_ConfigurationNode, DE_ConfigurationNode) IMPLEMENT_STANDARD_RTTIEXT(RWGltf_ConfigurationNode, DE_ConfigurationNode)
static const TCollection_AsciiString THE_CONFIGURATION_SCOPE = "provider"; namespace
{
static const TCollection_AsciiString& THE_CONFIGURATION_SCOPE()
{
static const TCollection_AsciiString aScope = "provider";
return aScope;
}
}
//======================================================================= //=======================================================================
// function : RWGltf_ConfigurationNode // function : RWGltf_ConfigurationNode
@ -47,7 +54,7 @@ RWGltf_ConfigurationNode::RWGltf_ConfigurationNode(const Handle(RWGltf_Configura
//======================================================================= //=======================================================================
bool RWGltf_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource) bool RWGltf_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource)
{ {
TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor(); TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor();
InternalParameters.FileLengthUnit = InternalParameters.FileLengthUnit =
theResource->RealVal("file.length.unit", InternalParameters.FileLengthUnit, aScope); theResource->RealVal("file.length.unit", InternalParameters.FileLengthUnit, aScope);
@ -114,7 +121,7 @@ TCollection_AsciiString RWGltf_ConfigurationNode::Save() const
TCollection_AsciiString aResult; TCollection_AsciiString aResult;
aResult += "!*****************************************************************************\n"; aResult += "!*****************************************************************************\n";
aResult = aResult + "!Configuration Node " + " Vendor: " + GetVendor() + " Format: " + GetFormat() + "\n"; aResult = aResult + "!Configuration Node " + " Vendor: " + GetVendor() + " Format: " + GetFormat() + "\n";
TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor() + "."; TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor() + ".";
aResult += "!\n"; aResult += "!\n";
aResult += "!Common parameters:\n"; aResult += "!Common parameters:\n";

13
src/RWObj/RWObj_ConfigurationNode.cxx
View File

@ -18,7 +18,14 @@
IMPLEMENT_STANDARD_RTTIEXT(RWObj_ConfigurationNode, DE_ConfigurationNode) IMPLEMENT_STANDARD_RTTIEXT(RWObj_ConfigurationNode, DE_ConfigurationNode)
static const TCollection_AsciiString THE_CONFIGURATION_SCOPE = "provider"; namespace
{
static const TCollection_AsciiString& THE_CONFIGURATION_SCOPE()
{
static const TCollection_AsciiString aScope = "provider";
return aScope;
}
}
//======================================================================= //=======================================================================
// function : RWObj_ConfigurationNode // function : RWObj_ConfigurationNode
@ -47,7 +54,7 @@ RWObj_ConfigurationNode::RWObj_ConfigurationNode(const Handle(RWObj_Configuratio
//======================================================================= //=======================================================================
bool RWObj_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource) bool RWObj_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource)
{ {
TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor(); TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor();
InternalParameters.FileLengthUnit = InternalParameters.FileLengthUnit =
theResource->RealVal("file.length.unit", InternalParameters.FileLengthUnit, aScope); theResource->RealVal("file.length.unit", InternalParameters.FileLengthUnit, aScope);
InternalParameters.SystemCS = (RWMesh_CoordinateSystem) InternalParameters.SystemCS = (RWMesh_CoordinateSystem)
@ -84,7 +91,7 @@ TCollection_AsciiString RWObj_ConfigurationNode::Save() const
TCollection_AsciiString aResult; TCollection_AsciiString aResult;
aResult += "!*****************************************************************************\n"; aResult += "!*****************************************************************************\n";
aResult = aResult + "!Configuration Node " + " Vendor: " + GetVendor() + " Format: " + GetFormat() + "\n"; aResult = aResult + "!Configuration Node " + " Vendor: " + GetVendor() + " Format: " + GetFormat() + "\n";
TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor() + "."; TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor() + ".";
aResult += "!\n"; aResult += "!\n";
aResult += "!Common parameters:\n"; aResult += "!Common parameters:\n";

13
src/RWStl/RWStl_ConfigurationNode.cxx
View File

@ -19,7 +19,14 @@
IMPLEMENT_STANDARD_RTTIEXT(RWStl_ConfigurationNode, DE_ConfigurationNode) IMPLEMENT_STANDARD_RTTIEXT(RWStl_ConfigurationNode, DE_ConfigurationNode)
static const TCollection_AsciiString THE_CONFIGURATION_SCOPE = "provider"; namespace
{
static const TCollection_AsciiString& THE_CONFIGURATION_SCOPE()
{
static const TCollection_AsciiString aScope = "provider";
return aScope;
}
}
//======================================================================= //=======================================================================
// function : STEPCAFControl_ConfigurationNode // function : STEPCAFControl_ConfigurationNode
@ -48,7 +55,7 @@ RWStl_ConfigurationNode::RWStl_ConfigurationNode(const Handle(RWStl_Configuratio
//======================================================================= //=======================================================================
bool RWStl_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource) bool RWStl_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource)
{ {
TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor(); TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor();
InternalParameters.ReadMergeAngle = InternalParameters.ReadMergeAngle =
theResource->RealVal("read.merge.angle", InternalParameters.ReadMergeAngle, aScope); theResource->RealVal("read.merge.angle", InternalParameters.ReadMergeAngle, aScope);
@ -68,7 +75,7 @@ TCollection_AsciiString RWStl_ConfigurationNode::Save() const
TCollection_AsciiString aResult; TCollection_AsciiString aResult;
aResult += "!*****************************************************************************\n"; aResult += "!*****************************************************************************\n";
aResult = aResult + "!Configuration Node " + " Vendor: " + GetVendor() + " Format: " + GetFormat() + "\n"; aResult = aResult + "!Configuration Node " + " Vendor: " + GetVendor() + " Format: " + GetFormat() + "\n";
TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor() + "."; TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor() + ".";
aResult += "!\n"; aResult += "!\n";
aResult += "!Read parameters:\n"; aResult += "!Read parameters:\n";

13
src/STEPCAFControl/STEPCAFControl_ConfigurationNode.cxx
View File

@ -19,7 +19,14 @@
IMPLEMENT_STANDARD_RTTIEXT(STEPCAFControl_ConfigurationNode, DE_ConfigurationNode) IMPLEMENT_STANDARD_RTTIEXT(STEPCAFControl_ConfigurationNode, DE_ConfigurationNode)
static const TCollection_AsciiString THE_CONFIGURATION_SCOPE = "provider"; namespace
{
static const TCollection_AsciiString& THE_CONFIGURATION_SCOPE()
{
static const TCollection_AsciiString aScope = "provider";
return aScope;
}
}
//======================================================================= //=======================================================================
// function : STEPCAFControl_ConfigurationNode // function : STEPCAFControl_ConfigurationNode
@ -48,7 +55,7 @@ STEPCAFControl_ConfigurationNode::STEPCAFControl_ConfigurationNode(const Handle(
//======================================================================= //=======================================================================
bool STEPCAFControl_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource) bool STEPCAFControl_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource)
{ {
TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor(); TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor();
InternalParameters.ReadBSplineContinuity = (ReadMode_BSplineContinuity) InternalParameters.ReadBSplineContinuity = (ReadMode_BSplineContinuity)
theResource->IntegerVal("read.iges.bspline.continuity", InternalParameters.ReadBSplineContinuity, aScope); theResource->IntegerVal("read.iges.bspline.continuity", InternalParameters.ReadBSplineContinuity, aScope);
@ -157,7 +164,7 @@ TCollection_AsciiString STEPCAFControl_ConfigurationNode::Save() const
TCollection_AsciiString aResult; TCollection_AsciiString aResult;
aResult += "!*****************************************************************************\n"; aResult += "!*****************************************************************************\n";
aResult = aResult + "!Configuration Node " + " Vendor: " + GetVendor() + " Format: " + GetFormat() + "\n"; aResult = aResult + "!Configuration Node " + " Vendor: " + GetVendor() + " Format: " + GetFormat() + "\n";
TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor() + "."; TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor() + ".";
aResult += "!\n"; aResult += "!\n";
aResult += "!Common parameters:\n"; aResult += "!Common parameters:\n";

2
src/SelectMgr/SelectMgr_Frustum.hxx
View File

@ -59,7 +59,7 @@ public:
} }
//! Dumps the content of me into the stream //! Dumps the content of me into the stream
Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE; inline virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE;
protected: protected:

2
src/TKRWMesh/EXTERNLIB
View File

@ -1,4 +1,3 @@
TKBinXCAF
TKernel TKernel
TKMath TKMath
TKMesh TKMesh
@ -7,6 +6,7 @@ TKLCAF
TKV3d TKV3d
TKBRep TKBRep
TKG3d TKG3d
TKTopAlgo
TKXDE TKXDE
TKService TKService
CSF_RapidJSON CSF_RapidJSON

1
src/TKSTL/EXTERNLIB
View File

@ -1,4 +1,3 @@
TKBinXCAF
TKXDE TKXDE
TKernel TKernel
TKMath TKMath

1
src/TKVRML/EXTERNLIB
View File

@ -1,4 +1,3 @@
TKBinXCAF
TKBRep TKBRep
TKXDE TKXDE
TKTopAlgo TKTopAlgo

5
src/TKXDECascade/EXTERNLIB
View File

@ -2,6 +2,7 @@ TKBin
TKBinL TKBinL
TKBinTObj TKBinTObj
TKBinXCAF TKBinXCAF
TKBRep
TKStd TKStd
TKXml TKXml
TKXmlL TKXmlL
@ -9,4 +10,8 @@ TKXmlTObj
TKXmlXCAF TKXmlXCAF
TKXDE TKXDE
TKernel TKernel
TKMath
TKLCAF TKLCAF
TKXCAF
TKStdL
TKCDF

1
src/TKXDEIGES/EXTERNLIB
View File

@ -1,4 +1,3 @@
TKBinXCAF
TKBRep TKBRep
TKXDE TKXDE
TKernel TKernel

1
src/TKXDESTEP/EXTERNLIB
View File

@ -1,4 +1,3 @@
TKBinXCAF
TKXDE TKXDE
TKBRep TKBRep
TKSTEPAttr TKSTEPAttr

13
src/Vrml/Vrml_ConfigurationNode.cxx
View File

@ -18,7 +18,14 @@
IMPLEMENT_STANDARD_RTTIEXT(Vrml_ConfigurationNode, DE_ConfigurationNode) IMPLEMENT_STANDARD_RTTIEXT(Vrml_ConfigurationNode, DE_ConfigurationNode)
static const TCollection_AsciiString THE_CONFIGURATION_SCOPE = "provider"; namespace
{
static const TCollection_AsciiString& THE_CONFIGURATION_SCOPE()
{
static const TCollection_AsciiString aScope = "provider";
return aScope;
}
}
//======================================================================= //=======================================================================
// function : STEPCAFControl_ConfigurationNode // function : STEPCAFControl_ConfigurationNode
@ -47,7 +54,7 @@ Vrml_ConfigurationNode::Vrml_ConfigurationNode(const Handle(Vrml_ConfigurationNo
//======================================================================= //=======================================================================
bool Vrml_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource) bool Vrml_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource)
{ {
TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor(); TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor();
InternalParameters.WriterVersion = (WriteMode_WriterVersion) InternalParameters.WriterVersion = (WriteMode_WriterVersion)
theResource->IntegerVal("writer.version", InternalParameters.WriterVersion, aScope); theResource->IntegerVal("writer.version", InternalParameters.WriterVersion, aScope);
@ -66,7 +73,7 @@ TCollection_AsciiString Vrml_ConfigurationNode::Save() const
TCollection_AsciiString aResult; TCollection_AsciiString aResult;
aResult += "!*****************************************************************************\n"; aResult += "!*****************************************************************************\n";
aResult = aResult + "!Configuration Node " + " Vendor: " + GetVendor() + " Format: " + GetFormat() + "\n"; aResult = aResult + "!Configuration Node " + " Vendor: " + GetVendor() + " Format: " + GetFormat() + "\n";
TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE + "." + GetFormat() + "." + GetVendor() + "."; TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor() + ".";
aResult += "!\n"; aResult += "!\n";
aResult += "!Write parameters:\n"; aResult += "!Write parameters:\n";