Changeset 54bdaa for src

Timestamp:

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

5be798

Parents:

fb95a5

git-author:

Frederik Heber <heber@…> (07/15/15 23:25:22)

git-committer:

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

Message:

Qt4 instance use new lastChanged..Id() in place of lastChanged().

• also changed in FormatParser_common.

Location:

src

Files:

• Parser/FormatParser_common.cpp (modified) (1 diff)
• UIElements/Views/Qt4/MoleculeList/QtMoleculeList.cpp (modified) (2 diffs)
• UIElements/Views/Qt4/Qt3D/GLMoleculeObject_atom.cpp (modified) (1 diff)
• UIElements/Views/Qt4/Qt3D/GLMoleculeObject_molecule.cpp (modified) (6 diffs)
• UIElements/Views/Qt4/Qt3D/GLWorldView.cpp (modified) (3 diffs)

src/Parser/FormatParser_common.cpp

@@ -96 +96 @@
   switch (notification->getChannelNo()) {
     case World::AtomInserted:
-      AtomInserted(World::getInstance().lastChanged<atom>()->getId());
+      AtomInserted(World::getInstance().lastChangedAtomId());
       break;
     case World::AtomRemoved:
-      AtomRemoved(World::getInstance().lastChanged<atom>()->getId());
+      AtomRemoved(World::getInstance().lastChangedAtomId());
       break;
     default:

src/UIElements/Views/Qt4/MoleculeList/QtMoleculeList.cpp

@@ -196 +196 @@
       case World::MoleculeInserted:
       {
-        const molecule * const mol = World::getInstance().lastChanged<molecule>();
         boost::recursive_mutex::scoped_lock lock(listAccessing_mutex);
-        const moleculeId_t molid = mol->getId();
+        const moleculeId_t molid = const_cast<const World &>(World::getInstance()).lastChangedMolId();
         if (molid != (unsigned int )-1)
           newMolecules.push_back( molid );
@@ -205 +204 @@
       case World::MoleculeRemoved:
       {
-        const molecule * const mol = World::getInstance().lastChanged<molecule>();
-
         boost::recursive_mutex::scoped_lock lock(listAccessing_mutex);
-        const moleculeId_t molid = mol->getId();
+        const moleculeId_t molid = const_cast<const World &>(World::getInstance()).lastChangedMolId();
         if (molid != (unsigned int )-1)
           removedMolecules.push_back( molid ); // remove in any case, as we also got insert

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

@@ -273 +273 @@
 atomId_t GLMoleculeObject_atom::updateIndex() const
 {
-  const atom * const _atom = World::getInstance().lastChanged<atom>();
-  if (_atom != NULL) {
-    return _atom->getId();
-  }
-  return (atomId_t)-1;
+  return const_cast<const World &>(World::getInstance()).lastChangedAtomId();
 }
 

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

@@ -429 +429 @@
 {
   const molecule * const mol = getMolecule(MolIndex.get());
-  const atomId_t id = mol->lastChanged()->getId();
-  if (mol->containsAtom(id))
-    DisplayedAtoms.insert(id);
-  else
-    DisplayedAtoms.erase(id);
+  if (mol != NULL) {
+    const atomId_t id = mol->lastChangedAtomId();
+    if (mol->containsAtom(id))
+      DisplayedAtoms.insert(id);
+    else
+      DisplayedAtoms.erase(id);
+  }
   return DisplayedAtoms;
 }
@@ -439 +441 @@
 moleculeId_t GLMoleculeObject_molecule::updateIndex() const
 {
-  const molecule * const mol = World::getInstance().lastChanged<molecule>();
-  if (mol != NULL) {
-    return mol->getId();
-  }
-  return (moleculeId_t)-1;
+  return const_cast<const World &>(World::getInstance()).lastChangedMolId();
 }
 
@@ -526 +524 @@
       case molecule::AtomInserted:
       {
-        const atomId_t _id = _molecule->lastChanged()->getId();
+        const atomId_t _id = _molecule->lastChangedAtomId();
   #ifdef LOG_OBSERVER
         observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that atom "+toString(_id)+" has been inserted.";
@@ -537 +535 @@
       case World::AtomRemoved:
       {
-        const atomId_t _id = _molecule->lastChanged()->getId();
+        const atomId_t _id = _molecule->lastChangedAtomId();
   #ifdef LOG_OBSERVER
         observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that atom "+toString(_id)+" has been removed.";
@@ -549 +547 @@
       {
   #ifdef LOG_OBSERVER
-        const atomId_t _id = _molecule->lastChanged()->getId();
+        const atomId_t _id = _molecule->lastChangedAtomId();
         observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that atom "+toString(_id)+" has been inserted.";
   #endif
@@ -559 +557 @@
       {
   #ifdef LOG_OBSERVER
-        const atomId_t _id = _molecule->lastChanged()->getId();
+        const atomId_t _id = _molecule->lastChangedAtomId();
         observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that atom "+toString(_id)+"'s index has changed.";
   #endif

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

@@ -370 +370 @@
 
     // emit removed signal
-    const moleculeId_t _id = World::getInstance().lastChanged<molecule>()->getId();
+    const moleculeId_t _id = mol->getId();
     emit moleculeRemoved(_id);
   }
@@ -394 +394 @@
       case World::MoleculeInserted:
       {
-        const moleculeId_t _id = World::getInstance().lastChanged<molecule>()->getId();
+        const moleculeId_t _id = const_cast<const World &>(World::getInstance()).lastChangedMolId();
   #ifdef LOG_OBSERVER
         observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that molecule "+toString(_id)+" has been inserted.";
@@ -428 +428 @@
   } else if (dynamic_cast<molecule *>(publisher) != NULL) {
     const molecule * mol = const_cast<const molecule * const>(dynamic_cast<molecule *>(publisher));
-    const atomId_t atomid = mol->lastChanged()->getId();
     const moleculeId_t molid = mol->getId();
+    const atomId_t atomid = mol->lastChangedAtomId();
     switch (notification->getChannelNo()) {
       case molecule::AtomInserted: