Changeset cf9287 for src/UIElements

Timestamp:

Feb 14, 2016, 12:33:41 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:

b2c2e4

Parents:

3b9aa1

git-author:

Frederik Heber <heber@…> (10/30/15 14:07:55)

git-committer:

Frederik Heber <heber@…> (02/14/16 12:33:41)

Message:

Equipped QtInfoBox with mutex and split clearTabs().

• this avoids a memory corruption with signal/slots as the first atomRemoved() signal also removes the molecule and hence the QtObservedMolecule ptr who is the recipient of the subsequent moleculeRemoved() signal.

Location:

src/UIElements/Views/Qt4

Files:

• QtInfoBox.cpp (modified) (8 diffs)
• QtInfoBox.hpp (modified) (3 diffs)

src/UIElements/Views/Qt4/QtInfoBox.cpp

@@ -41 +41 @@
 
 #include "UIElements/Qt4/InstanceBoard/QtObservedInstanceBoard.hpp"
+
+#include <boost/thread/locks.hpp>
 
 #include "Element/element.hpp"
@@ -70 +72 @@
 QtInfoBox::~QtInfoBox()
 {
-  clearTabs();
+  clearAtomTab();
+  clearMoleculeTab();
 }
 
@@ -93 +96 @@
 }
 
-void QtInfoBox::clearTabs()
-{
+void QtInfoBox::clearAtomTab()
+{
+  boost::recursive_mutex::scoped_lock lock(tabs_mutex);
   if (page_atom){
     //removeTab(indexOf(page_atom));
@@ -100 +104 @@
     page_atom = NULL;
   }
+}
+
+void QtInfoBox::clearMoleculeTab()
+{
+  boost::recursive_mutex::scoped_lock lock(tabs_mutex);
   if (page_mol){
     //removeTab(indexOf(page_mol));
@@ -112 +121 @@
 
   // Remove old tabs.
-  clearTabs();
+  clearAtomTab();
+  clearMoleculeTab();
 
   QtObservedAtom::ptr curAtom = board->getObservedAtom(_id);
@@ -122 +132 @@
     nextMoleculeId = -1;
 
+    boost::recursive_mutex::scoped_lock lock(tabs_mutex);
     page_atom = new QtAtomInfoPage(curAtom, periode, this);
     addTab(page_atom, "Atom");
-    connect(curAtom.get(), SIGNAL(atomRemoved()), this, SLOT(clearTabs()));
+    connect(curAtom.get(), SIGNAL(atomRemoved()), this, SLOT(clearAtomTab()));
 
     const moleculeId_t molid = curAtom->getAtomMoleculeIndex();
@@ -146 +157 @@
 
   // Remove old tabs.
-  clearTabs();
+  clearAtomTab();
+  clearMoleculeTab();
 
   QtObservedMolecule::ptr curMolecule = board->getObservedMolecule(_id);
@@ -154 +166 @@
   // Show new tabs.
   if (curMolecule){
+    boost::recursive_mutex::scoped_lock lock(tabs_mutex);
     page_mol = new QtMoleculeInfoPage(curMolecule, this);
     addTab(page_mol, "Molecule");
-    connect(curMolecule.get(), SIGNAL(moleculeRemoved()), this, SLOT(clearTabs()));
+    connect(curMolecule.get(), SIGNAL(moleculeRemoved()), this, SLOT(clearMoleculeTab()));
 
     if (currentPage > 0)

src/UIElements/Views/Qt4/QtInfoBox.hpp

@@ -22 +22 @@
 #include "UIElements/Qt4/InstanceBoard/QtObservedAtom.hpp"
 #include "UIElements/Qt4/InstanceBoard/QtObservedMolecule.hpp"
+
+#include <boost/thread/recursive_mutex.hpp>
 
 #include "types.hpp"
@@ -48 +50 @@
   void timerTimeout();
 
-  void clearTabs();
+  void clearAtomTab();
+  void clearMoleculeTab();
 
 private:
@@ -57 +60 @@
   QtMoleculeInfoPage *page_mol;
   QtAtomInfoPage *page_atom;
+
+  mutable boost::recursive_mutex tabs_mutex;
 
   QTimer *timer;