Changeset bfd520c for src/UIElements

Timestamp:

Mar 24, 2016, 2:23:20 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:

d316ad

Parents:

6a7353

git-author:

Frederik Heber <heber@…> (03/17/16 09:52:26)

git-committer:

Frederik Heber <heber@…> (03/24/16 14:23:20)

Message:

QtElementList uses QtObservedAtomObserver and is no longer Observer itself.

Location:

src/UIElements/Views/Qt4/ElementList

Files:

• QtElementList.cpp (modified) (7 diffs)
• QtElementList.hpp (modified) (3 diffs)

src/UIElements/Views/Qt4/ElementList/QtElementList.cpp

@@ -32 +32 @@
 #include <config.h>
 #endif
+
+#include <QtCore/QMetaType>
 
 #include "Views/Qt4/ElementList/QtElementList.hpp"
@@ -57 +59 @@
 QtElementList::QtElementList(QtObservedInstanceBoard *_board, QWidget * _parent) :
     QTreeWidget (_parent),
-    Observer("QtElementList"),
-    board(_board)
-{
+    atomobserver(_board)
+{
+  qRegisterMetaType<QtObservedAtom::ptr>("QtObservedAtom::ptr");
+
   setColumnCount(COLUMNCOUNT);
   setSelectionMode(QAbstractItemView::MultiSelection);
@@ -97 +100 @@
         dirty = true;
 
-        AtomObserver::getInstance().signOn(this, atom::ElementChanged);
-
+        connect(&atomobserver, SIGNAL(ElementChanged(const QtObservedAtom::ptr)),
+            this, SLOT(changeElement(const QtObservedAtom::ptr)));
+  connect(&atomobserver, SIGNAL(AtomInserted(const QtObservedAtom::ptr)),
+      this, SLOT(addAtomElement(const QtObservedAtom::ptr)));
+  connect(&atomobserver, SIGNAL(AtomRemoved(const atomId_t)),
+      this, SLOT(removeAtomElement(const atomId_t)));
   connect(this,SIGNAL(itemSelectionChanged()),this,SLOT(rowSelected()));
-  connect(this,SIGNAL(needsRefill(const atomId_t)),this,SLOT(refill(const atomId_t)), Qt::QueuedConnection);
 //  connect(this,SIGNAL(changed()),this,SLOT(update()));
 
@@ -107 +113 @@
 QtElementList::~QtElementList()
 {
-  AtomObserver::getInstance().signOff(this, atom::ElementChanged);
-}
-
-void QtElementList::update(Observable *publisher)
-{
-  ASSERT(0, "QtElementList::update() - is not enlisted to any general update.");
-}
-
-
-void QtElementList::recieveNotification(Observable *publisher, Notification_ptr notification)
-{
-  if (notification->getChannelNo() == atom::ElementChanged) {
-    dirty = true;
-
-    emit needsRefill(dynamic_cast<atom *>(publisher)->getId());
-  } else
-    ASSERT(0, "QtElementList::recieveNotification() - we are not enlisted to any other instance's channel.");
-}
-
-void QtElementList::updateElement(const QtObservedAtom::ptr &_atom)
-{
+}
+void QtElementList::changeElement(const QtObservedAtom::ptr _atom)
+{
+  boost::recursive_mutex::scoped_lock lock(refill_mutex);
+
   const atomicNumber_t newelement = _atom->getAtomElement();
   atomicNumber_t oldelement = -1;
@@ -134 +124 @@
   ASSERT( newtreeItem != NULL,
       "QtElementList::updateElement() - new element item not present.");
-//  if (newtreeItem == NULL) {
-//    // add new item
-//    const element& e = _atom.getElement();
-//    newtreeItem = new QTreeWidgetItem();
-//    newtreeItem->setText(NUMBER, QString::number(e.getAtomicNumber()));
-//    newtreeItem->setText(NAME, QString(e.getName().c_str()));
-//    newtreeItem->setText(SYMBOL, QString(e.getSymbol().c_str()));
-//    newtreeItem->setText(MASS, QString::number(e.getMass()));
-//    setOccurrence(*newtreeItem, 0);
-//    elementSelection.push_back(newtreeItem->isSelected());
-//    insertTopLevelItem(newelement-1, newtreeItem);
-//  }
   AtomElementMap_t::iterator iter = AtomElementMap.find(atomid);
   if (iter == AtomElementMap.end()) {
@@ -182 +160 @@
 }
 
-void QtElementList::refill(const atomId_t _atomid)
-{
-  refill_mutex.lock();
-
-  const QtObservedAtom::ptr walker = board->getObservedAtom(_atomid);
-  if (walker)
-    updateElement(walker);
-  else {
-    AtomElementMap_t::iterator iter = AtomElementMap.find(_atomid);
-    if (iter != AtomElementMap.end()) {
-      QTreeWidgetItem *oldtreeItem = topLevelItem(iter->second-1);
-      const int count_old = oldtreeItem->text(OCCURRENCE).toInt();
-      setOccurrence(*oldtreeItem, count_old-1);
-
-      AtomElementMap.erase(iter);
-    }
-  }
-
-  refill_mutex.unlock();
+void QtElementList::addAtomElement(const QtObservedAtom::ptr _atom)
+{
+  boost::recursive_mutex::scoped_lock lock(refill_mutex);
+
+  changeElement(_atom);
+
+}
+
+void QtElementList::removeAtomElement(const atomId_t _atomid)
+{
+  boost::recursive_mutex::scoped_lock lock(refill_mutex);
+
+  const AtomElementMap_t::iterator iter = AtomElementMap.find(_atomid);
+  ASSERT (iter != AtomElementMap.end(),
+      "QtElementList::addAtomElement() - atom #"+toString(_atomid)
+      +" is not present in elementlookup map.");
+  if (iter != AtomElementMap.end()) {
+    QTreeWidgetItem *oldtreeItem = topLevelItem(iter->second-1);
+    const int count_old = oldtreeItem->text(OCCURRENCE).toInt();
+    setOccurrence(*oldtreeItem, count_old-1);
+
+    AtomElementMap.erase(iter);
+  }
 }
 
@@ -208 +190 @@
 //    refill();
   QTreeWidget::paintEvent(event);
-}
-
-void QtElementList::subjectKilled(Observable *publisher) {
 }
 

src/UIElements/Views/Qt4/ElementList/QtElementList.hpp

@@ -14 +14 @@
 #endif
 
+#include <QtGui/QTreeWidget>
 
-#include <QtGui/QTreeWidget>
-#include <QMutex>
-
-#include "CodePatterns/Observer/Observer.hpp"
-#include "CodePatterns/Observer/Notification.hpp"
+#include <boost/thread/recursive_mutex.hpp>
 
 #include "types.hpp"
 
 #include "UIElements/Qt4/InstanceBoard/QtObservedAtom.hpp"
+#include "UIElements/Views/Qt4/ElementList/QtObservedAtomObserver.hpp"
 
 class QtObservedInstanceBoard;
 
-class QtElementList: public QTreeWidget, public Observer
+class QtElementList: public QTreeWidget
 {
   Q_OBJECT
@@ -36 +34 @@
 
 protected:
-  virtual void update(Observable *publisher);
-  virtual void recieveNotification(Observable *publisher, Notification_ptr notification);
-  virtual void subjectKilled(Observable *publisher);
   virtual void paintEvent(QPaintEvent * event);
 
   void setOccurrence(QTreeWidgetItem &_item, const int count);
-  void updateElement(const QtObservedAtom::ptr &_atom);
 
   static const int COLUMNCOUNT;
@@ -48 +42 @@
   static const char *COLUMNNAMES[];
 
-signals:
-  void needsRefill(const atomId_t);
-
 private slots:
   void rowSelected();
-  void refill(const atomId_t);
+  void changeElement(const QtObservedAtom::ptr _atom);
+  void addAtomElement(const QtObservedAtom::ptr _atom);
+  void removeAtomElement(const atomId_t _atom);
 
 private:
   std::vector<bool> elementSelection; //!< needed to determine when a selection changes
-  typedef std::map<atomId_t, atomicNumber_t> AtomElementMap_t;
+  typedef std::map<const atomId_t, atomicNumber_t> AtomElementMap_t;
   AtomElementMap_t AtomElementMap;
   bool dirty;
 
-  //!> ptr to instance board to obtain observed atoms
-  QtObservedInstanceBoard * const board;
+  //!> observed all QtObservedAtoms for ElementChanged signals
+  QtObservedAtomObserver atomobserver;
 
-  QMutex refill_mutex;
+  mutable boost::recursive_mutex refill_mutex;
 };