Changeset f714763 for src

Timestamp:

Aug 5, 2015, 5:32:09 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:

fb95a5

Parents:

3d5b5b

git-author:

Frederik Heber <heber@…> (07/15/15 15:22:04)

git-committer:

Frederik Heber <heber@…> (08/05/15 17:32:09)

Message:

GLWorldView no longer listens to WorldTime::TimeChanged.

• molecules are re-created when the time changes anyway so the world view is informed about the change.
• removed all commented-out lines.

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLMoleculeObject_molecule.cpp (modified) (1 diff)
• GLWorldScene.cpp (modified) (2 diffs)
• GLWorldScene.hpp (modified) (2 diffs)
• GLWorldView.cpp (modified) (3 diffs)

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

@@ -694 +694 @@
   connect (atomObject, SIGNAL(hoverChanged(GLMoleculeObject *)), this, SLOT(hoverChangedSignalled(GLMoleculeObject *)));
   connect (atomObject, SIGNAL(selectionChanged()), this, SIGNAL(changed()));
-  connect (atomObject, SIGNAL(BondsChanged(const atomId_t, const atomId_t, const GLMoleculeObject_bond::SideOfBond)), this, SLOT(bondInserted(const atomId_t, const atomId_t, const GLMoleculeObject_bond::SideOfBond)));
+//  connect (atomObject, SIGNAL(bondsChanged()), this, SLOT(bondInserted(const atomId_t, const atomId_t, const GLMoleculeObject_bond::SideOfBond)));
+  connect (atomObject, SIGNAL(BondsInserted(const atomId_t, const atomId_t, const GLMoleculeObject_bond::SideOfBond)), this, SLOT(bondInserted(const atomId_t, const atomId_t, const GLMoleculeObject_bond::SideOfBond)));
   connect (atomObject, SIGNAL(BondsRemoved(const atomId_t, const atomId_t)), this, SLOT(bondRemoved(const atomId_t, const atomId_t)));
   connect (atomObject, SIGNAL(indexChanged(GLMoleculeObject_atom*, const atomId_t, const atomId_t)), this, SLOT(changeAtomId(GLMoleculeObject_atom*, const atomId_t, const atomId_t)));

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

@@ -89 +89 @@
   }
 
-  connect(this, SIGNAL(updated()), this, SLOT(update()));
+//  connect(this, SIGNAL(updated()), this, SLOT(update()));
 }
 
@@ -98 +98 @@
 }
 
-/** Update the WorldScene with molecules and atoms from 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++) {
-    // check whether molecule already exists
-    const moleculeId_t molid = (*moliter)->getId();
-    const bool mol_present = MoleculesinSceneMap.count(molid);
-    if (!mol_present)
-      moleculeInserted((*moliter)->getId());
-  }
-
-  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);
-  }
-
-}
+///** 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++) {
+//    // check whether molecule already exists
+//    const moleculeId_t molid = (*moliter)->getId();
+//    const bool mol_present = MoleculesinSceneMap.count(molid);
+//    if (!mol_present)
+//      moleculeInserted((*moliter)->getId());
+//  }
+//
+//  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)

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

@@ -70 +70 @@
 signals:
   void changed();
-  void updated();
+//  void updated();
   void changeOccured();
   void pressed();
@@ -91 +91 @@
   void addShape();
   void removeShape();
-  void update();
+//  void update();
   void moleculesVisibilityChanged(const moleculeId_t _id, bool _visible);
   void changeMoleculeId(GLMoleculeObject_molecule *, const moleculeId_t, const moleculeId_t);

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

@@ -85 +85 @@
   connect(this, SIGNAL(ShapeAdded()), worldscene, SLOT(addShape()));
   connect(this, SIGNAL(ShapeRemoved()), worldscene, SLOT(removeShape()));
-  connect(this, SIGNAL(TimeChanged()), worldscene, SIGNAL(updated()));
+//  connect(this, SIGNAL(TimeChanged()), worldscene, SIGNAL(updated()));
   connect(worldscene, SIGNAL(changeOccured()), this, SLOT(changeSignalled()));
   connect(worldscene, SIGNAL(changed()), this, SIGNAL(changed()));
@@ -102 +102 @@
   World::getInstance().signOn(this, World::MoleculeInserted);
   World::getInstance().signOn(this, World::SelectionChanged);
-  WorldTime::getInstance().signOn(this, WorldTime::TimeChanged);
+//  WorldTime::getInstance().signOn(this, WorldTime::TimeChanged);
   AtomObserver::getInstance().signOn(this, AtomObservable::PositionChanged);
 
@@ -131 +131 @@
   World::getInstance().signOff(this, World::MoleculeInserted);
   World::getInstance().signOff(this, World::SelectionChanged);
-  WorldTime::getInstance().signOff(this, WorldTime::TimeChanged);
+//  WorldTime::getInstance().signOff(this, WorldTime::TimeChanged);
   AtomObserver::getInstance().signOff(this, AtomObservable::PositionChanged);
   ShapeRegistry::getInstance().signOff(this);