Changeset 1259df for src/UIElements

Timestamp:

Jul 24, 2015, 4:44:34 PM (10 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:

f01769

Parents:

63fb7a

git-author:

Frederik Heber <heber@…> (06/01/15 08:56:36)

git-committer:

Frederik Heber <heber@…> (07/24/15 16:44:34)

Message:

Replaced World::getAllMolecules() wherever possible by const version.

Location:

src/UIElements

Files:

• Qt4/Query/MoleculeQtQuery.cpp (modified) (1 diff)
• Views/Qt4/MoleculeList/QtMoleculeList.cpp (modified) (2 diffs)
• Views/Qt4/MoleculeList/QtMoleculeListView.cpp (modified) (2 diffs)
• Views/Qt4/Qt3D/GLWorldScene.cpp (modified) (3 diffs)

src/UIElements/Qt4/Query/MoleculeQtQuery.cpp

@@ -55 +55 @@
   inputBox = new QComboBox();
   // add all molecules to the combo box
-  vector<molecule*> molecules = World::getInstance().getAllMolecules();
-  for(vector<molecule*>::iterator iter  = molecules.begin();
+  vector<const molecule*> molecules =
+      const_cast<const World &>(World::getInstance()).getAllMolecules();
+  for(vector<const molecule*>::const_iterator iter  = molecules.begin();
       iter != molecules.end();
       ++iter) {

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

@@ -273 +273 @@
   changing = true;
 
-  const std::vector<molecule*> &molecules = World::getInstance().getAllMolecules();
+  const std::vector<const molecule*> &molecules =
+      const_cast<const World &>(World::getInstance()).getAllMolecules();
 
   clear();
@@ -288 +289 @@
   toBeSetVisibilityItems.clear();
 
-  for (std::vector<molecule*>::const_iterator iter = molecules.begin();
+  for (std::vector<const molecule*>::const_iterator iter = molecules.begin();
       iter != molecules.end();
       iter++)

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

@@ -106 +106 @@
       if ((index.column() == 0) && (selectionModel()->isSelected(index))) {
         const moleculeId_t mol_id = moleculelist->IndexToMoleculeId(index);
-        const molecule * const mol = World::getInstance().getMolecule(MoleculeById(mol_id));
+        const molecule * const mol = const_cast<const World &>(World::getInstance()).
+            getMolecule(MoleculeById(mol_id));
         // check for invalid molecule
         if (mol_id < 0)
@@ -129 +130 @@
       if ((index.column() == 0) && (!selectionModel()->isSelected(index))) {
         const moleculeId_t mol_id = moleculelist->IndexToMoleculeId(index);
-        const molecule * const mol = World::getInstance().getMolecule(MoleculeById(mol_id));
+        const molecule * const mol = const_cast<const World &>(World::getInstance()).
+            getMolecule(MoleculeById(mol_id));
         // check for invalid molecule
         if (mol_id < 0)

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

@@ -107 +107 @@
 void GLWorldScene::init()
 {
-  const std::vector<molecule *> &molecules = World::getInstance().getAllMolecules();
-
-  for (std::vector<molecule*>::const_iterator moliter = molecules.begin();
+  const std::vector<const molecule *> &molecules =
+      const_cast<const World &>(World::getInstance()).getAllMolecules();
+
+  for (std::vector<const molecule*>::const_iterator moliter = molecules.begin();
       moliter != molecules.end();
       moliter++) {
@@ -125 +126 @@
 void GLWorldScene::update()
 {
-  const std::vector<molecule *> &molecules = World::getInstance().getAllMolecules();
-
-  for (std::vector<molecule*>::const_iterator moliter = molecules.begin();
+  const std::vector<const molecule *> &molecules =
+      const_cast<const World &>(World::getInstance()).getAllMolecules();
+
+  for (std::vector<const molecule*>::const_iterator moliter = molecules.begin();
       moliter != molecules.end();
       moliter++) {
@@ -243 +245 @@
   LOG(3, "INFO: GLWorldScene: Received signal selectionChanged.");
 
-  const std::vector<molecule*> &molecules = World::getInstance().getAllMolecules();
+  const std::vector<const molecule*> &molecules =
+      const_cast<const World &>(World::getInstance()).getAllMolecules();
 
   if (molecules.size() > 0) {
-    for (std::vector<molecule*>::const_iterator Runner = molecules.begin();
+    for (std::vector<const molecule*>::const_iterator Runner = molecules.begin();
         Runner != molecules.end();
         Runner++) {
 
       // molecule selected but not in scene?
-      const bool isSelected = World::getInstance().isSelected(*Runner);
+      const bool isSelected =
+          const_cast<const World &>(World::getInstance()).isSelected(*Runner);
       if (isSelected){
         MoleculeNodeMap::iterator iter = MoleculesinSceneMap.find((*Runner)->getId());