Changeset e7341e for src/UIElements/Views

Timestamp:

Jul 24, 2015, 4:44:35 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:

084304

Parents:

f3b597

git-author:

Frederik Heber <heber@…> (06/02/15 11:23:35)

git-committer:

Frederik Heber <heber@…> (07/24/15 16:44:35)

Message:

FIX: QtInfoBox now works mostly on ids.

• slots are requested as ..Id_t and not as ptrs anymore for some time.

Location:

src/UIElements/Views/Qt4

Files:

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

src/UIElements/Views/Qt4/QtInfoBox.cpp

@@ -40 +40 @@
 #include "CodePatterns/MemDebug.hpp"
 
+#include "Descriptors/AtomIdDescriptor.hpp"
+#include "Descriptors/MoleculeIdDescriptor.hpp"
+
 #include "molecule.hpp"
 #include "Element/element.hpp"
+#include "World.hpp"
 
 using namespace std;
@@ -49 +53 @@
 QtInfoBox::QtInfoBox() :
     QTabWidget(),
-    curAtom(NULL), nextAtom(NULL),
-    curMolecule(NULL), nextMolecule(NULL),
+    curAtomId(-1), nextAtomId(-1),
+    curMoleculeId(-1), nextMoleculeId(-1),
     page_mol(NULL), page_atom(NULL)
 {
@@ -68 +72 @@
 }
 
-void QtInfoBox::atomHover(const atom &_atom)
-{
-  nextAtom = &_atom;
+void QtInfoBox::atomHover(const atomId_t _id)
+{
+  nextAtomId = _id;
   timer->start(500);
 }
 
-void QtInfoBox::moleculeHover(const molecule &_mol)
-{
-  nextMolecule = &_mol;
+void QtInfoBox::moleculeHover(const moleculeId_t _id)
+{
+  nextMoleculeId = _id;
   timer->start(500);
 }
@@ -82 +86 @@
 void QtInfoBox::timerTimeout()
 {
-  if (nextAtom)
-    showAtom(nextAtom);
-  if (nextMolecule)
-    showMolecule(nextMolecule);
+  if (nextAtomId != (atomId_t)-1)
+    showAtom(nextAtomId);
+  if (nextMoleculeId != (moleculeId_t)-1)
+    showMolecule(nextMoleculeId);
 }
 
@@ -102 +106 @@
 }
 
-void QtInfoBox::showAtom(const atom *_atom)
+void QtInfoBox::showAtom(const atomId_t _id)
 {
   currentPage = currentIndex();
@@ -109 +113 @@
   clearTabs();
 
-  curAtom = _atom;
-  nextAtom = NULL;
-  nextMolecule = NULL;
+  const atom *curAtom = const_cast<const World &>(World::getInstance()).
+      getAtom(AtomById(_id));
+  curAtomId = curAtom->getId();
+  nextAtomId = -1;
+  nextMoleculeId = -1;
 
   // Show new tabs.
@@ -130 +136 @@
 }
 
-void QtInfoBox::showMolecule(const molecule *_mol)
+void QtInfoBox::showMolecule(const moleculeId_t _id)
 {
   currentPage = currentIndex();
@@ -137 +143 @@
   clearTabs();
 
-  curMolecule = _mol;
-  nextAtom = NULL;
-  nextMolecule = NULL;
+  const molecule *curMolecule = const_cast<const World &>(World::getInstance()).
+      getMolecule(MoleculeById(_id));
+  nextAtomId = -1;
+  nextMoleculeId = -1;
 
   // Show new tabs.

src/UIElements/Views/Qt4/QtInfoBox.hpp

@@ -19 +19 @@
 #include <QtGui/QTreeWidget>
 #include <QTimer>
+
 #include "CodePatterns/Observer/Observer.hpp"
+
+#include "types.hpp"
 
 class molecule;
@@ -35 +38 @@
   virtual ~QtInfoBox();
 
-  void showAtom(const atom *_atom);
-  void showMolecule(const molecule *_mol);
+  void showAtom(const atomId_t _id);
+  void showMolecule(const moleculeId_t _id);
 
 public slots:
-  void atomHover(const atom &_atom);
-  void moleculeHover(const molecule &_mol);
+  void atomHover(const atomId_t _id);
+  void moleculeHover(const moleculeId_t _id);
   void timerTimeout();
 
@@ -46 +49 @@
 
 private:
-  const atom *curAtom;
-  const atom *nextAtom;
-  const molecule *curMolecule;
-  const molecule *nextMolecule;
+  atomId_t curAtomId;
+  atomId_t nextAtomId;
+  moleculeId_t curMoleculeId;
+  moleculeId_t nextMoleculeId;
   QtMoleculeInfoPage *page_mol;
   QtAtomInfoPage *page_atom;