mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2025-05-30 12:27:50 +05:00
NPAL14828: Impossible to load a study created in batch mode. Use './' instead of empty path for OCCT correct work.
This commit is contained in:
parent
ed3478401a
commit
6a13689810
@ -287,6 +287,17 @@ SALOMEDS::TMPFile* GEOM_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent,
|
|||||||
SALOMEDS::TMPFile_var aStreamFile;
|
SALOMEDS::TMPFile_var aStreamFile;
|
||||||
// Get a temporary directory to store a file
|
// Get a temporary directory to store a file
|
||||||
std::string aTmpDir = (isMultiFile)?theURL:SALOMEDS_Tool::GetTmpDir();
|
std::string aTmpDir = (isMultiFile)?theURL:SALOMEDS_Tool::GetTmpDir();
|
||||||
|
|
||||||
|
// OCCT BUG: cannot save a document (in current folder)
|
||||||
|
// if directory name is empty
|
||||||
|
if (aTmpDir.size() == 0) {
|
||||||
|
#ifdef WNT
|
||||||
|
aTmpDir = ".\\";
|
||||||
|
#else
|
||||||
|
aTmpDir = "./";
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
// Create a list to store names of created files
|
// Create a list to store names of created files
|
||||||
SALOMEDS::ListOfFileNames_var aSeq = new SALOMEDS::ListOfFileNames;
|
SALOMEDS::ListOfFileNames_var aSeq = new SALOMEDS::ListOfFileNames;
|
||||||
aSeq->length(1);
|
aSeq->length(1);
|
||||||
@ -338,8 +349,20 @@ CORBA::Boolean GEOM_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent,
|
|||||||
|
|
||||||
// Get a temporary directory for a file
|
// Get a temporary directory for a file
|
||||||
std::string aTmpDir = isMultiFile?theURL:SALOMEDS_Tool::GetTmpDir();
|
std::string aTmpDir = isMultiFile?theURL:SALOMEDS_Tool::GetTmpDir();
|
||||||
|
|
||||||
|
// OCCT BUG: cannot load a document (from current folder)
|
||||||
|
// if directory name is empty
|
||||||
|
if (aTmpDir.size() == 0) {
|
||||||
|
#ifdef WNT
|
||||||
|
aTmpDir = ".\\";
|
||||||
|
#else
|
||||||
|
aTmpDir = "./";
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
// Conver the byte stream theStream to a file and place it in tmp directory
|
// Conver the byte stream theStream to a file and place it in tmp directory
|
||||||
SALOMEDS::ListOfFileNames_var aSeq = SALOMEDS_Tool::PutStreamToFiles(theStream, aTmpDir.c_str(), isMultiFile);
|
SALOMEDS::ListOfFileNames_var aSeq =
|
||||||
|
SALOMEDS_Tool::PutStreamToFiles(theStream, aTmpDir.c_str(), isMultiFile);
|
||||||
|
|
||||||
// Prepare a file name to open
|
// Prepare a file name to open
|
||||||
TCollection_AsciiString aNameWithExt("");
|
TCollection_AsciiString aNameWithExt("");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user