Changeset d7e931 for src

Timestamp:

Aug 9, 2013, 2:26:27 PM (11 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:

d067e35

Parents:

89b992

git-author:

Frederik Heber <heber@…> (07/11/13 18:14:30)

git-committer:

Frederik Heber <heber@…> (08/09/13 14:26:27)

Message:

Added Timeline slider to QtMainWindow.

• this allows quick setting of current time step and uses SetWorldTimeAction.

Location:

src/UIElements

Files:

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

src/UIElements/Makefile.am

@@ -171 +171 @@
   UIElements/Views/Qt4/QtShapeList.cpp \
   UIElements/Views/Qt4/QtStatusBar.cpp \
+  UIElements/Views/Qt4/QtTimeLine.cpp \
   UIElements/Views/Qt4/QtToolBar.cpp \
   UIElements/Views/Qt4/Qt3D/GLWorldView.cpp \
@@ -193 +194 @@
   UIElements/Views/Qt4/QtShapeList.hpp \
   UIElements/Views/Qt4/QtStatusBar.hpp \
+  UIElements/Views/Qt4/QtTimeLine.hpp \
   UIElements/Views/Qt4/QtToolBar.hpp \
   UIElements/Views/Qt4/Qt3D/GLWorldView.hpp \

src/UIElements/Qt4/QtMainWindow.cpp

@@ -58 +58 @@
 #include "Views/Qt4/QtInfoBox.hpp"
 #include "Views/Qt4/QtStatusBar.hpp"
+#include "Views/Qt4/QtTimeLine.hpp"
 #include "Views/Qt4/QtToolBar.hpp"
 #include "Views/Qt4/Qt3D/GLWorldView.hpp"
@@ -93 +94 @@
   shapeController = new QtShapeController(worldTab);
 
+  timeline = new QtTimeLine(this);
+
   infoBox = new QtInfoBox();
   glWorldView = new GLWorldView(this);
@@ -114 +117 @@
   splitter3->addWidget(shapeController);
   splitter2->addWidget(glWorldView);
+  splitter2->addWidget(timeline);
   splitter2->addWidget(worldTab);
   worldTab->addTab(moleculeList, "Molecules");

src/UIElements/Qt4/QtMainWindow.hpp

@@ -33 +33 @@
 class QtToolBar;
 class QCloseEvent;
+class QSlider;
 
 class QtMainWindow : public QMainWindow, public MainWindow
@@ -60 +61 @@
   QtMenu<QMenuBar> *MainMenu;
   QtToolBar *toolbar;
+  QSlider *timeline;
 
 };