From: rnc <rnc@opencascade.com>
Date: Thu, 12 Sep 2013 15:47:57 +0000 (+0000)
Subject: BUG: Fixed computation failure introduced by a previous integration
X-Git-Tag: V7_3_0a1~28
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=30caef4d37aa09581d068490cd5f012d507af018;p=plugins%2Fghs3dplugin.git

BUG: Fixed computation failure introduced by a previous integration
---

diff --git a/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx
index fd0c7bb..491ad75 100644
--- a/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx
+++ b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx
@@ -184,6 +184,7 @@ bool GHS3DPlugin_GHS3D::CheckHypothesis ( SMESH_Mesh&         aMesh,
   _viscousLayersHyp = 0;
   _keepFiles = false;
   _removeLogOnSuccess = true;
+  _logInStandardOutput = false;
 
   const list <const SMESHDS_Hypothesis * >& hyps =
     GetUsedHypothesis(aMesh, aShape, /*ignoreAuxiliary=*/false);
@@ -199,6 +200,7 @@ bool GHS3DPlugin_GHS3D::CheckHypothesis ( SMESH_Mesh&         aMesh,
   {
     _keepFiles = _hyp->GetKeepFiles();
     _removeLogOnSuccess = _hyp->GetRemoveLogOnSuccess();
+    _logInStandardOutput = _hyp->GetStandardOutputLog();
   }
 
   return true;
@@ -3439,7 +3441,7 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh&         theMesh,
   TCollection_AsciiString cmd( (char*)GHS3DPlugin_Hypothesis::CommandToRun( _hyp ).c_str() );
   cmd += TCollection_AsciiString(" -f ") + aGenericName;  // file to read
   
-  if ( !_hyp->GetStandardOutputLog() )
+  if ( !_logInStandardOutput )
     cmd += TCollection_AsciiString(" 1>" ) + aLogFileName;  // dump into file
   // The output .mesh file does not contain yet the subdomain-info (Ghs3D 4.2)
 //   cmd += TCollection_AsciiString(" --in ") + aGenericName;
@@ -3711,7 +3713,8 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh&         theMesh,
   if ( nbEnforcedVertices + nbEnforcedNodes)
     cmd += TCollection_AsciiString(" --required_vertices ") + aGenericNameRequired;
   cmd += TCollection_AsciiString(" --out ") + aResultFileName;
-  cmd += TCollection_AsciiString(" 1>" ) + aLogFileName;  // dump into file
+  if ( !_logInStandardOutput )
+    cmd += TCollection_AsciiString(" 1>" ) + aLogFileName;  // dump into file
 
   std::cout << std::endl;
   std::cout << "Ghs3d execution..." << std::endl;
diff --git a/src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx
index 30ba8b0..0dc458e 100644
--- a/src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx
+++ b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx
@@ -96,6 +96,7 @@ private:
   int  _nbShape;
   bool _keepFiles;
   bool _removeLogOnSuccess;
+  bool _logInStandardOutput;
   SALOMEDS::Study_var myStudy;
   SMESH_Gen_i* smeshGen_i;