Changeset 7d0ddb 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:

ea73ce

Parents:

9d4f964

git-author:

Frederik Heber <heber@…> (06/17/15 22:06:29)

git-committer:

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

Message:

FIX: QtMoleculeItem would not correctly signOff prior to molecule being destroyed.

• all QtMoleculeItems signOn to molecule::AboutToBeRemoved.
• getMolecule() may return NULL, is caught at two places.
• getMoleculeId() for allowing QtMoleculeList to acess molid.

Location:

src/UIElements/Views/Qt4/MoleculeList

Files:

• QtMoleculeItem.cpp (modified) (1 diff)
• QtMoleculeItem.hpp (modified) (1 diff)
• QtMoleculeItemFactory.cpp (modified) (1 diff)
• QtMoleculeList.cpp (modified) (17 diffs)
• QtMoleculeList.hpp (modified) (2 diffs)

src/UIElements/Views/Qt4/MoleculeList/QtMoleculeItem.cpp

@@ -143 +143 @@
 {
   const molecule * const mol = const_cast<const World &>(World::getInstance()).getMolecule(MoleculeById(molid));
-  ASSERT (mol != NULL,
-      "QtMoleculeItem::getMolecule() - mol with "+toString(molid)+" is gone.");
+//  ASSERT (mol != NULL,
+//      "QtMoleculeItem::getMolecule() - mol with "+toString(molid)+" is gone.");
   return mol;
 }

src/UIElements/Views/Qt4/MoleculeList/QtMoleculeItem.hpp

@@ -69 +69 @@
   const molecule * const getMolecule() const;
 
+  /** Getter for the id of the molecule this item is associated to
+   *
+   * \return id of molecule
+   */
+  moleculeId_t getMoleculeId() const
+  { return molid; }
+
 private:
   void update(Observable *publisher);

src/UIElements/Views/Qt4/MoleculeList/QtMoleculeItemFactory.cpp

@@ -72 +72 @@
   // fill all the static channels lists
   const_cast<QtMoleculeItem::channellist_t &>(
-      QtMoleculeItem_name::channellist_name) +=
-          molecule::MoleculeNameChanged;
-  const_cast<QtMoleculeItem::channellist_t &>(
       QtMoleculeItem_atomcount::channellist_atomcount) +=
+          molecule::AboutToBeRemoved,
           molecule::AtomInserted,
           molecule::AtomRemoved;
   const_cast<QtMoleculeItem::channellist_t &>(
       QtMoleculeItem_formula::channellist_formula) +=
+          molecule::AboutToBeRemoved,
           molecule::FormulaChanged;
+  const_cast<QtMoleculeItem::channellist_t &>(
+      QtMoleculeItem_name::channellist_name) +=
+          molecule::AboutToBeRemoved,
+          molecule::MoleculeNameChanged;
+  const_cast<QtMoleculeItem::channellist_t &>(
+      QtMoleculeItem_occurrence::channellist_occurrence) +=
+          molecule::AboutToBeRemoved;
+  const_cast<QtMoleculeItem::channellist_t &>(
+      QtMoleculeItem_visibility::channellist_visibility) +=
+          molecule::AboutToBeRemoved;
 }
 

src/UIElements/Views/Qt4/MoleculeList/QtMoleculeList.cpp

@@ -61 +61 @@
 QtMoleculeList::QtMoleculeList() :
   Observer("QtMoleculeList"),
-  changing(false),
   ChangingChildrensVisibility(false),
-  list_accessing(false),
   update_timer(NULL),
   callback_DirtyItems(boost::bind(&QtMoleculeList::informDirtyState, this, _1, _2))
@@ -138 +136 @@
       {
         const molecule * const mol = World::getInstance().lastChanged<molecule>();
-        while(list_accessing);
-        list_accessing = true;
+        listAccessing_mutex.lock();
         newItems.push_back( mol );
-        list_accessing = false;
+        listAccessing_mutex.unlock();
         break;
       }
@@ -148 +145 @@
         const molecule * const mol = World::getInstance().lastChanged<molecule>();
 
-        while(list_accessing);
-        list_accessing = true;
+        listAccessing_mutex.lock();
         toBeRemovedItems.push_back( mol ); // remove in any case, as we also got insert
-        list_accessing = false;
+        listAccessing_mutex.unlock();
 
         const QtMoleculeItem *mol_item = MoleculeIdToItem(mol->getId());
@@ -186 +182 @@
     QStandardItem *_groupitem)
 {
-  while (list_accessing);
-  list_accessing = true;
+  listAccessing_mutex.lock();
   toBeSetOccurrenceItems.insert( _groupitem );
-  list_accessing = false;
+  listAccessing_mutex.unlock();
 }
 
@@ -271 +266 @@
     update_timer->stop();
 
-  changing = true;
+  refill_mutex.lock();
 
   const std::vector<const molecule*> &molecules =
@@ -294 +289 @@
     addMolecule(*iter);
 
-  changing = false;
+  refill_mutex.unlock();
 
   // activate timer
@@ -303 +298 @@
 {
   // get whether any items are dirty
-  while (list_accessing);
-  list_accessing = true;
+  listAccessing_mutex.lock();
   bool dirty = false;
   dirty |= !dirtyItems.empty();
@@ -312 +306 @@
   dirty |= !toBeSetOccurrenceItems.empty();
   dirty |= !toBeSetVisibilityItems.empty();
-  list_accessing = false;
+  listAccessing_mutex.unlock();
   return dirty;
 }
