Changeset 9e9100 for src/UIElements/Qt4/InstanceBoard/QtObservedAtom.cpp

Timestamp:

Feb 14, 2016, 12:33:42 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:

5cd3a33

Parents:

6d4925

git-author:

Frederik Heber <heber@…> (12/28/15 11:43:34)

git-committer:

Frederik Heber <heber@…> (02/14/16 12:33:42)

Message:

Added ObservedValue for selection status of atoms and molecules to QtObserved...

File:

• src/UIElements/Qt4/InstanceBoard/QtObservedAtom.cpp (modified) (9 diffs)

src/UIElements/Qt4/InstanceBoard/QtObservedAtom.cpp

@@ -69 +69 @@
       AtomObservable::NameChanged,
       AtomObservable::ElementChanged,
-      AtomObservable::PositionChanged;
+      AtomObservable::PositionChanged,
+      AtomObservable::SelectionChanged;
   return channels;
 }
@@ -86 +87 @@
 const Observable::channels_t
 QtObservedAtom::AtomPositionChannels(1, AtomObservable::PositionChanged);
+const Observable::channels_t
+QtObservedAtom::AtomSelectedChannels(1, AtomObservable::SelectionChanged);
 
 QtObservedAtom::QtObservedAtom(
@@ -112 +115 @@
   boost::any_cast<ObservedValue_wCallback<std::string, atomId_t> *>(ObservedValues[AtomName])->noteCallBackIsGone();
   boost::any_cast<ObservedValue_wCallback<Vector, atomId_t> *>(ObservedValues[AtomPosition])->noteCallBackIsGone();
+  boost::any_cast<ObservedValue_wCallback<bool, atomId_t> *>(ObservedValues[AtomSelected])->noteCallBackIsGone();
 
   deactivateObserver();
@@ -196 +200 @@
 }
 
+bool QtObservedAtom::updateSelected(
+    const boost::function<const atomId_t ()> &_getAtomIndex)
+{
+  const atom * const _atom = getAtomConst(_getAtomIndex());
+  if (_atom != NULL) {
+    return _atom->getSelected();
+  } else {
+    return false;
+  }
+}
+
 void QtObservedAtom::update(Observable *publisher)
 {
@@ -240 +255 @@
     case AtomObservable::PositionChanged:
       emit positionChanged();
+      break;
+    case AtomObservable::SelectionChanged:
+      emit selectedChanged();
       break;
     default:
@@ -324 +342 @@
   const boost::function<Vector ()> AtomPositionUpdater(
       boost::bind(&QtObservedAtom::updatePosition, AtomIndexGetter));
+  const boost::function<bool ()> AtomSelectedUpdater(
+      boost::bind(&QtObservedAtom::updateSelected, AtomIndexGetter));
 
   _ObservedValues[AtomBonds] = new ObservedValue_wCallback<ListOfBonds_t, atomId_t>(
@@ -363 +383 @@
       AtomPositionUpdater(),
       AtomPositionChannels,
+      _subjectKilled,
+      AtomIndexGetter);
+  _ObservedValues[AtomSelected] = new ObservedValue_wCallback<bool, atomId_t>(
+      _atomref,
+      AtomSelectedUpdater,
+      "AtomSelected_"+toString(_id),
+      AtomSelectedUpdater(),
+      AtomSelectedChannels,
       _subjectKilled,
       AtomIndexGetter);
@@ -376 +404 @@
   delete boost::any_cast<ObservedValue_wCallback<std::string, atomId_t> *>(_ObservedValues[AtomName]);
   delete boost::any_cast<ObservedValue_wCallback<Vector, atomId_t> *>(_ObservedValues[AtomPosition]);
+  delete boost::any_cast<ObservedValue_wCallback<bool, atomId_t> *>(_ObservedValues[AtomSelected]);
   _ObservedValues.clear();
 }
@@ -408 +437 @@
   return boost::any_cast<ObservedValue_wCallback<Vector, atomId_t> *>(ObservedValues[AtomPosition])->get();
 }
+
+const bool QtObservedAtom::getAtomSelected() const
+{
+  return boost::any_cast<ObservedValue_wCallback<bool, atomId_t> *>(ObservedValues[AtomSelected])->get();
+}