Changeset ca1535 for src/UIElements/Views/Qt4/MoleculeList/QtMoleculeList.hpp

Timestamp:

Feb 12, 2016, 11:15:39 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:

deb5ee

Parents:

1b6415a

git-author:

Frederik Heber <heber@…> (10/29/15 22:21:30)

git-committer:

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

Message:

All QtMoleculeItem now heed QtObservedMolecule and QtMoleculeList takes InstanceBoard.

• QtMoleculeItems no longer use Observer/Observable but get updates via signal/slot from QtObservedMolecule.
• QtMoleculeList listens to its molecule signals.

File:

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

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

@@ -25 +25 @@
 #include <string>
 
-#include "CodePatterns/Observer/Observer.hpp"
-
 #include "UIElements/Views/Qt4/MoleculeList/QtMoleculeItem.hpp"
+#include "UIElements/Qt4/InstanceBoard/QtObservedMolecule.hpp"
 
 #include "types.hpp"
 
-class molecule;
 class QtMoleculeItem;
 class QtMoleculeListView;
+class QtObservedInstanceBoard;
 
-class QtMoleculeList : public QStandardItemModel, public Observer
+class QtMoleculeList : public QStandardItemModel
 {
   Q_OBJECT
 
 public:
-  QtMoleculeList();
+  QtMoleculeList(QtObservedInstanceBoard *_board);
   virtual ~QtMoleculeList();
 
-protected:
-  virtual void update(Observable *publisher);
-  virtual void recieveNotification(Observable *publisher, Notification_ptr notification);
-  virtual void subjectKilled(Observable *publisher);
-
-  void refill();
+  void resetUpdateTimer();
 
   QVariant headerData(int section, Qt::Orientation orientation, int role) const;
@@ -70 +64 @@
   bool ChangingChildrensVisibility;
 
+private slots:
+  void moleculeInserted(const moleculeId_t _id);
+  void moleculeRemoved(const moleculeId_t _id);
+  void moleculeIndexChanged(const moleculeId_t _oldid, const moleculeId_t _newid);
+
+private:
   mutable boost::recursive_mutex listAccessing_mutex;
   mutable boost::recursive_mutex refill_mutex;
@@ -97 +97 @@
       const enum QtMoleculeItem::COLUMNTYPES _type) const;
 
-  std::string addMolecule(const molecule * const _mol);
-  void addGroupItem(QStandardItem *&mainitem, const std::string &_molecule_formula);
-  QList<QStandardItem *> createMoleculeItems(const moleculeId_t _molid, std::string &molecule_formula);
+  std::string addMolecule(
+      QtObservedMolecule::ptr &_ObservedMolecule);
+  void addGroupItem(
+      QStandardItem *&mainitem,
+      const std::string &_molecule_formula);
+  QList<QStandardItem *> createMoleculeItems(
+      QtObservedMolecule::ptr &_ObservedMolecule,
+      std::string &molecule_formula);
   void removeMoleculeItem(QtMoleculeItem * const _item);
   int setOccurrence(QStandardItem * const _groupitem);
@@ -111 +116 @@
       const QtMoleculeItem::MoveTypes _movetype);
 
-  void receiveSubjectKilled(const moleculeId_t _id);
+  void updateItemStates();
 
-  void updateItemStates();
+  //!> reference to InstanceBoard
+  QtObservedInstanceBoard *board;
 
   typedef std::map<std::string, unsigned int> FormulaVisibilityCountMap_t;
@@ -132 +138 @@
   const QtMoleculeItem::emitDirtyState_t callback_DirtyItems;
 
-  //!> callback function to hand over to items that inform about called subjectKilled()
-  const QtMoleculeItem::emitSubjectKilledState_t callback_subjectKilledItems;
-
   typedef std::map<moleculeId_t, unsigned int> KilledItemsPerMolecule_t;
   //!> takes note of how many items have already been killed for a specific row/molecule
@@ -142 +145 @@
   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;
@@ -151 +155 @@
   list_of_group_items_t visibilityGroupItems;
   //!> list of new molecules which need to be added
-  std::vector<moleculeId_t> newMolecules;
+  std::vector<QtObservedMolecule::ptr> newMolecules;
   //!> list of molecules that have been removed
   std::vector<moleculeId_t> removedMolecules;