Changeset 98c35c for src/UIElements

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.

Location:

src/UIElements

Files:

• Makefile.am (modified) (1 diff)
• Qt4/InstanceBoard/ObservedValue_types.hpp (added)
• Qt4/InstanceBoard/QtObservedAtom.cpp (modified) (1 diff)
• Qt4/InstanceBoard/QtObservedAtom.hpp (modified) (4 diffs)
• Qt4/InstanceBoard/QtObservedInstanceBoard.cpp (modified) (13 diffs)
• Qt4/InstanceBoard/QtObservedInstanceBoard.hpp (modified) (4 diffs)
• Qt4/InstanceBoard/QtObservedMolecule.cpp (modified) (1 diff)
• Qt4/InstanceBoard/QtObservedMolecule.hpp (modified) (4 diffs)

src/UIElements/Makefile.am

@@ -144 +144 @@
   UIElements/GlobalListOfParameterQueries.hpp \
   UIElements/MainWindow.hpp \
+  UIElements/Qt4/InstanceBoard/ObservedValue_types.hpp \
   UIElements/Views/Qt4/Qt3D/ObservedValue_UpdateAtoms.hpp \
   UIElements/Views/Qt4/Qt3D/ObservedValue_wCallback.hpp

src/UIElements/Qt4/InstanceBoard/QtObservedAtom.cpp

@@ -38 +38 @@
 #include "CodePatterns/MemDebug.hpp"
 
-QtObservedAtom::QtObservedAtom(QWidget * _parent) :
+QtObservedAtom::QtObservedAtom(
+    const ObservedValues_t &_obsvalues,
+    QWidget * _parent) :
   QWidget(_parent),
-  Observer("QtObservedAtom")
+  Observer("QtObservedAtom"),
+  obsvalues(_obsvalues)
 {}
 
 QtObservedAtom::~QtObservedAtom()
 {}
+
+void QtObservedAtom::update(Observable *publisher)
+{}
+
+void QtObservedAtom::subjectKilled(Observable *publisher)
+{}
+
+void QtObservedAtom::recieveNotification(Observable *publisher, Notification_ptr notification)
+{}

src/UIElements/Qt4/InstanceBoard/QtObservedAtom.hpp

@@ -17 +17 @@
 #include <QtGui/QWidget>
 
-#include <vector>
 
-#include <boost/any.hpp>
+#include <boost/shared_ptr.hpp>
 
 #include "CodePatterns/Observer/Observer.hpp"
-#include "CodePatterns/ObservedValue.hpp"
 
+#include "UIElements/Qt4/InstanceBoard/ObservedValue_types.hpp"
 #include "types.hpp"
+
+class QtObservedInstanceBoard;
 
 /** This instance is the ObservedValue representation of a World's atom.
@@ -40 +41 @@
   Q_OBJECT
 
+  //!> QtObservedInstanceBoard needs to access private cstor and dstor
+  friend class QtObservedInstanceBoard;
+
+  //!> typedef for instance wrapped in shared ptr
+  typedef boost::shared_ptr<QtObservedAtom> ptr;
+
   /** Cstor of QtObservedAtom.
    *
+   * \param _obsvalues ref to set of observed values for this instance
    * \param _parent Qt parent to automatically destroy when parent is destroyed
    */
-  QtObservedAtom(QWidget * _parent=0);
+  QtObservedAtom(
+      const ObservedValues_t &_obsvalues,
+      QWidget * _parent=0);
+
+public:
 
   /** Dstor of QtObservedAtom.
@@ -50 +62 @@
    */
   ~QtObservedAtom();
+
+  // Observer functions
+  void update(Observable *publisher);
+  void subjectKilled(Observable *publisher);
+  void recieveNotification(Observable *publisher, Notification_ptr notification);
 
 signals:
@@ -57 +74 @@
 
 private:
-
+  //!> internal reference to ObservedValues held by QtObservedInstanceBoard
+  const ObservedValues_t &obsvalues;
 };
 

src/UIElements/Qt4/InstanceBoard/QtObservedInstanceBoard.cpp

