Changeset c01fec for src/UIElements/Views

Timestamp:

Jan 12, 2015, 10:10:30 PM (10 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

52cd7b

Parents:

867473

git-author:

Frederik Heber <heber@…> (12/12/14 18:41:27)

git-committer:

Frederik Heber <heber@…> (01/12/15 22:10:30)

Message:

Undo/Redobuttons are grayed out when respective Action not possible.

Location:

src/UIElements/Views/Qt4

Files:

• QtToolBar.cpp (modified) (5 diffs)
• QtToolBar.hpp (modified) (4 diffs)
• QtToolBar_QtFavoriteActions.cpp (modified) (1 diff)

src/UIElements/Views/Qt4/QtToolBar.cpp

@@ -28 +28 @@
  */
 
-
-
-
 // include config.h
 #ifdef HAVE_CONFIG_H
@@ -36 +33 @@
 #endif
 
-
 #include "QtToolBar.hpp"
 
 #include "CodePatterns/MemDebug.hpp"
 
+#include "CodePatterns/Observer/Notification.hpp"
+
+#include "Actions/ActionQueue.hpp"
+
 QtToolBar::QtToolBar(QWidget * _parent) :
-  QToolBar(_parent)
+  QToolBar(_parent),
+  Observer("QToolBar"),
+  ActionQueue_observing(false),
+  undoaction(addActionItem("undo", "undo the last Action", "edit-undo")),
+  redoaction(addActionItem("redo", "redo the last Action", "edit-redo"))
 {
-  addActionItem("undo", "undo the last Action", "edit-undo");
-  addActionItem("redo", "redo the last Action", "edit-redo");
+  // gray out undo/redo buttons initially
+  undoaction->setEnabled(false);
+  redoaction->setEnabled(false);
+
+  // sign in
+  MoleCuilder::ActionQueue::getInstance().signOn(this, MoleCuilder::ActionQueue::ActionQueued);
+  ActionQueue_observing = true;
 }
 
@@ -51 +60 @@
 QtToolBar::~QtToolBar()
 {
+  // sign off
+  if (ActionQueue_observing)
+    MoleCuilder::ActionQueue::getInstance().signOff(this, MoleCuilder::ActionQueue::ActionQueued);
 }
 
 
-void QtToolBar::addActionItem(const std::string &token, const std::string &description, const std::string &icon_name)
+QAction * QtToolBar::addActionItem(
+    const std::string &token,
+    const std::string &description,
+    const std::string &icon_name)
 {
   QAction *action = addAction(QString(description.c_str()));
@@ -63 +78 @@
   plumbing.push_back(pipe);
   present_actions.insert( token );
+  return action;
 }
 
@@ -72 +88 @@
 }
 
+void QtToolBar::update(Observable *publisher)
+{
+  ASSERT(0, "QtToolBar::update() - this should never be called, we are only subscribed to channels.");
+}
+
+void QtToolBar::subjectKilled(Observable *publisher)
+{
+  ActionQueue_observing = false;
+}
+
+void QtToolBar::recieveNotification(Observable *publisher, Notification_ptr notification)
+{
+  if (dynamic_cast<MoleCuilder::ActionQueue *>(publisher) != NULL) {
+    switch(notification->getChannelNo()) {
+      case MoleCuilder::ActionQueue::ActionQueued:
+        undoaction->setEnabled(MoleCuilder::ActionQueue::getInstance().canUndo());
+        redoaction->setEnabled(MoleCuilder::ActionQueue::getInstance().canRedo());
+        break;
+      default:
+        ASSERT(0, "QtToolBar::recieveNotification() - cannot get here, not subscribed to channel "
+            +toString(notification->getChannelNo()));
+        break;
+    }
+  } else {
+    ASSERT(0, "QtToolBar::recieveNotification() - cannot get here, we are only subscribed to ActionQueue.");
+  }
+}

src/UIElements/Views/Qt4/QtToolBar.hpp

@@ -27 +27 @@
 
 
-class QtToolBar : public QToolBar
+class QtToolBar : public QToolBar, public Observer
 {
   Q_OBJECT
@@ -39 +39 @@
    * @param description description to appear as tooltip
    * @param icon_name name of icon
+   * @return ref to newly created action
    */
-  void addActionItem(const std::string &token, const std::string &description, const std::string &icon_name);
+  QAction * addActionItem(
+      const std::string &token,
+      const std::string &description,
+      const std::string &icon_name);
 
   /** Function to add a set of favorite actions.
@@ -57 +61 @@
   const present_actions_t & getPresentActions() const
   { return present_actions; }
+
+  void update(Observable *publisher);
+  void subjectKilled(Observable *publisher);
+  void recieveNotification(Observable *publisher, Notification_ptr notification);
 
 private:
@@ -105 +113 @@
   //!> set of already present action icons
   present_actions_t present_actions;
+
+  //!> sign in to ActionQueue?
+  bool ActionQueue_observing;
+  //!> ref to undoaction to gray out
+  QAction *undoaction;
+  //!> ref to redoaction to gray out
+  QAction *redoaction;
 };
 

src/UIElements/Views/Qt4/QtToolBar_QtFavoriteActions.cpp

@@ -46 +46 @@
 #include "CodePatterns/Assert.hpp"
 #include "CodePatterns/Log.hpp"
-#include "CodePatterns/Observer/Observer.hpp"
 
 #include "Actions/Action.hpp"