Changeset 57ee0d

Timestamp:

Jan 21, 2010, 2:01:16 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

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:

6adb96

Parents:

f8879d

Message:

Added a view that displays all molecules using a QTableWidget

Location:

src

Files:

• Makefile.am (modified) (1 diff)
• Patterns/Observer.hpp (modified) (2 diffs)
• UIElements/QT4/QTMainWindow.cpp (modified) (2 diffs)
• UIElements/QT4/QTMainWindow.hpp (modified) (2 diffs)
• Views/QT4/QTMoleculesView.cpp (added)
• Views/QT4/QTMoleculesView.hpp (added)
• molecule.hpp (modified) (2 diffs)
• moleculelist.cpp (modified) (1 diff)
• unittests/ObserverTest.cpp (modified) (4 diffs)
• unittests/ObserverTest.hpp (modified) (1 diff)

src/Makefile.am

@@ -20 +20 @@
 UIHEADER = ${ACTIONSHEADER} ${VIEWHEADER} ${MENUHEADER} UIElements/UIFactory.hpp UIElements/TextUIFactory.hpp UIElements/MainWindow.hpp UIElements/TextWindow.hpp UIElements/Dialog.hpp UIElements/TextDialog.hpp
 
-QTUIMOC_HEADER = UIElements/QT4/QTMainWindow.hpp UIElements/QT4/QTDialog.hpp Menu/QT4/QTMenu.hpp 
-QTUIMOC_TARGETS = QTMainWindow.moc.cpp QTMenu.moc.cpp QTDialog.moc.cpp
+QTUIMOC_HEADER = UIElements/QT4/QTMainWindow.hpp UIElements/QT4/QTDialog.hpp Menu/QT4/QTMenu.hpp  Views/QT4/QTMoleculesView.hpp
+QTUIMOC_TARGETS = QTMainWindow.moc.cpp QTMenu.moc.cpp QTDialog.moc.cpp QTMoleculesView.moc.cpp
 
-QTUISOURCE = ${QTUIMOC_TARGETS} UIElements/QT4/QTMainWindow.cpp UIElements/QT4/QTDialog.cpp UIElements/QT4/QTUIFactory.cpp Menu/QT4/QTMenu.cpp
+QTUISOURCE = ${QTUIMOC_TARGETS} UIElements/QT4/QTMainWindow.cpp UIElements/QT4/QTDialog.cpp UIElements/QT4/QTUIFactory.cpp Menu/QT4/QTMenu.cpp Views/QT4/QTMoleculesView.cpp
 QTUIHEADER = ${QTUIMOC_HEADER} UIElements/QT4/QTUIFactory.hpp
 

src/Patterns/Observer.hpp