@@ -333 +327 @@
   if (_item->index().column() == QtMoleculeItemFactory::VISIBILITY) {
 //    qDebug() << "visibilityItem changed: " << (_item->checkState() ? "checked" : "unchecked");
-    while(list_accessing);
-    list_accessing = true;
+    listAccessing_mutex.lock();
     if ((_item->parent() == NULL) || (_item->parent() == invisibleRootItem()))
       toBeSetVisibilityItems.insert( _item );
     else
       visibilityItems.insert( dynamic_cast<QtMoleculeItem *>(_item) );
-    list_accessing = false;
+    listAccessing_mutex.unlock();
   }
 }
@@ -349 +342 @@
 
   const bool visible = _item->checkState();
-  const std::string &molecule_formula = _item->getMolecule()->getFormula().toString();
-  ASSERT( FormulaVisibilityCountMap.count(molecule_formula) != 0,
-      "QtMoleculeList::setVisibilityForMoleculeItem() - molecule with formula " +molecule_formula
-      +" is not present in FormulaVisibilityCountMap.");
+  const molecule * const mol = _item->getMolecule();
+  std::string molecule_formula;
+  if (mol != NULL) {
+    molecule_formula = mol->getFormula().toString();
+    ASSERT( FormulaVisibilityCountMap.count(molecule_formula) != 0,
+        "QtMoleculeList::setVisibilityForMoleculeItem() - molecule with formula " +molecule_formula
+        +" is not present in FormulaVisibilityCountMap.");
+  }
 
   // get parent
@@ -360 +357 @@
   ASSERT( groupItem != NULL,
       "QtMoleculeList::setVisibilityForMoleculeItem() - item with id "
-      +toString(_item->getMolecule()->getId())+" has not parent?");
+      +toString(_item->getMoleculeId())+" has not parent?");
   // check whether we have to set the group item
 
@@ -469 +466 @@
     addToBeSetOccurrence(groupitem);
   // ..  and re-add where new formula fits
-  const std::string molecule_formula = _molitem->getMolecule()->getFormula().toString();
-  FormulaTreeItemMap_t::iterator iter = formula.find(molecule_formula);
-  if (iter == formula.end()) {
-    // add new group item and formula entry
-     addGroupItem(groupitem, molecule_formula);
-  } else {
-    groupitem = iter->second;
-  }
-  ASSERT( groupitem != NULL,
-      "QtMoleculeList::readdItem() - failed to create a sensible new groupitem");
-  // finally add again
-  groupitem->appendRow(mol_row);
+  const molecule * const mol = _molitem->getMolecule();
+  std::string molecule_formula;
+  if (mol != NULL) {
+    molecule_formula = mol->getFormula().toString();
+    FormulaTreeItemMap_t::iterator iter = formula.find(molecule_formula);
+    if (iter == formula.end()) {
+      // add new group item and formula entry
+       addGroupItem(groupitem, molecule_formula);
+    } else {
+      groupitem = iter->second;
+    }
+    ASSERT( groupitem != NULL,
+        "QtMoleculeList::readdItem() - failed to create a sensible new groupitem");
+    // finally add again
+    groupitem->appendRow(mol_row);
+  }
   // call setOccurrence on the new group later
   addToBeSetOccurrence(groupitem);
@@ -489 +490 @@
     const QtMoleculeItem::MoveTypes _type)
 {
-  while (list_accessing);
-  list_accessing = true;
-
+  refill_mutex.lock();
+
+  listAccessing_mutex.lock();
   dirtyItems.insert(_item);
+  listAccessing_mutex.unlock();
   if (_type == QtMoleculeItem::NeedsMove) {
     // we have to convert whatever item raised the dirty signal to the first
@@ -500 +502 @@
     QtMoleculeItem *mol_item =
         dynamic_cast<QtMoleculeItem *>(group_item->child(_item->row(), 0));
+    listAccessing_mutex.lock();
     toBeMovedItems.insert(mol_item);
+    listAccessing_mutex.unlock();
 //    // add group item, too
 //    toBeSetOccurrenceItems.insert(group_item);
   }
 
-  list_accessing = false;
+  refill_mutex.unlock();
 }
 
@@ -511 +515 @@
 {
   // wait till initial refill has been executed
-  if (changing)
-    return;
-
-  changing = true;
+  refill_mutex.lock();
 
   /// copy lists such that new signals for dirty/.. may come in right away
   // TODO: if we had move semantics ...
-  while (list_accessing);
-  list_accessing = true;
+  listAccessing_mutex.lock();
   list_of_items_t dirtyItems_copy = dirtyItems;
   dirtyItems.clear();
@@ -534 +534 @@
   std::set<QStandardItem*> toBeSetVisibilityItems_copy = toBeSetVisibilityItems;
   toBeSetVisibilityItems.clear();
-  list_accessing = false;
+  listAccessing_mutex.unlock();
 
   /// first check consistency among the sets:
@@ -667 +667 @@
 
   // and done
-  changing = false;
-}
+  refill_mutex.unlock();
+}

src/UIElements/Views/Qt4/MoleculeList/QtMoleculeList.hpp

@@ -17 +17 @@
 #include <QtGui/QStandardItem>
 #include <QtGui/QStandardItemModel>
+#include <QMutex>
 #include <QTimer>
 
@@ -69 +70 @@
 private:
 
-  bool changing;
   bool ChangingChildrensVisibility;
-  bool list_accessing;
+
+  QMutex listAccessing_mutex;
+  QMutex refill_mutex;
 
   //!> informs the view in regular intervals about updates