Changeset b375e7 for src/UIElements

Timestamp:

Feb 12, 2016, 11:15:03 PM (9 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:

4ab5dc

Parents:

db842b

git-author:

Frederik Heber <heber@…> (10/15/15 09:08:37)

git-committer:

Frederik Heber <heber@…> (02/12/16 23:15:03)

Message:

QtFavoriteActions uses ObservedValue for checking last queued action's name.

Location:

src/UIElements

Files:

• Qt4/QtUIFactory.cpp (modified) (2 diffs)
• Views/Qt4/QtToolBar.hpp (modified) (2 diffs)
• Views/Qt4/QtToolBar_QtFavoriteActions.cpp (modified) (3 diffs)

src/UIElements/Qt4/QtUIFactory.cpp

@@ -165 +165 @@
         executePythonScript(scriptfile_line, scriptname);
         do {
-          testlauncher_sleep(boost::posix_time::seconds(.1));
+          app->processEvents();
+          testlauncher_sleep(boost::posix_time::seconds(.5));
         } while (!MoleCuilder::ActionQueue::getInstance().isIdle());
       }
@@ -177 +178 @@
 
     std::cout << "TESTLAUNCHER: Sleeping after script" << std::endl;
-    testlauncher_sleep(boost::posix_time::seconds(1.5));
+    testlauncher_sleep(boost::posix_time::seconds(1.));
 
   } while ((scriptiter != _scripts.end()) && (!testlauncher_Interrupted));

src/UIElements/Views/Qt4/QtToolBar.hpp

@@ -24 +24 @@
 #include <string>
 
+#include "CodePatterns/ObservedValue.hpp"
+#include "CodePatterns/Observer/Observable.hpp"
 #include "CodePatterns/Observer/Observer.hpp"
 
@@ -99 +101 @@
         ) const;
 
+    void resetQueuedAction();
+    std::string updateQueuedAction() const;
+
   private:
+    //!> cached value of ActionQueue's last action name
+    ObservedValue<std::string> LastActionCalled;
+
+    //!> all channels that signal a queued action
+    static const Observable::channels_t ActionQueuedChannels;
+
     //!> typedef for the action counts
     typedef std::map<std::string, unsigned int> ActionCounts_t;

src/UIElements/Views/Qt4/QtToolBar_QtFavoriteActions.cpp

@@ -55 +55 @@
 using namespace MoleCuilder;
 
+const Observable::channels_t
+QtToolBar::QtFavoriteActions::ActionQueuedChannels(1, ActionQueue::ActionQueued);
+
 QtToolBar::QtFavoriteActions::QtFavoriteActions() :
   Observer("QtFavoriteActions"),
+  LastActionCalled(
+      ActionQueue::getPointer(),
+      boost::bind(&QtToolBar::QtFavoriteActions::updateQueuedAction, boost::cref(this)),
+      "QtFavoriteActions_QueuedAction",
+      std::string(""),
+      ActionQueuedChannels),
   ActionQueue_observing(false)
 {
@@ -85 +94 @@
 }
 
+std::string QtToolBar::QtFavoriteActions::updateQueuedAction() const
+{
+  const Action *lastcalledaction =
+      ActionQueue::getInstance().lastChanged<Action>();
+  if (lastcalledaction != NULL)
+    return lastcalledaction->getName();
+  else
+    return std::string("");
+}
+
+void QtToolBar::QtFavoriteActions::resetQueuedAction()
+{
+  const std::string name = LastActionCalled.get();
+  if (!name.empty())
+    ++ActionCounts[name];
+}
+
 QtToolBar::QtFavoriteActions::~QtFavoriteActions()
 {
@@ -115 +141 @@
 {
   if (dynamic_cast<ActionQueue *>(publisher) != NULL) {
-    // increment count for this action
-    const Action *lastcalledaction =
-        dynamic_cast<ActionQueue *>(publisher)->lastChanged<Action>();
-    ++ActionCounts[lastcalledaction->getName()];
+    resetQueuedAction();
   } else {
     ASSERT(0, "QtFavoriteActions::update() - cannot get here, we are only subscribed to ActionQueue.");