Changeset 9fb213 for src/UIElements/Views

Timestamp:

Jul 25, 2015, 1:02:11 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:

bcf056

Parents:

92df04

git-author:

Frederik Heber <heber@…> (06/17/15 23:41:07)

git-committer:

Frederik Heber <heber@…> (07/25/15 13:02:11)

Message:

FIX: QtElementList now uses new updateElement().

• old refill() polls complete list of atoms of specific type in the moment an atom is destroyed ... now we only get informed about newly created atoms (safe) and changing elements (also safe).

Location:

src/UIElements/Views/Qt4

Files:

• QtElementList.cpp (modified) (6 diffs)
• QtElementList.hpp (modified) (2 diffs)

src/UIElements/Views/Qt4/QtElementList.cpp

@@ -67 +67 @@
 
         dirty = true;
-        refill();
 
         AtomObserver::getInstance().signOn(this, atom::ElementChanged);
 
   connect(this,SIGNAL(itemSelectionChanged()),this,SLOT(rowSelected()));
-  connect(this,SIGNAL(needsRefill()),this,SLOT(refill()), Qt::QueuedConnection);
+  connect(this,SIGNAL(needsRefill(const atomId_t)),this,SLOT(refill(const atomId_t)), Qt::QueuedConnection);
 //  connect(this,SIGNAL(changed()),this,SLOT(update()));
+
+//  emit needsRefill();
 }
 
@@ -93 +94 @@
     dirty = true;
 
-    refill();
+    emit needsRefill(dynamic_cast<atom *>(publisher)->getId());
   } else
     ASSERT(0, "QtElementList::recieveNotification() - we are not enlisted to any other instance's channel.");
@@ -103 +104 @@
   // incompatible with the current refill scheme
   AtomElementMap_t::iterator iter = AtomElementMap.find(_atom.getId());
+  if (iter == AtomElementMap.end()) {
+    AtomElementMap.insert( std::make_pair(_atom.getId(), -1));
+    iter = AtomElementMap.find(_atom.getId());
+  }
   const atomicNumber_t oldelement = iter->second;
   const atomicNumber_t newelement = _atom.getElementNo();
   iter->second = newelement;
-  QTreeWidgetItem *oldtreeItem = topLevelItem(oldelement-1);
+  QTreeWidgetItem *oldtreeItem = NULL;
+  if (oldelement != (atomicNumber_t)-1)
+    oldtreeItem = topLevelItem(oldelement-1);
   QTreeWidgetItem *newtreeItem = topLevelItem(newelement-1);
-  ASSERT( (oldtreeItem != NULL) && (newtreeItem != NULL),
-      "QtElementList::updateElement() - missing element item.");
-  int count_old = oldtreeItem->text(OCCURRENCE).toInt();
-  int count_new = newtreeItem->text(OCCURRENCE).toInt();
-  setOccurrence(*oldtreeItem, count_old-1);
+  ASSERT( (newtreeItem != NULL),
+      "QtElementList::updateElement() - missing new element item.");
+  if (oldelement != (atomicNumber_t)-1) {
+    const int count_old = oldtreeItem->text(OCCURRENCE).toInt();
+    setOccurrence(*oldtreeItem, count_old-1);
+  }
+  const int count_new = newtreeItem->text(OCCURRENCE).toInt();
   setOccurrence(*newtreeItem, count_new+1);
 }
@@ -118 +127 @@
 void QtElementList::setOccurrence(QTreeWidgetItem &_item, const int count)
 {
-  if (count < 0) {
-    // something must be very wrong, rather refill
-    dirty = true;
-    refill();
-  } else {
+  ASSERT (count >= 0,
+      "QtElementList::setOccurrence() - count for an elment < 0.");
+
+//    // something must be very wrong, rather refill
+//    dirty = true;
+//    refill();
+//  } else {
     if (count > 0) {
       _item.setText(OCCURRENCE, QString::number(count));
@@ -129 +140 @@
       _item.setDisabled(true);
     }
-  }
-}
-
-void QtElementList::refill() 
+//  }
+}
+
+void QtElementList::refill(const atomId_t _atomid)
 {
   refill_mutex.lock();
 
-  periodentafel *&periode = World::getInstance().getPeriode();
-
-  elementSelection.clear();
-
-  int i;
-
-  clear();
-  periodentafel::const_iterator iter;
-  for(iter = periode->begin(),i=0;
-      iter != periode->end();
-      ++i,++iter) {
-    const element *e = iter->second;
-    int count = 0;
-    count = const_cast<const World &>(World::getInstance()).
-        getAllAtoms(AtomByType(e)).size();
-
-    QTreeWidgetItem *treeItem = new QTreeWidgetItem(this);
-    treeItem->setText(NUMBER, QString::number(e->getAtomicNumber()));
-    treeItem->setText(NAME, QString(e->getName().c_str()));
-    treeItem->setText(SYMBOL, QString(e->getSymbol().c_str()));
-    treeItem->setText(MASS, QString::number(e->getMass()));
-    setOccurrence(*treeItem, count);
-    elementSelection.push_back(treeItem->isSelected());
-  }
-  dirty = false;
+//  periodentafel *&periode = World::getInstance().getPeriode();
+//
+//  elementSelection.clear();
+//
+//  int i;
+//
+//  clear();
+//  periodentafel::const_iterator iter;
+//  for(iter = periode->begin(),i=0;
+//      iter != periode->end();
+//      ++i,++iter) {
+//    const element *e = iter->second;
+//    int count = 0;
+//    count = const_cast<const World &>(World::getInstance()).
+//        getAllAtoms(AtomByType(e)).size();
+//
+//    QTreeWidgetItem *treeItem = new QTreeWidgetItem(this);
+//    treeItem->setText(NUMBER, QString::number(e->getAtomicNumber()));
+//    treeItem->setText(NAME, QString(e->getName().c_str()));
+//    treeItem->setText(SYMBOL, QString(e->getSymbol().c_str()));
+//    treeItem->setText(MASS, QString::number(e->getMass()));
+//    setOccurrence(*treeItem, count);
+//    elementSelection.push_back(treeItem->isSelected());
+//  }
+//  dirty = false
+  const atom * const walker = const_cast<const World &>(World::getInstance()).
+      getAtom(AtomById(_atomid));
+  if (walker != NULL)
+    updateElement(*walker);
+  else {
+    AtomElementMap_t::iterator iter = AtomElementMap.find(_atomid);
+    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();
@@ -167 +190 @@
 void QtElementList::paintEvent(QPaintEvent * event)
 {
-  if (dirty)
-    refill();
+//  if (dirty)
+//    refill();
   QTreeWidget::paintEvent(event);
 }

src/UIElements/Views/Qt4/QtElementList.hpp

@@ -38 +38 @@
   virtual void subjectKilled(Observable *publisher);
   virtual void paintEvent(QPaintEvent * event);
-  void refill();
 
   void setOccurrence(QTreeWidgetItem &_item, const int count);
@@ -47 +46 @@
   static const char *COLUMNNAMES[];
 
+signals:
+  void needsRefill(const atomId_t);
+
 private slots:
   void rowSelected();
+  void refill(const atomId_t);
 
 private: