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

0033751: Shape Healing - Use static values in case of an absent Resource file

Browse Source 
If a Resource file with parameters for ShapeFix is absent, use static parameters instead if possible.
This commit is contained in:
anv 2024-06-27 16:09:48 +01:00 committed by Andrey PANIN
parent ba24817433
commit 324f1da29d
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Resource/Resource_Manager.cxx
View File

@ -62,7 +62,8 @@ Resource_Manager::Resource_Manager (const TCollection_AsciiString& theName,
const TCollection_AsciiString& theUserDefaultsDirectory, const TCollection_AsciiString& theUserDefaultsDirectory,
const Standard_Boolean theIsVerbose) const Standard_Boolean theIsVerbose)
: myName (theName), : myName (theName),
myVerbose (theIsVerbose) myVerbose (theIsVerbose),
myInitialized(Standard_False)
{ {
if (!theDefaultsDirectory.IsEmpty()) if (!theDefaultsDirectory.IsEmpty())
{ {
@ -102,7 +103,7 @@ Resource_Manager::Resource_Manager (const TCollection_AsciiString& theName,
} }
Resource_Manager::Resource_Manager(const Standard_CString aName, Resource_Manager::Resource_Manager(const Standard_CString aName,
const Standard_Boolean Verbose) : myName(aName), myVerbose(Verbose) const Standard_Boolean Verbose) : myName(aName), myVerbose(Verbose), myInitialized(Standard_False)
{ {
OSD_Environment envDebug("ResourceDebug"); OSD_Environment envDebug("ResourceDebug");
Debug = (!envDebug.Value().IsEmpty()) ; Debug = (!envDebug.Value().IsEmpty()) ;
@ -157,6 +158,7 @@ void Resource_Manager::Load(const TCollection_AsciiString& thePath,
<< "\". File not found or permission denied." << std::endl; << "\". File not found or permission denied." << std::endl;
return; return;
} }
myInitialized = Standard_True;
Standard_Integer LineNumber = 1; Standard_Integer LineNumber = 1;
while ((aKind = WhatKindOfLine(File, Token1, Token2)) != Resource_KOL_End) { while ((aKind = WhatKindOfLine(File, Token1, Token2)) != Resource_KOL_End) {
switch (aKind) { switch (aKind) {

4
src/Resource/Resource_Manager.hxx
View File

@ -116,6 +116,9 @@ public:
//! Returns internal Ref or User map with parameters //! Returns internal Ref or User map with parameters
Standard_EXPORT Resource_DataMapOfAsciiStringAsciiString& GetMap(Standard_Boolean theRefMap = Standard_True); Standard_EXPORT Resource_DataMapOfAsciiStringAsciiString& GetMap(Standard_Boolean theRefMap = Standard_True);
//! Returns true if Resource have been found
Standard_Boolean IsInitialized() const { return myInitialized; }
private: private:
@ -129,6 +132,7 @@ private:
Resource_DataMapOfAsciiStringAsciiString myUserMap; Resource_DataMapOfAsciiStringAsciiString myUserMap;
Resource_DataMapOfAsciiStringExtendedString myExtStrMap; Resource_DataMapOfAsciiStringExtendedString myExtStrMap;
Standard_Boolean myVerbose; Standard_Boolean myVerbose;
Standard_Boolean myInitialized;
}; };

11
src/XSAlgo/XSAlgo_AlgoContainer.cxx
View File

@ -104,17 +104,12 @@ TopoDS_Shape XSAlgo_AlgoContainer::ProcessShape(const TopoDS_Shape& theShape,
if (aContext.IsNull()) if (aContext.IsNull())
{ {
Standard_CString aRscfile = Interface_Static::CVal(thePrscfile); Standard_CString aRscfile = Interface_Static::CVal(thePrscfile);
if (aRscfile != nullptr && strlen(aRscfile) == 0) aContext = new ShapeProcess_ShapeContext(theShape, aRscfile);
if (!aContext->ResourceManager()->IsInitialized())
{ {
aContext = new ShapeProcess_ShapeContext(theShape, nullptr); // If resource file wasn't found, use static values instead
Interface_Static::FillMap(aContext->ResourceManager()->GetMap()); Interface_Static::FillMap(aContext->ResourceManager()->GetMap());
} }
else
{
if (!aRscfile)
aRscfile = thePrscfile;
aContext = new ShapeProcess_ShapeContext(theShape, aRscfile);
}
aContext->SetDetalisation(theDetalisationLevel); aContext->SetDetalisation(theDetalisationLevel);
} }
aContext->SetNonManifold(theNonManifold); aContext->SetNonManifold(theNonManifold);