Add a global result for a study.

[tools/ydefx.git] / src / cpp / TMonoPyJob.hxx

diff --git a/src/cpp/TMonoPyJob.hxx b/src/cpp/TMonoPyJob.hxx
index 4351e5e83ff3779025169609cfc414700bea8d78..54bc43f17bb57f12d46b55ac68eeebcf9e894fc5 100644 (file)
--- a/src/cpp/TMonoPyJob.hxx
+++ b/src/cpp/TMonoPyJob.hxx
@@ -1,11 +1,27 @@
+// Copyright (C) 2019  EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// 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/ or email : webmaster.salome@opencascade.com
+//
 #ifndef YDEFX_TMONOPYJOB_HXX
 #define YDEFX_TMONOPYJOB_HXX
 #include "JobParametersProxy.hxx"
 #include "MonoPyJob.hxx"
-#include "Sample.hxx"
 #include "SamplePyConversions.hxx"
 #include "PyStudyFunction.hxx"
-#include <py2cpp/py2cpp.hxx>
 
 namespace ydefx
 {
@@ -20,14 +36,14 @@ public:
   : MonoPyJob()
   , _sample(sample)
   {
-    if(_lastError.empty()) // no errors during parent contruction
+    if(_lastError.empty()) // no errors during parent construction
     {
       try
       {
         py2cpp::PyPtr pySample = createPySample(sample);
         py2cpp::PyFunction pyFn;
         pyFn.loadExp(_pyStudy, "createNewJob");
-        pyFn(fnScript.content(), pySample, params);
+        pyFn(fnScript, pySample, params);
       }
       catch(std::exception& e)
       {
@@ -42,7 +58,7 @@ public:
   : MonoPyJob()
   , _sample(sample)
   {
-    if(_lastError.empty()) // no errors during parent contruction
+    if(_lastError.empty()) // no errors during parent construction
     {
       try
       {
@@ -66,6 +82,7 @@ public:
     {
       py2cpp::PyFunction pyFn;
       pyFn.loadExp(_pyStudy, "getResult");
+      pyFn(); // python call: _pyStudy.getResult()
       fetchResults(_pyStudy.getAttr("sample"), _sample);
     }
     catch(std::exception& e)