Changeset bcf056 for src/UIElements/Views

Timestamp:

Jul 25, 2015, 1:02:12 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:

9ec4b8

Parents:

9fb213

git-author:

Frederik Heber <heber@…> (06/17/15 23:42:13)

git-committer:

Frederik Heber <heber@…> (07/25/15 13:02:12)

Message:

FIX: QtTimeLine would cause another WorldSetTime action.

• we did not catch where setValue() was called from, from an obtained Observable update() or from changing the slider.
• QtTimeLine needs DirectConnection for valueChanged.

Location:

src/UIElements/Views/Qt4

Files:

• QtTimeLine.cpp (modified) (4 diffs)
• QtTimeLine.hpp (modified) (1 diff)

src/UIElements/Views/Qt4/QtTimeLine.cpp

@@ -50 +50 @@
     Observer("QtTimeLine"),
     atomobserver_enlisted(false),
-    worldtime_enlisted(false)
+    worldtime_enlisted(false),
+    WorldTime_change(false)
 {
   // set initial values
   QSlider::setMinimum(0);
   QSlider::setMaximum(0);
+  WorldTime_change = true;
   QSlider::setValue(0);
   QSlider::setTickInterval(1);
@@ -67 +69 @@
 
   // connect to QSlider's valueChanged() signal
-  bool result = connect(this,SIGNAL(valueChanged(int)),this,SLOT(StepUpdate(int)));
+  bool result = connect(this,SIGNAL(valueChanged(int)),this,SLOT(StepUpdate(int)), Qt::DirectConnection);
   if (!result)
     ELOG(0, "Could not connect to QSlider::valueChanged.");
@@ -105 +107 @@
       QSlider::setMaximum(timestep);
     // set slider position to new time step
+    WorldTime_change = true;
     QSlider::setValue( timestep );
   } else
@@ -119 +122 @@
 void QtTimeLine::StepUpdate(int position)
 {
-  MoleCuilder::WorldSetWorldTime(position);
+  if (WorldTime_change)
+    WorldTime_change = false;
+  else
+    MoleCuilder::WorldSetWorldTime(position);
 }

src/UIElements/Views/Qt4/QtTimeLine.hpp

@@ -38 +38 @@
   //!> whether WorldTime knows about us or not
   bool worldtime_enlisted;
+  //!> states whether value was set by observing WorldTime (and not by slider)
+  bool WorldTime_change;
 };