Skip to content
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

6.0 Hotfix #403

Merged
merged 3 commits into from
Jul 19, 2022
Merged

6.0 Hotfix #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15601db
fix date
Jul 15, 2022
c4ae1b5
Update PsPM_release_checklist.md
Jul 19, 2022
23dbc04
Merge branch 'develop' into 6_0_hotfix
Jul 19, 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
1 change: 1 addition & 0 deletions doc/PsPM_release_checklist.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ This file contains the steps required for finalising a PsPM release. Many items
- [ ] Update version number & date in
- [ ] `pspm_msg`
- [ ] `pspm_quit`
- [ ] `pspm_ui`
- [ ] `pspm.fig`: Load `pspm.fig` into MATLAB using `openfig`, update `fig.Children(9).String` and save back to `pspm.fig`
- [ ] Manual and Developers Guide: front pages
- [ ] Make sure both manuals are updated
Expand Down
Binary file modified src/pspm.fig
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions src/pspm.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
function varargout = pspm(varargin)

% pspm.m handles the main GUI for PsPM
% PsPM Version 5.1.1
% (C) 2008-2021 Dominik R Bach (Wellcome Centre for Human Neuroimaging)
% PsPM Version 6.0.0
% (C) 2008-2022 Dominik R Bach (Wellcome Centre for Human Neuroimaging)
% Updated 22-07-2021 Teddy (WCHN, UCL)

% initialise
Expand Down
6 changes: 3 additions & 3 deletions src/pspm_bf_data.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
% FORMAT:
% [bf, x]=pspm_bf_data(td)
%
% PsPM 5.1.1,
% 2021 Dominik R Bach (University College London)
% Updated 2021 Teddy Chao (WCHN, UCL)
% PsPM 6.0.0
% 2022 Dominik R Bach (University College London)
% Updated 2022 Teddy Chao (WCHN, UCL)

%% Constants
% CHANGE THIS TO CREATE YOUR FUNCTION
Expand Down
3 changes: 1 addition & 2 deletions src/pspm_ui.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ function pspm_ui(hObject,handles,window)
handles.tag_attribution.FontSize = FSAttr;
%handles.tag_attribution.Visible = 'off';
handles.tag_attribution.HorizontalAlignment = 'center';
attribution_disp_text = sprintf(['Version 5.1.1, Build ',...
datestr(now,'ddmmyyyy'),' with MATLAB 2021a, ',...
attribution_disp_text = sprintf(['Version 6.0.0, Build 14-07-2022 with MATLAB 2022a, ',...
'The PsPM Team, University College London']);
handles.tag_attribution.String = attribution_disp_text;
handles.tag_PsPM.FontName = FNRoman;
Expand Down