From dc55e9529c529c5c62bde8174536a08508a0d0d0 Mon Sep 17 00:00:00 2001 From: eap Date: Thu, 30 Jan 2014 09:20:33 +0000 Subject: [PATCH] 22470: EDF 2824 HEXOTICPLUGIN: Working directory is not taking into account with an imported mesh --- src/HexoticPlugin/HexoticPlugin_Hexotic.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/HexoticPlugin/HexoticPlugin_Hexotic.cxx b/src/HexoticPlugin/HexoticPlugin_Hexotic.cxx index 9db08d4..9ae6bec 100644 --- a/src/HexoticPlugin/HexoticPlugin_Hexotic.cxx +++ b/src/HexoticPlugin/HexoticPlugin_Hexotic.cxx @@ -1427,7 +1427,7 @@ gp_Pnt HexoticPlugin_Hexotic::tangencyPoint(const gp_Pnt& p1, //============================================================================= bool HexoticPlugin_Hexotic::Compute(SMESH_Mesh& aMesh, - const TopoDS_Shape& aShape) + const TopoDS_Shape& aShape) { _compute_canceled = false; bool Ok = true; @@ -1488,7 +1488,7 @@ bool HexoticPlugin_Hexotic::Compute(SMESH_Mesh& aMesh, SetParameters(_hypothesis); // TCollection_AsciiString aTmpDir = getTmpDir(); - TCollection_AsciiString aTmpDir = TCollection_AsciiString(_hexoticWorkingDirectory.c_str()); + TCollection_AsciiString aTmpDir = _hexoticWorkingDirectory.c_str(); #ifdef WIN32 if ( aTmpDir.Value(aTmpDir.Length()) != '\\' ) aTmpDir += '\\'; #else @@ -1649,7 +1649,7 @@ bool HexoticPlugin_Hexotic::Compute(SMESH_Mesh & aMesh, SMESH_MesherHelper* aHel SetParameters(_hypothesis); - TCollection_AsciiString aTmpDir = getTmpDir(); + TCollection_AsciiString aTmpDir = _hexoticWorkingDirectory.c_str();//getTmpDir(); TCollection_AsciiString Hexotic_In, Hexotic_Out, Hexotic_SizeMap_Prefix; TCollection_AsciiString modeFile_In( "chmod 666 " ), modeFile_Out( "chmod 666 " ); TCollection_AsciiString aLogFileName = aTmpDir + "Hexotic"+getSuffix()+".log"; // log @@ -1788,7 +1788,7 @@ void HexoticPlugin_Hexotic::CancelCompute() _compute_canceled = true; #ifdef WIN32 #else - TCollection_AsciiString aTmpDir = getTmpDir(); + TCollection_AsciiString aTmpDir = _hexoticWorkingDirectory.c_str(); //getTmpDir(); TCollection_AsciiString Hexotic_In = aTmpDir + "Hexotic_In.mesh"; TCollection_AsciiString cmd = TCollection_AsciiString("ps ux | grep ") + Hexotic_In; cmd += TCollection_AsciiString(" | grep -v grep | awk '{print $2}' | xargs kill -9 > /dev/null 2>&1"); -- 2.39.2