Changeset ca1535 for src/UIElements/Views/Qt4/MoleculeList/QtMoleculeItem.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/QtMoleculeItem.hpp (modified) (8 diffs)

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

@@ -17 +17 @@
 #include <QStandardItem>
 
-#include "CodePatterns/Observer/Observer.hpp"
-
 #include <boost/function.hpp>
 #include <boost/thread/recursive_mutex.hpp>
@@ -24 +22 @@
 #include <string>
 
-#include "molecule.hpp"
+#include "UIElements/Qt4/InstanceBoard/QtObservedMolecule.hpp"
 
 /** This class describes the general interface for a specific item in a QtAbstractItemModel
@@ -37 +35 @@
  * -# relaying updateState() call from QtMoleculeList to the specific internal_updateState()
  */
-class QtMoleculeItem : public QStandardItem, public Observer
+class QtMoleculeItem : public QStandardItem
 {
 public:
-  //!> typedef for a list of notification channels required, to know when to update
-  typedef Observable::channels_t channellist_t;
-
   //!> enum states whether an item's formula changed or not
   enum MoveTypes {
@@ -58 +53 @@
       const enum MoveTypes)> emitDirtyState_t;
 
-  //!> typedef for callback function to model to inform when our subjectKilled() was called
-  typedef const boost::function<void (const moleculeId_t _id)> emitSubjectKilledState_t;
-
   QtMoleculeItem(
-      const moleculeId_t _molid,
-      const channellist_t &_channellist,
+      QtObservedMolecule::ptr &_ObservedMolecule,
       const enum MoveTypes _movetype,
-      const emitDirtyState_t _emitDirtyState,
-      const emitSubjectKilledState_t _emitSubjectKilledState);
+      const emitDirtyState_t _emitDirtyState);
   virtual ~QtMoleculeItem();
 
@@ -74 +64 @@
   void updateState();
 
-  /** Const getter to this item's molecule.
-   *
-   * \return const ref to \a mol
-   */
-  const molecule * const getMolecule() const;
-
-  /** Getter for the id of the molecule this item is associated to
-   *
-   * \return id of molecule
-   */
-  moleculeId_t getMoleculeId() const
-  { return molid; }
-
   /** Returns the type of this QtMoleculeItem, i.e. the column in QtMoleculeList.
    *
@@ -93 +70 @@
   virtual QtMoleculeItem::COLUMNTYPES getType() const = 0;
 
-private:
-  void update(Observable *publisher);
-  void recieveNotification(Observable *publisher, Notification_ptr notification);
-  void subjectKilled(Observable *publisher);
+  /** Getter to the observed molecule in this item.
+   *
+   * \return const ref to ObservedMolecule for this item
+   */
+  const QtObservedMolecule::ptr& getMolecule() const
+  { return ObservedMolecule; }
 
-protected:
-  void signOnToMolecule();
-  void signOffFromMolecule();
+  /** Getter for the id of the observed molecule for this item.
+   *
+   * \return id of the observed molecule
+   */
+  const moleculeId_t getMoleculeId() const
+  { return ObservedMolecule->getMolIndex(); }
 
 protected:
@@ -108 +90 @@
   virtual void internal_updateState() = 0;
 
-  //!> molecule we are signed on to
-  const moleculeId_t molid;
+  //!> ptr to ObservedMolecule we follow
+  const QtObservedMolecule::ptr ObservedMolecule;
 
 private:
   //!> move type for this specific item, set this when implementing
   const enum MoveTypes movetype;
-
-  //!> ref to the specific static list of channels we are signed on to
-  const channellist_t &channellist;
-
-  //!> the Observable we are signed on, also indicates whether we are sign on (not NULL)
-  const Observable * owner;
 
   //!> states that this item needs to be updated
@@ -126 +102 @@
   //!> bound callback function to inform model about change
   const emitDirtyState_t emitDirtyState;
-
-  //!> bound callback function to inform model about change
-  const emitSubjectKilledState_t emitSubjectKilledState;
-
-  //!> this protects the signing on and off
-  mutable boost::recursive_mutex owner_mutex;
 };