Skip to content

Commit 8874700

Browse files
authored
Merge branch 'develop' into update_documents
2 parents f735eb9 + 4adc3f1 commit 8874700

6 files changed

+7
-5
lines changed

doc/PsPM_release_checklist.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
This file contains the steps required for finalising a PsPM release. Many items at the beginning don't have to be followed sequentially. However, it is important that there aren't any revisions (commits) that implement/fix something new in the release branch, because we don't merge these branches back to trunk. Therefore, it is sensible to create the release branch after making absolutely sure that no new stuff will be implemented.
33

44
- [ ] Update version number & date in
5-
- [ ] `pspm_msg`
5+
- [ ] `pspm_msg.txt`
66
- [ ] `pspm_quit`
77
- [ ] `pspm_ui`
8-
- [ ] `pspm.fig`: Load `pspm.fig` into MATLAB using `openfig`, update `fig.Children(9).String` and save back to `pspm.fig`
8+
- [ ] `pspm_ui_app`
99
- [ ] Manual and Developers Guide: front pages
1010
- [ ] Make sure both manuals are updated
1111
- [ ] Add release notes section of the new version to manual (at the end) and release\_notes.tex
@@ -23,3 +23,5 @@ This file contains the steps required for finalising a PsPM release. Many items
2323
- [ ] Add release message to GitHub
2424
- [ ] Change release number on lab webpage (gh-pages branch)
2525
- [ ] Add release message to lab webpage (gh-pages branch)
26+
- [ ] Update `PsPM_installer` in `/src/helper` with the new version number and download link, and merge this pull request on the official release date.
27+

src/pspm_appdesigner.mlapp

10.4 KB
Binary file not shown.

src/pspm_appdesigner2019.mlapp

13.3 KB
Binary file not shown.

src/pspm_msg.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
$___________________________________________________________________________
22
Welcome to PsPM (Psychophysiological Modelling)
3-
Version 7.0 (xx.xx.2025)
3+
Version 7.0 (12.02.2025)
44
$
55
------------------------------------------
66
(c) 2008-2025

src/pspm_ui.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
handles.tag_attribution.FontSize = FSAttr;
113113
%handles.tag_attribution.Visible = 'off';
114114
handles.tag_attribution.HorizontalAlignment = 'center';
115-
attribution_disp_text = sprintf(['Version 7.0, Build 25-01-2024 with MATLAB 2023a, ',...
115+
attribution_disp_text = sprintf(['Version 7.0, Build 12-02-2025 with MATLAB 2024a, ',...
116116
'The PsPM Team']);
117117
handles.tag_attribution.String = attribution_disp_text;
118118
handles.tag_PsPM.FontName = FNRoman;

src/pspm_ui_app.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
%% Window specific settings
5959
switch app.layout.Name
6060
case 'pspm'
61-
attribution_disp_text = ['Build 03-06-2024 with MATLAB 2024a, ',...
61+
attribution_disp_text = ['Build 12-02-2025 with MATLAB 2024a, ',...
6262
'The PsPM Team'];
6363
app.text_attribution.Text{1,1} = 'Version 7.0';
6464
app.text_attribution.Text{2,1} = attribution_disp_text;

0 commit comments

Comments
 (0)