Changeset 63fb7a for src/UIElements/Views/Qt4/Qt3D

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:

1259df

Parents:

795c0f

git-author:

Frederik Heber <heber@…> (06/01/15 08:48:35)

git-committer:

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

Message:

Replaced getMolecule() by const access version where possible.

• so far this is done done via const_casting the World.

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLMoleculeObject_molecule.cpp (modified) (8 diffs)
• GLWorldScene.cpp (modified) (1 diff)

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

@@ -69 +69 @@
 static QGLSceneNode *createMoleculeMesh(const moleculeId_t molid, QObject *parent)
 {
-  const molecule *molref = World::getInstance().getMolecule(MoleculeById(molid));
+  const molecule *molref = const_cast<const World &>(World::getInstance()).
+      getMolecule(MoleculeById(molid));
   if (molref == NULL) {
     ELOG(1, "Could not createMoleculeMesh, molecule with id " << molid << " already gone.");
@@ -156 +157 @@
 {
   // sign on as observer (obtain non-const instance before)
-  const molecule *_molecule = World::getInstance().getMolecule(MoleculeById(moleculeid));
+  const molecule *_molecule = const_cast<const World &>(World::getInstance()).
+      getMolecule(MoleculeById(moleculeid));
   if (_molecule != NULL) {
     _molecule->signOn(this, molecule::AtomInserted);
@@ -194 +196 @@
 {
   // sign on as observer (obtain non-const instance before)
-  const molecule *_molecule = World::getInstance().getMolecule(MoleculeById(moleculeid));
+  const molecule *_molecule = const_cast<const World &>(World::getInstance()).
+      getMolecule(MoleculeById(moleculeid));
   if (_molecule != NULL) {
     _molecule->signOn(this, molecule::AtomInserted);
@@ -225 +228 @@
 {
   if (isSignedOn) {
-    const molecule *_molecule = World::getInstance().getMolecule(MoleculeById(moleculeid));
+    const molecule *_molecule = const_cast<const World &>(World::getInstance()).
+        getMolecule(MoleculeById(moleculeid));
     if (_molecule != NULL) {
       _molecule->signOff(this, molecule::AtomInserted);
@@ -247 +251 @@
 void GLMoleculeObject_molecule::init()
 {
-  const molecule *_molecule = World::getInstance().getMolecule(MoleculeById(moleculeid));
+  const molecule * const _molecule = const_cast<const World &>(World::getInstance()).
+      getMolecule(MoleculeById(moleculeid));
   if (_molecule == NULL) {
     ELOG(1, "GLMoleculeObject_molecule cannot init, molecule with "
@@ -320 +325 @@
 void GLMoleculeObject_molecule::reinit()
 {
-  const molecule *_molecule = World::getInstance().getMolecule(MoleculeById(moleculeid));
+  const molecule * const _molecule = const_cast<const World &>(World::getInstance()).
+      getMolecule(MoleculeById(moleculeid));
   if (_molecule == NULL) {
     ELOG(1, "GLMoleculeObject_molecule cannot reinit, molecule with "
@@ -348 +354 @@
 {
   isBoundingBoxUptodate = true;
-  const molecule *_molecule = World::getInstance().getMolecule(MoleculeById(moleculeid));
+  const molecule * const _molecule = const_cast<const World &>(World::getInstance()).
+      getMolecule(MoleculeById(moleculeid));
   if (_molecule == NULL) {
     ELOG(1, "GLMoleculeObject_molecule cannot updateBoundingBox, molecule with "
@@ -375 +382 @@
 void GLMoleculeObject_molecule::recieveNotification(Observable *publisher, Notification_ptr notification)
 {
-  const molecule *_molecule = World::getInstance().getMolecule(MoleculeById(moleculeid));
+  const molecule * const _molecule = const_cast<const World &>(World::getInstance()).
+      getMolecule(MoleculeById(moleculeid));
   if (publisher == dynamic_cast<const Observable*>(_molecule)){
     // notofication from atom

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

@@ -162 +162 @@
 {
    LOG(3, "INFO: GLMoleculeObject_molecule - mol " << no << " has been clicked.");
-   const molecule *mol= World::getInstance().getMolecule(MoleculeById(no));
+   const molecule * const mol= const_cast<const World &>(World::getInstance()).
+       getMolecule(MoleculeById(no));
    ASSERT(mol, "Atom without molecule has been clicked.");
    molids_t ids(1, mol->getId());