Skip to content

Add illustrate shape space for animation background #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yanhaoy wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add illustrate shape space for animation background #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
541c0b8
Fix se2exp
yanhaoy Jul 20, 2022
65c134e
Add illustrate shape space for animation background
yanhaoy Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions ProgramFiles/Animation/animate_locomotor.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,12 @@ function animate_locomotor(export,info_needed)

% Create lists to iterate along for shape space axis creation, and then
% trim out movies that aren't being made
fignums = [171; 172; 173; 181; 182; 183];
fignums = [171; 172; 173; 181; 182; 183; 191];
fignums(~export_list(2:end)) = [];

% Name the plots to draw into those windows, and trim them to just the
% plots being made
fignames = {'CCF X';'CCF Y';'CCF Theta'; 'Avec X';'Avec Y';'Avec Theta'};
fignames = {'CCF X';'CCF Y';'CCF Theta'; 'Avec X';'Avec Y';'Avec Theta'; 'Illustrate Shape Space'};

if strcmp(info_needed.Coordinates,'minperturbation_coords')
fignamessuffix = ' min. perturbation coords';
Expand All @@ -152,7 +152,7 @@ function animate_locomotor(export,info_needed)

%%%%%
% Internal names used by sys_draw
figinternal = {'X';'Y';'T';'X';'Y';'T'};
figinternal = {'X';'Y';'T';'X';'Y';'T';''};
if strcmp(info_needed.Coordinates,'minperturbation_coords')
figinternalsuffix = 'opt';
else
Expand All @@ -164,7 +164,7 @@ function animate_locomotor(export,info_needed)

%%%%%%
% Category of plots to make
figcategory = {'CCF';'CCF';'CCF';'vfield';'vfield';'vfield'};
figcategory = {'CCF';'CCF';'CCF';'vfield';'vfield';'vfield';'ShapeSpace'};
figcategory(~export_list(2:end)) = [];

%%%%%%
Expand Down Expand Up @@ -224,7 +224,11 @@ function animate_locomotor(export,info_needed)

% Call the drawing function
for idx = 1:numel(plot_info)
hh(idx,1) = absolute_feval(underlying_function{idx},s,[],plot_info(idx),[],'null',resolution);
if strcmp(plot_info(idx).category, 'ShapeSpace')
hh(idx,1) = feval([plot_info(idx).category '_draw'],s,[],plot_info(idx),system_name,'null',resolution);
else
hh(idx,1) = absolute_feval(underlying_function{idx},s,[],plot_info(idx),[],'null',resolution);
end
end

% Remove click callbacks on axes created
Expand Down
2 changes: 1 addition & 1 deletion ProgramFiles/GaitOptimization/optimalgaitgenerator_fcns/se2exp.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

z_theta = xi(3);

z_xy = 1/z_theta * [sin(z_theta), 1-cos(z_theta); cos(z_theta)-1, sin(z_theta)] * xi(1:2);
z_xy = 1/z_theta * [sin(z_theta), -1+cos(z_theta); 1-cos(z_theta), sin(z_theta)] * xi(1:2);

expXi = [ [cos(z_theta), -sin(z_theta); sin(z_theta), cos(z_theta)], z_xy;
0 0 1];
Expand Down
5 changes: 5 additions & 0 deletions ProgramFiles/sys_draw_fcns/ShapeSpace_draw.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,10 @@

end

%Label the axes
label_shapespace_axes(plot_info.axes,[],plot_info.stretch);

%Set the tic marks
set(plot_info.axes,'FontSize',30,'FontName','Helvetica')

end
2 changes: 2 additions & 0 deletions ProgramFiles/sysplotter_gui_fcns/animatebutton_gui2_Callback.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ function animatebutton_gui2_Callback(hObject, eventdata, handles)
info_needed.Movies.vfieldx = get(handles.checkbox_vfieldx_movie,'value');
info_needed.Movies.vfieldy = get(handles.checkbox_vfieldy_movie,'value');
info_needed.Movies.vfieldtheta = get(handles.checkbox_vfieldtheta_movie,'value');
%
info_needed.Movies.illustrateShapeSpace = get(handles.checkbox_illustrate_shape_space,'value');

% Get the selected system coordinates
info_needed.Coordinates = get(findobj(handles.coordinate_selector,'Value',1),'Tag');
Expand Down
Binary file modified ProgramFiles/sysplotter_gui_fcns/animation_gui.fig
View file
Open in desktop
Binary file not shown.
11 changes: 10 additions & 1 deletion ProgramFiles/sysplotter_gui_fcns/animation_gui.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

% Edit the above text to modify the response to help animation_gui

% Last Modified by GUIDE v2.5 07-Sep-2018 12:53:48
% Last Modified by GUIDE v2.5 29-Sep-2022 15:17:03

% Begin initialization code - DO NOT EDIT

Expand Down Expand Up @@ -215,3 +215,12 @@ function checkbox_vfieldtheta_movie_Callback(hObject, eventdata, handles)
% handles structure with handles and user data (see GUIDATA)

% Hint: get(hObject,'Value') returns toggle state of checkbox_vfieldtheta_movie


% --- Executes on button press in checkbox_illustrate_shape_space.
function checkbox_illustrate_shape_space_Callback(hObject, eventdata, handles)
% hObject handle to checkbox_illustrate_shape_space (see GCBO)
% eventdata reserved - to be defined in a future version of MATLAB
% handles structure with handles and user data (see GUIDATA)

% Hint: get(hObject,'Value') returns toggle state of checkbox_illustrate_shape_space