Changeset 407638e for src/UIElements/Views/Qt4

Timestamp:

Jul 17, 2012, 12:17:27 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:

7b6bcfe

Parents:

859a00

git-author:

Michael Ankele <ankele@…> (06/18/12 13:33:33)

git-committer:

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

Message:

GL: Qt signals rewired

• GLWorldView now tells us, over which atom the mouse is hovering

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLMoleculeObject.cpp (modified) (1 diff)
• GLMoleculeObject.hpp (modified) (1 diff)
• GLWorldScene.cpp (modified) (3 diffs)
• GLWorldScene.hpp (modified) (3 diffs)
• GLWorldView.cpp (modified) (2 diffs)
• GLWorldView.hpp (modified) (2 diffs)

src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject.cpp

@@ -189 +189 @@
    } else if (e->type() == QEvent::Enter) {
        m_hovering = true;
-       emit hoverChanged();
+       emit hoverChanged(this);
    } else if (e->type() == QEvent::Leave) {
        m_hovering = false;
-       emit hoverChanged();
+       emit hoverChanged(NULL);
    }
    return QObject::event(e);

src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject.hpp

@@ -78 +78 @@
    void clicked();
    void doubleClicked();
-   void hoverChanged();
+   void hoverChanged(GLMoleculeObject *ob);
    void selectionChanged();
    void changed();

src/UIElements/Views/Qt4/Qt3D/GLWorldScene.cpp

@@ -58 +58 @@
 
 GLWorldScene::GLWorldScene(QObject *parent)
-   : QObject(parent)
+   : QObject(parent),
+     hoverAtom(NULL)
 {
   QGLBuilder builder0;
@@ -138 +139 @@
   connect (atomObject, SIGNAL(clicked(atomId_t)), this, SLOT(atomClicked(atomId_t)));
   connect (atomObject, SIGNAL(changed()), this, SIGNAL(changed()));
-  connect (atomObject, SIGNAL(hoverChanged()), this, SIGNAL(changed()));
+  connect (atomObject, SIGNAL(hoverChanged(GLMoleculeObject *)), this, SIGNAL(changed()));
+  connect (atomObject, SIGNAL(hoverChanged(GLMoleculeObject *)), this, SLOT(hoverChangedSignalled(GLMoleculeObject *)));
   connect (atomObject, SIGNAL(selectionChanged()), this, SIGNAL(changed()));
   connect (atomObject, SIGNAL(BondsInserted(const bond *, const GLMoleculeObject_bond::SideOfBond)), this, SLOT(bondInserted(const bond *, const GLMoleculeObject_bond::SideOfBond)));
@@ -338 +340 @@
 }
 
+void GLWorldScene::hoverChangedSignalled(GLMoleculeObject *ob)
+{
+  // Find the atom, ob corresponds to.
+  hoverAtom = NULL;
+  GLMoleculeObject_atom *atomObject = dynamic_cast<GLMoleculeObject_atom *>(ob);
+  if (atomObject){
+    for (AtomNodeMap::iterator iter = AtomsinSceneMap.begin();iter != AtomsinSceneMap.end(); ++ iter){
+      if (iter->second == atomObject)
+        hoverAtom = World::getInstance().getAtom(AtomById(iter->first));
+    }
+  }
+
+  // Propagate signal.
+  emit hoverChanged(hoverAtom);
+}
+

src/UIElements/Views/Qt4/Qt3D/GLWorldScene.hpp

@@ -71 +71 @@
   void clicked(atomId_t);
   void doubleClicked();
-  void hoverChanged();
+  void hoverChanged(const atom*);
 
 private slots:
@@ -83 +83 @@
   void setSelectionModeAtom();
   void setSelectionModeMolecule();
+  void hoverChangedSignalled(GLMoleculeObject *ob);
 
 private:
@@ -105 +106 @@
 
   SelectionModeType selectionMode;
+  const atom *hoverAtom;
 };
 

src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp

@@ -57 +57 @@
   connect(worldscene, SIGNAL(changeOccured()), this, SLOT(changeSignalled()));
   connect(worldscene, SIGNAL(changed()), this, SIGNAL(changed()));
+  connect(worldscene, SIGNAL(hoverChanged(const atom *)), this, SLOT(sceneHoverSignalled(const atom *)));
   connect(this, SIGNAL(atomInserted(const atom *)), worldscene, SLOT(atomInserted(const atom *)));
   connect(this, SIGNAL(atomRemoved(const atom *)), worldscene, SLOT(atomRemoved(const atom *)));
@@ -526 +527 @@
 }
 
+void GLWorldView::sceneHoverSignalled(const atom *_atom)
+{
+  emit hoverChanged(_atom);
+}
+
 
 //#include <GL/glu.h>

src/UIElements/Views/Qt4/Qt3D/GLWorldView.hpp

@@ -51 +51 @@
   void checkChanges();
   void sceneChangeSignalled();
+  void sceneHoverSignalled(const atom *_atom);
 
 signals:
@@ -59 +60 @@
   void moleculeRemoved(const molecule *_molecule);
   void worldSelectionChanged();
+  void hoverChanged(const atom *_atom);
 
 protected: