Changeset ecc050 for src

Timestamp:

May 19, 2021, 7:06:29 PM (5 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, Candidate_v1.7.1, stable

Children:

923ce2

Parents:

8c9cce

git-author:

Frederik Heber <frederik.heber@…> (04/24/19 21:29:22)

git-committer:

Frederik Heber <frederik.heber@…> (05/19/21 19:06:29)

Message:

pyMoleCuilder's wait() has return value.

• tells whether actions have been executed successfully or not.
• DOCU: updated docu

Location:

src

Files:

• Python/PythonScripting_impl.hpp (modified) (1 diff)
• Python/modules.hpp (modified) (1 diff)
• Python/wait.cpp (modified) (2 diffs)
• cleanUp.cpp (modified) (1 diff)
• cleanUp.hpp (modified) (1 diff)

src/Python/PythonScripting_impl.hpp

@@ -95 +95 @@
       "Reinitializes the internal state of the python module as if it had been freshly imported,saves all input files beforehand."
   );
-  boost::python::def(
+  boost::python::def< bool() >(
       "wait",
       MoleCuilder::detail::module_wait,

src/Python/modules.hpp

@@ -25 +25 @@
 void module_exit();
 void module_reinit();
-void module_wait();
+bool module_wait();
 
 typedef std::vector<atomId_t> atomIdVec;

src/Python/wait.cpp

@@ -42 +42 @@
 #include "cleanUp.hpp"
 
-void MoleCuilder::detail::module_wait()
+bool MoleCuilder::detail::module_wait()
 {
+  bool retval = true;
   // prevent wait() in python scripts in case of present UI (loaded sessions)
 #ifdef HAVE_ACTION_THREAD
@@ -49 +50 @@
     LOG(0, "Waiting for action queue to idle.");
     waitQueue();
+    retval = getOkQueue();
   }
 #endif
+  return retval;
 }

src/cleanUp.cpp

@@ -244 +244 @@
   MoleCuilder::ActionQueue::getInstance().wait();
 }
-#endif
+
+/** Returns whether last action did ok.
+ *
+ */
+bool getOkQueue()
+{
+  return MoleCuilder::ActionQueue::getConstInstance().getLastActionOk();
+}
+#endif
+
+

src/cleanUp.hpp

@@ -22 +22 @@
 void stopQueue();
 void waitQueue();
+bool getOkQueue();
 #endif