@@ -142 +142 @@
 #endif
               moleculeObservedValues.insert(
-                  std::make_pair( _id, ObservedValues));
+                  std::make_pair( _id, std::make_pair(ObservedValues,0) ));
           ASSERT( inserter.second,
               "QtObservedInstanceBoard::recieveNotification() - could not insert ObservedValues for"
@@ -190 +190 @@
 #endif
               atomObservedValues.insert(
-                  std::make_pair( _id, ObservedValues));
+                  std::make_pair( _id, std::make_pair(ObservedValues,0) ));
           ASSERT( inserter.second,
               "QtObservedInstanceBoard::recieveNotification() - could not insert ObservedValues for"
@@ -259 +259 @@
           // change id here only if still present
           if (iter != moleculeObservedValues.end()) {
-            ObservedValues_t obsvalues = iter->second;
+            RefCountedObservedValues_t obsvalues = iter->second;
             moleculeObservedValues.erase(iter);
             ASSERT( moleculeObservedValues.find(newmoleculeId) == moleculeObservedValues.end(),
@@ -290 +290 @@
           // change id here only if still present
           if (iter != atomObservedValues.end()) {
-            ObservedValues_t obsvalues = iter->second;
+            RefCountedObservedValues_t obsvalues = iter->second;
             atomObservedValues.erase(iter);
             ASSERT( atomObservedValues.find(newatomId) == atomObservedValues.end(),
@@ -326 +326 @@
 
   if (iter->second > GLMoleculeObject_atom::MAX_ObservedTypes) {
+    ASSERT( atomObservedValues[_atomid].second == 0,
+        "QtObservedInstanceBoard::atomcountsubjectKilled() - observed Values for atom "
+        +toString(_atomid)+" are still being held somewhere.");
     if (_atomid == lastremovedatomsmolecule.second)
       emit atomRemoved(lastremovedatomsmolecule.first, lastremovedatomsmolecule.second);
@@ -347 +350 @@
 
   if (iter->second > GLMoleculeObject_molecule::MAX_ObservedTypes) {
+    ASSERT( moleculeObservedValues[_molid].second == 0,
+        "QtObservedInstanceBoard::moleculecountsubjectKilled() - observed Values for molecule "
+        +toString(_molid)+" are still being held somewhere.");
     // then free the instance
     emit moleculeRemoved(_molid);
@@ -353 +359 @@
 }
 
-QtObservedInstanceBoard::ObservedValues_t
+ObservedValues_t
 QtObservedInstanceBoard::getAtomObservedValues(const atomId_t _id)
 {
@@ -362 +368 @@
       +toString(_id));
   if (iter->first == _id) {
-    returnvalues = iter->second;
+    returnvalues = iter->second.first;
     atomObservedValues.erase(iter);
   }
@@ -368 +374 @@
 }
 
-QtObservedInstanceBoard::ObservedValues_t
+ObservedValues_t
 QtObservedInstanceBoard::getMoleculeObservedValues(const moleculeId_t _id)
 {
@@ -377 +383 @@
       +toString(_id));
   if (iter->first == _id) {
-    returnvalues = iter->second;
+    returnvalues = iter->second.first;
     moleculeObservedValues.erase(iter);
   }
@@ -392 +398 @@
 #endif
         atomObservedValues.insert(
-            std::make_pair( _id, _observedvalues) );
+            std::make_pair( _id, std::make_pair(_observedvalues,0) ) );
     ASSERT( inserter.second,
         "QtObservedInstanceBoard::returnAtomObservedValues() - could not insert ObservedValues for"
@@ -409 +415 @@
 #endif
           moleculeObservedValues.insert(
-              std::make_pair( _id, _observedvalues) );
+              std::make_pair( _id, std::make_pair(_observedvalues,0) ) );
       ASSERT( inserter.second,
           "QtObservedInstanceBoard::returnMoleculeObservedValues() - could not insert ObservedValues for"
@@ -416 +422 @@
     lastremovedmolecule = (moleculeId_t)-1;
 }
+
+QtObservedAtom::ptr QtObservedInstanceBoard::getObservedAtom(const atomId_t _id)
+{
+  atomObservedValues_t::iterator iter = atomObservedValues.find(_id);
+  ASSERT( iter != atomObservedValues.end(),
+      "QtObservedInstanceBoard::getObservedAtom() - no observed values present for atom "
+      +toString(_id));
+  const ObservedValues_t &obsvalues = iter->second.first;
+  // increase refcount
+  ++(iter->second.second);
+  QtObservedAtom::ptr _atom(new QtObservedAtom(obsvalues));
+
+  return _atom;
+}
+
+QtObservedMolecule::ptr QtObservedInstanceBoard::getObservedMolecule(const moleculeId_t _id)
+{
+  moleculeObservedValues_t::iterator iter = moleculeObservedValues.find(_id);
+  ASSERT( iter != moleculeObservedValues.end(),
+      "QtObservedInstanceBoard::getObservedMolecule() - no observed values present for molecule "
+      +toString(_id));
+  const ObservedValues_t &obsvalues = iter->second.first;
+  // increase refcount
+  ++(iter->second.second);
+  QtObservedMolecule::ptr _molecule(new QtObservedMolecule(obsvalues));
+
+  return _molecule;
+}
+
+void QtObservedInstanceBoard::returnObservedAtom(const atomId_t _id)
+{
+  atomObservedValues_t::iterator iter = atomObservedValues.find(_id);
+  ASSERT( iter != atomObservedValues.end(),
+      "QtObservedInstanceBoard::returnObservedAtom() - no observed values present for atom "
+      +toString(_id));
+  ASSERT( iter->second.second != 0,
+      "QtObservedInstanceBoard::returnObservedAtom() - all ObservedAtoms for atom "
+      +toString(_id)+" have already been returned.");
+  // decrease refcount
+  --(iter->second.second);
+  if (iter->second.second == 0) {
+    // free instance
+  }
+}
+
+void QtObservedInstanceBoard::returnObservedMolecule(const moleculeId_t _id)
+{
+  moleculeObservedValues_t::iterator iter = moleculeObservedValues.find(_id);
+  ASSERT( iter != moleculeObservedValues.end(),
+      "QtObservedInstanceBoard::returnObservedMolecule() - no observed values present for molecule "
+      +toString(_id));
+  ASSERT( iter->second.second != 0,
+      "QtObservedInstanceBoard::returnObservedMolecule() - all ObservedMolecules for molecule "
+      +toString(_id)+" have already been returned.");
+  // decrease refcount
+  --(iter->second.second);
+  if (iter->second.second == 0) {
+    // free instance
+  }
+}
+

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;

src/UIElements/Qt4/InstanceBoard/QtObservedMolecule.cpp

@@ -38 +38 @@
 #include "CodePatterns/MemDebug.hpp"
 
-QtObservedMolecule::QtObservedMolecule(QWidget * _parent) :
+QtObservedMolecule::QtObservedMolecule(
+    const ObservedValues_t &_obsvalues,
+    QWidget * _parent) :
   QWidget(_parent),
-  Observer("QtObservedMolecule")
+  Observer("QtObservedMolecule"),
+  obsvalues(_obsvalues)
 {}
 
 QtObservedMolecule::~QtObservedMolecule()
 {}
+
+void QtObservedMolecule::update(Observable *publisher)
+{}
+
+void QtObservedMolecule::subjectKilled(Observable *publisher)
+{}
+
+void QtObservedMolecule::recieveNotification(Observable *publisher, Notification_ptr notification)
+{}

src/UIElements/Qt4/InstanceBoard/QtObservedMolecule.hpp

@@ -17 +17 @@
 #include <QtGui/QWidget>
 
-#include <vector>
-
-#include <boost/any.hpp>
+#include <boost/shared_ptr.hpp>
 
 #include "CodePatterns/Observer/Observer.hpp"
-#include "CodePatterns/ObservedValue.hpp"
 
+#include "UIElements/Qt4/InstanceBoard/ObservedValue_types.hpp"
 #include "types.hpp"
+
+class QtObservedInstanceBoard;
 
 /** This instance is the ObservedValue representation of a World's molecule.
@@ -40 +40 @@
   Q_OBJECT
 
+  //!> QtObservedInstanceBoard needs to access private cstor and dstor
+  friend class QtObservedInstanceBoard;
+
+  //!> typedef for instance wrapped in shared ptr
+  typedef boost::shared_ptr<QtObservedMolecule> ptr;
+
   /** Cstor of QtObservedMolecule.
    *
+   * \param _obsvalues ref to set of observed values for this instance
    * \param _parent Qt parent to automatically destroy when parent is destroyed
    */
-  QtObservedMolecule(QWidget * _parent=0);
+  QtObservedMolecule(
+      const ObservedValues_t &_obsvalues,
+      QWidget * _parent=0);
+
+public:
 
   /** Dstor of QtObservedMolecule.
@@ -50 +61 @@
    */
   ~QtObservedMolecule();
+
+  // Observer functions
+  void update(Observable *publisher);
+  void subjectKilled(Observable *publisher);
+  void recieveNotification(Observable *publisher, Notification_ptr notification);
 
 signals:
@@ -57 +73 @@
 
 private:
-
+  //!> internal reference to ObservedValues held by QtObservedInstanceBoard
+  const ObservedValues_t &obsvalues;
 };