Changeset 907636 for src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp

Timestamp:

Oct 6, 2011, 3:06:16 PM (14 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:

06ebf5

Parents:

04f017

git-author:

Frederik Heber <heber@…> (08/26/11 15:53:28)

git-committer:

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

Message:

First working version of GLWorldView that show atoms and molecules.

• GLWorldView is view of model GLWorldScene.
• GLWorldScene contains GLMoleculeScene for each molecule.
• GLMoleculeScene contains GLMoleculeObject_.. for each atom and two for each bond.
• GLMoleculeObject_... derive from GLMoleculeObject which hides the specifics of being sphere or cylinder and allows for initializing and drawing unifiedly.
• so far clicking the atoms is not working (as in teaservice example).

File:

• src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp (modified) (3 diffs)

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

@@ -21 +21 @@
 
 #include <Qt/qevent.h>
-#include <Qt3D/qglbuilder.h>
-#include <Qt3D/qglcube.h>
-
-//#include "GLWorldScene.hpp"
+
+#include "GLWorldScene.hpp"
 
 #include "CodePatterns/MemDebug.hpp"
@@ -31 +29 @@
    : QGLView(parent), worldscene(NULL)
 {
-//   worldscene = new GLWorldScene(this);
+   worldscene = new GLWorldScene(this);
 
    setOption(QGLView::ObjectPicking, true);
 
-//   connect(worldscene, SIGNAL(changed()), this, SLOT(updateGL()));
+   connect(worldscene, SIGNAL(changed()), this, SLOT(updateGL()));
 }
 
@@ -46 +44 @@
 void GLWorldView::initializeGL(QGLPainter *painter)
 {
-  QGLBuilder builder;
-  builder << QGL::Faceted;
-  builder << QGLCube();
-  worldscene = builder.finalizedSceneNode();
-//   worldscene->initialize(this, painter);
+   worldscene->initialize(this, painter);
 }
 
 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);
+   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>