Changeset 4a2f3e for src/UIElements/Views/Qt4

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:

7772aa

Parents:

4f7473

git-author:

Michael Ankele <ankele@…> (06/19/12 13:46:00)

git-committer:

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

Message:

QtMoleculeView using a timer to delay the display after hovering

Location:

src/UIElements/Views/Qt4

Files:

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

src/UIElements/Views/Qt4/QtMoleculeView.cpp

@@ -34 +34 @@
 QtMoleculeView::QtMoleculeView() :
     QTabWidget(),
+    curAtom(NULL), nextAtom(NULL),
     page_mol(NULL), page_atom(NULL)
 {
-  /*allPage = new QTAllMoleculePage();
-  addTab(allPage,QString("All Molecules"));
+  timer = new QTimer(this);
+  timer->setSingleShot(true);
 
-  connect(this,SIGNAL(addMolecule(molecule*)),allPage,SLOT(addMolecule(molecule*)));
-  connect(this,SIGNAL(removeMolecule(molecule*)),allPage,SLOT(removeMolecule(molecule*)));*/
+  connect(timer, SIGNAL(timeout()), this, SLOT(timerTimeout()));
 }
 
@@ -46 +46 @@
 {}
 
-/*void QtMoleculeView::moleculeSelected(molecule *mol){
-  if(!pages.count(mol)){
-    string molName = mol->name;
-    QTMoleculePage *molPage = new QTMoleculePage(mol,molName);
-    addTab(molPage,QString(molName.c_str()));
-    pages[mol] = molPage;
-
-    connect(molPage,SIGNAL(nameChanged(QTMoleculePage*,std::string)),this,SLOT(nameChanged(QTMoleculePage*,std::string)));
-
-    emit addMolecule(mol);
-  }
-}
-
-void QtMoleculeView::moleculeUnSelected(molecule *mol){
-  if(pages.count(mol)){
-    QTMoleculePage *molPage = pages[mol];
-    removeTab(indexOf(molPage));
-    pages.erase(mol);
-    delete molPage;
-    emit removeMolecule(mol);
-  }
-}
-
-void QtMoleculeView::nameChanged(QTMoleculePage *page, std::string name){
-  setTabText(indexOf(page),QString(name.c_str()));
-}*/
-
 void QtMoleculeView::nameChanged(QTMoleculePage *page, std::string name){}
 
 void QtMoleculeView::atomHover(const atom *_atom)
 {
+  nextAtom = _atom;
+  timer->start(500);
+}
+
+void QtMoleculeView::timerTimeout()
+{
+  if (nextAtom)
+    showAtom(nextAtom);
+}
+
+void QtMoleculeView::showAtom(const atom *_atom)
+{
+  curAtom = _atom;
+
   // Remove old tabs.
   if (page_atom){
@@ -91 +78 @@
 
   // Show new tabs.
-  if (_atom){
-    page_atom = new QTAtomPage(_atom);
+  if (curAtom){
+    page_atom = new QTAtomPage(curAtom);
     addTab(page_atom, "Atom");
 
-    page_mol = new QTMoleculePage(_atom->getMolecule());
+    page_mol = new QTMoleculePage(curAtom->getMolecule());
     addTab(page_mol, "Molecule");
   }

src/UIElements/Views/Qt4/QtMoleculeView.hpp

@@ -18 +18 @@
 #include <QtGui/QTabWidget>
 #include <QtGui/QTreeWidget>
+#include <QTimer>
 #include "CodePatterns/Observer/Observer.hpp"
 
@@ -34 +35 @@
   virtual ~QtMoleculeView();
 
+  void showAtom(const atom *_atom);
+
 public slots:
   void atomHover(const atom *_atom);
+  void timerTimeout();
 
   void nameChanged(QTMoleculePage *page, std::string name);
 
 private:
+  const atom *curAtom;
+  const atom *nextAtom;
   QTMoleculePage *page_mol;
   QTAtomPage *page_atom;
+
+  QTimer *timer;
 };