Changeset 85c36d for src/UIElements/Views/Qt4/QtShapeList.cpp

Timestamp:

Nov 16, 2012, 11:10:57 AM (12 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:

b3b228

Parents:

7de208

git-author:

Michael Ankele <ankele@…> (10/26/12 12:58:05)

git-committer:

Frederik Heber <heber@…> (11/16/12 11:10:57)

Message:

cached shapes in GLWorldScene + cleaner ShapeRegistry notifications

File:

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

src/UIElements/Views/Qt4/QtShapeList.cpp

@@ -39 +39 @@
 #include "CodePatterns/MemDebug.hpp"
 
+#include "CodePatterns/Observer/Notification.hpp"
+
 #include "Shapes/ShapeFactory.hpp"
 #include "Shapes/ShapeRegistry.hpp"
@@ -66 +68 @@
         selecting = false;
 
-        refill();
+        refill(NULL);
 
         ShapeRegistry::getInstance().signOn(this);
+  ShapeRegistry::getInstance().signOn(this, ShapeRegistry::ShapeInserted);
+  ShapeRegistry::getInstance().signOn(this, ShapeRegistry::ShapeRemoved);
+  ShapeRegistry::getInstance().signOn(this, ShapeRegistry::SelectionChanged);
 
   connect(this,SIGNAL(itemSelectionChanged()),this,SLOT(rowSelected()));
@@ -76 +81 @@
 {
   ShapeRegistry::getInstance().signOff(this);
+  ShapeRegistry::getInstance().signOff(this, ShapeRegistry::ShapeInserted);
+  ShapeRegistry::getInstance().signOff(this, ShapeRegistry::ShapeRemoved);
+  ShapeRegistry::getInstance().signOff(this, ShapeRegistry::SelectionChanged);
 }
 
-void QtShapeList::update(Observable *publisher) {
+void QtShapeList::update(Observable *publisher) {}
 
-  refill();
+void QtShapeList::recieveNotification(Observable *publisher, Notification_ptr notification)
+{
+  if (static_cast<ShapeRegistry*>(publisher) == ShapeRegistry::getPointer()) {
+    switch (notification->getChannelNo()) {
+      case ShapeRegistry::ShapeInserted:
+      {
+        refill(NULL);
+        break;
+      }
+      case ShapeRegistry::ShapeRemoved:
+      {
+        refill(ShapeRegistry::getInstance().lastChanged());
+        break;
+      }
+      case ShapeRegistry::SelectionChanged:
+      {
+        refill(NULL);
+        break;
+      }
+      default:
+        ASSERT(0, "QtShapeList::recieveNotification() - we cannot get here.");
+        break;
+    }
+  } else
+    ASSERT(0, "QtShapeList::recieveNotification() - received notification from unknown source.");
 }
 
-void QtShapeList::refill() {
+void QtShapeList::refill(::Shape *ignore) {
 
   clearing = true;
@@ -95 +127 @@
   for (iter = reg.getBeginIter(); iter != reg.getEndIter(); iter ++){
     ::Shape *s = iter->second;
+    if (s == ignore)
+      continue;
 
     QTreeWidgetItem *treeItem = new QTreeWidgetItem(this);