Changeset 6770fa for src/UIElements/Views

Timestamp:

Jan 27, 2015, 5:18:30 PM (10 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:

8ccf3b

Parents:

0a5beb

git-author:

Frederik Heber <heber@…> (12/12/14 19:43:05)

git-committer:

Frederik Heber <heber@…> (01/27/15 17:18:30)

Message:

Extracted add/removeItem in QtMoleculeList, no more complete refilling on update.

• this is unfinished as we can't find the item to a molecule that is about to be removed. We have to switch to Qt's Model/View ... argh.

Location:

src/UIElements/Views/Qt4

Files:

• QtMoleculeList.cpp (modified) (6 diffs)
• QtMoleculeList.hpp (modified) (1 diff)

src/UIElements/Views/Qt4/QtMoleculeList.cpp

@@ -40 +40 @@
 
 #include "CodePatterns/MemDebug.hpp"
+
+#include "CodePatterns/Observer/Notification.hpp"
 
 #include "Atom/atom.hpp"
@@ -76 +78 @@
   clearing = false;
   selecting = false;
+  changing = false;
   ChangingChildrensVisibility = false;
   refill();
@@ -96 +99 @@
 }
 
-void QtMoleculeList::recieveNotification(Observable *publisher, Notification_ptr notification) {
+void QtMoleculeList::recieveNotification(Observable *publisher, Notification_ptr notification)
+{
+  if (dynamic_cast<World *>(publisher) != NULL) {
+    switch (notification->getChannelNo()) {
+      case World::MoleculeInserted:
+      {
+        const molecule * const mol = World::getInstance().lastChanged<molecule>();
+        addItem(mol);
+        break;
+      }
+      case World::MoleculeRemoved:
+      {
+        const molecule * const mol = World::getInstance().lastChanged<molecule>();
+        removeItem(mol);
+        break;
+      }
+      default:
+        ASSERT(0, "QtMoleculeList::recieveNotification() - cannot get here, not subscribed to channel "
+            +toString(notification->getChannelNo()));
+        break;
+    }
+  }
 
   if (selecting)
@@ -104 +128 @@
 }
 
+void QtMoleculeList::addGroupItem(
+    QTreeWidgetItem *&_groupItem,
+    const std::string &_molecule_formula)
+{
+  _groupItem = new QTreeWidgetItem(this);
+  formula.insert( std::make_pair(_molecule_formula, _groupItem) );
+  // fill item
+  _groupItem->setText(NAME, QString("default"));
+  _groupItem->setFlags((_groupItem->flags() | Qt::ItemIsUserCheckable) ^ Qt::ItemIsSelectable);
+  _groupItem->setCheckState(VISIBILITY, Qt::Unchecked);
+  _groupItem->setText(ATOMCOUNT, QString::number(0));
+  _groupItem->setText(FORMULA, QString(""));
+  _groupItem->setText(OCCURRENCE, "0");
+  _groupItem->setData(0, Qt::UserRole, QVariant(-1));
+}
+
+void QtMoleculeList::addMoleculeItem(
+    QTreeWidgetItem *&_groupItem,
+    const molecule *_mol,
+    const std::string &_molecule_formula)
+{
+  QTreeWidgetItem *molItem = new QTreeWidgetItem(_groupItem);
+  molItem->setText(NAME, QString(_mol->getName().c_str()));
+  molItem->setFlags(molItem->flags() | Qt::ItemIsUserCheckable | Qt::ItemIsSelectable);
+  molItem->setCheckState(VISIBILITY, Qt::Unchecked);
+  molItem->setText(ATOMCOUNT, QString::number(_mol->getAtomCount()));
+  molItem->setText(FORMULA, QString(_molecule_formula.c_str()));
+  const int index = _mol->getId();
+  molItem->setData(0, Qt::UserRole, QVariant(index));
+  molItem->setSelected(World::getInstance().isSelected(_mol));
+}
+
+void QtMoleculeList::addItem(const molecule *_mol)
+{
+  if (changing)
+    return;
+  changing = true;
+  // find group if already in list
+  QTreeWidgetItem *groupItem = NULL;
+
+  const std::string &molecule_formula = _mol->getFormula().toString();
+  FormulaTreeItemMap_t::const_iterator formulaiter =
+      formula.find(molecule_formula);
+
+  // new molecule type -> create new group
+  if (formulaiter == formula.end()){
+    // insert new formula entry into visibility
+#ifndef NDEBUG
+    std::pair< FormulaVisibilityCountMap_t::iterator, bool> visibilityinserter =
+#endif
+        FormulaVisibilityCountMap.insert(
+            std::make_pair( molecule_formula, (unsigned int)0) );
+    ASSERT( visibilityinserter.second,
+        "QtMoleculeList::refill() - molecule with formula "
+        +molecule_formula+" already in FormulaVisibilityCountMap.");
+
+    // create item and place into Map with formula as key
+    addGroupItem(groupItem, molecule_formula);
+  } else {
+    groupItem = formulaiter->second;
+  }
+  ASSERT( groupItem != NULL,
+      "QtMoleculeList::addItem() - item with id "+toString(_mol->getId())
+      +" has not parent?");
+
+  // add molecule
+  addMoleculeItem(groupItem, _mol, molecule_formula);
+
+  // increase group occurrence
+  int count = groupItem->text(OCCURRENCE).toInt() + 1;
+  groupItem->setText(OCCURRENCE, QString::number(count));
+
+  changing = false;
+}
+
+void QtMoleculeList::removeItem(const molecule *_mol)
+{
+  if (changing)
+    return;
+  changing = true;
+
+  dirty = true;
+  // TODO: We have to get some Model into the Table in order to "find" items right
+  // away
+//  QTreeWidgetItem *molItem = itemFromIndex(mol->getId());
+//  delete molItem1;
+
+  changing = false;
+}
 
 void QtMoleculeList::refill() {
@@ -117 +230 @@
       iter++) {
 
-    // find group if already in list
-    QTreeWidgetItem *groupItem = NULL;
-    const std::string &molecule_formula = (*iter)->getFormula().toString();
-    FormulaTreeItemMap_t::const_iterator formulaiter =
-        formula.find(molecule_formula);
-
-    // new molecule type -> create new group
-    if (formulaiter == formula.end()){
-      // insert new formula entry into visibility
-#ifndef NDEBUG
-      std::pair< FormulaVisibilityCountMap_t::iterator, bool> visibilityinserter =
-#endif
-          FormulaVisibilityCountMap.insert(
-              std::make_pair( molecule_formula, (unsigned int)0) );
-      ASSERT( visibilityinserter.second,
-          "QtMoleculeList::refill() - molecule with formula "
-          +molecule_formula+" already in FormulaVisibilityCountMap.");
-
-      // create item and place into Map with formula as key
-      groupItem = new QTreeWidgetItem(this);
-      formula.insert( std::make_pair(molecule_formula, groupItem) );
-      // fill item
-      groupItem->setText(NAME, QString("default"));
-      groupItem->setFlags((groupItem->flags() | Qt::ItemIsUserCheckable) ^ Qt::ItemIsSelectable);
-      groupItem->setCheckState(VISIBILITY, Qt::Unchecked);
-      groupItem->setText(ATOMCOUNT, QString::number(0));
-      groupItem->setText(FORMULA, QString(""));
-      groupItem->setText(OCCURRENCE, "0");
-      groupItem->setData(0, Qt::UserRole, QVariant(-1));
-    } else {
-      groupItem = formulaiter->second;
-    }
-
-    // add molecule
-    QTreeWidgetItem *molItem = new QTreeWidgetItem(groupItem);
-    molItem->setText(NAME, QString((*iter)->getName().c_str()));
-    molItem->setFlags(molItem->flags() | Qt::ItemIsUserCheckable | Qt::ItemIsSelectable);
-    molItem->setCheckState(VISIBILITY, Qt::Unchecked);
-    molItem->setText(ATOMCOUNT, QString::number((*iter)->getAtomCount()));
-    molItem->setText(FORMULA, QString(molecule_formula.c_str()));
-    const int index = (*iter)->getId();
-    molItem->setData(0, Qt::UserRole, QVariant(index));
-    molItem->setSelected(World::getInstance().isSelected(*iter));
-
-    // increase group occurrence
-    int count = groupItem->text(OCCURRENCE).toInt() + 1;
-    groupItem->setText(OCCURRENCE, QString::number(count));
+    addItem(*iter);
   }
   dirty = false;
@@ -181 +248 @@
 void QtMoleculeList::visibilityChanged(QTreeWidgetItem* item, int column)
 {
-  if ((!clearing) && (!ChangingChildrensVisibility))
+  if ((!changing) && (!clearing) && (!ChangingChildrensVisibility))
     if (column == VISIBILITY) {
       const moleculeId_t molid = item->data(0, Qt::UserRole).toInt();
       const bool visible = item->checkState(VISIBILITY);
       if (molid != (unsigned int)-1) { // molecule item
-        const molecule * const _molecule =
-            World::getInstance().getMolecule(MoleculeById(molid));
+        World::MoleculeConstIterator moliter =
+            const_cast<const World &>(World::getInstance()).getMoleculeIter(MoleculeById(molid));
+        const molecule * const _molecule = *moliter;
         ASSERT( _molecule != NULL,
             "QtMoleculeList::visibilityChanged() - molecule with id "

src/UIElements/Views/Qt4/QtMoleculeList.hpp

@@ -60 +60 @@
   bool clearing;
   bool selecting;
+  bool changing;
   bool ChangingChildrensVisibility;
+
+  void addItem(const molecule *_mol);
+  void addGroupItem(QTreeWidgetItem *&_groupItem, const std::string &_molecule_formula);
+  void addMoleculeItem(QTreeWidgetItem *&_groupItem, const molecule *_mol, const std::string &molecule_formula);
+  void removeItem(const molecule *_mol);
 
   typedef std::map<std::string, unsigned int> FormulaVisibilityCountMap_t;