Changeset ca1535 for src/UIElements/Views/Qt4/MoleculeList/SpecificItems

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.

Location:

src/UIElements/Views/Qt4/MoleculeList/SpecificItems

Files:

• QtMoleculeItem_atomcount.hpp (modified) (3 diffs)
• QtMoleculeItem_formula.hpp (modified) (3 diffs)
• QtMoleculeItem_name.hpp (modified) (3 diffs)
• QtMoleculeItem_occurrence.hpp (modified) (2 diffs)
• QtMoleculeItem_visibility.hpp (modified) (2 diffs)

src/UIElements/Views/Qt4/MoleculeList/SpecificItems/QtMoleculeItem_atomcount.hpp

@@ -16 +16 @@
 #include "UIElements/Views/Qt4/MoleculeList/QtMoleculeItem.hpp"
 
-#include "CodePatterns/ObservedValue.hpp"
-
-#include "Descriptors/MoleculeIdDescriptor.hpp"
-#include "molecule.hpp"
-#include "World.hpp"
-
 class QtMoleculeItemFactory;
 
@@ -33 +27 @@
 
   QtMoleculeItem_atomcount(
-      const moleculeId_t _molid,
-      const emitDirtyState_t &_emitDirtyState,
-      const emitSubjectKilledState_t &_emitSubjectKilledState) :
-        QtMoleculeItem(_molid, channellist_atomcount, QtMoleculeItem::NeedsMove, _emitDirtyState, _emitSubjectKilledState),
-        molref(getMolecule()),
-        atomcount(
-            molref,
-            boost::bind(&QtMoleculeItem_atomcount::updateAtomCount, this),
-            "MoleculeItem_atomcount_"+toString(_molid),
-            updateAtomCount(),
-            channellist_atomcount)
+      QtObservedMolecule::ptr &_ObservedMolecule,
+      const emitDirtyState_t &_emitDirtyState) :
+        QtMoleculeItem(_ObservedMolecule, QtMoleculeItem::NeedsMove, _emitDirtyState)
   {
-    signOnToMolecule();
     // cannot call pure virtual function in QtMoleculeItem's cstor
     internal_updateState();
-  }
-
-  ~QtMoleculeItem_atomcount()
-  {
-    signOffFromMolecule();
-  }
-
-  int updateAtomCount() const
-  {
-    const molecule * const mol = getMolecule();
-    if (mol != NULL)
-      return mol->getAtomCount();
-    else
-      return -1;
   }
 
@@ -69 +40 @@
   void internal_updateState()
   {
-    setText(QString::number(atomcount.get()));
+    setText(QString::number(ObservedMolecule->getAtomCount()));
   }
 
   QtMoleculeItem::COLUMNTYPES getType() const
   { return QtMoleculeItem::ATOMCOUNT; }
-
-  //!> notification channels of molecule specific to this molecule item, required for update
-  static const QtMoleculeItem::channellist_t channellist_atomcount;
-
-  //!> temporary value for molecule
-  const molecule * const molref;
-
-  //!> contains visibility state
-  ObservedValue<int> atomcount;
 };
 

src/UIElements/Views/Qt4/MoleculeList/SpecificItems/QtMoleculeItem_formula.hpp

@@ -18 +18 @@
 #include <string>
 
-#include "CodePatterns/ObservedValue.hpp"
-
-#include "Descriptors/MoleculeIdDescriptor.hpp"
-#include "Formula.hpp"
-#include "molecule.hpp"
-#include "World.hpp"
-
 class QtMoleculeItemFactory;
 
@@ -36 +29 @@
 
   QtMoleculeItem_formula(
-      const moleculeId_t _molid,
-      const emitDirtyState_t &_emitDirtyState,
-      const emitSubjectKilledState_t &_emitSubjectKilledState) :
-        QtMoleculeItem(_molid, channellist_formula, QtMoleculeItem::NeedsMove, _emitDirtyState, _emitSubjectKilledState),
-        molref(getMolecule()),
-        formula(
-            molref,
-            boost::bind(&QtMoleculeItem_formula::updateFormula, this),
-            "MoleculeItem_formula_"+toString(_molid),
-            updateFormula(),
-            channellist_formula)
+      QtObservedMolecule::ptr &_ObservedMolecule,
+      const emitDirtyState_t &_emitDirtyState) :
+        QtMoleculeItem(_ObservedMolecule, QtMoleculeItem::NeedsMove, _emitDirtyState)
   {
-    signOnToMolecule();
     // cannot call pure virtual function in QtMoleculeItem's cstor
     internal_updateState();
-  }
-
-  ~QtMoleculeItem_formula()
-  {
-    signOffFromMolecule();
-  }
-
-  std::string updateFormula() const
-  {
-    const molecule * const mol = getMolecule();
-    if (mol != NULL)
-      return mol->getFormula().toString();
-    else
-      return std::string();
   }
 
@@ -72 +42 @@
   void internal_updateState()
   {
-    setText(QString(formula.get().c_str()));
+    setText(QString(ObservedMolecule->getMolFormula().c_str()));
   }
 
   QtMoleculeItem::COLUMNTYPES getType() const
   { return QtMoleculeItem::FORMULA; }
