Merge pull request #400 from aodn/2.5.22

2.5.22
aodn · Nov 25, 2016 · 13917e6 · 13917e6
2 parents aba8887 + 4e8e891
commit 13917e6
Show file tree

Hide file tree

Showing 16 changed files with 456 additions and 41 deletions.
diff --git a/GUI/mainWindow.m b/GUI/mainWindow.m
@@ -254,8 +254,8 @@ function mainWindow(...
   buttons = findall(tb);
 
   zoomoutb    = findobj(buttons, 'TooltipString', 'Zoom Out');
-  zoominb     = findobj(buttons, 'TooltipString', 'Zoom In (Ctrl+z)');
-  panb        = findobj(buttons, 'TooltipString', 'Pan (Ctrl+a)');
+  zoominb     = findobj(buttons, 'TooltipString', 'Zoom In');
+  panb        = findobj(buttons, 'TooltipString', 'Pan');
   datacursorb = findobj(buttons, 'TooltipString', 'Data Cursor');
 
   buttons(buttons == tb)            = [];
@@ -273,6 +273,10 @@ function mainWindow(...
   set(hZoom, 'ActionPostCallback', @zoomPostCallback);
   set(hPan, 'ActionPostCallback', @zoomPostCallback);
 
+  % update zoom in and pan's tooltips to display hot keys
+  set(zoominb, 'TooltipString', 'Zoom In (Ctrl+z)');
+  set(panb,    'TooltipString', 'Pan (Ctrl+a)');
+
   %set uimenu
   hToolsMenu                        = uimenu(fig, 'label', 'Tools');
   switch mode

diff --git a/Graph/checkMooringPlannedDepths.m b/Graph/checkMooringPlannedDepths.m
@@ -277,7 +277,8 @@ function checkMooringPlannedDepths(sample_data, isQC, saveToFile, exportDir)
         'buffer', [0 -hYBuffer], ...
         'ncol', nCols,...
         'FontSize', fontSizeAx,...
-        'xscale',xscale);
+        'xscale', xscale, ...
+        'parent', hPanelMooringVar);
     posAx = get(hAxPress, 'Position');
     set(hLegend, 'Units', 'Normalized', 'color', backgroundColor);
 

diff --git a/Graph/checkMooringPresDiffs.m b/Graph/checkMooringPresDiffs.m
@@ -322,7 +322,8 @@ function checkMooringPresDiffs(sample_data, iSampleMenu, isQC, saveToFile, expor
         'buffer', [0 -hYBuffer], ...
         'ncol', nCols,...
         'FontSize', fontSizeAx,...
-        'xscale',xscale);
+        'xscale', xscale, ...
+        'parent', hPanelMooringVar);
     posAx = get(hAxPress, 'Position');
     set(hLegend, 'Units', 'Normalized', 'color', backgroundColor);
 

diff --git a/Graph/lineMooring1DVar.m b/Graph/lineMooring1DVar.m
@@ -278,7 +278,8 @@ function lineMooring1DVar(sample_data, varName, isQC, saveToFile, exportDir)
         'buffer', [0 -hYBuffer], ...
         'ncol', nCols,...
         'FontSize', fontSizeAx,...
-        'xscale',xscale);
+        'xscale', xscale, ...
+        'parent', hPanelMooringVar);
     posAx = get(hAxMooringVar, 'Position');
     set(hLegend, 'Units', 'Normalized', 'color', backgroundColor);
     posLh = get(hLegend, 'Position');

diff --git a/Graph/scatterMooring1DVarAgainstDepth.m b/Graph/scatterMooring1DVarAgainstDepth.m
@@ -383,7 +383,8 @@ function scatterMooring1DVarAgainstDepth(sample_data, varName, isQC, saveToFile,
             'buffer', [0 -hYBuffer], ...
             'ncol', nCols,...
             'FontSize', fontSizeAx, ...
-            'xscale', xscale);
+            'xscale', xscale, ...
+            'parent', hPanelMooringVar);
         entries = get(hLegend,'children');
         % if used mesh for scatter plot then have to clean up legend
         % entries

diff --git a/Graph/scatterMooring2DVarAgainstDepth.m b/Graph/scatterMooring2DVarAgainstDepth.m
@@ -463,7 +463,9 @@ function scatterMooring2DVarAgainstDepth(sample_data, varName, isQC, saveToFile,
         'anchor', [6 2], ...
         'buffer', [0 -hYBuffer], ...
         'ncol', nCols,...
-        'FontSize', fontSizeAx,'xscale',xscale);
+        'FontSize', fontSizeAx, ...
+        'xscale',xscale, ...
+        'parent', hPanelMooringVar);
 
     % if used mesh for scatter plot then have to clean up legend
     % entries

diff --git a/IMOS/imosParameters.txt b/IMOS/imosParameters.txt
@@ -1,6 +1,6 @@
 %
 % A list of all IMOS compliant parameter names, associated standard names from version 20
-% (http://cf-pcmdi.llnl.gov/documents/cf-standard-names/standard-name-table/20/cf-standard-name-table.html/),
+% (http://cfconventions.org/Data/cf-standard-names/20/build/cf-standard-name-table.html),
 % units of measurement, fill values, and valid min/max values. Entries are in the following format:
 % 
 %   parameter name, is cf parameter, standard/long name, units of measurement, direction positive, reference datum, data code, fillValue, validMin, validMax, NetCDF C type
@@ -11,6 +11,7 @@
 % of a comment.
 %
 
+ABSI,                0, backscatter_intensity_from_acoustic_beam,                                                 decibel,       ,              ,                                  A, 999999.0, 0.0,      150.0,    float
 ABSI1,               0, backscatter_intensity_from_acoustic_beam_1,                                               decibel,       ,              ,                                  A, 999999.0, 0.0,      150.0,    float
 ABSI2,               0, backscatter_intensity_from_acoustic_beam_2,                                               decibel,       ,              ,                                  A, 999999.0, 0.0,      150.0,    float
 ABSI3,               0, backscatter_intensity_from_acoustic_beam_3,                                               decibel,       ,              ,                                  A, 999999.0, 0.0,      150.0,    float
@@ -42,6 +43,7 @@ CPHL,                0, mass_concentration_of_inferred_chlorophyll_from_relative
 CHLF,                0, mass_concentration_of_inferred_chlorophyll_from_relative_fluorescence_units_in_sea_water, mg m-3,        ,              ,                                  K, 999999.0, 0.0,      100.0,    float
 CHLU,                0, mass_concentration_of_inferred_chlorophyll_from_relative_fluorescence_units_in_sea_water, mg m-3,        ,              ,                                  K, 999999.0, 0.0,      100.0,    float
 CSPD,                1, sea_water_speed,                                                                          m s-1,         ,              ,                                  V, 999999.0, 0.0,      10.0,     float
+CSPD_STD,            0, sea_water_speed_standard_deviation,                                                       m s-1,         ,              ,                                  V, 999999.0, 0.0,      10.0,     float
 DENS,                1, sea_water_density,                                                                        kg m-3,        ,              ,                                  D, 999999.0, ,         ,         float
 DEPTH,               1, depth,                                                                                    m,             down,          sea surface,                       Z, 999999.0, -5.0,     12000.0,  float
 DESC,                0, profiling_descent_rate_of_instrument,                                                     m s-1,         ,              ,                                  E, 999999.0, 0.0,      5.0,      float