@@ -32 +32 @@
 class Observer
 {
+  friend class Observable;
 public:
   Observer();
   virtual ~Observer();
 
+protected:
   virtual void update(Observable *publisher)=0;
   virtual void subjectKilled(Observable *publisher)=0;
@@ -48 +50 @@
   virtual void signOff(Observer *target);
 
+protected:
   virtual void update(Observable *publisher);
   virtual void subjectKilled(Observable *publisher);
 
-private:
   virtual void notifyAll();
 protected:
-// Observer mechanismen is done from a static central place
+// Observer mechanism is done from a static central place
   /**
    * Internal method.

src/UIElements/QT4/QTMainWindow.cpp

@@ -19 +19 @@
 #include "molecule.hpp"
 #include "Menu/QT4/QTMenu.hpp"
-#include "Views/StreamStringView.hpp"
+#include "Views/QT4/QTMoleculesView.hpp"
 
 
@@ -27 +27 @@
     theApp(_theApp)
 {
-  moleculeView = new StreamStringView(boost::bind(&MoleculeListClass::Enumerate,molecules,_1));
-  moleculeDisplay = new QLabel(QString(moleculeView->toString().c_str()));
+  moleculeDisplay = new QTMoleculesView(molecules,this);
   setCentralWidget(moleculeDisplay);
 

src/UIElements/QT4/QTMainWindow.hpp

@@ -12 +12 @@
 #include <Qt/qmainwindow.h>
 
-class QLabel;
+class QTMoleculesView;
 class StringView;
 class QTMenu;
@@ -30 +30 @@
   // All kinds of QTStuff used in this window
   QApplication *theApp;
-  QLabel *moleculeDisplay;
+  QTMoleculesView *moleculeDisplay;
   QTMenu *editMoleculesMenu;
-
-  // All kinds of internal stuff that is bridged to QT
-  StringView *moleculeView;
 
 };

src/molecule.hpp

@@ -30 +30 @@
 #include "stackclass.hpp"
 #include "tesselation.hpp"
+#include "Patterns/Observer.hpp"
 
 /****************************************** forward declarations *****************************/
@@ -308 +309 @@
 /** A list of \a molecule classes.
  */
-class MoleculeListClass {
+class MoleculeListClass : public Observable {
   public:
     MoleculeList ListOfMolecules; //!< List of the contained molecules

src/moleculelist.cpp

@@ -852 +852 @@
 
 void MoleculeListClass::createNewMolecule(periodentafel *periode) {
+  START_OBSERVER;
   molecule *mol = NULL;
   mol = new molecule(periode);
   insert(mol);
+  FINISH_OBSERVER;
 };
 

src/unittests/ObserverTest.cpp

@@ -86 +86 @@
 
 void ObserverTest::setUp() {
-  simpleObservable = new  SimpleObservable();
+  simpleObservable1 = new SimpleObservable();
+  simpleObservable2 = new SimpleObservable();
   callObservable = new CallObservable();
   superObservable = new SuperObservable();
@@ -93 +94 @@
   observer2 = new UpdateCountObserver();
   observer3 = new UpdateCountObserver();
+  observer4 = new UpdateCountObserver();
 }
 
 void ObserverTest::tearDown() {
-  delete simpleObservable;
+  delete simpleObservable1;
+  delete simpleObservable2;
   delete callObservable;
   delete superObservable;
@@ -103 +106 @@
   delete observer2;
   delete observer3;
+  delete observer4;
 }
 
 void ObserverTest::doesUpdateTest()
 {
-  simpleObservable->signOn(observer1);
-  simpleObservable->signOn(observer2);
-  simpleObservable->signOn(observer3);
-
-  simpleObservable->changeMethod();
+  simpleObservable1->signOn(observer1);
+  simpleObservable1->signOn(observer2);
+  simpleObservable1->signOn(observer3);
+  simpleObservable2->signOn(observer2);
+  simpleObservable2->signOn(observer4);
+
+  simpleObservable1->changeMethod();
   CPPUNIT_ASSERT_EQUAL( 1, observer1->updates );
   CPPUNIT_ASSERT_EQUAL( 1, observer2->updates );
   CPPUNIT_ASSERT_EQUAL( 1, observer3->updates );
-
-  simpleObservable->signOff(observer3);
-
-  simpleObservable->changeMethod();
+  CPPUNIT_ASSERT_EQUAL( 0, observer4->updates );
+
+  simpleObservable1->signOff(observer3);
+
+  simpleObservable1->changeMethod();
   CPPUNIT_ASSERT_EQUAL( 2, observer1->updates );
   CPPUNIT_ASSERT_EQUAL( 2, observer2->updates );
   CPPUNIT_ASSERT_EQUAL( 1, observer3->updates );
+  CPPUNIT_ASSERT_EQUAL( 0, observer4->updates );
+
+  simpleObservable2->changeMethod();
+  CPPUNIT_ASSERT_EQUAL( 2, observer1->updates );
+  CPPUNIT_ASSERT_EQUAL( 3, observer2->updates );
+  CPPUNIT_ASSERT_EQUAL( 1, observer3->updates );
+  CPPUNIT_ASSERT_EQUAL( 1, observer4->updates );
 }
 
@@ -155 +169 @@
   cout << "If this test does not complete in a few seconds, kill the test-suite and fix the Error in the circle detection mechanism" << endl;
 
-  cout << endl << endl << "The following error displayed by the observer framwork can be ignored" << endl;
+  cout << endl << endl << "The following errors displayed by the observer framework can be ignored" << endl;
 
   // make this Observable its own subject. NEVER DO THIS IN ACTUAL CODE
-  simpleObservable->signOn(simpleObservable);
-  simpleObservable->changeMethod();
+  simpleObservable1->signOn(simpleObservable1);
+  simpleObservable1->changeMethod();
+
+  // more complex test
+  simpleObservable1->signOff(simpleObservable1);
+  simpleObservable1->signOn(simpleObservable2);
+  simpleObservable2->signOn(simpleObservable1);
+  simpleObservable1->changeMethod();
+  simpleObservable1->signOff(simpleObservable2);
+  simpleObservable2->signOff(simpleObservable1);
   // when we reach this line, although we broke the DAG assumption the circle check works fine
   CPPUNIT_ASSERT(true);

src/unittests/ObserverTest.hpp

@@ -40 +40 @@
   UpdateCountObserver *observer2;
   UpdateCountObserver *observer3;
+  UpdateCountObserver *observer4;
 
-  SimpleObservable *simpleObservable;
+  SimpleObservable *simpleObservable1;
+  SimpleObservable *simpleObservable2;
   CallObservable *callObservable;
   SuperObservable *superObservable;