ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-04-24 01:32:05 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix for Bug IPAL15353:

Browse Source 
"No valid file..." error is in terminal after trying to import BREP file.
This commit is contained in:
enk 2007-03-27 11:07:45 +00:00
parent d6a9af2f7d
commit d9de435c09
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
View File

@ -452,9 +452,14 @@ Standard_Boolean GEOMImpl_IInsertOperations::IsSupported
//============================================================================= //=============================================================================
Standard_Boolean GEOMImpl_IInsertOperations::InitResMgr() Standard_Boolean GEOMImpl_IInsertOperations::InitResMgr()
{ {
bool isResourceFound = false;
bool isResourceFoundUser = false;
TCollection_AsciiString aUserResDir,aResDir;
if (myResMgr.IsNull()) { if (myResMgr.IsNull()) {
// Initialize the Resource Manager // Initialize the Resource Manager
TCollection_AsciiString aResDir (getenv("GEOM_ROOT_DIR")),aNull; TCollection_AsciiString aNull;
aResDir = TCollection_AsciiString(getenv("GEOM_ROOT_DIR"));
#ifdef WNT #ifdef WNT
aResDir += "\\share\\salome\\resources\\geom"; aResDir += "\\share\\salome\\resources\\geom";
#else #else
@ -463,15 +468,18 @@ Standard_Boolean GEOMImpl_IInsertOperations::InitResMgr()
myResMgr = new Resource_Manager ("ImportExport", aResDir, aNull, Standard_False); myResMgr = new Resource_Manager ("ImportExport", aResDir, aNull, Standard_False);
isResourceFound = true;
if (!myResMgr->Find("Import") && !myResMgr->Find("Export")) { if (!myResMgr->Find("Import") && !myResMgr->Find("Export")) {
// instead of complains in Resource_Manager // instead of complains in Resource_Manager
isResourceFound = false;
INFOS("No valid file \"ImportExport\" found in " << aResDir.ToCString()); INFOS("No valid file \"ImportExport\" found in " << aResDir.ToCString());
} }
} } else
isResourceFound = true;
if (myResMgrUser.IsNull()) { if (myResMgrUser.IsNull()) {
char * dir = getenv("GEOM_ENGINE_RESOURCES_DIR"); char * dir = getenv("GEOM_ENGINE_RESOURCES_DIR");
TCollection_AsciiString aUserResDir,aNull; TCollection_AsciiString aNull;
if ( dir ) if ( dir )
{ {
aUserResDir = dir; aUserResDir = dir;
@ -488,12 +496,20 @@ Standard_Boolean GEOMImpl_IInsertOperations::InitResMgr()
myResMgrUser = new Resource_Manager ("ImportExport", aNull, aUserResDir, Standard_False); myResMgrUser = new Resource_Manager ("ImportExport", aNull, aUserResDir, Standard_False);
isResourceFoundUser = true;
if (!myResMgrUser->Find("Import") && !myResMgrUser->Find("Export")) { if (!myResMgrUser->Find("Import") && !myResMgrUser->Find("Export")) {
// instead of complains in Resource_Manager // instead of complains in Resource_Manager
INFOS("No valid file \"ImportExport\" found in " << aUserResDir.ToCString() ); isResourceFoundUser = false;
} }
} } else
isResourceFoundUser = true;
if(!isResourceFound && !isResourceFoundUser){
INFOS("No valid file \"ImportExport\" found in " << aResDir.ToCString());
INFOS("No valid file \"ImportExport\" found in " << aUserResDir.ToCString() );
}
return ( myResMgr->Find("Import") || myResMgr->Find("Export") || return ( myResMgr->Find("Import") || myResMgr->Find("Export") ||
myResMgrUser->Find("Import") || myResMgrUser->Find("Export")); myResMgrUser->Find("Import") || myResMgrUser->Find("Export"));