Salome HOME
projects
/
plugins
/
hexoticplugin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cf5a6a1
)
Fix for "0022515: [CEA 1074] Hexotic does not work under Windows 7 64 bits" issue
V7_8_0a2
V7_8_0b1
author
ana
<ana@opencascade.com>
Fri, 1 Apr 2016 15:35:15 +0000
(18:35 +0300)
committer
ana
<ana@opencascade.com>
Fri, 1 Apr 2016 15:35:15 +0000
(18:35 +0300)
src/HexoticPlugin/HexoticPlugin_Hexotic.cxx
patch
|
blob
|
history
diff --git
a/src/HexoticPlugin/HexoticPlugin_Hexotic.cxx
b/src/HexoticPlugin/HexoticPlugin_Hexotic.cxx
index 314fc516ab141df41586c8f367151a9654f9b164..111ef226434147cc6c253a5837b0167e1aaf9c26 100644
(file)
--- a/
src/HexoticPlugin/HexoticPlugin_Hexotic.cxx
+++ b/
src/HexoticPlugin/HexoticPlugin_Hexotic.cxx
@@
-879,7
+879,9
@@
static TCollection_AsciiString getSuffix()
#ifndef WIN32
aSuffix += getenv("USER");
#else
#ifndef WIN32
aSuffix += getenv("USER");
#else
- aSuffix += getenv("USERNAME");
+ std::string uname = std::string(getenv("USERNAME"));
+ replace(uname.begin(), uname.end(), ' ', '_');
+ aSuffix += uname.c_str();
#endif
aSuffix += "_";
aSuffix += Kernel_Utils::GetHostname().c_str();
#endif
aSuffix += "_";
aSuffix += Kernel_Utils::GetHostname().c_str();
@@
-1517,7
+1519,9
@@
bool HexoticPlugin_Hexotic::Compute(SMESH_Mesh& aMesh,
// TCollection_AsciiString aTmpDir = getTmpDir();
TCollection_AsciiString aTmpDir = _hexoticWorkingDirectory.c_str();
// TCollection_AsciiString aTmpDir = getTmpDir();
TCollection_AsciiString aTmpDir = _hexoticWorkingDirectory.c_str();
+ TCollection_AsciiString aQuote("");
#ifdef WIN32
#ifdef WIN32
+ aQuote = "\"";
if ( aTmpDir.Value(aTmpDir.Length()) != '\\' ) aTmpDir += '\\';
#else
if ( aTmpDir.Value(aTmpDir.Length()) != '/' ) aTmpDir += '/';
if ( aTmpDir.Value(aTmpDir.Length()) != '\\' ) aTmpDir += '\\';
#else
if ( aTmpDir.Value(aTmpDir.Length()) != '/' ) aTmpDir += '/';
@@
-1555,8
+1559,8
@@
bool HexoticPlugin_Hexotic::Compute(SMESH_Mesh& aMesh,
Hexotic_SizeMap_Prefix = aTmpDir + "Hexotic_SizeMap" + getSuffix();
std::vector<std::string> sizeMapFiles = writeSizeMapFile( Hexotic_SizeMap_Prefix.ToCString() );
Hexotic_SizeMap_Prefix = aTmpDir + "Hexotic_SizeMap" + getSuffix();
std::vector<std::string> sizeMapFiles = writeSizeMapFile( Hexotic_SizeMap_Prefix.ToCString() );
- std::string run_Hexotic = getHexoticCommand(
Hexotic_In, Hexotic_Out
, Hexotic_SizeMap_Prefix);
- run_Hexotic += std::string(" 1> ") + a
LogFileNam
e.ToCString(); // dump into file
+ std::string run_Hexotic = getHexoticCommand(
aQuote + Hexotic_In + aQuote, aQuote + Hexotic_Out + aQuote
, Hexotic_SizeMap_Prefix);
+ run_Hexotic += std::string(" 1> ") + a
Quote.ToCString() + aLogFileName.ToCString() + aQuot
e.ToCString(); // dump into file
cout << "Creating MG-Hexa log file : " << aLogFileName << std::endl;
cout << std::endl;
cout << "Creating MG-Hexa log file : " << aLogFileName << std::endl;
cout << std::endl;
@@
-1677,7
+1681,10
@@
bool HexoticPlugin_Hexotic::Compute(SMESH_Mesh & aMesh, SMESH_MesherHelper* aHel
*/
bool Ok = true;
TCollection_AsciiString hexahedraMessage;
*/
bool Ok = true;
TCollection_AsciiString hexahedraMessage;
-
+ TCollection_AsciiString aQuote("");
+#ifdef WIN32
+ aQuote = "\"";
+#endif
SetParameters(_hypothesis);
TCollection_AsciiString aTmpDir = _hexoticWorkingDirectory.c_str();//getTmpDir();
SetParameters(_hypothesis);
TCollection_AsciiString aTmpDir = _hexoticWorkingDirectory.c_str();//getTmpDir();
@@
-1695,8
+1702,8
@@
bool HexoticPlugin_Hexotic::Compute(SMESH_Mesh & aMesh, SMESH_MesherHelper* aHel
std::vector<std::string> sizeMapFiles = writeSizeMapFile( Hexotic_SizeMap_Prefix.ToCString() );
std::vector<std::string> sizeMapFiles = writeSizeMapFile( Hexotic_SizeMap_Prefix.ToCString() );
- std::string run_Hexotic = getHexoticCommand(
Hexotic_In, Hexotic_Out
, Hexotic_SizeMap_Prefix);
- run_Hexotic += std::string(" 1> ") + a
LogFileNam
e.ToCString(); // dump into file
+ std::string run_Hexotic = getHexoticCommand(
aQuote + Hexotic_In + aQuote, aQuote + Hexotic_Out + aQuote
, Hexotic_SizeMap_Prefix);
+ run_Hexotic += std::string(" 1> ") + a
Quote.ToCString() + aLogFileName.ToCString() + aQuot
e.ToCString(); // dump into file
removeHexoticFiles(Hexotic_In, Hexotic_Out);
removeHexoticFiles(Hexotic_In, Hexotic_Out);