Changeset 50246c for src/UIElements

Timestamp:

Apr 20, 2016, 11:07:47 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:

498c678

Parents:

691533

git-author:

Frederik Heber <heber@…> (04/12/16 14:32:13)

git-committer:

Frederik Heber <heber@…> (04/20/16 23:07:47)

Message:

FIX: made disconnect() check for NULL pointers.

Location:

src/UIElements/Views/Qt4

Files:

• ElementList/QtObservedAtomObserver.cpp (modified) (1 diff)
• MoleculeList/QtObservedMoleculeObserver.cpp (modified) (1 diff)
• Plotting/QSeisPlotPage.cpp (modified) (1 diff)
• QtInfoBox.cpp (modified) (2 diffs)

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

@@ -66 +66 @@
 {
   const QtObservedAtom::ptr walker = board->getObservedAtom(_index);
-  disconnect( walker.get(), SIGNAL(elementChanged()), this, SLOT(elementChanged()));
+  if (walker)
+    disconnect( walker.get(), SIGNAL(elementChanged()), this, SLOT(elementChanged()));
   emit AtomRemoved(_index);
 }

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

@@ -63 +63 @@
 {
   const QtObservedMolecule::ptr mol = board->getObservedMolecule(_index);
-  disconnect( mol.get(), SIGNAL(atomcountChanged()), this, SLOT(atomcountChanged()));
-  disconnect( mol.get(), SIGNAL(formulaChanged()), this, SLOT(formulaChanged()));
-  disconnect( mol.get(), SIGNAL(nameChanged()), this, SLOT(nameChanged()));
-  disconnect( mol.get(), SIGNAL(selectedChanged()), this, SLOT(selectionChanged()));
+  if (mol) {
+    disconnect( mol.get(), SIGNAL(atomcountChanged()), this, SLOT(atomcountChanged()));
+    disconnect( mol.get(), SIGNAL(formulaChanged()), this, SLOT(formulaChanged()));
+    disconnect( mol.get(), SIGNAL(nameChanged()), this, SLOT(nameChanged()));
+    disconnect( mol.get(), SIGNAL(selectedChanged()), this, SLOT(selectionChanged()));
+  }
   emit MoleculeRemoved(_index);
 }

src/UIElements/Views/Qt4/Plotting/QSeisPlotPage.cpp

@@ -57 +57 @@
 void QSeisPlotPage::deinitializeLayout()
 {
+  if (curveList != NULL) {
     disconnect(curveList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(listItemChanged(QListWidgetItem*)));
     layout->removeWidget(curveList);
-    layout->removeWidget(plot);
-    delete curveList;
-    delete plot;
-    layoutInitialized = false;
+  }
+  layout->removeWidget(plot);
+  delete curveList;
+  delete plot;
+  layoutInitialized = false;
 }
 

src/UIElements/Views/Qt4/QtInfoBox.cpp

@@ -100 +100 @@
   boost::recursive_mutex::scoped_lock lock(tabs_mutex);
   if (page_atom){
-    disconnect(page_atom->getAtom().get(), SIGNAL(atomRemoved()), this, SLOT(clearAtomTab()));
+    if (page_atom->getAtom())
+      disconnect(page_atom->getAtom().get(), SIGNAL(atomRemoved()), this, SLOT(clearAtomTab()));
     //removeTab(indexOf(page_atom));
     delete(page_atom);
@@ -111 +112 @@
   boost::recursive_mutex::scoped_lock lock(tabs_mutex);
   if (page_mol){
-    disconnect(page_mol->getMolecule().get(), SIGNAL(moleculeRemoved()), this, SLOT(clearMoleculeTab()));
+    if (page_mol->getMolecule())
+      disconnect(page_mol->getMolecule().get(), SIGNAL(moleculeRemoved()), this, SLOT(clearMoleculeTab()));
     //removeTab(indexOf(page_mol));
     delete(page_mol);