Changeset 0f7ffe for src/UIElements/Views/Qt4/Qt3D/GLWorldScene.cpp

Timestamp:

Feb 12, 2016, 11:15:07 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:

2f7988

Parents:

8d5fbf1

git-author:

Frederik Heber <heber@…> (01/25/16 09:09:33)

git-committer:

Frederik Heber <heber@…> (02/12/16 23:15:07)

Message:

Changed connections between GLWorldScene, GLWorldView and GLMoleculeObject_molecule.

File:

• src/UIElements/Views/Qt4/Qt3D/GLWorldScene.cpp (modified) (2 diffs)

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

@@ -113 +113 @@
   GLMoleculeObject::cleanMaterialMap();
 }
-
-///** Update the WorldScene with molecules and atomsfrom World.
-// *
-// * This function should be called after e.g. WorldTime::TimeChanged was
-// * received or after another molecule has been loaded.
-// *
-// */
-//void GLWorldScene::update()
-//{
-//  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++) {
-//    boost::recursive_mutex::scoped_lock lock(MoleculeinSceneMap_mutex);
-//    // check whether molecule already exists
-//    const moleculeId_t molid = (*moliter)->getId();
-//    const bool mol_present = MoleculesinSceneMap.count(molid);
-//    if (!mol_present)
-//      moleculeInserted((*moliter)->getId());
-//  }
-//
-//  boost::recursive_mutex::scoped_lock lock(MoleculeinSceneMap_mutex);
-//  MoleculeNodeMap::iterator iter = MoleculesinSceneMap.begin();
-//  for (;iter != MoleculesinSceneMap.end();) {
-//    const moleculeId_t molid = iter->first;
-//    const molecule * const mol = const_cast<const World &>(World::getInstance()).
-//        getMolecule(MoleculeById(molid));
-//    const bool mol_absent = (mol == NULL);
-//    // step on to next molecule before possibly removing entry and invalidating iter
-//    ++iter;
-//    if (mol_absent)
-//      moleculeRemoved(molid);
-//  }
-//
-//}
 
 void GLWorldScene::atomClicked(atomId_t no)
@@ -350 +313 @@
   connect (molObject, SIGNAL(hoverChanged(const moleculeId_t, int)), this, SIGNAL(hoverChanged(const moleculeId_t, int)));
   connect (molObject, SIGNAL(hoverChanged(const moleculeId_t, int)), this, SIGNAL(hoverChanged(const moleculeId_t, int)));
-  connect(board, SIGNAL(atomInserted(const atomId_t)),
-      molObject, SLOT(atomInserted(const atomId_t)));
-  connect(board, SIGNAL(atomRemoved(const atomId_t)),
-      molObject, SLOT(atomRemoved(const atomId_t)));
 
   emit changed();