Changes in src/Actions/ActionQueue.hpp [11d433:601ef8]

File:

• src/Actions/ActionQueue.hpp (modified) (12 diffs)

src/Actions/ActionQueue.hpp

@@ -16 +16 @@
 #include "CodePatterns/Singleton.hpp"
 
+#include "CodePatterns/Observer/Channels.hpp"
+#include "CodePatterns/Observer/Observable.hpp"
 
 #ifdef HAVE_ACTION_THREAD
@@ -38 +40 @@
 class ActionRegistry;
 class ActionTrait;
+
+namespace Queuedetail {
+  template <class T> const T* lastChanged()
+  {
+    ASSERT(0, "Queuedetail::lastChanged() - only specializations may be used.");
+    return NULL;
+  }
+}
 
 /** This class combines the whole handling of Actions into a single class.
@@ -44 +54 @@
  * automatically queued and placed into a History after execution.
  */
-class ActionQueue : public Singleton<ActionQueue>
+class ActionQueue : public Singleton<ActionQueue>, public Observable
 {
   friend class Singleton<ActionQueue>;
@@ -51 +61 @@
   typedef std::vector< Action * > ActionQueue_t;
 
+  //!> channels for this observable
+  enum NotificationType {
+    ActionQueued,  // new action was queued
+    NotificationType_MAX  // denotes the maximum of available notification types
+  };
+
+  //>! access to last changed element (atom or molecule)
+  template <class T> const T* lastChanged() const
+  { return Queuedetail::lastChanged<T>(); }
+
   /** Queues the Action with \a name to be called.
    *
@@ -124 +144 @@
    */
   void redoLast();
+
+  /** Checks whether there is one completed Action stored in ActionHistory in the past.
+   *
+   * @return true - at least one Action to undo present, false - else
+   */
+  bool canUndo() const;
+
+  /** Checks whether there is one completed Action stored in ActionHistory in the future.
+   *
+   * @return true - at least one Action to redo present, false - else
+   */
+  bool canRedo() const;
 
   /** Return status of last executed action.
@@ -170 +202 @@
   void clear();
 
-  /** Clears all actions currently present in the actionqueues.
-   *
-   */
-  void clearQueue();
-
-#ifdef HAVE_ACTION_THREAD
+  /** Clears all actions present in the actionqueues from \a _fromAction.
+   *
+   * @param _fromAction 0 if all Actions to clear or else
+   */
+  void clearQueue(const size_t _fromAction = 0);
+
+#ifdef HAVE_ACTION_THREAD
+
+  /** Clears the temporary queue.
+   *
+   */
+  void clearTempQueue();
+
+  /** Sets the run_thread_isIdle flag.
+   *
+   * @param _flag state to set to
+   */
+  void setRunThreadIdle(const bool _flag);
+
   /** Runs the ActionQueue.
    *
@@ -194 +239 @@
    */
   void wait();
+
+  /** Moves all action from tempqueue into real queue.
+   *
+   */
+  void insertTempQueue();
+
 #endif
 
@@ -204 +255 @@
   void insertAction(Action *_action, enum Action::QueryOptions state);
 
-  /** Moves all action from tempqueue into real queue.
-   *
-   */
-  void insertTempQueue();
-
 private:
   /** Private cstor for ActionQueue.
@@ -222 +268 @@
   ~ActionQueue();
 
+private:
+  friend const Action *Queuedetail::lastChanged<Action>();
+  static const Action *_lastchangedaction;
+
   //!> ActionRegistry to spawn new actions
   ActionRegistry *AR;
@@ -231 +281 @@
   ActionQueue_t actionqueue;
 
+  //!> indicates that the last action has failed
+  bool lastActionOk;
+
+#ifdef HAVE_ACTION_THREAD
   //!> point to current action in actionqueue
   size_t CurrentAction;
@@ -237 +291 @@
   ActionQueue_t tempqueue;
 
-  //!> indicates that the last action has failed
-  bool lastActionOk;
-
-#ifdef HAVE_ACTION_THREAD
   //!> internal thread to call Actions
   boost::thread run_thread;
@@ -260 +310 @@
   ActionStatusList StatusList;
 };
+namespace Queuedetail {
+  template <>       inline  const Action* lastChanged<Action>() { return ActionQueue::_lastchangedaction; }
+}
 
 };