Changeset 5771e6 for src/UIElements/Views/Qt4/MoleculeList/QtMoleculeList.hpp

Timestamp:

Apr 18, 2016, 10:33:41 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:

ea2663

Parents:

24eb6b

git-author:

Frederik Heber <heber@…> (03/18/16 10:17:01)

git-committer:

Frederik Heber <heber@…> (04/18/16 22:33:41)

Message:

Removed all mutexes and updateDirtyStates() in QtMoleculeList, replaced by simpler slots.

• thanks to events we don't need this humonguous system of lists, update timers, and mutexes. We simply need to take action whenever an event comes in.

File:

• src/UIElements/Views/Qt4/MoleculeList/QtMoleculeList.hpp (modified) (5 diffs)

src/UIElements/Views/Qt4/MoleculeList/QtMoleculeList.hpp

@@ -26 +26 @@
 
 #include "UIElements/Views/Qt4/MoleculeList/QtMoleculeItem.hpp"
+#include "UIElements/Views/Qt4/MoleculeList/QtObservedMoleculeObserver.hpp"
 #include "UIElements/Qt4/InstanceBoard/QtObservedMolecule.hpp"
 
@@ -47 +48 @@
 
 private slots:
+  void formulaChanged(const QtObservedMolecule::ptr _mol);
+  void nameChanged(const QtObservedMolecule::ptr _mol);
+
   void moleculeNameChanged(QStandardItem*);
   void checkForVisibilityChange(QStandardItem*);
-  void checkState();
-
-  friend class QtMoleculeItem;
-
-  std::string readdItem(QtMoleculeItem *_molitem);
 
 signals:
-  void moleculeSelected(molecule*);
-  void moleculeUnSelected(molecule*);
+  void moleculeSelected(const QtObservedMolecule::ptr _mol);
+  void moleculeUnSelected(const QtObservedMolecule::ptr _mol);
   void moleculesVisibilityChanged(const moleculeId_t, bool);
 
 private:
-
-  bool ChangingChildrensVisibility;
 
 private slots:
@@ -70 +67 @@
 
 private:
-  mutable boost::recursive_mutex listAccessing_mutex;
-  mutable boost::recursive_mutex refill_mutex;
-  mutable boost::recursive_mutex map_mutex;
-
-  //!> informs the view in regular intervals about updates
-  QTimer *update_timer;
-
-  //!> how often per second update is signalled to view
-  static const unsigned int update_times_per_second;
-
   friend class QtMoleculeListView;
 
@@ -107 +94 @@
   void removeMoleculeItem(QtMoleculeItem * const _item);
   int setOccurrence(QStandardItem * const _groupitem);
-  bool areAnyItemsDirty();
   void setVisibilityForMoleculeItem(QtMoleculeItem* _item);
   void setVisibilityForGroupItem(QStandardItem* _item);
+  void moveItem(QtMoleculeItem *_molitem, const std::string &_new_formula);
 
-  void updateItemStates();
+//  void updateItemStates();
 
   //!> reference to InstanceBoard
@@ -130 +117 @@
   MoleculeItemBiMap_t MoleculeItemBiMap;
 
-  typedef std::map<moleculeId_t, unsigned int> KilledItemsPerMolecule_t;
-  //!> takes note of how many items have already been killed for a specific row/molecule
-  KilledItemsPerMolecule_t KilledItemsPerMolecule;
-
   typedef std::set< moleculeId_t > list_of_molecules_t;
   typedef std::set< std::pair<moleculeId_t, QtMoleculeItem::COLUMNTYPES> > list_of_molecule_items_t;
   typedef std::set< std::pair<std::string, QtMoleculeItem::COLUMNTYPES> > list_of_group_items_t;
 
-  //!> list of molecule items that need an update
-  list_of_molecule_items_t dirtyMolItems;
-  //!> list of molecule items that need an update of visibility
-  list_of_molecules_t visibilityMolItems;
-  //!> list of group items that need an update
-  list_of_group_items_t dirtyGroupItems;
-  //!> list of group items that need an update of visibility
-  list_of_group_items_t visibilityGroupItems;
-  //!> list of new molecules which need to be added
-  std::vector<QtObservedMolecule::ptr> newMolecules;
-  //!> list of molecules that have been removed
-  std::vector<moleculeId_t> removedMolecules;
-  //!> list of molecule items to molecule's whose formulas has changed and need to be moved
-  list_of_molecules_t toBeMovedItems;
+  //!> listens to all QtObservedMolecule and relays important events to us
+  QtObservedMoleculeObserver observer;
 };