Changeset 8e7dd9 for src/UIElements/Views/Qt4

Timestamp:

Jul 18, 2012, 2:02:27 PM (12 years ago)

Author:

Michael Ankele <ankele@…>

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:

f31b34

Parents:

8d5fde3

git-author:

Michael Ankele <ankele@…> (07/12/12 14:41:48)

git-committer:

Michael Ankele <ankele@…> (07/18/12 14:02:27)

Message:

GLWorldView: added stereo modes

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLWorldView.cpp (modified) (4 diffs)
• GLWorldView.hpp (modified) (2 diffs)

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

@@ -22 +22 @@
 #include <Qt/qevent.h>
 #include <Qt/qaction.h>
+#include <QtGui/QMenu>
 #include <QtGui/QToolBar>
+#include <QtGui/QToolButton>
 #include <Qt/qtimer.h>
 #include <Qt/qsettings.h>
@@ -50 +52 @@
   setOption(QGLView::CameraNavigation, false);
   setCameraControlMode(Rotate);
+  defaultEyeSeparation = 4.0;
 
   createDomainBox();
@@ -119 +122 @@
   connect(selMolAction, SIGNAL(triggered()), worldscene, SLOT(setSelectionModeMolecule()));
   toolbar->addAction(selMolAction);
+
+  QToolButton *stereoButton = new QToolButton(toolbar);
+  QMenu *stereoMenu = new QMenu();
+  QAction *stereoHardwareAction = new QAction(QIcon::fromTheme("zoom-best-fit"), tr("hardware"), this);
+  connect(stereoHardwareAction, SIGNAL(triggered()), this, SLOT(setCameraStereoModeHardware()));
+  stereoMenu->addAction(stereoHardwareAction);
+  QAction *stereoLeftRightAction = new QAction(QIcon::fromTheme("zoom-best-fit"), tr("left right"), this);
+  connect(stereoLeftRightAction, SIGNAL(triggered()), this, SLOT(setCameraStereoModeLeftRight()));
+  stereoMenu->addAction(stereoLeftRightAction);
+  QAction *stereoRightLeftAction = new QAction(QIcon::fromTheme("zoom-best-fit"), tr("right left"), this);
+  connect(stereoRightLeftAction, SIGNAL(triggered()), this, SLOT(setCameraStereoModeRightLeft()));
+  stereoMenu->addAction(stereoRightLeftAction);
+  QAction *stereoTopBottomAction = new QAction(QIcon::fromTheme("zoom-best-fit"), tr("top bottom"), this);
+  connect(stereoTopBottomAction, SIGNAL(triggered()), this, SLOT(setCameraStereoModeTopBottom()));
+  stereoMenu->addAction(stereoTopBottomAction);
+  QAction *stereoBottomTopAction = new QAction(QIcon::fromTheme("zoom-best-fit"), tr("bottom top"), this);
+  connect(stereoBottomTopAction, SIGNAL(triggered()), this, SLOT(setCameraStereoModeBottomTop()));
+  stereoMenu->addAction(stereoBottomTopAction);
+  QAction *stereoAnaglyphAction = new QAction(QIcon::fromTheme("zoom-best-fit"), tr("anaglyph"), this);
+  connect(stereoAnaglyphAction, SIGNAL(triggered()), this, SLOT(setCameraStereoModeAnaglyph()));
+  stereoMenu->addAction(stereoAnaglyphAction);
+  stereoButton->setMenu(stereoMenu);
+  stereoButton->setPopupMode(QToolButton::InstantPopup);
+  toolbar->addWidget(stereoButton);
 }
 
@@ -411 +438 @@
 }
 
+void GLWorldView::setCameraStereoModeDisable()
+{
+  setStereoType(QGLView::Hardware);
+  camera()->setEyeSeparation(0.0);
+  updateGL();
+}
+
+void GLWorldView::setCameraStereoModeHardware()
+{
+  setStereoType(QGLView::Hardware);
+  camera()->setEyeSeparation(defaultEyeSeparation);
+  updateGL();
+}
+
+void GLWorldView::setCameraStereoModeLeftRight()
+{
+  setStereoType(QGLView::LeftRight);
+  camera()->setEyeSeparation(defaultEyeSeparation);
+  updateGL();
+}
+
+void GLWorldView::setCameraStereoModeRightLeft()
+{
+  setStereoType(QGLView::RightLeft);
+  camera()->setEyeSeparation(defaultEyeSeparation);
+  updateGL();
+}
+
+void GLWorldView::setCameraStereoModeTopBottom()
+{
+  setStereoType(QGLView::TopBottom);
+  camera()->setEyeSeparation(defaultEyeSeparation);
+  updateGL();
+}
+
+void GLWorldView::setCameraStereoModeBottomTop()
+{
+  setStereoType(QGLView::BottomTop);
+  camera()->setEyeSeparation(defaultEyeSeparation);
+  updateGL();
+}
+
+void GLWorldView::setCameraStereoModeAnaglyph()
+{
+  setStereoType(QGLView::RedCyanAnaglyph);
+  camera()->setEyeSeparation(defaultEyeSeparation);
+  updateGL();
+}
+
 void GLWorldView::mousePressEvent(QMouseEvent *event)
 {

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

@@ -86 +86 @@
   void setCameraControlModeRotation();
   void setCameraControlModeTranslation();
+  void setCameraStereoModeDisable();
+  void setCameraStereoModeHardware();
+  void setCameraStereoModeLeftRight();
+  void setCameraStereoModeRightLeft();
+  void setCameraStereoModeTopBottom();
+  void setCameraStereoModeBottomTop();
+  void setCameraStereoModeAnaglyph();
 
 protected:
@@ -106 +113 @@
   QTimer *redrawTimer;
   bool needsRedraw;
+
+  double defaultEyeSeparation;
 };