// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include <Standard_Stream.hxx>
#include <GEOMImpl_Types.hxx>
+#include <Standard_Failure.hxx>
#include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
//=============================================================================
//Compute the Copy value
try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+ OCC_CATCH_SIGNALS;
+#endif
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Copy driver failed");
return NULL;
//Perform the Export
try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+ OCC_CATCH_SIGNALS;
+#endif
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Export driver failed");
return;
//Perform the Import
try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+ OCC_CATCH_SIGNALS;
+#endif
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("Import driver failed");
return NULL;
if (!InitResMgr()) return Standard_False;
- // Read Import formats list
+ // Read Import formats list from install directory
if (myResMgr->Find("Import")) {
TCollection_AsciiString aFormats (myResMgr->Value("Import"));
TCollection_AsciiString aToken = aFormats.Token("| \t", 1);
}
}
+ // Read Import formats from user directory
+ if (myResMgrUser->Find("Import")) {
+ TCollection_AsciiString aFormats (myResMgrUser->Value("Import"));
+ TCollection_AsciiString aToken = aFormats.Token("| \t", 1);
+ int i = 1;
+ for (; !aToken.IsEmpty(); aToken = aFormats.Token("| \t", ++i)) {
+ int aLenFormats = theFormats->Length();
+ bool isFound = false;
+ for(int aInd=1;aInd<=aLenFormats;aInd++){
+ if( theFormats->Value(aInd) == aToken){
+ isFound = true;
+ break;
+ }
+ }
+ if(!isFound)
+ theFormats->Append(aToken);
+ }
+ }
+
// Read Patterns for each supported format
int j = 1, len = theFormats->Length();
for (; j <= len; j++) {
aKey = theFormats->Value(j) + ".ImportPattern";
if (myResMgr->Find(aKey.ToCString()))
aPattern = myResMgr->Value(aKey.ToCString());
+ else if(myResMgrUser->Find(aKey.ToCString()))
+ aPattern = myResMgrUser->Value(aKey.ToCString());
else {
aKey = theFormats->Value(j) + ".Pattern";
if (myResMgr->Find(aKey.ToCString()))
aPattern = myResMgr->Value(aKey.ToCString());
+ else if(myResMgrUser->Find(aKey.ToCString()))
+ aPattern = myResMgrUser->Value(aKey.ToCString());
else {
aPattern = theFormats->Value(j);
aPattern += " Files ( *.* )";
if (!InitResMgr()) return Standard_False;
- // Read Export formats list
+ // Read Export formats list from install directory
if (myResMgr->Find("Export")) {
TCollection_AsciiString aFormats (myResMgr->Value("Export"));
TCollection_AsciiString aToken = aFormats.Token("| \t", 1);
}
}
+ // Read Export formats list from user directory
+ if (myResMgrUser->Find("Export")) {
+ TCollection_AsciiString aFormats (myResMgrUser->Value("Export"));
+ TCollection_AsciiString aToken = aFormats.Token("| \t", 1);
+ int i = 1;
+ for (; !aToken.IsEmpty(); aToken = aFormats.Token("| \t", ++i)) {
+ int aLenFormats = theFormats->Length();
+ bool isFound = false;
+ for(int aInd=1;aInd<=aLenFormats;aInd++){
+ if( theFormats->Value(aInd) == aToken){
+ isFound = true;
+ break;
+ }
+ }
+ if(!isFound)
+ theFormats->Append(aToken);
+ }
+ }
+
// Read Patterns for each supported format
int j = 1, len = theFormats->Length();
for (; j <= len; j++) {
aKey = theFormats->Value(j) + ".ExportPattern";
if (myResMgr->Find(aKey.ToCString()))
aPattern = myResMgr->Value(aKey.ToCString());
+ else if (myResMgrUser->Find(aKey.ToCString()))
+ aPattern = myResMgrUser->Value(aKey.ToCString());
else {
aKey = theFormats->Value(j) + ".Pattern";
if (myResMgr->Find(aKey.ToCString()))
aPattern = myResMgr->Value(aKey.ToCString());
+ else if (myResMgrUser->Find(aKey.ToCString()))
+ aPattern = myResMgrUser->Value(aKey.ToCString());
else {
aPattern = theFormats->Value(j);
aPattern += " Files ( *.* )";
if (isImport) aMode = "Import";
else aMode = "Export";
- // Read supported formats for the certain mode
+
+ // Read supported formats for the certain mode from install directory
if (myResMgr->Find(aMode.ToCString())) {
TCollection_AsciiString aFormats (myResMgr->Value(aMode.ToCString()));
if (aFormats.Search(theFormat) > -1) {
aKey += ".";
aKey += aMode;
if (myResMgr->Find(aKey.ToCString())) {
- TCollection_AsciiString aLibName (myResMgr->Value(aKey.ToCString()));
+ TCollection_AsciiString aLibName (myResMgr->Value(aKey.ToCString()));
+#ifndef WNT
+ aLibName += ".so";
+#else
+ aLibName += ".dll";
+#endif
theLibName = new TCollection_HAsciiString (aLibName);
return Standard_True;
}
}
}
-
+
+ // Read supported formats for the certain mode from user directory
+ if (myResMgrUser->Find(aMode.ToCString())) {
+ TCollection_AsciiString aFormats (myResMgrUser->Value(aMode.ToCString()));
+ if (aFormats.Search(theFormat) > -1) {
+ // Read library name for the supported format
+ TCollection_AsciiString aKey (theFormat);
+ aKey += ".";
+ aKey += aMode;
+ if (myResMgrUser->Find(aKey.ToCString())) {
+ TCollection_AsciiString aLibName (myResMgrUser->Value(aKey.ToCString()));
+ theLibName = new TCollection_HAsciiString (aLibName);
+ return Standard_True;
+ }
+ }
+ }
+
return Standard_False;
}
//=============================================================================
Standard_Boolean GEOMImpl_IInsertOperations::InitResMgr()
{
+ bool isResourceFound = false;
+ bool isResourceFoundUser = false;
+ TCollection_AsciiString aUserResDir,aResDir;
+
if (myResMgr.IsNull()) {
// Initialize the Resource Manager
- TCollection_AsciiString aResDir (getenv("GEOM_ROOT_DIR"));
+ TCollection_AsciiString aNull;
+ aResDir = TCollection_AsciiString(getenv("GEOM_ROOT_DIR"));
#ifdef WNT
- aResDir += "\\share\\salome\\resources";
+ aResDir += "\\share\\salome\\resources\\geom";
#else
- aResDir += "/share/salome/resources";
+ aResDir += "/share/salome/resources/geom";
#endif
+
+ myResMgr = new Resource_Manager ("ImportExport", aResDir, aNull, Standard_False);
+
+ isResourceFound = true;
+ if (!myResMgr->Find("Import") && !myResMgr->Find("Export")) {
+ // instead of complains in Resource_Manager
+ isResourceFound = false;
+ INFOS("No valid file \"ImportExport\" found in " << aResDir.ToCString());
+ }
+ } else
+ isResourceFound = true;
+
+ if (myResMgrUser.IsNull()) {
char * dir = getenv("GEOM_ENGINE_RESOURCES_DIR");
- TCollection_AsciiString aUserResDir;
+ TCollection_AsciiString aNull;
if ( dir )
{
aUserResDir = dir;
aUserResDir += "/.salome/resources";
#endif
}
- myResMgr = new Resource_Manager ("ImportExport", aResDir, aUserResDir, Standard_False);
- if (!myResMgr->Find("Import") && !myResMgr->Find("Export")) {
+ myResMgrUser = new Resource_Manager ("ImportExport", aNull, aUserResDir, Standard_False);
+
+ isResourceFoundUser = true;
+
+ if (!myResMgrUser->Find("Import") && !myResMgrUser->Find("Export")) {
// instead of complains in Resource_Manager
- INFOS("No valid file \"ImportExport\" found in " << aResDir.ToCString() <<
- " and 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"));
}