Skip to content

Commit

Permalink
Updating detailed instructions for key bindings
Browse files Browse the repository at this point in the history
  • Loading branch information
Samreay committed Sep 19, 2016
1 parent 169c91f commit 435e061
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ After doing this, you can analyse a FITS file by running `./marz.sh <FITSFilePat

# Updates

## 1.3.6
* Improving keybinding documentation.

## 1.3.5
* Adding type "AGN"

Expand Down
2 changes: 1 addition & 1 deletion js/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Any change in the version will mean prior redshifts stored in the program
// will not be loaded (as they may be different with the update).
var globalConfig = {};
globalConfig.marzVersion = "1.3.5";
globalConfig.marzVersion = "1.3.6";

globalConfig.waveExt = 'wavelength';
globalConfig.dataExt = 'intensity';
Expand Down
4 changes: 2 additions & 2 deletions js/controllers.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,10 @@ angular.module('controllersZ', ['ui.router', 'ui.bootstrap', 'servicesZ'])
{key: 'shift+?', label: '?', description: 'Go to the Usage tab', fn: function() {
$state.go('usage');
}},
{key: 'n', label: 'n', description: 'Selects to the next spectra', fn: _.throttle(function() {
{key: 'n', label: 'n', description: 'Selects the next spectra', fn: _.throttle(function() {
$scope.$apply(function() {$scope.setNextSpectra();});
}, 300, { 'trailing': false})},
{key: 'b', label: 'b', description: 'Selects to the previous spectra', fn: _.throttle(function() {
{key: 'b', label: 'b', description: 'Selects the previous spectra', fn: _.throttle(function() {
$scope.$apply(function() {$scope.setPreviousSpectra();});
}, 300, { 'trailing': false})},
{key: 't', label: 't', description: 'Toggle whether templates are displayed', fn: _.throttle(function() {
Expand Down
3 changes: 2 additions & 1 deletion templates/usage.html
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ <h4>Downloading results</h4>
<p>The options to clear the internal saved data are irreversible. If you have saved <code>.mz</code> output via downloading the results, these can still be loaded in without hassle, this section only pertains to the automatic background saving of results.</p>
</accordion-group>
<accordion-group heading="Keybindings">
<p>Many key bindings have been added to this application from the RUNZ default keymapping to make usage easier. The following commands are available:</p>
<p>Many key bindings have been added to this application from the RUNZ default keymapping to make usage easier. Note that the way the key bindings and browser interact, make sure you don't have any input element selected when pressing the keyboard shortcuts. In most cases this is obvious - if you are in the comment text input, typing will write out a comment, not trigger shortcuts. However, the same is true if you have a check-button focused, or a slider. So, if a shortcut doesn't work, click away and try again!</p>
<p>The following commands are available:</p>
<keybind bind="bind" ng-repeat="bind in keybinds"></keybind>
</accordion-group>
<accordion-group heading="File Output and Loading Results with Python">
Expand Down

0 comments on commit 435e061

Please sign in to comment.