Changeset 6e1628 for src/UIElements

Timestamp:

Apr 20, 2016, 11:07:47 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:

502614

Parents:

2560f1

git-author:

Frederik Heber <heber@…> (04/12/16 18:17:46)

git-committer:

Frederik Heber <heber@…> (04/20/16 23:07:47)

Message:

FIX: QtMoleculeList should not use getIdtoIndex unnecessarily.

• this function is only meant to be used in interaction with the user, i.e. while the GUI does not change.

File:

• src/UIElements/Views/Qt4/MoleculeList/QtMoleculeList.cpp (modified) (6 diffs)

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

@@ -147 +147 @@
   ASSERT( iter != MoleculeItemBiMap.left.end(),
       "QtMoleculeList::MoleculeIdToItem() - could not find item to id "
-      +toString(observer.getIdtoIndex(_molid)));
+      +toString(_molid));
   return iter->second;
 }
@@ -211 +211 @@
   ASSERT(item != NULL,
       "QtMoleculeList::MoleculeIdToIndex() - could not find item to "
-      +toString(observer.getIdtoIndex(_id)));
+      +toString(_id));
   return indexFromItem(item);
 }
@@ -310 +310 @@
       ASSERT( removeformulaiter != MoleculeFormulaMap.end(),
           "QtMoleculeList::removeMoleculeItem() - could not find id "
-          +toString(observer.getIdtoIndex(removeiter->second))+" in MoleculeFormulaMap.");
+          +toString(removeiter->second)+" in MoleculeFormulaMap.");
       LOG(1, "Removing " << removeformulaiter->second << " for "
           << removeformulaiter->first << " from MoleculeFormulaMap.");
@@ -346 +346 @@
     ASSERT( formulaiter != MoleculeFormulaMap.end(),
         "QtMoleculeList::setVisibilityForMoleculeItem() - formula of molecule "
-        +toString(observer.getIdtoIndex(molid))+" unknown.");
+        +toString(molid)+" unknown.");
     molecule_formula = formulaiter->second;
   }
@@ -358 +358 @@
   ASSERT( groupItem != NULL,
       "QtMoleculeList::setVisibilityForMoleculeItem() - item to "
-      +toString(observer.getIdtoIndex(molid))+" has not parent?");
+      +toString(molid)+" has not parent?");
   // check whether we have to set the group item
 
@@ -531 +531 @@
   }
 
-  LOG(3, "DEBUG: Moving item to id " << observer.getIdtoIndex(molid));
+  LOG(3, "DEBUG: Moving item to id " << molid);
   const MoleculeFormulaMap_t::iterator formulaiter =
       MoleculeFormulaMap.find(molid);
   ASSERT( formulaiter != MoleculeFormulaMap.end(),
       "QtMoleculeList::updateItemStates() - formula of molecule "
-      +toString(observer.getIdtoIndex(molid))+" unknown.");
+      +toString(molid)+" unknown.");
   // we get old formula from stored map and new formula from the ObservedMolecule
   const std::string old_formula = formulaiter->second;