Changeset 367489 for src/UIElements/Views/Qt4/QtInfoBox.hpp

Timestamp:

Feb 12, 2016, 11:15:40 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:

3b9aa1

Parents:

5a9e34

git-author:

Frederik Heber <heber@…> (10/30/15 11:06:30)

git-committer:

Frederik Heber <heber@…> (02/12/16 23:15:40)

Message:

QtInfoBox now obtains information completely from QtObservedInstanceBoard and ObservedValues.

File:

• src/UIElements/Views/Qt4/QtInfoBox.hpp (modified) (5 diffs)

src/UIElements/Views/Qt4/QtInfoBox.hpp

@@ -20 +20 @@
 #include <QTimer>
 
-#include "CodePatterns/Observer/Observer.hpp"
+#include "UIElements/Qt4/InstanceBoard/QtObservedAtom.hpp"
+#include "UIElements/Qt4/InstanceBoard/QtObservedMolecule.hpp"
 
 #include "types.hpp"
 
-class molecule;
-class atom;
+class periodentafel;
 
 // Forwarding of the Tab-Pages
@@ -31 +31 @@
 class QtMoleculeInfoPage;
 
+class QtObservedInstanceBoard;
+
 class QtInfoBox : public QTabWidget
 {
   Q_OBJECT
 public:
-  QtInfoBox();
+  QtInfoBox(QtObservedInstanceBoard *_board);
   virtual ~QtInfoBox();
 
@@ -58 +60 @@
   QTimer *timer;
 
+  QtObservedInstanceBoard *board;
+
   int currentPage;
+
+  periodentafel *periode;
 };
 
@@ -64 +70 @@
  * Widget to display the tab page for a single atom
  */
-class QtAtomInfoPage : public QTreeWidget, public Observer {
+class QtAtomInfoPage : public QTreeWidget
+{
   Q_OBJECT
 public:
-  QtAtomInfoPage(const atom *_atom, QWidget *parent);
+  QtAtomInfoPage(QtObservedAtom::ptr &_atom, periodentafel *_periode, QWidget *parent);
   virtual ~QtAtomInfoPage();
-  void update(Observable *subject);
-  void subjectKilled(Observable *subject);
 
-signals:
-  void atomKilled();
-
-private:
+private slots:
   void updatePage();
 
 private:
-  const atom *atomRef;
+  QtObservedAtom::ptr atomRef;
+  periodentafel *periode;
   QTreeWidget *info;
 };
@@ -86 +89 @@
  * Widget to display the tab page for a single molecule
  */
-class QtMoleculeInfoPage : public QTreeWidget,  public Observer {
+class QtMoleculeInfoPage : public QTreeWidget
+{
   Q_OBJECT
 public:
-  QtMoleculeInfoPage(const molecule *_mol, QWidget *parent);
+  QtMoleculeInfoPage(QtObservedMolecule::ptr &_mol, QWidget *parent);
   virtual ~QtMoleculeInfoPage();
 
-  void update(Observable *subject);
-  void subjectKilled(Observable *subject);
-
-  signals:
-    void moleculeKilled();
-
-private:
+private slots:
   void updatePage();
 
 private:
-  const molecule *mol;
+  QtObservedMolecule::ptr mol;
   QTreeWidget *info;
 };