Index: gliderproc/trunk/gliderCTD_2DPlots.m =================================================================== --- gliderproc/trunk/gliderCTD_2DPlots.m (revision 496) +++ gliderproc/trunk/gliderCTD_2DPlots.m (revision 498) @@ -16,10 +16,9 @@ dens, densBounds, densCorrected, depth, pres,... salin, salinBounds, salinCorrected,... - temp, tempBounds, chlor, chlorBounds,... - plotFlag_TS, plotFlag_TS_AllLegs, plotFlag_TS_Chlorophyll,... + temp, tempBounds,... + plotFlag_TS, plotFlag_TS_AllLegs,... plotFlag_Temperature, plotFlag_Salinity, plotFlag_Density,... - plotFlag_Chlorophyll, plotFlag_TemperatureProfile,... - plotFlag_SalinityProfile, plotFlag_DensityProfile,... - plotFlag_ChlorophyllProfile) + plotFlag_TemperatureProfile,... + plotFlag_SalinityProfile, plotFlag_DensityProfile) @@ -37,5 +36,5 @@ % TS plot for all legs (separate color for each leg)... lastLeg = length(nLegEndPoints); - figure('Position', [500,500,1600,900]); + figure('Position', [10,10,1600,900]); for i=2:lastLeg % get start/end points strings and indices for this leg... @@ -86,5 +85,5 @@ dens = dens(nLegStart:nLegEnd); densCorrected = densCorrected(nLegStart:nLegEnd); - chlor = chlor(nLegStart:nLegEnd); + % chlor = chlor(nLegStart:nLegEnd); % set leg strings for plot titles... @@ -98,5 +97,5 @@ if (plotFlag_TS==1) % TS plot... - figure('Position', [500,500,1600,900]); + figure('Position', [10,10,1600,900]); % set marker color and plot TS for this leg... if legNumber==0 @@ -123,28 +122,28 @@ - if (plotFlag_TS_Chlorophyll==1) - % TS plot with color mapped to chlorophyll... - figure('Position', [500,500,1600,900]); - ccplot(salinCorrected, temp, chlor, chlorBounds, '.', 10); - hold on; - hc = colorbar; - set(hc, 'fontsize', 12); - % scale the x-axis and y-axis... - ax = axis; - axis([salinBounds(1) salinBounds(2) tempBounds(1) tempBounds(2)]); - ylabel('Temperature (°C)', 'fontsize', 18); - xlabel('Salinity (psu)', 'fontsize', 18); - title([strGliderName, ' , ', strDeployment, ' , ', strLeg, ' with CHLOROPHYLL (ug/l) '], 'fontsize', 20, 'fontweight', 'bold'); - x = [ax(1):0.1:ax(2)]; - y = [ax(3):0.3:ax(4)]; - [X,Y] = meshgrid(x,y); - rho = sw_pden(X, Y, 0, 0); - [C, H] = contour(X, Y, rho, [1024:0.2:1028], 'k--'); - clabel(C, H, 'FontSize', 16); - end + % if (plotFlag_TS_Chlorophyll==1) + % % TS plot with color mapped to chlorophyll... + % figure('Position', [10,10,1600,900]); + % ccplot(salinCorrected, temp, chlor, chlorBounds, '.', 10); + % hold on; + % hc = colorbar; + % set(hc, 'fontsize', 12); + % % scale the x-axis and y-axis... + % ax = axis; + % axis([salinBounds(1) salinBounds(2) tempBounds(1) tempBounds(2)]); + % ylabel('Temperature (°C)', 'fontsize', 18); + % xlabel('Salinity (psu)', 'fontsize', 18); + % title([strGliderName, ' , ', strDeployment, ' , ', strLeg, ' with CHLOROPHYLL (ug/l) '], 'fontsize', 20, 'fontweight', 'bold'); + % x = [ax(1):0.1:ax(2)]; + % y = [ax(3):0.3:ax(4)]; + % [X,Y] = meshgrid(x,y); + % rho = sw_pden(X, Y, 0, 0); + % [C, H] = contour(X, Y, rho, [1024:0.2:1028], 'k--'); + % clabel(C, H, 'FontSize', 16); + % end if (plotFlag_Temperature==1) % temperature vs depth... - figure('Position', [500,500,1600,900]); + figure('Position', [10,10,1600,900]); plot(temp, depth, 'b.'); grid on; @@ -160,5 +159,5 @@ if (plotFlag_Salinity==1) % corrected salinity vs depth... - figure('Position', [500,500,1600,900]); + figure('Position', [10,10,1600,900]); plot(salinCorrected, depth, 'b.'); grid on; @@ -174,5 +173,5 @@ if (plotFlag_Density==1) % corrected density vs depth... - figure('Position', [500,500,1600,900]); + figure('Position', [10,10,1600,900]); plot(densCorrected, depth, 'b.'); grid on; @@ -186,21 +185,21 @@ end - if (plotFlag_Chlorophyll==1) - % chlorophyll vs depth... - figure('Position', [500,500,1600,900]); - plot(chlor, depth, 'b.'); - grid on; - % scale the x-axis... - ax = axis; - axis([chlorBounds(1) chlorBounds(2) ax(3) ax(4)]); - set(gca, 'fontsize', 13, 'ydir', 'reverse'); - ylabel('Depth (m)', 'fontsize', 18); - xlabel('Chlorophyll (ug/l)', 'fontsize', 18); - title(['CHLOROPHYLL - ', strGliderName, ' , ', strDeployment, ' , ', strLeg, ' '], 'fontsize', 20, 'fontweight', 'bold'); - end + % if (plotFlag_Chlorophyll==1) + % % chlorophyll vs depth... + % figure('Position', [10,10,1600,900]); + % plot(chlor, depth, 'b.'); + % grid on; + % % scale the x-axis... + % ax = axis; + % axis([chlorBounds(1) chlorBounds(2) ax(3) ax(4)]); + % set(gca, 'fontsize', 13, 'ydir', 'reverse'); + % ylabel('Depth (m)', 'fontsize', 18); + % xlabel('Chlorophyll (ug/l)', 'fontsize', 18); + % title(['CHLOROPHYLL - ', strGliderName, ' , ', strDeployment, ' , ', strLeg, ' '], 'fontsize', 20, 'fontweight', 'bold'); + % end if (plotFlag_TemperatureProfile==1) % temperature profile... - figure('Position', [500,500,1600,900]); + figure('Position', [10,10,1600,900]); ccplot(ptime_datenum, depth, temp, tempBounds, '.', 10); set(gca, 'fontsize', 12, 'ydir', 'reverse'); @@ -215,5 +214,5 @@ if (plotFlag_SalinityProfile==1) % corrected salinity profile... - figure('Position', [500,500,1600,900]); + figure('Position', [10,10,1600,900]); ccplot(ptime_datenum, depth, salinCorrected, salinBounds, '.', 10); set(gca, 'fontsize', 12, 'ydir', 'reverse'); @@ -228,5 +227,5 @@ if (plotFlag_DensityProfile==1) % corrected density profile... - figure('Position', [500,500,1600,900]); + figure('Position', [10,10,1600,900]); ccplot(ptime_datenum, depth, densCorrected, densBounds, '.', 10); set(gca, 'fontsize', 12, 'ydir', 'reverse'); @@ -239,16 +238,16 @@ end - if (plotFlag_ChlorophyllProfile==1) - % chlorophyll profile... - figure('Position', [500,500,1600,900]); - ccplot(ptime_datenum, depth, chlor, chlorBounds, '.', 10); - set(gca, 'fontsize', 12, 'ydir', 'reverse'); - datetick('x', 6, 'keeplimits', 'keepticks'); - hc = colorbar; - set(hc, 'fontsize', 12); - ylabel('Depth (m)', 'fontsize', 18); - xlabel('Chlorophyll (ug/l)', 'fontsize', 18); - title(['CHLOROPHYLL - ', strGliderName, ' , ', strDeployment, ' , ', strLeg, ' '], 'fontsize', 20, 'fontweight', 'bold'); - end + % if (plotFlag_ChlorophyllProfile==1) + % % chlorophyll profile... + % figure('Position', [10,10,1600,900]); + % ccplot(ptime_datenum, depth, chlor, chlorBounds, '.', 10); + % set(gca, 'fontsize', 12, 'ydir', 'reverse'); + % datetick('x', 6, 'keeplimits', 'keepticks'); + % hc = colorbar; + % set(hc, 'fontsize', 12); + % ylabel('Depth (m)', 'fontsize', 18); + % xlabel('Chlorophyll (ug/l)', 'fontsize', 18); + % title(['CHLOROPHYLL - ', strGliderName, ' , ', strDeployment, ' , ', strLeg, ' '], 'fontsize', 20, 'fontweight', 'bold'); + % end end Index: gliderproc/trunk/gliderCTD_3DPlots.m =================================================================== --- gliderproc/trunk/gliderCTD_3DPlots.m (revision 496) +++ gliderproc/trunk/gliderCTD_3DPlots.m (revision 498) @@ -16,7 +16,7 @@ ztop, zbottom, gpsLat, gpsLon, depth, pres,... salinCorrected, salinBounds, densCorrected, densBounds,... - temp, tempBounds, chlor, chlorBounds,... + temp, tempBounds,... plotFlag_Temperature3D, plotFlag_Salinity3D,... - plotFlag_Density3D, plotFlag_Chlorophyll3D,... + plotFlag_Density3D,... plotFlag_AllGliderTracks) @@ -36,5 +36,5 @@ salinCorrected = salinCorrected(nLegStart:nLegEnd); densCorrected = densCorrected(nLegStart:nLegEnd); - chlor = chlor(nLegStart:nLegEnd); + % chlor = chlor(nLegStart:nLegEnd); % set strings for plot titles... @@ -112,5 +112,5 @@ if (plotFlag_Temperature3D==1) % 3D color plot of temperature (with bathymetry surface)... - figure('Position', [500,500,1600,900]); + figure('Position', [10,10,1600,900]); % plot the coastline... plot3(cillong, cillat, 0*ones(size(cillong)), 'k-', 'linewidth', [3]); @@ -175,5 +175,5 @@ if (plotFlag_Salinity3D==1) % 3D color plot of salinity (with bathymetry surface)... - figure('Position', [500,500,1600,900]); + figure('Position', [10,10,1600,900]); % plot the coastline... plot3(cillong, cillat, 0*ones(size(cillong)), 'k-', 'linewidth', [3]); @@ -220,5 +220,5 @@ if (plotFlag_Density3D==1) % 3D color plot of density (with bathymetry surface)... - figure('Position', [500,500,1600,900]); + figure('Position', [10,10,1600,900]); % plot the coastline... plot3(cillong, cillat, 0*ones(size(cillong)), 'k-', 'linewidth', [3]); @@ -263,46 +263,46 @@ %***** DRAW 3D CHLOROPHYLL PLOT ***************************************************** - if (plotFlag_Chlorophyll3D==1) - % 3D color plot of chlorophyll (with bathymetry surface)... - figure('Position', [500,500,1600,900]); - % plot the coastline... - plot3(cillong, cillat, 0*ones(size(cillong)), 'k-', 'linewidth', [3]); - hold on; - % plot the bathymetry surface... - HndlBATH = surf(XI, YI, Z); - %set(HndlBATH, 'facecolor', [0.75 0.75 0.75], 'edgecolor', [0.5 0.5 0.5]); - set(HndlBATH, 'facecolor', [0.75 0.75 0.75], 'edgecolor', 'none'); - set(gca, 'box', 'on', 'position', [0.1227 0.2024 0.7727 0.6235]); - % lighting and shading bath... - camlight right; - lighting phong; - material dull; - set(HndlBATH, 'edgecolor', 'none'); - hold on; - % vertical marker lines at mooring locations - plot3(LB1_X, LB1_Y, LB1_Z, 'k', 'linewidth', 5); - hold on; - plot3(LB2_X, LB2_Y, LB2_Z, 'k', 'linewidth', 5); - hold on; - plot3(LB3_X, LB3_Y, LB3_Z, 'k', 'linewidth', 5); - hold on; - % surface marker symbol at mooring locations - plot3(lb1Lon, lb1Lat, 0, 'ko', 'LineWidth', 3, 'MarkerEdgeColor','k', 'MarkerFaceColor','k', 'MarkerSize', 12); - hold on; - plot3(lb2Lon, lb2Lat, 0, 'ko', 'LineWidth', 3, 'MarkerEdgeColor','k', 'MarkerFaceColor','k', 'MarkerSize', 12); - hold on; - plot3(lb3Lon, lb3Lat, 0, 'ko', 'LineWidth', 3, 'MarkerEdgeColor','k', 'MarkerFaceColor','k', 'MarkerSize', 12); - hold on; - % plot chlorophyll profile - hc = ccplot3(gpsLon, gpsLat, -depth, chlor, chlorBounds, '.', 10); - grid on; - axis([lonlim latlim zbottom ztop]); - hc = colorbar; - set(hc, 'fontsize', 12); - xlabel('Longitude', 'fontsize', 18); - ylabel('Latitude', 'fontsize', 18); - zlabel('Depth (m)', 'fontsize', 18); - title(['CHLOROPHYLL (ug/l) - ', strGliderName, ' , ', strDeployment, ' , ', strLeg, ' '], 'fontsize', 20, 'fontweight', 'bold'); - end + % if (plotFlag_Chlorophyll3D==1) + % % 3D color plot of chlorophyll (with bathymetry surface)... + % figure('Position', [10,10,1600,900]); + % % plot the coastline... + % plot3(cillong, cillat, 0*ones(size(cillong)), 'k-', 'linewidth', [3]); + % hold on; + % % plot the bathymetry surface... + % HndlBATH = surf(XI, YI, Z); + % %set(HndlBATH, 'facecolor', [0.75 0.75 0.75], 'edgecolor', [0.5 0.5 0.5]); + % set(HndlBATH, 'facecolor', [0.75 0.75 0.75], 'edgecolor', 'none'); + % set(gca, 'box', 'on', 'position', [0.1227 0.2024 0.7727 0.6235]); + % % lighting and shading bath... + % camlight right; + % lighting phong; + % material dull; + % set(HndlBATH, 'edgecolor', 'none'); + % hold on; + % % vertical marker lines at mooring locations + % plot3(LB1_X, LB1_Y, LB1_Z, 'k', 'linewidth', 5); + % hold on; + % plot3(LB2_X, LB2_Y, LB2_Z, 'k', 'linewidth', 5); + % hold on; + % plot3(LB3_X, LB3_Y, LB3_Z, 'k', 'linewidth', 5); + % hold on; + % % surface marker symbol at mooring locations + % plot3(lb1Lon, lb1Lat, 0, 'ko', 'LineWidth', 3, 'MarkerEdgeColor','k', 'MarkerFaceColor','k', 'MarkerSize', 12); + % hold on; + % plot3(lb2Lon, lb2Lat, 0, 'ko', 'LineWidth', 3, 'MarkerEdgeColor','k', 'MarkerFaceColor','k', 'MarkerSize', 12); + % hold on; + % plot3(lb3Lon, lb3Lat, 0, 'ko', 'LineWidth', 3, 'MarkerEdgeColor','k', 'MarkerFaceColor','k', 'MarkerSize', 12); + % hold on; + % % plot chlorophyll profile + % hc = ccplot3(gpsLon, gpsLat, -depth, chlor, chlorBounds, '.', 10); + % grid on; + % axis([lonlim latlim zbottom ztop]); + % hc = colorbar; + % set(hc, 'fontsize', 12); + % xlabel('Longitude', 'fontsize', 18); + % ylabel('Latitude', 'fontsize', 18); + % zlabel('Depth (m)', 'fontsize', 18); + % title(['CHLOROPHYLL (ug/l) - ', strGliderName, ' , ', strDeployment, ' , ', strLeg, ' '], 'fontsize', 20, 'fontweight', 'bold'); + % end @@ -314,5 +314,5 @@ for i=1:3 % mat file path string... - strMatFilePath = strcat('GLIDER_DATA_LEVEL1/CTD/Pelagia_CTD_Deployment', num2str(i), '.mat'); + strMatFilePath = strcat('GLIDER_DATA_LEVEL1/Pelagia_Deployment', num2str(i), '_CTD_L1.mat'); % load glider sensor data from mat file... load(strMatFilePath); @@ -327,5 +327,5 @@ for i=1:3 % mat file path string... - strMatFilePath = strcat('GLIDER_DATA_LEVEL1/CTD/Ramses_CTD_Deployment', num2str(i), '.mat'); + strMatFilePath = strcat('GLIDER_DATA_LEVEL1/Ramses_Deployment', num2str(i), '_CTD_L1.mat'); % load glider sensor data from mat file... load(strMatFilePath); @@ -361,5 +361,5 @@ % plot of complete glider tracks (all 3 deployments) with contour lines... - figure('Position', [500,500,1200,1200]); + figure('Position', [10,10,1200,1200]); % plot the coastline... plot(cillong, cillat, 'k-', 'linewidth', [5]); Index: gliderproc/trunk/gliderCTD_DataViz.m =================================================================== --- gliderproc/trunk/gliderCTD_DataViz.m (revision 495) +++ gliderproc/trunk/gliderCTD_DataViz.m (revision 498) @@ -19,4 +19,10 @@ % Created: 18 June 2012 % +% Todo: Have tracks for individual legs instead of just all tracks. +% Get some better bathymetry. +% Move specification of leg endpoints to included .m file. +% Individualize axes bounds per glider but NOT per leg. +% Include legend for all legs TS plot. +% %////////////////////////////////////////////////////////////////////////// @@ -35,17 +41,17 @@ global mPlotFlag_TS; global mPlotFlag_TS_AllLegs; -global mPlotFlag_TS_Chlorophyll; +% global mPlotFlag_TS_Chlorophyll; global mPlotFlag_Temperature; global mPlotFlag_Salinity; global mPlotFlag_Density; -global mPlotFlag_Chlorophyll; +% global mPlotFlag_Chlorophyll; global mPlotFlag_TemperatureProfile; global mPlotFlag_SalinityProfile; global mPlotFlag_DensityProfile; -global mPlotFlag_ChlorophyllProfile; +% global mPlotFlag_ChlorophyllProfile; global mPlotFlag_Temperature3D; global mPlotFlag_Salinity3D; global mPlotFlag_Density3D; -global mPlotFlag_Chlorophyll3D; +% global mPlotFlag_Chlorophyll3D; global mPlotFlag_AllGliderTracks; @@ -99,17 +105,17 @@ mPlotFlag_TS = 0; mPlotFlag_TS_AllLegs = 0; -mPlotFlag_TS_Chlorophyll = 0; +% mPlotFlag_TS_Chlorophyll = 0; mPlotFlag_Temperature = 0; mPlotFlag_Salinity = 0; mPlotFlag_Density = 0; -mPlotFlag_Chlorophyll = 0; +% mPlotFlag_Chlorophyll = 0; mPlotFlag_TemperatureProfile = 0; mPlotFlag_SalinityProfile = 0; mPlotFlag_DensityProfile = 0; -mPlotFlag_ChlorophyllProfile = 0; +% mPlotFlag_ChlorophyllProfile = 0; mPlotFlag_Temperature3D = 0; mPlotFlag_Salinity3D = 0; mPlotFlag_Density3D = 0; -mPlotFlag_Chlorophyll3D = 0; +% mPlotFlag_Chlorophyll3D = 0; mPlotFlag_AllGliderTracks = 0; @@ -168,23 +174,23 @@ figureWidth = 790; %figureHeight = 690; -figureHeight = 770; - -titleTextPosFromLeft = 180; -titleTextPosFromBottom = 720; -titleTextWidth = 410; -titleTextHeight = 25; +figureHeight = 670; + +titleTextPosFromLeft = 85; +titleTextPosFromBottom = 620; +titleTextWidth = 600; +titleTextHeight = 35; gliderBGPosFromLeft = 20; -gliderBGPosFromBottom = 580; +gliderBGPosFromBottom = 470; gliderBGWidth = 200; gliderBGHeight = 120; deploymentBGPosFromLeft = 20; -deploymentBGPosFromBottom = 400; +deploymentBGPosFromBottom = 290; deploymentBGWidth = 200; deploymentBGHeight = 160; legBGPosFromLeft = 250; -legBGPosFromBottom = 400; +legBGPosFromBottom = 290; legBGWidth = 500; legBGHeight = 300; @@ -194,12 +200,12 @@ plotsBGWidth = 730; %plotsBGHeight = 190; -plotsBGHeight = 270; +plotsBGHeight = 160; % create figure... -guih = figure('MenuBar', 'none', 'Position', [360, 500, figureWidth, figureHeight]); +guih = figure('MenuBar', 'none', 'Position', [10, 10, figureWidth, figureHeight]); % add title text... -uicontrol(guih, 'Style', 'text', 'String', ' Slocum Glider CTD Data Visualization', 'FontSize', 22,... +uicontrol(guih, 'Style', 'text', 'String', ' Slocum Glider CTD Data Visualization', 'FontSize', 16,... 'FontWeight', 'bold', 'BackgroundColor', [0.8 0.8 0.8], 'Units', 'pixels',... 'Position', [titleTextPosFromLeft titleTextPosFromBottom titleTextWidth titleTextHeight]); @@ -210,7 +216,7 @@ 'SelectionChangeFcn', @hGliderSelectionChanged); rbhGlider_Pelagia = uicontrol(bghGlider, 'Style', 'radiobutton', 'String', 'Pelagia', 'FontSize', 14,... - 'Units', 'pixels', 'Position', [30 60 100 30]); + 'Units', 'pixels', 'Position', [30 60 120 30]); rbhGlider_Ramses = uicontrol(bghGlider, 'Style', 'radiobutton', 'String', 'Ramses', 'FontSize', 14,... - 'Units', 'pixels', 'Position', [30 20 100 30]); + 'Units', 'pixels', 'Position', [30 20 120 30]); % add button group to select deployment number... @@ -218,9 +224,9 @@ 'Units', 'pixels', 'Position', [deploymentBGPosFromLeft deploymentBGPosFromBottom deploymentBGWidth deploymentBGHeight],... 'SelectionChangeFcn', @hDeploymentNumberSelectionChanged); -rbhDeployment_1 = uicontrol(bghDeployment, 'Style', 'radiobutton', 'String', 'Deployment 1', 'FontSize', 14,... +rbhDeployment_1 = uicontrol(bghDeployment, 'Style', 'radiobutton', 'String', '1', 'FontSize', 14,... 'Units', 'pixels', 'Position', [30 100 140 30]); -rbhDeployment_2 = uicontrol(bghDeployment, 'Style', 'radiobutton', 'String', 'Deployment 2', 'FontSize', 14,... +rbhDeployment_2 = uicontrol(bghDeployment, 'Style', 'radiobutton', 'String', '2', 'FontSize', 14,... 'Units', 'pixels', 'Position', [30 60 140 30]); -rbhDeployment_3 = uicontrol(bghDeployment, 'Style', 'radiobutton', 'String', 'Deployment 3', 'FontSize', 14,... +rbhDeployment_3 = uicontrol(bghDeployment, 'Style', 'radiobutton', 'String', '3', 'FontSize', 14,... 'Units', 'pixels', 'Position', [30 20 140 30]); @@ -230,38 +236,38 @@ 'SelectionChangeFcn', @hLegNumberSelectionChanged); -rbhLeg_0 = uicontrol(bghLeg, 'Style', 'radiobutton', 'String', 'Complete', 'FontSize', 14,... - 'Units', 'pixels', 'Position', [30 235 100 30]); -sthLeg_0 = uicontrol(bghLeg, 'Style', 'text', 'String', mStrComplete_DateRange, 'FontSize', 14,... - 'Units', 'pixels', 'Position', [120 229 350 30]); - -rbhLeg_1 = uicontrol(bghLeg, 'Style', 'radiobutton', 'String', 'Leg 1', 'FontSize', 14,... - 'Units', 'pixels', 'Position', [30 200 70 30]); -sthLeg_1 = uicontrol(bghLeg, 'Style', 'text', 'String', mStrLeg1_DateRange, 'FontSize', 14,... - 'Units', 'pixels', 'Position', [120 194 350 30]); +rbhLeg_0 = uicontrol(bghLeg, 'Style', 'radiobutton', 'String', 'All', 'FontSize', 14,... + 'Units', 'pixels', 'Position', [30 235 50 30]); +sthLeg_0 = uicontrol(bghLeg, 'Style', 'text', 'String', mStrComplete_DateRange, 'FontSize', 10,... + 'Units', 'pixels', 'Position', [90 240 380 20]); + +rbhLeg_1 = uicontrol(bghLeg, 'Style', 'radiobutton', 'String', '1', 'FontSize', 14,... + 'Units', 'pixels', 'Position', [30 200 50 30]); +sthLeg_1 = uicontrol(bghLeg, 'Style', 'text', 'String', mStrLeg1_DateRange, 'FontSize', 10,... + 'Units', 'pixels', 'Position', [90 205 380 20]); -rbhLeg_2 = uicontrol(bghLeg, 'Style', 'radiobutton', 'String', 'Leg 2', 'FontSize', 14,... - 'Units', 'pixels', 'Position', [30 165 70 30]); -sthLeg_2 = uicontrol(bghLeg, 'Style', 'text', 'String', mStrLeg2_DateRange, 'FontSize', 14,... - 'Units', 'pixels', 'Position', [120 159 350 30]); +rbhLeg_2 = uicontrol(bghLeg, 'Style', 'radiobutton', 'String', '2', 'FontSize', 14,... + 'Units', 'pixels', 'Position', [30 165 50 30]); +sthLeg_2 = uicontrol(bghLeg, 'Style', 'text', 'String', mStrLeg2_DateRange, 'FontSize', 10,... + 'Units', 'pixels', 'Position', [90 170 380 20]); -rbhLeg_3 = uicontrol(bghLeg, 'Style', 'radiobutton', 'String', 'Leg 3', 'FontSize', 14,... - 'Units', 'pixels', 'Position', [30 130 70 30]); -sthLeg_3 = uicontrol(bghLeg, 'Style', 'text', 'String', mStrLeg3_DateRange, 'FontSize', 14,... - 'Units', 'pixels', 'Position', [120 124 350 30]); +rbhLeg_3 = uicontrol(bghLeg, 'Style', 'radiobutton', 'String', '3', 'FontSize', 14,... + 'Units', 'pixels', 'Position', [30 130 50 30]); +sthLeg_3 = uicontrol(bghLeg, 'Style', 'text', 'String', mStrLeg3_DateRange, 'FontSize', 10,... + 'Units', 'pixels', 'Position', [90 135 380 20]); -rbhLeg_4 = uicontrol(bghLeg, 'Style', 'radiobutton', 'String', 'Leg 4', 'FontSize', 14,... - 'Units', 'pixels', 'Position', [30 95 70 30]); -sthLeg_4 = uicontrol(bghLeg, 'Style', 'text', 'String', mStrLeg4_DateRange, 'FontSize', 14,... - 'Units', 'pixels', 'Position', [120 89 350 30]); - -rbhLeg_5 = uicontrol(bghLeg, 'Style', 'radiobutton', 'String', 'Leg 5', 'FontSize', 14,... - 'Units', 'pixels', 'Position', [30 60 70 30]); -sthLeg_5 = uicontrol(bghLeg, 'Style', 'text', 'String', mStrLeg5_DateRange, 'FontSize', 14,... - 'Units', 'pixels', 'Position', [120 54 350 30]); +rbhLeg_4 = uicontrol(bghLeg, 'Style', 'radiobutton', 'String', '4', 'FontSize', 14,... + 'Units', 'pixels', 'Position', [30 95 50 30]); +sthLeg_4 = uicontrol(bghLeg, 'Style', 'text', 'String', mStrLeg4_DateRange, 'FontSize', 10,... + 'Units', 'pixels', 'Position', [90 100 380 20]); + +rbhLeg_5 = uicontrol(bghLeg, 'Style', 'radiobutton', 'String', '5', 'FontSize', 14,... + 'Units', 'pixels', 'Position', [30 60 50 30]); +sthLeg_5 = uicontrol(bghLeg, 'Style', 'text', 'String', mStrLeg5_DateRange, 'FontSize', 10,... + 'Units', 'pixels', 'Position', [90 65 380 20]); -rbhLeg_6 = uicontrol(bghLeg, 'Style', 'radiobutton', 'String', 'Leg 6', 'FontSize', 14,... - 'Units', 'pixels', 'Position', [30 25 70 30]); -sthLeg_6 = uicontrol(bghLeg, 'Style', 'text', 'String', mStrLeg6_DateRange, 'FontSize', 14,... - 'Units', 'pixels', 'Position', [120 19 350 30]); +rbhLeg_6 = uicontrol(bghLeg, 'Style', 'radiobutton', 'String', '6', 'FontSize', 14,... + 'Units', 'pixels', 'Position', [30 25 50 30]); +sthLeg_6 = uicontrol(bghLeg, 'Style', 'text', 'String', mStrLeg6_DateRange, 'FontSize', 10,... + 'Units', 'pixels', 'Position', [90 30 380 20]); @@ -280,36 +286,36 @@ bghPlotType = uibuttongroup('Parent', guih, 'Title', 'Data Plots', 'FontSize', 14, 'FontWeight', 'bold',... 'Units', 'pixels', 'Position', [plotsBGPosFromLeft plotsBGPosFromBottom plotsBGWidth plotsBGHeight]); -cbhPlot_1 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', 'All Glider Tracks', 'FontSize', 14,... - 'Units', 'pixels', 'Position', [30 210 160 30], 'Callback', @checkbox1_Callback); -cbhPlot_2 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', 'TS', 'FontSize', 14,... - 'Units', 'pixels', 'Position', [30 175 160 30], 'Callback', @checkbox2_Callback); -cbhPlot_3 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', 'TS (all legs)', 'FontSize', 14,... - 'Units', 'pixels', 'Position', [30 140 160 30], 'Callback', @checkbox3_Callback); -cbhPlot_4 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', 'TS (with Chlorophyll)', 'FontSize', 14,... - 'Units', 'pixels', 'Position', [30 105 160 30], 'Callback', @checkbox4_Callback); -cbhPlot_5 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', 'Temperature', 'FontSize', 14,... - 'Units', 'pixels', 'Position', [220 210 160 30], 'Callback', @checkbox5_Callback); -cbhPlot_6 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', 'Salinity', 'FontSize', 14,... - 'Units', 'pixels', 'Position', [220 175 160 30], 'Callback', @checkbox6_Callback); -cbhPlot_7 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', 'Density', 'FontSize', 14,... - 'Units', 'pixels', 'Position', [220 140 160 30], 'Callback', @checkbox7_Callback); -cbhPlot_8 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', 'Chlorophyll', 'FontSize', 14,... - 'Units', 'pixels', 'Position', [220 105 160 30], 'Callback', @checkbox8_Callback); -cbhPlot_9 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', 'Temperature Profile', 'FontSize', 14,... - 'Units', 'pixels', 'Position', [370 210 160 30], 'Callback', @checkbox9_Callback); -cbhPlot_10 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', 'Salinity Profile', 'FontSize', 14,... - 'Units', 'pixels', 'Position', [370 175 160 30], 'Callback', @checkbox10_Callback); -cbhPlot_11 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', 'Density Profile', 'FontSize', 14,... - 'Units', 'pixels', 'Position', [370 140 160 30], 'Callback', @checkbox11_Callback); -cbhPlot_12 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', 'Chlorophyll Profile', 'FontSize', 14,... - 'Units', 'pixels', 'Position', [370 105 160 30], 'Callback', @checkbox12_Callback); -cbhPlot_13 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', '3D Temperature', 'FontSize', 14,... - 'Units', 'pixels', 'Position', [560 210 160 30], 'Callback', @checkbox13_Callback); -cbhPlot_14 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', '3D Salinity', 'FontSize', 14,... - 'Units', 'pixels', 'Position', [560 175 160 30], 'Callback', @checkbox14_Callback); -cbhPlot_15 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', '3D Density', 'FontSize', 14,... - 'Units', 'pixels', 'Position', [560 140 160 30], 'Callback', @checkbox15_Callback); -cbhPlot_16 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', '3D Chlorophyll', 'FontSize', 14,... - 'Units', 'pixels', 'Position', [560 105 160 30], 'Callback', @checkbox16_Callback); +cbhPlot_1 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', 'All Glider Tracks', 'FontSize', 10,... + 'Units', 'pixels', 'Position', [30 90 160 30], 'Callback', @checkbox1_Callback); +cbhPlot_2 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', 'TS', 'FontSize', 10,... + 'Units', 'pixels', 'Position', [30 55 160 30], 'Callback', @checkbox2_Callback); +cbhPlot_3 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', 'TS (all legs)', 'FontSize', 10,... + 'Units', 'pixels', 'Position', [30 20 160 30], 'Callback', @checkbox3_Callback); +% cbhPlot_4 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', 'TS (with Chlorophyll)', 'FontSize', 10,... +% 'Units', 'pixels', 'Position', [30 105 160 30], 'Callback', @checkbox4_Callback); +cbhPlot_5 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', 'Temperature', 'FontSize', 10,... + 'Units', 'pixels', 'Position', [220 90 160 30], 'Callback', @checkbox5_Callback); +cbhPlot_6 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', 'Salinity', 'FontSize', 10,... + 'Units', 'pixels', 'Position', [220 55 160 30], 'Callback', @checkbox6_Callback); +cbhPlot_7 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', 'Density', 'FontSize', 10,... + 'Units', 'pixels', 'Position', [220 20 160 30], 'Callback', @checkbox7_Callback); +% cbhPlot_8 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', 'Chlorophyll', 'FontSize', 10,... +% 'Units', 'pixels', 'Position', [220 105 160 30], 'Callback', @checkbox8_Callback); +cbhPlot_9 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', 'Temperature Profile', 'FontSize', 10,... + 'Units', 'pixels', 'Position', [370 90 160 30], 'Callback', @checkbox9_Callback); +cbhPlot_10 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', 'Salinity Profile', 'FontSize', 10,... + 'Units', 'pixels', 'Position', [370 55 160 30], 'Callback', @checkbox10_Callback); +cbhPlot_11 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', 'Density Profile', 'FontSize', 10,... + 'Units', 'pixels', 'Position', [370 20 160 30], 'Callback', @checkbox11_Callback); +% cbhPlot_12 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', 'Chlorophyll Profile', 'FontSize', 10,... +% 'Units', 'pixels', 'Position', [370 105 160 30], 'Callback', @checkbox12_Callback); +cbhPlot_13 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', '3D Temperature', 'FontSize', 10,... + 'Units', 'pixels', 'Position', [560 90 160 30], 'Callback', @checkbox13_Callback); +cbhPlot_14 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', '3D Salinity', 'FontSize', 10,... + 'Units', 'pixels', 'Position', [560 55 160 30], 'Callback', @checkbox14_Callback); +cbhPlot_15 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', '3D Density', 'FontSize', 10,... + 'Units', 'pixels', 'Position', [560 20 160 30], 'Callback', @checkbox15_Callback); +% cbhPlot_16 = uicontrol(bghPlotType, 'Style', 'checkbox', 'String', '3D Chlorophyll', 'FontSize', 10,... +% 'Units', 'pixels', 'Position', [560 105 160 30], 'Callback', @checkbox16_Callback); @@ -352,7 +358,7 @@ radioButtonLabel = get(selected, 'String'); - if (strcmp(radioButtonLabel, 'Deployment 1')) + if (strcmp(radioButtonLabel, '1')) mDeploymentNumber = 1; - elseif (strcmp(radioButtonLabel, 'Deployment 2')) + elseif (strcmp(radioButtonLabel, '2')) mDeploymentNumber = 2; else @@ -371,15 +377,15 @@ radioButtonLabel = get(selected, 'String'); - if (strcmp(radioButtonLabel, 'Complete')) + if (strcmp(radioButtonLabel, 'All')) mLegNumber = 0; - elseif (strcmp(radioButtonLabel, 'Leg 1')) + elseif (strcmp(radioButtonLabel, '1')) mLegNumber = 1; - elseif (strcmp(radioButtonLabel, 'Leg 2')) + elseif (strcmp(radioButtonLabel, '2')) mLegNumber = 2; - elseif (strcmp(radioButtonLabel, 'Leg 3')) + elseif (strcmp(radioButtonLabel, '3')) mLegNumber = 3; - elseif (strcmp(radioButtonLabel, 'Leg 4')) + elseif (strcmp(radioButtonLabel, '4')) mLegNumber = 4; - elseif (strcmp(radioButtonLabel, 'Leg 5')) + elseif (strcmp(radioButtonLabel, '5')) mLegNumber = 5; else @@ -421,12 +427,12 @@ %---------------------------------------------------------------------- - function checkbox4_Callback(hObject, eventdata, handles) - % callback called when the TS-Chlorophyll plot checkbox is checked - if (get(hObject,'Value') == get(hObject,'Max')) - mPlotFlag_TS_Chlorophyll = 1; - else - mPlotFlag_TS_Chlorophyll = 0; - end - end + % function checkbox4_Callback(hObject, eventdata, handles) + % % callback called when the TS-Chlorophyll plot checkbox is checked + % if (get(hObject,'Value') == get(hObject,'Max')) + % mPlotFlag_TS_Chlorophyll = 1; + % else + % mPlotFlag_TS_Chlorophyll = 0; + % end + % end %---------------------------------------------------------------------- @@ -461,12 +467,12 @@ %---------------------------------------------------------------------- - function checkbox8_Callback(hObject, eventdata, handles) - % callback called when the chlorophyll plot checkbox is checked - if (get(hObject,'Value') == get(hObject,'Max')) - mPlotFlag_Chlorophyll = 1; - else - mPlotFlag_Chlorophyll = 0; - end - end + % function checkbox8_Callback(hObject, eventdata, handles) + % % callback called when the chlorophyll plot checkbox is checked + % if (get(hObject,'Value') == get(hObject,'Max')) + % mPlotFlag_Chlorophyll = 1; + % else + % mPlotFlag_Chlorophyll = 0; + % end + % end %---------------------------------------------------------------------- @@ -501,12 +507,12 @@ %---------------------------------------------------------------------- - function checkbox12_Callback(hObject, eventdata, handles) - % callback called when the chlorophyll profile plot checkbox is checked - if (get(hObject,'Value') == get(hObject,'Max')) - mPlotFlag_ChlorophyllProfile = 1; - else - mPlotFlag_ChlorophyllProfile = 0; - end - end + % function checkbox12_Callback(hObject, eventdata, handles) + % % callback called when the chlorophyll profile plot checkbox is checked + % if (get(hObject,'Value') == get(hObject,'Max')) + % mPlotFlag_ChlorophyllProfile = 1; + % else + % mPlotFlag_ChlorophyllProfile = 0; + % end + % end %---------------------------------------------------------------------- @@ -541,12 +547,12 @@ %---------------------------------------------------------------------- - function checkbox16_Callback(hObject, eventdata, handles) - % callback called when the 3D chlorophyll plot checkbox is checked - if (get(hObject,'Value') == get(hObject,'Max')) - mPlotFlag_Chlorophyll3D = 1; - else - mPlotFlag_Chlorophyll3D = 0; - end - end + % function checkbox16_Callback(hObject, eventdata, handles) + % % callback called when the 3D chlorophyll plot checkbox is checked + % if (get(hObject,'Value') == get(hObject,'Max')) + % mPlotFlag_Chlorophyll3D = 1; + % else + % mPlotFlag_Chlorophyll3D = 0; + % end + % end @@ -662,11 +668,11 @@ gliderCTD_GeneratePlots(mGliderIndex, mDeploymentNumber, mLegNumber,... - mPlotFlag_TS, mPlotFlag_TS_AllLegs, mPlotFlag_TS_Chlorophyll,... + mPlotFlag_TS, mPlotFlag_TS_AllLegs,... mPlotFlag_Temperature, mPlotFlag_Salinity, mPlotFlag_Density,... - mPlotFlag_Chlorophyll, mPlotFlag_TemperatureProfile,... + mPlotFlag_TemperatureProfile,... mPlotFlag_SalinityProfile, mPlotFlag_DensityProfile,... - mPlotFlag_ChlorophyllProfile, mPlotFlag_Temperature3D,... + mPlotFlag_Temperature3D,... mPlotFlag_Salinity3D, mPlotFlag_Density3D,... - mPlotFlag_Chlorophyll3D, mPlotFlag_AllGliderTracks); + mPlotFlag_AllGliderTracks); end Index: gliderproc/trunk/gliderCTD_Generate_L1_Data.m =================================================================== --- gliderproc/trunk/gliderCTD_Generate_L1_Data.m (revision 497) +++ gliderproc/trunk/gliderCTD_Generate_L1_Data.m (revision 498) @@ -39,5 +39,6 @@ % other position measures for now. % -% removed chlorophyll from processing, do separately +% removed chlorophyll from processing, do separately + clear all; @@ -48,8 +49,8 @@ % % SET THE GLIDER INDEX (Pelagia = 1, Ramses = 2) ... -gliderIndex = 1; +gliderIndex = 2; % SET THE DEPLOYMENT NUMBER (1, 2 or 3) ... -deploymentNumber = 1; +deploymentNumber = 3; % SET CORRECTION PARAMETERS STRUCTURE... @@ -475,5 +476,5 @@ % set Level 1 data mat file name... -strMatFileName = strcat(strGliderName, '_Deployment', strDeploymentNumber, '_DataL1.mat'); +strMatFileName = strcat(strGliderName, '_Deployment', strDeploymentNumber, '_CTD_L1.mat'); Index: gliderproc/trunk/gliderOptode_Generate_L1_Data.m =================================================================== --- gliderproc/trunk/gliderOptode_Generate_L1_Data.m (revision 496) +++ gliderproc/trunk/gliderOptode_Generate_L1_Data.m (revision 498) @@ -200,5 +200,5 @@ C4 = C4coef(1)+C4coef(2)*tempi+C4coef(3)*tempi.^2+C4coef(4)*tempi.^3; -o2 = C0+C1*oxy_dphase+C2*oxy_dphase.^2+C3*oxy_dphase.^3+C4*oxy_dphase.^4; +o2 = C0+C1.*oxy_dphase+C2.*oxy_dphase.^2+C3.*oxy_dphase.^3+C4.*oxy_dphase.^4; % second, implement the salinity correction to DO concentration (page 31)