Changeset 02ce36 for src/UIElements

Timestamp:

Jan 2, 2012, 1:00:04 PM (13 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:

d82961

Parents:

b3fb31

git-author:

Frederik Heber <heber@…> (01/02/12 12:57:32)

git-committer:

Frederik Heber <heber@…> (01/02/12 13:00:04)

Message:

We now require CodePatterns 1.2.0.

• this is due to the updated Observer structure and multi_array MemDebug bugfix.

Location:

src/UIElements

Files:

• CommandLineUI/CommandLineStatusIndicator.cpp (modified) (1 diff)
• CommandLineUI/CommandLineStatusIndicator.hpp (modified) (1 diff)
• TextUI/TextStatusIndicator.hpp (modified) (1 diff)
• Views/Qt4/Qt3D/GLMoleculeObject_atom.cpp (modified) (3 diffs)
• Views/Qt4/Qt3D/GLMoleculeObject_atom.hpp (modified) (1 diff)
• Views/Qt4/Qt3D/GLWorldView.cpp (modified) (3 diffs)
• Views/Qt4/Qt3D/GLWorldView.hpp (modified) (2 diffs)
• Views/Qt4/QtMoleculeView.hpp (modified) (1 diff)
• Views/Qt4/QtStatusBar.hpp (modified) (1 diff)
• Views/Qt4/QtWorldView.hpp (modified) (1 diff)

src/UIElements/CommandLineUI/CommandLineStatusIndicator.cpp

@@ -25 +25 @@
 
 #include "Actions/Process.hpp"
+#include "CodePatterns/Observer/Observable.hpp"
 
 using namespace MoleCuilder;

src/UIElements/CommandLineUI/CommandLineStatusIndicator.hpp

@@ -15 +15 @@
 
 
-#include "CodePatterns/Observer.hpp"
+#include "CodePatterns/Observer/Observer.hpp"
+
+class Observable;
 
 class CommandLineStatusIndicator : public Observer

src/UIElements/TextUI/TextStatusIndicator.hpp

@@ -15 +15 @@
 
 
-#include "CodePatterns/Observer.hpp"
+#include "CodePatterns/Observer/Observer.hpp"
 
 class TextStatusIndicator : public Observer

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

@@ -28 +28 @@
 #include "CodePatterns/Assert.hpp"
 #include "CodePatterns/Log.hpp"
+#include "CodePatterns/Observer/Notification.hpp"
 
 #include "Descriptors/AtomIdDescriptor.hpp"
@@ -47 +48 @@
 {
   // sign on as observer (obtain non-const instance before)
-  atomref->signOn(this, atomref->getChannel(AtomObservable::IndexChanged));
-  atomref->signOn(this, atomref->getChannel(AtomObservable::PositionChanged));
-  atomref->signOn(this, atomref->getChannel(AtomObservable::ElementChanged));
-  atomref->signOn(this, atomref->getChannel(AtomObservable::BondsChanged));
+  atomref->signOn(this, AtomObservable::IndexChanged);
+  atomref->signOn(this, AtomObservable::PositionChanged);
+  atomref->signOn(this, AtomObservable::ElementChanged);
+  atomref->signOn(this, AtomObservable::BondsChanged);
 
   // set the object's id
@@ -62 +63 @@
 GLMoleculeObject_atom::~GLMoleculeObject_atom()
 {
-  _atom->signOff(this, _atom->getChannel(AtomObservable::IndexChanged));
-  _atom->signOff(this, _atom->getChannel(AtomObservable::PositionChanged));
-  _atom->signOff(this, _atom->getChannel(AtomObservable::ElementChanged));
-  _atom->signOff(this, _atom->getChannel(AtomObservable::BondsChanged));
+  _atom->signOff(this, AtomObservable::IndexChanged);
+  _atom->signOff(this, AtomObservable::PositionChanged);
+  _atom->signOff(this, AtomObservable::ElementChanged);
+  _atom->signOff(this, AtomObservable::BondsChanged);
 }
 

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

@@ -16 +16 @@
 #include "GLMoleculeObject.hpp"
 
-#include "CodePatterns/Observer.hpp"
+#include "CodePatterns/Observer/Observer.hpp"
 
 #include "Atom/atom.hpp"

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

@@ -27 +27 @@
 
 #include "CodePatterns/Log.hpp"
+#include "CodePatterns/Observer/Notification.hpp"
 
 #include "World.hpp"
@@ -45 +46 @@
   // sign on to changes in the world
   World::getInstance().signOn(this);
-  World::getInstance().signOn(this, World::getInstance().getChannel(World::AtomInserted));
-  World::getInstance().signOn(this, World::getInstance().getChannel(World::AtomRemoved));
+  World::getInstance().signOn(this, World::AtomInserted);
+  World::getInstance().signOn(this, World::AtomRemoved);
 }
 
@@ -52 +53 @@
 {
   World::getInstance().signOff(this);
-  World::getInstance().signOff(this, World::getInstance().getChannel(World::AtomInserted));
-  World::getInstance().signOff(this, World::getInstance().getChannel(World::AtomRemoved));
+  World::getInstance().signOff(this, World::AtomInserted);
+  World::getInstance().signOff(this, World::AtomRemoved);
   delete worldscene;
 }

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

@@ -16 +16 @@
 #include <Qt3D/qglview.h>
 
-#include "CodePatterns/Observer.hpp"
+#include "CodePatterns/Observer/Observer.hpp"
 
 #include "World.hpp"
@@ -61 +61 @@
 
 
-//#include "CodePatterns/Observer.hpp"
+//#include "CodePatterns/Observer/Observer.hpp"
 //#include "LinearAlgebra/Vector.hpp"
 //#include "changetypes.hpp"

src/UIElements/Views/Qt4/QtMoleculeView.hpp

@@ -17 +17 @@
 #include <string>
 #include <QtGui/QTabWidget>
-#include "CodePatterns/Observer.hpp"
+#include "CodePatterns/Observer/Observer.hpp"
 
 class molecule;

src/UIElements/Views/Qt4/QtStatusBar.hpp

@@ -20 +20 @@
 #include <QtGui/QStatusBar>
 
-#include "CodePatterns/Observer.hpp"
+#include "CodePatterns/Observer/Observer.hpp"
 
 class QLabel;

src/UIElements/Views/Qt4/QtWorldView.hpp

@@ -16 +16 @@
 
 #include <QtGui/QTableWidget>
-#include "CodePatterns/Observer.hpp"
+#include "CodePatterns/Observer/Observer.hpp"
 
 class molecule;