Changeset 7ded1c for src/UIElements/Views/Qt4/Qt3D/GLWorldScene.cpp

Timestamp:

Feb 14, 2016, 12:34:27 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:

4cac6c

Parents:

3fe318

git-author:

Frederik Heber <heber@…> (01/05/16 22:22:13)

git-committer:

Frederik Heber <heber@…> (02/14/16 12:34:27)

Message:

GLMoleculeObject_atom and .._molecule don't get QtObserved... right away.

• needs to be checked for empty instance first.

File:

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

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

@@ -223 +223 @@
   // add new object
   LOG(1, "DEBUG: Adding GLMoleculeObject_molecule to id " << _id);
-  GLMoleculeObject_molecule *molObject =
-      new GLMoleculeObject_molecule(
-          GLMoleculeObject::meshEmpty,
-          this,
-          *board,
-          board->getObservedMolecule(_id));
-  ASSERT( molObject != NULL,
-      "GLWorldScene::moleculeInserted - could not create molecule object for "+toString(_id));
-  MoleculesinSceneMap.insert( make_pair(_id, molObject) );
-
-  // now handle all state changes that came up before the instantiation
-  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();
-        iter = MoleculeMissedStateMap[_id].begin()) {
-      std::pair<StateChangeMap_t::iterator, StateChangeMap_t::iterator> rangeiter =
-          MoleculeMissedStateMap[_id].equal_range(iter->first);
-      const size_t StateCounts = std::distance(rangeiter.first, rangeiter.second);
-      if (StateCounts > 1) {
-        // more than one state change, have to combine
-        typedef std::map<StateChangeType, size_t> StateChangeAmounts_t;
-        StateChangeAmounts_t StateChangeAmounts;
-        for (StateChangeMap_t::const_iterator stateiter = rangeiter.first;
-            stateiter != rangeiter.second; ++stateiter)
-          ++StateChangeAmounts[stateiter->second];
-        ASSERT( StateChangeAmounts[atomInsertedState] >= StateChangeAmounts[atomRemovedState],
-            "GLWorldScene::moleculeInserted() - more atomRemoved states than atomInserted for atom "
-            +toString(iter->first));
-        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::QueuedConnection,     // 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
-        switch (rangeiter.first->second) {
-          case atomRemovedState:
-            ASSERT( 0,
-                "GLWorldScene::moleculeInserted() - atomRemoved state without atomInserted for atom "
-                +toString(iter->first));
-            break;
-          case atomInsertedState:
+  const QtObservedMolecule::ptr mol = board->getObservedMolecule(_id);
+  if (mol) {
+    GLMoleculeObject_molecule *molObject =
+        new GLMoleculeObject_molecule(
+            GLMoleculeObject::meshEmpty,
+            this,
+            *board,
+            mol);
+    ASSERT( molObject != NULL,
+        "GLWorldScene::moleculeInserted - could not create molecule object for "+toString(_id));
+    MoleculesinSceneMap.insert( make_pair(_id, molObject) );
+
+    // now handle all state changes that came up before the instantiation
+    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();
+          iter = MoleculeMissedStateMap[_id].begin()) {
+        std::pair<StateChangeMap_t::iterator, StateChangeMap_t::iterator> rangeiter =
+            MoleculeMissedStateMap[_id].equal_range(iter->first);
+        const size_t StateCounts = std::distance(rangeiter.first, rangeiter.second);
+        if (StateCounts > 1) {
+          // more than one state change, have to combine
+          typedef std::map<StateChangeType, size_t> StateChangeAmounts_t;
+          StateChangeAmounts_t StateChangeAmounts;
+          for (StateChangeMap_t::const_iterator stateiter = rangeiter.first;
+              stateiter != rangeiter.second; ++stateiter)
+            ++StateChangeAmounts[stateiter->second];
+          ASSERT( StateChangeAmounts[atomInsertedState] >= StateChangeAmounts[atomRemovedState],
+              "GLWorldScene::moleculeInserted() - more atomRemoved states than atomInserted for atom "
+              +toString(iter->first));
+          if (StateChangeAmounts[atomInsertedState] > StateChangeAmounts[atomRemovedState]) {
             LOG(1, "INFO: invoking atomInserted for atom " << iter->first);
             QMetaObject::invokeMethod(molObject,        // pointer to a QObject
@@ -278 +263 @@
                                       Qt::QueuedConnection,     // connection type
                                       Q_ARG(const atomId_t, iter->first));     // parameters
-            break;
-          default:
-            ASSERT( 0,
-                "GLWorldScene::moleculeInserted() - there are unknown change states.");
-            break;
+          } else {
+            LOG(1, "INFO: Atom " << iter->first << " has been inserted and removed already.");
+          }
+        } else {
+          // can only be an insertion
+          switch (rangeiter.first->second) {
+            case atomRemovedState:
+              ASSERT( 0,
+                  "GLWorldScene::moleculeInserted() - atomRemoved state without atomInserted for atom "
+                  +toString(iter->first));
+              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)
+                                        Qt::QueuedConnection,     // connection type
+                                        Q_ARG(const atomId_t, iter->first));     // parameters
+              break;
+            default:
+              ASSERT( 0,
+                  "GLWorldScene::moleculeInserted() - there are unknown change states.");
+              break;
+          }
         }
+        // removed state changes for this atom
+        MoleculeMissedStateMap[_id].erase(iter);
       }
-      // removed state changes for this atom
-      MoleculeMissedStateMap[_id].erase(iter);
     }
