Changeset 1d9b6dd for src/UIElements

Timestamp:

Apr 20, 2016, 8:52:04 AM (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:

76c238

Parents:

f91ef6

git-author:

Frederik Heber <heber@…> (03/21/16 23:12:07)

git-committer:

Frederik Heber <heber@…> (04/20/16 08:52:04)

Message:

FIX: Removed some unnecessary observer code from GLWorldView.

File:

• src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp (modified) (4 diffs)

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

@@ -102 +102 @@
 
   // sign on to changes in the world
-  World::getInstance().signOn(this);
-  World::getInstance().signOn(this, World::SelectionChanged);
-//  WorldTime::getInstance().signOn(this, WorldTime::TimeChanged);
+  WorldTime::getInstance().signOn(this, WorldTime::TimeChanged);
   AtomObserver::getInstance().signOn(this, AtomObservable::PositionChanged);
 
@@ -124 +122 @@
 
 
-  World::getInstance().signOff(this);
-  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);
@@ -338 +334 @@
 void GLWorldView::recieveNotification(Observable *publisher, Notification_ptr notification)
 {
-  if (static_cast<World *>(publisher) == World::getPointer()) {
-    switch (notification->getChannelNo()) {
-      case World::SelectionChanged:
-      {
-  #ifdef LOG_OBSERVER
-        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that selection has changed.";
-  #endif
-        emit worldSelectionChanged();
-        break;
-      }
-      default:
-        ASSERT(0, "GLWorldView::recieveNotification() - we cannot get here for World.");
-        break;
-    }
-  } else if (static_cast<WorldTime *>(publisher) == WorldTime::getPointer()) {
+  if (static_cast<WorldTime *>(publisher) == WorldTime::getPointer()) {
     switch (notification->getChannelNo()) {
       case WorldTime::TimeChanged:
@@ -365 +347 @@
       default:
         ASSERT(0, "GLWorldView::recieveNotification() - we cannot get here for WorldTime.");
-        break;
-    }
-  } else if (dynamic_cast<AtomObservable *>(publisher) != NULL) {
-    switch (notification->getChannelNo()) {
-      case AtomObservable::PositionChanged:
-      {
-    #ifdef LOG_OBSERVER
-        const atom *_atom = dynamic_cast<const atom *>(publisher);
-        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that atom "+toString(_atom->getId())+" has changed its position.";
-    #endif
-        emit changed();
-        break;
-      }
-      default:
-        ASSERT(0, "GLWorldView::recieveNotification() - we cannot get here for AtomObservable.");
         break;
     }