Changeset 04f017

Timestamp:

Oct 6, 2011, 3:06:13 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:

907636

Parents:

a08d3c0

git-author:

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

git-committer:

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

Message:

Removed teapotview.?pp again.

• Functionality is contained in GLWorldView class now.

Location:

src/UIElements

Files:

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

src/UIElements/Makefile.am

@@ -191 +191 @@
   UIElements/Views/Qt4/QtMoleculeView.cpp \
   UIElements/Views/Qt4/QtStatusBar.cpp \
-        UIElements/Views/Qt4/teapotview.cpp
-#  UIElements/Views/Qt4/Qt3D/GLWorldView.cpp
+  UIElements/Views/Qt4/Qt3D/GLWorldView.cpp
 
 #  UIElements/Views/Qt4/Qt3D/GLWorldScene.cpp \
@@ -224 +223 @@
   UIElements/Views/Qt4/QtMoleculeView.hpp \
   UIElements/Views/Qt4/QtStatusBar.hpp \
-        UIElements/Views/Qt4/teapotview.hpp
-#  UIElements/Views/Qt4/Qt3D/GLWorldView.hpp
+  UIElements/Views/Qt4/Qt3D/GLWorldView.hpp
 
 #  UIElements/Views/Qt4/Qt3D/GLWorldScene.hpp \

src/UIElements/Qt4/QtMainWindow.cpp

@@ -35 +35 @@
 #include "Views/Qt4/QtMoleculeView.hpp"
 #include "Views/Qt4/QtStatusBar.hpp"
-#include "Views/Qt4/teapotview.hpp"
+#include "Views/Qt4/Qt3D/GLWorldView.hpp"
 
 #include "CodePatterns/MemDebug.hpp"
@@ -55 +55 @@
 
   moleculeDisplay = new QtMoleculeView();
-  molecule3dDisplay = new TeapotView(this);
+  molecule3dDisplay = new GLWorldView(this);
   //setCentralWidget(molecule3dDisplay);
   //molecule3dDisplay->setFocus();

src/UIElements/Qt4/QtMainWindow.hpp

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

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

@@ -21 +21 @@
 
 #include <Qt/qevent.h>
+#include <Qt3D/qglbuilder.h>
+#include <Qt3D/qglcube.h>
 
 //#include "GLWorldScene.hpp"
@@ -27 +29 @@
 
 GLWorldView::GLWorldView(QWidget *parent)
-   : worldscene(NULL) //QGLView(parent),
+   : QGLView(parent), worldscene(NULL)
 {
 //   worldscene = new GLWorldScene(this);
 
-   //setOption(QGLView::ObjectPicking, true);
+   setOption(QGLView::ObjectPicking, true);
 
 //   connect(worldscene, SIGNAL(changed()), this, SLOT(updateGL()));
 }
 
+GLWorldView::~GLWorldView()
+{
+  delete worldscene;
+}
+
+
 void GLWorldView::initializeGL(QGLPainter *painter)
 {
+  QGLBuilder builder;
+  builder << QGL::Faceted;
+  builder << QGLCube();
+  worldscene = builder.finalizedSceneNode();
 //   worldscene->initialize(this, painter);
 }
@@ -43 +55 @@
 void GLWorldView::paintGL(QGLPainter *painter)
 {
+  painter->setStandardEffect(QGL::LitMaterial);
+  painter->setFaceColor(QGL::AllFaces, QColor(170, 202, 0));
+
+  painter->modelViewMatrix().rotate(45.0f, 1.0f, 1.0f, 1.0f);
+  worldscene->draw(painter);
 //   worldscene->draw(painter);
 }
 
-void GLWorldView::keyPressEvent(QKeyEvent *e)
-{
-   if (e->key() == Qt::Key_Tab) {
-       // The Tab key turns the ShowPicking option on and off,
-       // which helps show what the pick buffer looks like.
-       //setOption(QGLView::ShowPicking, ((options() & QGLView::ShowPicking) == 0));
-       //updateGL();
-   }
-   //QGLView::keyPressEvent(e);
-}
-
+//void GLWorldView::keyPressEvent(QKeyEvent *e)
+//{
+//   if (e->key() == Qt::Key_Tab) {
+//       // The Tab key turns the ShowPicking option on and off,
+//       // which helps show what the pick buffer looks like.
+//       setOption(QGLView::ShowPicking, ((options() & QGLView::ShowPicking) == 0));
+//       updateGL();
+//   }
+//   QGLView::keyPressEvent(e);
+//}
+//
 
 //#include <GL/glu.h>

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

@@ -14 +14 @@
 #endif
 
-#include <Qt/qwidget.h>
-//#include <Qt3D/qglview.h>
+#include "qglview.h"
+#include "qglteapot.h"
 
-class QKeyEvent;
-class GLWorldScene;
+//class QKeyEvent;
+//class GLWorldScene;
+class QGLSceneNode;
 class QGLPainter;
 
@@ -25 +26 @@
  *
  */
-class GLWorldView : public QWidget // : public QGLView
+class GLWorldView : public QGLView
 {
    Q_OBJECT
 public:
    GLWorldView(QWidget *parent=0);
+   virtual ~GLWorldView();
 
 public slots:
@@ -36 +38 @@
    void initializeGL(QGLPainter *painter);
    void paintGL(QGLPainter *painter);
-   void keyPressEvent(QKeyEvent *e);
+   //void keyPressEvent(QKeyEvent *e);
 
 private:
-   GLWorldScene *worldscene;
+   //GLWorldScene *worldscene;
+   QGLSceneNode *worldscene;
 };