Changeset 98c35c for src/UIElements/Qt4/InstanceBoard/QtObservedInstanceBoard.hpp

Timestamp:

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

41e287

Parents:

0070aa

git-author:

Frederik Heber <heber@…> (10/28/15 13:57:10)

git-committer:

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

Message:

Added rudimentary getter and returner for ObservedAtom/..Molecule() to InstanceBoard.

File:

• src/UIElements/Qt4/InstanceBoard/QtObservedInstanceBoard.hpp (modified) (4 diffs)

src/UIElements/Qt4/InstanceBoard/QtObservedInstanceBoard.hpp

@@ -17 +17 @@
 #include <QtGui/QWidget>
 
+#include "UIElements/Qt4/InstanceBoard/QtObservedAtom.hpp"
+#include "UIElements/Qt4/InstanceBoard/QtObservedMolecule.hpp"
+
 #include <map>
-#include <vector>
-
-#include <boost/any.hpp>
+#include <boost/function.hpp>
 
 #include "CodePatterns/Observer/Observer.hpp"
-#include "CodePatterns/ObservedValue.hpp"
 
+#include "UIElements/Qt4/InstanceBoard/ObservedValue_types.hpp"
 #include "types.hpp"
 
@@ -62 +63 @@
 
 public:
-  /** typedef for a vector of ObservedValue's (each is due to templating its
-   * own type. Therefore, we need to use boost::any).
-   */
-  typedef std::vector<boost::any> ObservedValues_t;
-
   /** Cstor of QtObservedInstanceBoard.
    *
@@ -83 +79 @@
   void recieveNotification(Observable *publisher, Notification_ptr notification);
 
+  QtObservedAtom::ptr getObservedAtom(const atomId_t _id);
+  QtObservedMolecule::ptr getObservedMolecule(const moleculeId_t _id);
+
   ObservedValues_t getAtomObservedValues(const atomId_t _id);
   ObservedValues_t getMoleculeObservedValues(const moleculeId_t _id);
+
+  void returnObservedAtom(const atomId_t _id);
+  void returnObservedMolecule(const moleculeId_t _id);
 
   void returnAtomObservedValues(const atomId_t _id, ObservedValues_t &_observedvalues);
@@ -144 +146 @@
   moleculesubjectKilledCount_t moleculesubjectKilledCount;
 
+  typedef std::pair<ObservedValues_t, size_t> RefCountedObservedValues_t;
+
   //!> typedef for the map of id to each one's ObservedValues
-  typedef typename std::map<atomId_t, ObservedValues_t> atomObservedValues_t;
+  typedef typename std::map<atomId_t, RefCountedObservedValues_t> atomObservedValues_t;
   //!> map containing all ObservedValues for each atom, associated by id
   atomObservedValues_t atomObservedValues;
 
   //!> typedef for the map of id to each one's ObservedValues
-  typedef typename std::map<moleculeId_t, ObservedValues_t> moleculeObservedValues_t;
+  typedef typename std::map<moleculeId_t, RefCountedObservedValues_t> moleculeObservedValues_t;
   //!> map containing all ObservedValues for each molecule, associated by id
   moleculeObservedValues_t moleculeObservedValues;