Changeset 8b59dd for src/UIElements

Timestamp:

Feb 26, 2016, 9:46:19 AM (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:

5c9604

Parents:

92af1b

git-author:

Frederik Heber <heber@…> (02/13/16 14:48:14)

git-committer:

Frederik Heber <heber@…> (02/26/16 09:46:19)

Message:

Removed last...removed in QtObservedInstanceBoard.

• this does not do anything useful anymore, we may just pass the id we obtained from ObservedValuesContainer as Qt signal.

Location:

src/UIElements/Qt4/InstanceBoard

Files:

• QtObservedInstanceBoard.cpp (modified) (6 diffs)
• QtObservedInstanceBoard.hpp (modified) (1 diff)

src/UIElements/Qt4/InstanceBoard/QtObservedInstanceBoard.cpp

@@ -65 +65 @@
       "molecule",
       *this,
-      boost::bind(&QtObservedInstanceBoard::moleculecountsubjectKilled, this, _1)),
-  lastremovedatom((atomId_t)-1),
-  lastremovedmolecule((moleculeId_t)-1)
+      boost::bind(&QtObservedInstanceBoard::moleculecountsubjectKilled, this, _1))
 {
   qRegisterMetaType<QtObservedAtom::ptr>("QtObservedAtom::ptr");
@@ -74 +72 @@
   // be first (besides ObservedValues to know about new insertions)
   World::getInstance().signOn(this, World::AtomInserted, GlobalObservableInfo::PriorityLevel(int(-10)));
-  World::getInstance().signOn(this, World::AtomRemoved, GlobalObservableInfo::PriorityLevel(int(-10)));
   World::getInstance().signOn(this, World::MoleculeInserted, GlobalObservableInfo::PriorityLevel(int(-10)));
-  World::getInstance().signOn(this, World::MoleculeRemoved, GlobalObservableInfo::PriorityLevel(int(-10)));
   WorldSignedOn = true;
 }
@@ -84 +80 @@
   if (WorldSignedOn) {
     World::getInstance().signOff(this, World::AtomInserted);
-    World::getInstance().signOff(this, World::AtomRemoved);
     World::getInstance().signOff(this, World::MoleculeInserted);
-    World::getInstance().signOff(this, World::MoleculeRemoved);
   }
   // sign off from all remaining molecules and atoms
@@ -161 +155 @@
           ELOG(1, "QtObservedInstanceBoard got MoleculeInserted for unknown molecule id " << _id);
         }
-        break;
-      }
-      case World::MoleculeRemoved:
-      {
-        const moleculeId_t _id = const_cast<const World &>(World::getInstance()).lastChangedMolId();
-        LOG(3, "DEBUG: InformationBoard got MoleculeRemoved signal for molecule " << _id);
-        // note down such that ObservedValues are simply dropped
-        lastremovedmolecule = _id;
         break;
       }
@@ -195 +181 @@
         break;
       }
-      case World::AtomRemoved:
-      {
-        const atomId_t _id = const_cast<const World &>(World::getInstance()).lastChangedAtomId();
-        LOG(3, "DEBUG: InformationBoard got AtomRemoved signal for atom " << _id);
-        // note down such that ObservedValues are simply dropped
-        lastremovedatom = _id;
-        break;
-      }
       default:
         ASSERT(0, "QtObservedInstanceBoard::recieveNotification() - we cannot get here for World.");
@@ -259 +237 @@
 void QtObservedInstanceBoard::atomcountsubjectKilled(const atomId_t _atomid)
 {
-  if ((_atomid == lastremovedatom)) {
-    LOG(3, "DEBUG: InstanceBoard emits atomRemoved for " << _atomid);
-    emit atomRemoved(lastremovedatom);
-  } else
-    ELOG(2, "QtObservedInstanceBoard::atomcountsubjectKilled() - id " << _atomid
-        << " not fitting with " << lastremovedatom);
+  LOG(3, "DEBUG: InstanceBoard emits atomRemoved for " << _atomid);
+  emit atomRemoved(_atomid);
 }
 
 void QtObservedInstanceBoard::moleculecountsubjectKilled(const moleculeId_t _molid)
 {
-  if (lastremovedmolecule == _molid) {
-    LOG(3, "DEBUG: InstanceBoard emits moleculeRemoved for " << _molid);
-    emit moleculeRemoved(_molid);
-  } else
-    ELOG(2, "QtObservedInstanceBoard::moleculecountsubjectKilled() - id " << _molid
-        << " not fitting with " << lastremovedmolecule);
+  LOG(3, "DEBUG: InstanceBoard emits moleculeRemoved for " << _molid);
+  emit moleculeRemoved(_molid);
 }
 

src/UIElements/Qt4/InstanceBoard/QtObservedInstanceBoard.hpp

@@ -135 +135 @@
   //!> container with all ObservedValues for each molecule, associated by id
   ObservedValuesContainer<QtObservedMolecule, moleculeId_t> moleculeObservedValues;
-
-  //!> note down atom id of last removed atom to drop its ObservedValues
-  atomId_t lastremovedatom;
-
-  //!> note down molecule id of last removed molecule to drop its ObservedValues
-  moleculeId_t lastremovedmolecule;
 };