Changeset a08d3c0 for src

Timestamp:

Oct 6, 2011, 3:05:56 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:

04f017

Parents:

da8f97

git-author:

Frederik Heber <heber@…> (08/26/11 14:49:14)

git-committer:

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

Message:

Replaced empty GLWordlView QWidget by TeapotView example from Qt3d.

• this completes the initial test for a QGLView derived class.

Location:

src/UIElements

Files:

• Makefile.am (modified) (2 diffs)
• Qt4/QtMainWindow.cpp (modified) (3 diffs)
• Qt4/QtMainWindow.hpp (modified) (2 diffs)
• Views/Qt4/teapotview.cpp (added)
• Views/Qt4/teapotview.hpp (added)

src/UIElements/Makefile.am

@@ -191 +191 @@
   UIElements/Views/Qt4/QtMoleculeView.cpp \
   UIElements/Views/Qt4/QtStatusBar.cpp \
-  UIElements/Views/Qt4/Qt3D/GLWorldView.cpp
-
+        UIElements/Views/Qt4/teapotview.cpp
+#  UIElements/Views/Qt4/Qt3D/GLWorldView.cpp
+
+#  UIElements/Views/Qt4/Qt3D/GLWorldScene.cpp \
+  UIElements/Views/Qt4/Qt3D/GLMoleculeObject.cpp \
+  UIElements/Views/Qt4/Qt3D/GLMoleculeObject_atom.cpp \
+  UIElements/Views/Qt4/Qt3D/GLMoleculeObject_bond.cpp \
+  UIElements/Views/Qt4/Qt3D/GLMoleculeScene.cpp
 #  UIElements/Views/Qt4/dialoglight.cpp
              
@@ -218 +224 @@
   UIElements/Views/Qt4/QtMoleculeView.hpp \
   UIElements/Views/Qt4/QtStatusBar.hpp \
-  UIElements/Views/Qt4/Qt3D/GLWorldView.hpp
+        UIElements/Views/Qt4/teapotview.hpp
+#  UIElements/Views/Qt4/Qt3D/GLWorldView.hpp
+
+#  UIElements/Views/Qt4/Qt3D/GLWorldScene.hpp \
+        UIElements/Views/Qt4/Qt3D/GLMoleculeObject.hpp \
+  UIElements/Views/Qt4/Qt3D/GLMoleculeObject_atom.hpp \
+  UIElements/Views/Qt4/Qt3D/GLMoleculeObject_bond.hpp \
+  UIElements/Views/Qt4/Qt3D/GLMoleculeScene.hpp
 
 #QTUIUI_HEADER = \

src/UIElements/Qt4/QtMainWindow.cpp

@@ -31 +31 @@
 #include<boost/bind.hpp>
 
+#include "Menu/Qt4/QtMenu.hpp"
+#include "Views/Qt4/QtWorldView.hpp"
+#include "Views/Qt4/QtMoleculeView.hpp"
+#include "Views/Qt4/QtStatusBar.hpp"
+#include "Views/Qt4/teapotview.hpp"
+
 #include "CodePatterns/MemDebug.hpp"
 
@@ -39 +45 @@
 #include "Actions/ActionRegistry.hpp"
 #include "Actions/ValueStorage.hpp"
-#include "Menu/Qt4/QtMenu.hpp"
-#include "Views/Qt4/QtWorldView.hpp"
-#include "Views/Qt4/QtMoleculeView.hpp"
-#include "Views/Qt4/QtStatusBar.hpp"
-#include "Views/Qt4/Qt3D/GLWorldView.hpp"
 
 QtMainWindow::QtMainWindow(QApplication *_theApp) :
@@ -54 +55 @@
 
   moleculeDisplay = new QtMoleculeView();
-  molecule3dDisplay = new GLWorldView(this);
+  molecule3dDisplay = new TeapotView(this);
   //setCentralWidget(molecule3dDisplay);
   //molecule3dDisplay->setFocus();

src/UIElements/Qt4/QtMainWindow.hpp

@@ -25 +25 @@
 class QtWorldView;
 class StringView;
-class GLWorldView;
+//class GLWorldView;
+class TeapotView;
 class QtMoleculeView;
 class QtStatusBar;
@@ -44 +45 @@
   QApplication *theApp;
   QtWorldView *worldDisplay;
-  GLWorldView *molecule3dDisplay;
+  TeapotView *molecule3dDisplay;
   QtMoleculeView *moleculeDisplay;
   QtStatusBar *statusBar;