Changeset 0ac85c3 for src/UIElements/Views/Qt4/QtToolBar.cpp

Timestamp:

Jan 29, 2015, 7:37:57 AM (11 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, Candidate_v1.7.0, Candidate_v1.7.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:

27e464

Parents:

7b38d3 (diff), 4f2895 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'GUI_TesselatedLargeMolecules' into Candidate_v1.4.10

File:

• src/UIElements/Views/Qt4/QtToolBar.cpp (modified) (5 diffs)

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.");
+  }
+}