Skip to content

Commit a4f55b8

Browse files
use finish_font everywhere, update comments, remove old file that probably no longer works, update readme
1 parent 7d2ab73 commit a4f55b8

14 files changed

+18
-71
lines changed

README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,13 @@ or use `map_data_from_ecomapper_by_type` / `plot_em_by_type` / `map_all` / `plot
3030
and change the data_prefix_path to the specific log file.
3131
(Haven't tested this in a while.. :) )
3232

33-
## creating interpolated bathymetry plots, x: longitude, y: latitude, color: depth
33+
## creating interpolated data plots, x: longitude, y: latitude, color: depth
3434
To create an interpolated data plot, run
3535
`map_interpolated_data_from_ecomapper_by_type` using any data type, for example `water_depth`:
3636
```
3737
map_interpolated_data_from_ecomapper_by_type('water_depth','~/data_em/puddingstone_20180419')
3838
```
39+
To create an interpolated bathymetry plot, you can also use the shortcut of running the `map_bathymetry_from_ecomapper` script.
3940

4041
## non-interpolated top-down views
4142
Examples:

curtain_plot_by_type.m

+4-17
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
%
1111
function[] = curtain_plot_by_type(data_type, file_path, location, save_figs)
1212

13-
if ( ~exist('save_figs','var') )
13+
if ~exist('save_figs','var')
1414
save_figs = 0;
1515
end
16-
if ( ~exist('location','var') )
16+
if ~exist('location','var')
1717
location = 'puddingstone';
1818
end
1919

@@ -29,7 +29,7 @@
2929
run em_prepare_labels
3030

3131
% Importing file into matlab cell
32-
if ( ~exist('file_path','var') )
32+
if ~exist('file_path','var')
3333
[filename, pathname] = uigetfile('*.log', 'Select the data file');
3434
file_path = strcat(pathname, filename);
3535
end
@@ -77,7 +77,7 @@
7777
end
7878

7979
% Plot the completed 3D slice/graph
80-
hFig= figure;
80+
hFig = figure;
8181
set(hFig, 'Position', [0 0 1000 1000])
8282
three_dimensional_slice = surf(lon_copies, lat_copies, -depth_copies, grid_data_values);
8383
shading interp
@@ -146,18 +146,5 @@
146146
end
147147
end
148148

149-
% % testing, trying to get map underneath
150-
% hold on;
151-
% if ( strcmp(location,'puddingstone') == 1 )
152-
% mapfile = '~/Maps/puddingstone/puddingstone_dam_extended.tiff';
153-
% elseif ( strcmp(location,'elsinore') == 1 )
154-
% mapfile='~/Maps/elsinore/elsinore17_crop.tiff';
155-
% else
156-
% disp('Error, location unknown, exiting');
157-
% return;
158-
% end
159-
% [data_array, ref_object] = geotiffread(mapfile);
160-
% geoshow(data_array,ref_object)
161-
162149
end
163150

finish_font.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
function [] = finish_font(fsize)
1111

1212
if nargin < 1
13-
fsize = 26;
13+
fsize = 16;
1414
end
1515

1616
% make all text in the figure to size

map_bathymetry_from_ecomapper.m

+1-2
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
end
8080

8181
% make all text in the figure to size 16
82-
set(gca,'FontSize',16)
83-
set(findall(gcf,'type','text'),'FontSize',16)
82+
finish_font
8483

8584
end

map_data_from_ecomapper_by_type.m

+1-2
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,7 @@
121121
set(get(cb,'Title'),'String',type_title_string);
122122

123123
% make all text in the figure to size 16
124-
set(gca,'FontSize',16)
125-
set(findall(gcf,'type','text'),'FontSize',16)
124+
finish_font
126125

127126
focus_map
128127

map_data_from_ecomapper_by_type_and_date.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@
103103
maxData = max(data(:,3));
104104
caxis([minData maxData]);
105105
set(get(cb,'Title'),'String',type_title_string);
106+
106107
% make all text in the figure to size 16
107-
set(gca,'FontSize',16)
108-
set(findall(gcf,'type','text'),'FontSize',16)
108+
finish_font
109109

110110
end

map_interpolated_data_from_ecomapper_by_type.m

+1-2
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,7 @@
115115
set(get(cb,'Title'),'String','Depth (m)');
116116

117117
% make all text in the figure to size 16
118-
set(gca,'FontSize',16)
119-
set(findall(gcf,'type','text'),'FontSize',16)
118+
finish_font
120119

121120
%% other save methods
122121

plot_em_by_type.m

+1-2
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,7 @@
120120
grid on
121121

122122
% make all text in the figure to size 16
123-
set(gca,'FontSize',16);
124-
set(findall(gcf,'type','text'),'FontSize',16);
123+
finish_font
125124

126125
if ( save_figs )
127126
%% save file

plot_em_by_type_3d.m

+1-2
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,7 @@
118118
set(h,'interpreter','none')
119119

120120
% make all text in the figure to size 16
121-
set(gca,'FontSize',16);
122-
set(findall(gcf,'type','text'),'FontSize',16);
121+
finish_font
123122

124123
% change viewing angle slightly to be a bit more based on Lon axis
125124
view([-30.0 25])

plot_em_type_date.m

+1-2
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,7 @@
9898
h = title(['EM ' data_type ' vs depth and time for: ' date_desired]);
9999
set(h,'interpreter','none')
100100

101-
set(gca,'FontSize',16);
102-
set(findall(gcf,'type','text'),'FontSize',16);
101+
finish_font
103102

104103
%% save file
105104
disp(['Save figures for: ' data_type]);

plot_pitch_roll_from_pfd.m

-34
This file was deleted.

plot_trajectory_single_mission.m

+1-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
ylabel('latitude')
4343

4444
% make all text in the figure to size 16
45-
set(gca,'FontSize',16);
46-
set(findall(gcf,'type','text'),'FontSize',16);
45+
finish_font
4746

4847
end

save_as_fig.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
% Institution: University of Southern California
55
% Date: June 29, 2017
66
%
7-
% tested with MatlabR2012a on Ubuntu 16.04
7+
% last tested with MatlabR2018a on Ubuntu 16.04
88
%
99
function [] = save_as_fig(fig_h, data_path_prefix, location, prefix, identifier, data_type)
1010

save_as_jpeg.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
% Institution: University of Southern California
55
% Date: June 29, 2017
66
%
7-
% tested with MatlabR2012a on Ubuntu 16.04
7+
% last tested with MatlabR2018a on Ubuntu 16.04
88
%
99
function [] = save_as_jpeg(data_path_prefix, location, prefix, identifier, data_type, resolution, postfix, paper_position)
1010

0 commit comments

Comments
 (0)