Changeset 3054f4a for src/UIElements/Views/Qt4/ElementList/QtElementList.cpp

Timestamp:

Apr 20, 2016, 8:51:51 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:

0a558d

Parents:

1a58ce

git-author:

Frederik Heber <heber@…> (03/21/16 21:13:43)

git-committer:

Frederik Heber <heber@…> (04/20/16 08:51:51)

Message:

QtObserved...Observed now get index on ...Removed() signal.

• Changed slots of QtElementList, QtMoleculeList, and QtMoleculeListView. This is not all of them, but they now all used ObservedValue_Index_t.

File:

• src/UIElements/Views/Qt4/ElementList/QtElementList.cpp (modified) (3 diffs)

src/UIElements/Views/Qt4/ElementList/QtElementList.cpp

@@ -104 +104 @@
   connect(&atomobserver, SIGNAL(AtomInserted(const QtObservedAtom::ptr)),
       this, SLOT(addAtomElement(const QtObservedAtom::ptr)));
-  connect(&atomobserver, SIGNAL(AtomRemoved(const atomId_t)),
-      this, SLOT(removeAtomElement(const atomId_t)));
+  connect(&atomobserver, SIGNAL(AtomRemoved(ObservedValue_Index_t)),
+      this, SLOT(removeAtomElement(ObservedValue_Index_t)));
   connect(this,SIGNAL(itemSelectionChanged()),this,SLOT(rowSelected()));
 //  connect(this,SIGNAL(changed()),this,SLOT(update()));
@@ -120 +120 @@
   const atomicNumber_t newelement = _atom->getAtomElement();
   atomicNumber_t oldelement = -1;
-  const atomId_t atomid = _atom->getAtomIndex();
+  const ObservedValue_Index_t atomid = _atom->getIndex();
   QTreeWidgetItem *newtreeItem = topLevelItem(newelement-1);
   ASSERT( newtreeItem != NULL,
@@ -168 +168 @@
 }
 
-void QtElementList::removeAtomElement(const atomId_t _atomid)
+void QtElementList::removeAtomElement(ObservedValue_Index_t _id)
 {
   boost::recursive_mutex::scoped_lock lock(refill_mutex);
 
-  const AtomElementMap_t::iterator iter = AtomElementMap.find(_atomid);
+  const AtomElementMap_t::iterator iter = AtomElementMap.find(_id);
   ASSERT (iter != AtomElementMap.end(),
-      "QtElementList::addAtomElement() - atom #"+toString(_atomid)
+      "QtElementList::addAtomElement() - atom #"+toString(_id)
       +" is not present in elementlookup map.");
   if (iter != AtomElementMap.end()) {