Changeset 73b13c for src/UIElements/Views/Qt4/Qt3D/GLWorldScene.cpp

Timestamp:

Jul 25, 2015, 1:01:44 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:

9b56f0a

Parents:

9737db

git-author:

Frederik Heber <heber@…> (06/17/15 16:59:19)

git-committer:

Frederik Heber <heber@…> (07/25/15 13:01:44)

Message:

Extracted signing on to molecule into activateObserver.

• is called by GLWorldScene after all "missed" signals have been emitted.

File:

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

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

@@ -70 +70 @@
 using namespace MoleCuilder;
 
-GLWorldScene::GLWorldScene(QObject *parent)
-   : QObject(parent)
+GLWorldScene::GLWorldScene(QObject *parent) :
+    QObject(parent),
+    selectionMode(SelectAtom)
 {
   int sphereDetails[] = {5, 3, 2, 0};
@@ -228 +229 @@
   LOG(3, "INFO: GLWorldScene: Received signal atomInserted for atom "+toString(_atomid)+".");
 
+  boost::recursive_mutex::scoped_lock lock(MoleculeMissedStateMap_mutex);
+
   // check of molecule is already present
   if (MoleculesinSceneMap.count(_molid) != 0) {
@@ -248 +251 @@
   LOG(3, "INFO: GLWorldScene: Received signal atomRemoved for atom "+toString(_atomid)+".");
 
+  boost::recursive_mutex::scoped_lock lock(MoleculeMissedStateMap_mutex);
+
   // check of molecule is already present
   if (MoleculesinSceneMap.count(_molid) != 0) {
@@ -276 +281 @@
   MoleculesinSceneMap.insert( make_pair(_id, molObject) );
 
-  // now handle all state changes that came up before the instantiation
-  if (MoleculeMissedStateMap.count(_id) != 0) {
+  // now handle all state changes that came up before the instantiation7
+  while (MoleculeMissedStateMap.count(_id) != 0) {
     ASSERT( !MoleculeMissedStateMap[_id].empty(),
         "GLWorldScene::moleculeInserted() - we have an empty state change map for molecule with id "
         +toString(_id));
+    boost::recursive_mutex::scoped_lock lock(MoleculeMissedStateMap_mutex);
     for (StateChangeMap_t::iterator iter = MoleculeMissedStateMap[_id].begin();
         !MoleculeMissedStateMap[_id].empty();
@@ -297 +303 @@
             "GLWorldScene::moleculeInserted() - more atomRemoved states than atomInserted for atom "
             +toString(iter->first));
-        if (StateChangeAmounts[atomInsertedState] > StateChangeAmounts[atomRemovedState])
+        if (StateChangeAmounts[atomInsertedState] > StateChangeAmounts[atomRemovedState]) {
+          LOG(1, "INFO: invoking atomInserted for atom " << iter->first);
           QMetaObject::invokeMethod(molObject,        // pointer to a QObject
                                     "atomInserted",       // member name (no parameters here)
                                     Qt::DirectConnection,     // connection type
                                     Q_ARG(const atomId_t, iter->first));     // parameters
+        } else {
+          LOG(1, "INFO: Atom " << iter->first << " has been inserted and removed already.");
+        }
       } else {
         // can only be an insertion
@@ -311 +321 @@
             break;
           case atomInsertedState:
+            LOG(1, "INFO: invoking atomInserted for atom " << iter->first);
             QMetaObject::invokeMethod(molObject,        // pointer to a QObject
                                       "atomInserted",       // member name (no parameters here)
@@ -329 +340 @@
   }
 
+  // now let the molObject sign on to molecule
+  molObject->activateObserver();
+
   connect (molObject, SIGNAL(changed()), this, SIGNAL(changed()));
   connect (molObject, SIGNAL(changeOccured()), this, SIGNAL(changeOccured()));
@@ -359 +373 @@
 
   // remove any possible state changes left
-  MoleculeMissedStateMap.erase(_id);
+  {
+    boost::recursive_mutex::scoped_lock lock(MoleculeMissedStateMap_mutex);
+    MoleculeMissedStateMap.erase(_id);
+  }
 
   emit changed();