Changeset 15c8a9 for src/UIElements/Views/Qt4/Qt3D/GLWorldScene.cpp

Timestamp:

Feb 12, 2016, 11:15:06 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:

47f0e4

Parents:

026bef

git-author:

Frederik Heber <heber@…> (10/17/15 15:42:17)

git-committer:

Frederik Heber <heber@…> (02/12/16 23:15:06)

Message:

Added QtInstanceInformationBoard that handles ObservedValues through the QtGui interface.

• this is meant as a instantiator of all ObservedValue's needed by QtGui for representing information from the World. The ObservedValue's are instantiated separately w.r.t. to the instance for the visual representation. This is light-weight and can be performed in the same thread, while the visual representation's instantiation can be done elsewhere and there we just need to access the ready ObservedValue's that exist as long as they are needed by the QtGui.

File:

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

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

@@ -49 +49 @@
 #include "UIElements/Views/Qt4/Qt3D/GLMoleculeObject_shape.hpp"
 
+#include "UIElements/Views/Qt4/QtInstanceInformationBoard.hpp"
 #include "UIElements/Views/Qt4/QtSelectionChangedAgent.hpp"
 
@@ -72 +73 @@
 using namespace MoleCuilder;
 
-GLWorldScene::GLWorldScene(QObject *parent) :
-    QObject(parent),
-    selectionMode(SelectAtom)
+GLWorldScene::GLWorldScene(
+    QtInstanceInformationBoard * _board,
+    QObject *parent) :
+  QObject(parent),
+  selectionMode(SelectAtom),
+  board(_board)
 {
   int sphereDetails[] = {5, 3, 2, 0};
@@ -90 +94 @@
     GLMoleculeObject::meshCylinder[i]->setOption(QGLSceneNode::CullBoundingBox, true);
   }
+  connect(board, SIGNAL(moleculeIndexChanged(const moleculeId_t, const moleculeId_t)),
+      this, SLOT(moleculeIndexChanged(const moleculeId_t, const moleculeId_t)));
+  connect(board, SIGNAL(moleculeInserted(const moleculeId_t)),
+      this, SLOT(moleculeInserted(const moleculeId_t)));
+  connect(board, SIGNAL(moleculeRemoved(const moleculeId_t)),
+      this, SLOT(moleculeRemoved(const moleculeId_t)));
+  connect(board, SIGNAL(moleculeIndexChanged(const moleculeId_t, const moleculeId_t)),
+      this, SLOT(moleculeIndexChanged(const moleculeId_t, const moleculeId_t)));
 
 //  connect(this, SIGNAL(updated()), this, SLOT(update()));
@@ -359 +371 @@
 }
 
+void GLWorldScene::moleculeIndexChanged(const moleculeId_t _oldid, const moleculeId_t _newid)
+{
+  MoleculeNodeMap::iterator iter = MoleculesinSceneMap.find(_oldid);
+  if ( iter == MoleculesinSceneMap.end()) {
+    RemovalMolecule_t::iterator removeiter =
+        RemovalMolecules.find(_oldid);
+    ASSERT( removeiter != RemovalMolecules.end(),
+        "GLWorldScene::moleculeIndexChanged() - cannot find id "+toString(_oldid)+" in any map.");
+    RemovalMolecules.erase(removeiter);
+    RemovalMolecules.insert(_newid);
+  } else {
+    LOG(1, "DEBUG: Changing GLMoleculeObject_molecule from " << _oldid << " to id " << _newid);
+    GLMoleculeObject_molecule* molObject = iter->second;
+    MoleculesinSceneMap.erase(iter);
+    MoleculesinSceneMap.insert(
+        std::make_pair( _newid, molObject) );
+  }
+}
+
 void GLWorldScene::moleculesVisibilityChanged(const moleculeId_t _id, bool _visible)
 {
@@ -506 +537 @@
   boost::recursive_mutex::scoped_lock lock(MoleculeinSceneMap_mutex);
   MoleculeNodeMap::iterator iter = MoleculesinSceneMap.find(_molid);
+  // use direct connection as it's lightweight and we avoid index change troubles
   if (iter != MoleculesinSceneMap.end())
     QMetaObject::invokeMethod(iter->second,        // pointer to a QObject
                             "AtomSelected",       // member name (no parameters here)
-                            Qt::QueuedConnection,     // connection type
+                            Qt::DirectConnection,     // connection type
                             Q_ARG(const atomId_t, _id));     // parameters
   else
@@ -520 +552 @@
   boost::recursive_mutex::scoped_lock lock(MoleculeinSceneMap_mutex);
   MoleculeNodeMap::iterator iter = MoleculesinSceneMap.find(_molid);
+  // use direct connection as it's lightweight and we avoid index change troubles
   if (iter != MoleculesinSceneMap.end())
     QMetaObject::invokeMethod(iter->second,        // pointer to a QObject
                             "AtomUnselected",       // member name (no parameters here)
-                            Qt::QueuedConnection,     // connection type
+                            Qt::DirectConnection,     // connection type
                             Q_ARG(const atomId_t, _id));     // parameters
   else