-    // remove state change map for the molecule
+
+    connect (molObject, SIGNAL(changed()), this, SIGNAL(changed()));
+    connect (molObject, SIGNAL(changeOccured()), this, SIGNAL(changeOccured()));
+    connect (molObject, SIGNAL(atomClicked(atomId_t)), this, SLOT(atomClicked(atomId_t)));
+    connect (molObject, SIGNAL(moleculeClicked(moleculeId_t)), this, SLOT(moleculeClicked(moleculeId_t)));
+    connect (molObject, SIGNAL(selectionChanged()), this, SIGNAL(changed()));
+    connect (molObject, SIGNAL(selectionChanged()), this, SIGNAL(changed()));
+    connect (molObject, SIGNAL(hoverChanged(const atomId_t)), this, SIGNAL(hoverChanged(const atomId_t)));
+    connect (molObject, SIGNAL(hoverChanged(const moleculeId_t, int)), this, SIGNAL(hoverChanged(const moleculeId_t, int)));
+    connect (molObject, SIGNAL(hoverChanged(const moleculeId_t, int)), this, SIGNAL(hoverChanged(const moleculeId_t, int)));
+
+    emit changed();
+    emit changeOccured();
+  }
+
+  // remove state change map for the molecule
+  {
+    boost::recursive_mutex::scoped_lock lock(MoleculeMissedStateMap_mutex);
     MoleculeMissedStateMap.erase(_id);
   }
-
-  connect (molObject, SIGNAL(changed()), this, SIGNAL(changed()));
-  connect (molObject, SIGNAL(changeOccured()), this, SIGNAL(changeOccured()));
-  connect (molObject, SIGNAL(atomClicked(atomId_t)), this, SLOT(atomClicked(atomId_t)));
-  connect (molObject, SIGNAL(moleculeClicked(moleculeId_t)), this, SLOT(moleculeClicked(moleculeId_t)));
-  connect (molObject, SIGNAL(selectionChanged()), this, SIGNAL(changed()));
-  connect (molObject, SIGNAL(selectionChanged()), this, SIGNAL(changed()));
-  connect (molObject, SIGNAL(hoverChanged(const atomId_t)), this, SIGNAL(hoverChanged(const atomId_t)));
-  connect (molObject, SIGNAL(hoverChanged(const moleculeId_t, int)), this, SIGNAL(hoverChanged(const moleculeId_t, int)));
-  connect (molObject, SIGNAL(hoverChanged(const moleculeId_t, int)), this, SIGNAL(hoverChanged(const moleculeId_t, int)));
-
-  emit changed();
-  emit changeOccured();
 }