Changeset 63fb7a for src/UIElements


Ignore:
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
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • src/UIElements/CommandLineUI/Query/MoleculesCommandLineQuery.cpp

    r795c0f r63fb7a  
    6161    }
    6262    for (std::vector<int>::iterator iter = IdxOfMol.begin(); iter != IdxOfMol.end(); ++iter) {
    63       const molecule *temp_element = World::getInstance().getMolecule(MoleculeById(*iter));
     63      const molecule *temp_element = const_cast<const World &>(World::getInstance()).
     64          getMolecule(MoleculeById(*iter));
    6465      if (temp_element)
    6566        temp.push_back(temp_element);

  • src/UIElements/Views/Qt4/MoleculeList/QtMoleculeItem.cpp

    r795c0f r63fb7a  
    7171void QtMoleculeItem::signOnToMolecule()
    7272{
    73   const molecule *mol = World::getInstance().getMolecule(MoleculeById(molid));
     73  const molecule * const mol = const_cast<const World &>(World::getInstance()).
     74      getMolecule(MoleculeById(molid));
    7475  if (mol != NULL) {
    7576    if (!IsSignedOn)
    … …  
    8384void QtMoleculeItem::signOffFromMolecule()
    8485{
    85   const molecule *mol = World::getInstance().getMolecule(MoleculeById(molid));
     86  const molecule * const mol = const_cast<const World &>(World::getInstance()).
     87      getMolecule(MoleculeById(molid));
    8688  if (mol != NULL) {
    8789    if (IsSignedOn)
    … …  
    140142const molecule * const QtMoleculeItem::getMolecule() const
    141143{
    142   const molecule * mol = World::getInstance().getMolecule(MoleculeById(molid));
     144  const molecule * const mol = const_cast<const World &>(World::getInstance()).getMolecule(MoleculeById(molid));
    143145  ASSERT (mol != NULL,
    144146      "QtMoleculeItem::getMolecule() - mol with "+toString(molid)+" is gone.");

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

    r795c0f r63fb7a  
    578578            QtMoleculeItemFactory::NAME));
    579579    const moleculeId_t molid = ItemToMoleculeId(_item);
    580     const molecule *mol = World::getInstance().getMolecule(MoleculeById(molid));
     580    const molecule *mol = const_cast<const World &>(World::getInstance()).
     581        getMolecule(MoleculeById(molid));
    581582    if (std::binary_search(
    582583            toBeRemovedItems_copy.begin(), toBeRemovedItems_copy.end(),
    … …  
    624625//    LOG(1, "Adding molecule " << (*moliter)->getName());
    625626    // check that World knows the molecule still
    626     const molecule * const mol =
    627         World::getInstance().getMolecule(MoleculeById((*moliter)->getId()));
     627    const molecule * const mol = const_cast<const World &>(World::getInstance()).
     628        getMolecule(MoleculeById((*moliter)->getId()));
    628629    if ((mol != NULL) && (mol == *moliter)) {
    629630      addMolecule(mol);

  • src/UIElements/Views/Qt4/MoleculeList/SpecificItems/QtMoleculeItem_atomcount.hpp

    r795c0f r63fb7a  
    4444  void internal_updateState()
    4545  {
    46     const molecule * mol = World::getInstance().getMolecule(MoleculeById(molid));
     46    const molecule * mol = const_cast<const World &>(World::getInstance()).
     47        getMolecule(MoleculeById(molid));
    4748    if (mol != NULL)
    4849      setText(QString::number(mol->getAtomCount()));

  • src/UIElements/Views/Qt4/MoleculeList/SpecificItems/QtMoleculeItem_formula.hpp

    r795c0f r63fb7a  
    4747  void internal_updateState()
    4848  {
    49     const molecule * mol = World::getInstance().getMolecule(MoleculeById(molid));
     49    const molecule * mol = const_cast<const World &>(World::getInstance()).
     50        getMolecule(MoleculeById(molid));
    5051    if (mol != NULL)
    5152      setText(QString(mol->getFormula().toString().c_str()));

  • src/UIElements/Views/Qt4/MoleculeList/SpecificItems/QtMoleculeItem_name.hpp

    r795c0f r63fb7a  
    4444  void internal_updateState()
    4545  {
    46     const molecule * mol = World::getInstance().getMolecule(MoleculeById(molid));
     46    const molecule * mol = const_cast<const World &>(World::getInstance()).
     47        getMolecule(MoleculeById(molid));
    4748    if (mol != NULL)
    4849      setText(QString(mol->getName().c_str()));

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

    r795c0f r63fb7a  
    6969static QGLSceneNode *createMoleculeMesh(const moleculeId_t molid, QObject *parent)
    7070{
    71   const molecule *molref = World::getInstance().getMolecule(MoleculeById(molid));
     71  const molecule *molref = const_cast<const World &>(World::getInstance()).
     72      getMolecule(MoleculeById(molid));
    7273  if (molref == NULL) {
    7374    ELOG(1, "Could not createMoleculeMesh, molecule with id " << molid << " already gone.");
    … …  
    156157{
    157158  // sign on as observer (obtain non-const instance before)
    158   const molecule *_molecule = World::getInstance().getMolecule(MoleculeById(moleculeid));
     159  const molecule *_molecule = const_cast<const World &>(World::getInstance()).
     160      getMolecule(MoleculeById(moleculeid));
    159161  if (_molecule != NULL) {
    160162    _molecule->signOn(this, molecule::AtomInserted);
    … …  
    194196{
    195197  // sign on as observer (obtain non-const instance before)
    196   const molecule *_molecule = World::getInstance().getMolecule(MoleculeById(moleculeid));
     198  const molecule *_molecule = const_cast<const World &>(World::getInstance()).
     199      getMolecule(MoleculeById(moleculeid));
    197200  if (_molecule != NULL) {
    198201    _molecule->signOn(this, molecule::AtomInserted);
    … …  
    225228{
    226229  if (isSignedOn) {
    227     const molecule *_molecule = World::getInstance().getMolecule(MoleculeById(moleculeid));
     230    const molecule *_molecule = const_cast<const World &>(World::getInstance()).
     231        getMolecule(MoleculeById(moleculeid));
    228232    if (_molecule != NULL) {
    229233      _molecule->signOff(this, molecule::AtomInserted);
    … …  
    247251void GLMoleculeObject_molecule::init()
    248252{
    249   const molecule *_molecule = World::getInstance().getMolecule(MoleculeById(moleculeid));
     253  const molecule * const _molecule = const_cast<const World &>(World::getInstance()).
     254      getMolecule(MoleculeById(moleculeid));
    250255  if (_molecule == NULL) {
    251256    ELOG(1, "GLMoleculeObject_molecule cannot init, molecule with "
    … …  
    320325void GLMoleculeObject_molecule::reinit()
    321326{
    322   const molecule *_molecule = World::getInstance().getMolecule(MoleculeById(moleculeid));
     327  const molecule * const _molecule = const_cast<const World &>(World::getInstance()).
     328      getMolecule(MoleculeById(moleculeid));
    323329  if (_molecule == NULL) {
    324330    ELOG(1, "GLMoleculeObject_molecule cannot reinit, molecule with "
    … …  
    348354{
    349355  isBoundingBoxUptodate = true;
    350   const molecule *_molecule = World::getInstance().getMolecule(MoleculeById(moleculeid));
     356  const molecule * const _molecule = const_cast<const World &>(World::getInstance()).
     357      getMolecule(MoleculeById(moleculeid));
    351358  if (_molecule == NULL) {
    352359    ELOG(1, "GLMoleculeObject_molecule cannot updateBoundingBox, molecule with "
    … …  
    375382void GLMoleculeObject_molecule::recieveNotification(Observable *publisher, Notification_ptr notification)
    376383{
    377   const molecule *_molecule = World::getInstance().getMolecule(MoleculeById(moleculeid));
     384  const molecule * const _molecule = const_cast<const World &>(World::getInstance()).
     385      getMolecule(MoleculeById(moleculeid));
    378386  if (publisher == dynamic_cast<const Observable*>(_molecule)){
    379387    // notofication from atom

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

    r795c0f r63fb7a  
    162162{
    163163   LOG(3, "INFO: GLMoleculeObject_molecule - mol " << no << " has been clicked.");
    164    const molecule *mol= World::getInstance().getMolecule(MoleculeById(no));
     164   const molecule * const mol= const_cast<const World &>(World::getInstance()).
     165       getMolecule(MoleculeById(no));
    165166   ASSERT(mol, "Atom without molecule has been clicked.");
    166167   molids_t ids(1, mol->getId());
Note: See TracChangeset for help on using the changeset viewer.