Changeset be374a

Timestamp:

Jul 17, 2012, 12:17:28 PM (13 years ago)

Author:

Michael Ankele <ankele@…>

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:

c736fe

Parents:

7772aa

git-author:

Michael Ankele <ankele@…> (06/29/12 15:25:34)

git-committer:

Michael Ankele <ankele@…> (07/17/12 12:17:28)

Message:

Fix: QtMoleculeView must not signOff after subjectKilled

Location:

src/UIElements/Views/Qt4

Files:

• QtMoleculeView.cpp (modified) (6 diffs)
• QtMoleculeView.hpp (modified) (3 diffs)

src/UIElements/Views/Qt4/QtMoleculeView.cpp

@@ -44 +44 @@
 
 QtMoleculeView::~QtMoleculeView()
-{}
+{
+  clearTabs();
+}
 
 void QtMoleculeView::nameChanged(QTMoleculePage *page, std::string name){}
@@ -60 +62 @@
 }
 
-void QtMoleculeView::showAtom(const atom *_atom)
+void QtMoleculeView::clearTabs()
 {
-  curAtom = _atom;
-
-  // Remove old tabs.
   if (page_atom){
-    removeTab(indexOf(page_atom));
+    //removeTab(indexOf(page_atom));
     delete(page_atom);
     page_atom = NULL;
   }
   if (page_mol){
-    removeTab(indexOf(page_mol));
+    //removeTab(indexOf(page_mol));
     delete(page_mol);
     page_mol = NULL;
   }
+}
 
+void QtMoleculeView::showAtom(const atom *_atom)
+{
+  // Remove old tabs.
+  clearTabs();
+
+  curAtom = _atom;
 
   // Show new tabs.
@@ -81 +87 @@
     page_atom = new QTAtomPage(curAtom);
     addTab(page_atom, "Atom");
+    connect(page_atom, SIGNAL(atomKilled()), this, SLOT(clearTabs()));
 
     if (curAtom->getMolecule()){
       page_mol = new QTMoleculePage(curAtom->getMolecule());
       addTab(page_mol, "Molecule");
+      connect(page_mol, SIGNAL(moleculeKilled()), this, SLOT(clearTabs()));
     }
   }
@@ -120 +128 @@
 QTAtomPage::~QTAtomPage()
 {
-  atomRef->signOff(this);
+  if (atomRef)
+    atomRef->signOff(this);
 }
 
@@ -130 +139 @@
 }
 
-void QTAtomPage::subjectKilled(Observable *subject){}
+void QTAtomPage::subjectKilled(Observable *subject){
+  atomRef = NULL;
+  emit atomKilled();
+}
 
 /************************ Tab for single Molecules *****************/
@@ -154 +166 @@
 
 QTMoleculePage::~QTMoleculePage(){
-  mol->signOff(this);
+  if (mol)
+    mol->signOff(this);
 }
 
-void QTMoleculePage::update(Observable *subject){
+void QTMoleculePage::update(Observable *subject){  std::cout << "tab mol update\n";
 }
 
-void QTMoleculePage::subjectKilled(Observable *subject){}
+void QTMoleculePage::subjectKilled(Observable *subject){
+  mol = NULL;
+  emit moleculeKilled();
+}

src/UIElements/Views/Qt4/QtMoleculeView.hpp

@@ -42 +42 @@
 
   void nameChanged(QTMoleculePage *page, std::string name);
+  void clearTabs();
 
 private:
@@ -63 +64 @@
   void subjectKilled(Observable *subject);
 
+signals:
+  void atomKilled();
+
 private:
   const atom *atomRef;
@@ -80 +84 @@
   void subjectKilled(Observable *subject);
 
+  signals:
+    void moleculeKilled();
+
 private:
   const molecule *mol;