Changeset 015f8c for src/UIElements/Views/Qt4/Qt3D/GLWorldScene.cpp

Timestamp:

Aug 5, 2015, 5:32:11 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:

a39d72

Parents:

e5a477

git-author:

Frederik Heber <heber@…> (07/19/15 07:08:38)

git-committer:

Frederik Heber <heber@…> (08/05/15 17:32:11)

Message:

QtMainWindow uses QtSelectionChangedAgent.

• QtMoleculeListView and GLWorldView receive its signals. The latter passes it on to GLWorldScene.
• QtMoleculeList has new MoleculeIdToIndex to allow QtMoleculeListView to (un)select specific rows on a given index.
• GLWorldScene passes atom and molecule selection to GLMoleculeObject_molecule.
• GLMoleculeObject_molecule passes atom selection to respective GLMoleculeObject_atom.

File:

• src/UIElements/Views/Qt4/Qt3D/GLWorldScene.cpp (modified) (3 diffs)

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

@@ -43 +43 @@
 #include <Qt3D/qglcylinder.h>
 
-#include "GLMoleculeObject.hpp"
-#include "GLMoleculeObject_atom.hpp"
-#include "GLMoleculeObject_bond.hpp"
-#include "GLMoleculeObject_molecule.hpp"
-#include "GLMoleculeObject_shape.hpp"
+#include "UIElements/Views/Qt4/Qt3D/GLMoleculeObject.hpp"
+#include "UIElements/Views/Qt4/Qt3D/GLMoleculeObject_atom.hpp"
+#include "UIElements/Views/Qt4/Qt3D/GLMoleculeObject_bond.hpp"
+#include "UIElements/Views/Qt4/Qt3D/GLMoleculeObject_molecule.hpp"
+#include "UIElements/Views/Qt4/Qt3D/GLMoleculeObject_shape.hpp"
+
+#include "UIElements/Views/Qt4/QtSelectionChangedAgent.hpp"
 
 #include "CodePatterns/MemDebug.hpp"
@@ -417 +419 @@
 }
 
+void GLWorldScene::setSelectionChangedAgent(QtSelectionChangedAgent *agent)
+{
+  connect(agent, SIGNAL(atomSelected(const moleculeId_t, const atomId_t)),
+      this, SLOT(AtomSelected(const moleculeId_t, const atomId_t)));
+  connect(agent, SIGNAL(atomUnselected(const moleculeId_t, const atomId_t)),
+      this, SLOT(AtomUnselected(const moleculeId_t, const atomId_t)));
+
+  connect(agent, SIGNAL(moleculeSelected(const moleculeId_t)),
+      this, SLOT(MoleculeSelected(const moleculeId_t)));
+  connect(agent, SIGNAL(moleculeUnselected(const moleculeId_t)),
+      this, SLOT(MoleculeUnselected(const moleculeId_t)));
+}
+
 void GLWorldScene::setSelectionModeAtom()
 {
@@ -463 +478 @@
   }
 }
+
+void GLWorldScene::AtomSelected(const moleculeId_t _molid, const atomId_t _id)
+{
+  MoleculeNodeMap::iterator iter = MoleculesinSceneMap.find(_molid);
+  ASSERT( iter != MoleculesinSceneMap.end(),
+      "GLWorldScene::AtomSelected() - molecule "+toString(_molid)
+      +" unknown to GLWorldScene.");
+  QMetaObject::invokeMethod(iter->second,        // pointer to a QObject
+                            "AtomSelected",       // member name (no parameters here)
+                            Qt::QueuedConnection,     // connection type
+                            Q_ARG(const atomId_t, _id));     // parameters
+}
+
+void GLWorldScene::AtomUnselected(const moleculeId_t _molid, const atomId_t _id)
+{
+  MoleculeNodeMap::iterator iter = MoleculesinSceneMap.find(_molid);
+  ASSERT( iter != MoleculesinSceneMap.end(),
+      "GLWorldScene::AtomUnselected() - molecule "+toString(_molid)
+      +" unknown to GLWorldScene.");
+  QMetaObject::invokeMethod(iter->second,        // pointer to a QObject
+                            "AtomUnselected",       // member name (no parameters here)
+                            Qt::QueuedConnection,     // connection type
+                            Q_ARG(const atomId_t, _id));     // parameters
+}
+
+void GLWorldScene::MoleculeSelected(const moleculeId_t _molid)
+{
+  MoleculeNodeMap::iterator iter = MoleculesinSceneMap.find(_molid);
+  ASSERT( iter != MoleculesinSceneMap.end(),
+      "GLWorldScene::MoleculeSelected() - molecule "+toString(_molid)
+      +" unknown to GLWorldScene.");
+  QMetaObject::invokeMethod(iter->second,        // pointer to a QObject
+                            "Selected",       // member name (no parameters here)
+                            Qt::QueuedConnection);     // connection type
+}
+
+void GLWorldScene::MoleculeUnselected(const moleculeId_t _molid)
+{
+  MoleculeNodeMap::iterator iter = MoleculesinSceneMap.find(_molid);
+  ASSERT( iter != MoleculesinSceneMap.end(),
+      "GLWorldScene::MoleculeUnselected() - molecule "+toString(_molid)
+      +" unknown to GLWorldScene.");
+  QMetaObject::invokeMethod(iter->second,        // pointer to a QObject
+                            "Unselected",       // member name (no parameters here)
+                            Qt::QueuedConnection);     // connection type
+}