Changeset 0e5d14 for src/UIElements

Timestamp:

Jul 17, 2012, 12:17:21 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:

3f48c2

Parents:

e13b34

git-author:

Michael Ankele <ankele@…> (05/03/12 10:29:08)

git-committer:

Michael Ankele <ankele@…> (07/17/12 12:17:21)

Message:

added toolbar actions for camera modes

Location:

src/UIElements

Files:

• Qt4/QtMainWindow.cpp (modified) (1 diff)
• Views/Qt4/Qt3D/GLWorldView.cpp (modified) (4 diffs)
• Views/Qt4/Qt3D/GLWorldView.hpp (modified) (2 diffs)

src/UIElements/Qt4/QtMainWindow.cpp

@@ -70 +70 @@
 
   toolbar = new QtToolBar(this);
+  molecule3dDisplay->addToolBarActions(toolbar);
   addToolBar(toolbar);
 

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

@@ -21 +21 @@
 
 #include <Qt/qevent.h>
+#include <Qt/qaction.h>
+#include <QtGui/QToolBar>
 
 #include "GLWorldScene.hpp"
@@ -67 +69 @@
   AtomObserver::getInstance().signOff(this, AtomObservable::PositionChanged);
   delete worldscene;
+}
+
+
+/**
+ * Add some widget specific actions to the toolbar:
+ * - camera rotation/translation mode
+ * - camera fit to domain
+ */
+void GLWorldView::addToolBarActions(QToolBar *toolbar)
+{
+  toolbar->addSeparator();
+  QAction *transAction = new QAction(QIcon::fromTheme("forward"), tr("camera translation mode"), this);
+  connect(transAction, SIGNAL(triggered()), this, SLOT(setCameraControlModeTranslation()));
+  toolbar->addAction(transAction);
+  QAction *rotAction = new QAction(QIcon::fromTheme("object-rotate-left"), tr("camera rotation mode"), this);
+  connect(rotAction, SIGNAL(triggered()), this, SLOT(setCameraControlModeRotation()));
+  toolbar->addAction(rotAction);
+  QAction *fitAction = new QAction(QIcon::fromTheme("zoom-best-fit"), tr("camera fit to domain"), this);
+  connect(fitAction, SIGNAL(triggered()), this, SLOT(fitCameraToDomain()));
+  toolbar->addAction(fitAction);
 }
 
@@ -191 +213 @@
 
 
+/**
+ * Set the current camera control mode.
+ */
 void GLWorldView::setCameraControlMode(GLWorldView::CameraControlModeType mode)
 {
@@ -206 +231 @@
 }
 
+/**
+ * Returns the current camera control mode.
+ * This needs to be invertable (rotation - translation), if the shift key is pressed.
+ */
 GLWorldView::CameraControlModeType GLWorldView::getCameraControlMode(bool inverted)
 {

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

@@ -24 +24 @@
 class GLWorldScene;
 class QGLPainter;
+class QToolBar;
 
 /** This class is the view on the 3D representation of the World, i.e. the whole
@@ -35 +36 @@
   GLWorldView(QWidget *parent=0);
   virtual ~GLWorldView();
+
+  void addToolBarActions(QToolBar *toolbar);
 
   // Observer functions