-
-  //!> notification channels of molecule specific to this molecule item, required for update
-  static const QtMoleculeItem::channellist_t channellist_formula;
-
-  //!> temporary value for molecule
-  const molecule * const molref;
-
-  //!> contains visibility state
-  ObservedValue<std::string> formula;
 };
 

src/UIElements/Views/Qt4/MoleculeList/SpecificItems/QtMoleculeItem_name.hpp

@@ -16 +16 @@
 #include "UIElements/Views/Qt4/MoleculeList/QtMoleculeItem.hpp"
 
-#include "CodePatterns/ObservedValue.hpp"
-
-#include "Descriptors/MoleculeIdDescriptor.hpp"
-#include "molecule.hpp"
-#include "World.hpp"
-
 class QtMoleculeItemFactory;
 
@@ -33 +27 @@
 
   QtMoleculeItem_name(
-      const moleculeId_t _molid,
-      const emitDirtyState_t &_emitDirtyState,
-      const emitSubjectKilledState_t &_emitSubjectKilledState) :
-        QtMoleculeItem(_molid, channellist_name, QtMoleculeItem::DoesNotMove, _emitDirtyState, _emitSubjectKilledState),
-        molref(getMolecule()),
-        name(
-            molref,
-            boost::bind(&QtMoleculeItem_name::updateName, this),
-            "MoleculeItem_name_"+toString(_molid),
-            updateName(),
-            channellist_name)
+      QtObservedMolecule::ptr &_ObservedMolecule,
+      const emitDirtyState_t &_emitDirtyState) :
+        QtMoleculeItem(_ObservedMolecule, QtMoleculeItem::DoesNotMove, _emitDirtyState)
   {
-    signOnToMolecule();
     // cannot call pure virtual function in QtMoleculeItem's cstor
     internal_updateState();
-  }
-
-  ~QtMoleculeItem_name()
-  {
-    signOffFromMolecule();
-  }
-
-  std::string updateName() const
-  {
-    const molecule * const mol = getMolecule();
-    if (mol != NULL)
-      return mol->getName();
-    else
-      return std::string();
   }
 
@@ -69 +40 @@
   void internal_updateState()
   {
-    setText(QString(name.get().c_str()));
+    setText(QString(ObservedMolecule->getMolName().c_str()));
   }
 
   QtMoleculeItem::COLUMNTYPES getType() const
   { return QtMoleculeItem::NAME; }
-
-  //!> notification channels of molecule specific to this molecule item, required for update
-  static const QtMoleculeItem::channellist_t channellist_name;
-
-  //!> temporary value for molecule
-  const molecule * const molref;
-
-  //!> contains visibility state
-  ObservedValue<std::string> name;
 };
 

src/UIElements/Views/Qt4/MoleculeList/SpecificItems/QtMoleculeItem_occurrence.hpp

@@ -27 +27 @@
 
   QtMoleculeItem_occurrence(
-      const moleculeId_t _molid,
-      const emitDirtyState_t &_emitDirtyState,
-      const emitSubjectKilledState_t &_emitSubjectKilledState) :
-        QtMoleculeItem(_molid, channellist_occurrence, QtMoleculeItem::DoesNotMove, _emitDirtyState, _emitSubjectKilledState)
+      QtObservedMolecule::ptr &_ObservedMolecule,
+      const emitDirtyState_t &_emitDirtyState) :
+        QtMoleculeItem(_ObservedMolecule, QtMoleculeItem::DoesNotMove, _emitDirtyState)
   {
-    signOnToMolecule();
     // cannot call pure virtual function in QtMoleculeItem's cstor
     internal_updateState();
-  }
-
-  ~QtMoleculeItem_occurrence()
-  {
-    signOffFromMolecule();
   }
 
@@ -52 +45 @@
   QtMoleculeItem::COLUMNTYPES getType() const
   { return QtMoleculeItem::OCCURRENCE; }
-
-  //!> notification channels of molecule specific to this molecule item, required for update
-  static const QtMoleculeItem::channellist_t channellist_occurrence;
 };
 

src/UIElements/Views/Qt4/MoleculeList/SpecificItems/QtMoleculeItem_visibility.hpp

@@ -27 +27 @@
 
   QtMoleculeItem_visibility(
-      const moleculeId_t _molid,
-      const emitDirtyState_t &_emitDirtyState,
-      const emitSubjectKilledState_t &_emitSubjectKilledState) :
-        QtMoleculeItem(_molid, channellist_visibility, QtMoleculeItem::DoesNotMove, _emitDirtyState, _emitSubjectKilledState)
+      QtObservedMolecule::ptr &_ObservedMolecule,
+      const emitDirtyState_t &_emitDirtyState) :
+        QtMoleculeItem(_ObservedMolecule, QtMoleculeItem::DoesNotMove, _emitDirtyState)
   {
-    signOnToMolecule();
     setFlags(flags() | Qt::ItemIsUserCheckable);
     setCheckState(Qt::Unchecked);
     // cannot call pure virtual function in QtMoleculeItem's cstor
     internal_updateState();
-  }
-
-  ~QtMoleculeItem_visibility()
-  {
-    signOffFromMolecule();
   }
 
@@ -52 +45 @@
   QtMoleculeItem::COLUMNTYPES getType() const
   { return QtMoleculeItem::VISIBILITY; }
-
-  //!> notification channels of molecule specific to this molecule item, required for update
-  static const QtMoleculeItem::channellist_t channellist_visibility;
 };