Changeset 2f7988 for src/UIElements/Views/Qt4/Qt3D

Timestamp:

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

0070aa

Parents:

0f7ffe

git-author:

Frederik Heber <heber@…> (10/28/15 13:23:09)

git-committer:

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

Message:

Moved and renamed QtInstanceInformationBoard -> QtObservedInstanceBoard.

• this is preparatory for adding ObservedAtom and ObservedMolecule classes that combine all observed information on either type.

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLMoleculeObject_atom.cpp (modified) (2 diffs)
• GLMoleculeObject_atom.hpp (modified) (4 diffs)
• GLMoleculeObject_bond.cpp (modified) (1 diff)
• GLMoleculeObject_molecule.cpp (modified) (3 diffs)
• GLMoleculeObject_molecule.hpp (modified) (5 diffs)
• GLWorldScene.cpp (modified) (2 diffs)
• GLWorldScene.hpp (modified) (3 diffs)
• GLWorldView.cpp (modified) (1 diff)
• GLWorldView.hpp (modified) (2 diffs)

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

@@ -54 +54 @@
 #include "LinearAlgebra/Vector.hpp"
 #include "UIElements/Views/Qt4/Qt3D/GLMoleculeObject_bond.hpp"
-#include "UIElements/Views/Qt4/QtInstanceInformationBoard.hpp"
+#include "UIElements/Qt4/InstanceBoard/QtObservedInstanceBoard.hpp"
 #include "World.hpp"
 #include "WorldTime.hpp"
@@ -95 +95 @@
     QObject *parent,
     const atomId_t _id,
-    QtInstanceInformationBoard * _board,
+    QtObservedInstanceBoard * _board,
     std::vector<boost::any> _ObservedValues) :
   GLMoleculeObject(mesh, parent),

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

@@ -29 +29 @@
 
 class GLWorldScene;
-class QtInstanceInformationBoard;
+class QtObservedInstanceBoard;
 
 class GLMoleculeObject_atom : public GLMoleculeObject, Observer
@@ -39 +39 @@
       QObject *parent,
       const atomId_t id,
-      QtInstanceInformationBoard * _board,
+      QtObservedInstanceBoard * _board,
       std::vector<boost::any> _ObservedValues
       );
@@ -104 +104 @@
 
 private:
-  friend class QtInstanceInformationBoard;
+  friend class QtObservedInstanceBoard;
   /** Observed Values **/
 
@@ -189 +189 @@
   unsigned int signedOnChannels;
 
-  QtInstanceInformationBoard * board;
+  QtObservedInstanceBoard * board;
 };
 

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

@@ -55 +55 @@
 #include "LinearAlgebra/Line.hpp"
 #include "LinearAlgebra/Vector.hpp"
-#include "UIElements/Views/Qt4/QtInstanceInformationBoard.hpp"
+#include "UIElements/Qt4/InstanceBoard/QtObservedInstanceBoard.hpp"
 #include "World.hpp"
 

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

@@ -62 +62 @@
 #include "Tesselation/BoundaryTriangleSet.hpp"
 #include "Tesselation/CandidateForTesselation.hpp"
-#include "UIElements/Views/Qt4/QtInstanceInformationBoard.hpp"
+#include "UIElements/Qt4/InstanceBoard/QtObservedInstanceBoard.hpp"
 #include "Atom/TesselPoint.hpp"
 #include "World.hpp"
@@ -105 +105 @@
     QObject *parent,
     const moleculeId_t _molid,
-    QtInstanceInformationBoard * _board,
+    QtObservedInstanceBoard * _board,
     std::vector<boost::any> _ObservedValues) :
   GLMoleculeObject((QGLSceneNode *)NULL, parent),
@@ -137 +137 @@
     QObject *parent,
     const moleculeId_t _molid,
-    QtInstanceInformationBoard * _board,
+    QtObservedInstanceBoard * _board,
     std::vector<boost::any> _ObservedValues) :
   GLMoleculeObject(mesh, parent),

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

@@ -34 +34 @@
 class GLMoleculeObject_atom;
 class GLWorldScene;
-class QtInstanceInformationBoard;
+class QtObservedInstanceBoard;
 
 class GLMoleculeObject_molecule : public GLMoleculeObject, public Observer
@@ -43 +43 @@
       QObject *parent,
       const moleculeId_t molid,
-      QtInstanceInformationBoard * _board,
+      QtObservedInstanceBoard * _board,
       std::vector<boost::any> _ObservedValues);
   GLMoleculeObject_molecule(
@@ -49 +49 @@
       QObject *parent,
       const moleculeId_t molid,
-      QtInstanceInformationBoard * _board,
+      QtObservedInstanceBoard * _board,
       std::vector<boost::any> _ObservedValues);
   virtual ~GLMoleculeObject_molecule();
@@ -155 +155 @@
 
 private:
-  friend class QtInstanceInformationBoard;
+  friend class QtObservedInstanceBoard;
   /** Observed Values **/
 
@@ -235 +235 @@
   unsigned int signedOnChannels;
 
-  QtInstanceInformationBoard * board;
+  QtObservedInstanceBoard * board;
 };
 

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

@@ -49 +49 @@
 #include "UIElements/Views/Qt4/Qt3D/GLMoleculeObject_shape.hpp"
 
-#include "UIElements/Views/Qt4/QtInstanceInformationBoard.hpp"
+#include "UIElements/Qt4/InstanceBoard/QtObservedInstanceBoard.hpp"
 #include "UIElements/Views/Qt4/QtSelectionChangedAgent.hpp"
 
@@ -74 +74 @@
 
 GLWorldScene::GLWorldScene(
-    QtInstanceInformationBoard * _board,
+    QtObservedInstanceBoard * _board,
     QObject *parent) :
   QObject(parent),

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

@@ -41 +41 @@
 class QtSelectionChangedAgent;
 
-class QtInstanceInformationBoard;
+class QtObservedInstanceBoard;
 
 /** This class contains a list of all molecules in the world.
@@ -51 +51 @@
 public:
   GLWorldScene(
-      QtInstanceInformationBoard * _board,
+      QtObservedInstanceBoard * _board,
       QObject *parent=0);
   virtual ~GLWorldScene();
@@ -139 +139 @@
   SelectionModeType selectionMode;
 
-  QtInstanceInformationBoard * board;
+  QtObservedInstanceBoard * board;
 };
 

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

@@ -66 +66 @@
 
 GLWorldView::GLWorldView(
-    QtInstanceInformationBoard * _board,
+    QtObservedInstanceBoard * _board,
     QWidget *parent) :
   QGLView(parent),

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

@@ -28 +28 @@
 class QtSelectionChangedAgent;
 
-class QtInstanceInformationBoard;
+class QtObservedInstanceBoard;
 
 /** This class is the view on the 3D representation of the World, i.e. the whole
@@ -39 +39 @@
 public:
   GLWorldView(
-      QtInstanceInformationBoard * _board,
+      QtObservedInstanceBoard * _board,
       QWidget *parent=0);
   virtual ~GLWorldView();