Changeset 2b596f for src/UIElements/Views/Qt4/QtInfoBox.cpp

Timestamp:

Jan 10, 2015, 5:14:32 PM (10 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:

9a7ef9

Parents:

7b5984

git-author:

Frederik Heber <heber@…> (11/12/14 22:26:05)

git-committer:

Frederik Heber <heber@…> (01/10/15 17:14:32)

Message:

Hovering over molecules is working including update of QtInfoBox.

• SelectionBox is drawn again when molecule is fully shown.

File:

• src/UIElements/Views/Qt4/QtInfoBox.cpp (modified) (5 diffs)

src/UIElements/Views/Qt4/QtInfoBox.cpp

@@ -50 +50 @@
     QTabWidget(),
     curAtom(NULL), nextAtom(NULL),
+    curMolecule(NULL), nextMolecule(NULL),
     page_mol(NULL), page_atom(NULL)
 {
@@ -67 +68 @@
 }
 
-void QtInfoBox::atomHover(const atom *_atom)
-{
-  nextAtom = _atom;
+void QtInfoBox::atomHover(const atom &_atom)
+{
+  nextAtom = &_atom;
+  timer->start(500);
+}
+
+void QtInfoBox::moleculeHover(const molecule &_mol)
+{
+  nextMolecule = &_mol;
   timer->start(500);
 }
@@ -77 +84 @@
   if (nextAtom)
     showAtom(nextAtom);
+  if (nextMolecule)
+    showMolecule(nextMolecule);
 }
 
@@ -101 +110 @@
 
   curAtom = _atom;
+  nextAtom = NULL;
+  nextMolecule = NULL;
 
   // Show new tabs.
@@ -116 +127 @@
         setCurrentIndex(currentPage);
     }
+  }
+}
+
+void QtInfoBox::showMolecule(const molecule *_mol)
+{
+  currentPage = currentIndex();
+
+  // Remove old tabs.
+  clearTabs();
+
+  curMolecule = _mol;
+  nextAtom = NULL;
+  nextMolecule = NULL;
+
+  // Show new tabs.
+  if (curMolecule){
+    page_mol = new QtMoleculeInfoPage(curMolecule, this);
+    addTab(page_mol, "Molecule");
+    connect(page_mol, SIGNAL(moleculeKilled()), this, SLOT(clearTabs()));
+
+    if (currentPage > 0)
+      setCurrentIndex(currentPage);
   }
 }