Changeset 53c1ff for src/UIElements/Views/Qt4/MoleculeList/QtMoleculeList.hpp

Timestamp:

Jan 28, 2015, 7:07:03 PM (10 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:

d2dbb5d

Parents:

6d1e0a

git-author:

Frederik Heber <heber@…> (01/18/15 14:04:26)

git-committer:

Frederik Heber <heber@…> (01/28/15 19:07:03)

Message:

Modified QtMoleculeList to use QtMoleculeItemFactory.

• setOccurrence() gives index of row back if it should be romoved.
• i.e. moving a row and removing the row entirely does not mix. Updating it and then removing it is ill-spent time.
• split off removing a group item from setting its occurrence.
• emitDirtyState() only uses the first column item despite for the dirty items set. Otherwise we have multiple moves of the same row.
• this is safer than removing the entry in MoleculeBiMap right away as thread in GUI and Action thread do not access in an orderly fashion.
• using vector of molecule pointers and set operations to fulfil validity of updates.

File:

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

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

@@ -14 +14 @@
 #endif
 
+#include <QtGui/QItemSelection>
 #include <QtGui/QStandardItem>
 #include <QtGui/QStandardItemModel>
+#include <QTimer>
 
 #include <boost/bimap.hpp>
 #include <map>
+#include <set>
 #include <string>
 
 #include "CodePatterns/Observer/Observer.hpp"
+
+#include "UIElements/Views/Qt4/MoleculeList/QtMoleculeItem.hpp"
 
 #include "types.hpp"
@@ -27 +32 @@
 class molecule;
 class MoleculeListClass;
+class QtMoleculeItem;
 class QtMoleculeListView;
 
@@ -41 +47 @@
   virtual void recieveNotification(Observable *publisher, Notification_ptr notification);
   virtual void subjectKilled(Observable *publisher);
-//  virtual void paintEvent(QPaintEvent * event);
+
   void refill();
-
-  static const int COLUMNCOUNT;
-  enum {NAME,VISIBILITY,ATOMCOUNT,FORMULA,OCCURRENCE,COLUMNTYPES_MAX} COLUMNTYPES;
-  static const char *COLUMNNAMES[];
 
   QVariant headerData(int section, Qt::Orientation orientation, int role) const;
@@ -53 +55 @@
   void moleculeChanged();
 //  void visibilityChanged(QStandardItem*, int);
+  void checkState();
+
+  friend class QtMoleculeItem;
 
 //  void rowsSelected(const QItemSelection & selected, const QItemSelection & deselected);
-
+  void readdItem(QtMoleculeItem *_molitem);
 
 signals:
@@ -63 +68 @@
 
 private:
-  bool dirty;
-  bool clearing;
+
   bool selecting;
   bool changing;
   bool ChangingChildrensVisibility;
+  bool list_accessing;
+
+  //!> 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;
-  QStandardItem * MoleculeToItem(const molecule * const _mol);
 
-  void addItem(const molecule * const _mol);
+  QtMoleculeItem * MoleculeToItem(const molecule * const _mol) const;
+  const molecule * const IndexToMolecule(const QModelIndex &_index) const;
+  const molecule * const ItemToMolecule(const QtMoleculeItem * const _item) const;
+
+  void addMolecule(const molecule * const _mol);
   void addGroupItem(QStandardItem *&mainitem, const std::string &_molecule_formula);
-  void addMoleculeItem(QStandardItem *_groupitem, const molecule *_mol, const std::string &molecule_formula);
-  void removeItem(const molecule * const _mol);
+  void addMoleculeItem(QStandardItem *_groupitem, const molecule * const _mol, const std::string &molecule_formula);
+  void removeItem(QtMoleculeItem * const _item);
+  int setOccurrence(QStandardItem * const _groupitem);
+  bool areAnyItemsDirty();
+  void addToBeSetOccurrence(QStandardItem *_groupitem);
+
+  void informDirtyState(QtMoleculeItem *_item, const QtMoleculeItem::MoveTypes _type);
+
+  void updateItemStates();
 
   typedef std::map<std::string, unsigned int> FormulaVisibilityCountMap_t;
@@ -84 +105 @@
   FormulaTreeItemMap_t formula;
 
-  typedef boost::bimap<const molecule *, QStandardItem*> MoleculeItemBiMap_t;
+  typedef boost::bimap<const molecule *, QtMoleculeItem*> MoleculeItemBiMap_t;
   MoleculeItemBiMap_t MoleculeItemBiMap;
+
+  //!> callback function to hand over to items that inform about requiring update
+  const QtMoleculeItem::emitDirtyState_t callback_DirtyItems;
+
+  typedef std::set<QtMoleculeItem*> list_of_items_t;
+  //!> list of items that need an update
+  list_of_items_t dirtyItems;
+  //!> list of items to molecule's whose formulas has changed and need to be moved
+  list_of_items_t toBeMovedItems;
+  //!> list of items to new molecules which need to be added
+  std::vector<const molecule *> newItems;
+  //!> list of items to molecules that have been removed
+  std::vector<const molecule *> toBeRemovedItems;
+  //!> list of group items that need update due to moved molecule items
+  std::set<QStandardItem*> toBeSetOccurrenceItems;
 };