Changeset 9bdbc7 for src/UIElements

Timestamp:

Sep 9, 2016, 10:09:47 AM (8 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, 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_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes, stable

Children:

34af97

Parents:

546f7d

git-author:

Frederik Heber <heber@…> (09/01/16 22:09:00)

git-committer:

Frederik Heber <heber@…> (09/09/16 10:09:47)

Message:

FIX: QtFragmentList controls access to clear() and refill() via mutex.

Location:

src/UIElements/Views/Qt4

Files:

• QtFragmentList.cpp (modified) (3 diffs)
• QtFragmentList.hpp (modified) (2 diffs)

src/UIElements/Views/Qt4/QtFragmentList.cpp

@@ -82 +82 @@
 
         dirty = true;
-  clearing = false;
 
   refill();
@@ -102 +101 @@
 
 void QtFragmentList::update(Observable *publisher) {
-
+  boost::unique_lock<boost::mutex> lock(flag_mutex);
   dirty = true;
-
-  // force an update from Qt...
-  clearing = true;
-  clear();
-  clearing = false;
-  emit changed(); // doesn't work!?!
 }
 
 void QtFragmentList::refill()
 {
-  clearing = true;
+  boost::unique_lock<boost::mutex> lock(flag_mutex);
   FragmentationResultContainer &fragments =
       FragmentationResultContainer::getInstance();
@@ -188 +181 @@
   }
   dirty = false;
-  clearing = false;
 }
 

src/UIElements/Views/Qt4/QtFragmentList.hpp

@@ -14 +14 @@
 #endif
 
-
 #include <QtGui/QTreeWidget>
 #include "CodePatterns/Observer/Observer.hpp"
 
+#include <boost/thread/mutex.hpp>
+
 #include "Fragmentation/Summation/IndexSet.hpp"
+
 
 class FragmentGraph;
@@ -53 +55 @@
   //!> index set of the fragment
   std::vector<IndexSet> indexsets;
+  //!> controls atomic access to flags
+  boost::mutex flag_mutex;
   //!> flag to indicate that we got an update
   bool dirty;
-  //!> flag to indicate that we currently clear the view, avoids thread collisions
-  bool clearing;
 };