diff --git a/.gitignore b/.gitignore index b1b531429..5820156d9 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ vendor/ test/pspm_test_temp.m test/pspm_test_dynamic.m success.txt +*.dll diff --git a/doc/Figures/YY1_import.png b/doc/Figures/YY1_import.png index f60405b7f..787994b26 100644 Binary files a/doc/Figures/YY1_import.png and b/doc/Figures/YY1_import.png differ diff --git a/doc/Figures/YY1_import_legacy.png b/doc/Figures/YY1_import_legacy.png new file mode 100644 index 000000000..f60405b7f Binary files /dev/null and b/doc/Figures/YY1_import_legacy.png differ diff --git a/doc/Figures/YY2_trim.png b/doc/Figures/YY2_trim.png index 0ca75b8b2..3e24cb606 100644 Binary files a/doc/Figures/YY2_trim.png and b/doc/Figures/YY2_trim.png differ diff --git a/doc/Figures/YY2_trim_legacy.png b/doc/Figures/YY2_trim_legacy.png new file mode 100644 index 000000000..0ca75b8b2 Binary files /dev/null and b/doc/Figures/YY2_trim_legacy.png differ diff --git a/doc/Figures/YY3_glm.png b/doc/Figures/YY3_glm.png index e884f5d65..388bc5821 100644 Binary files a/doc/Figures/YY3_glm.png and b/doc/Figures/YY3_glm.png differ diff --git a/doc/Figures/YY3_glm_legacy.png b/doc/Figures/YY3_glm_legacy.png new file mode 100644 index 000000000..e884f5d65 Binary files /dev/null and b/doc/Figures/YY3_glm_legacy.png differ diff --git a/doc/PsPM_Developers_Guide.pdf b/doc/PsPM_Developers_Guide.pdf index 09487d744..e09ae5e80 100644 Binary files a/doc/PsPM_Developers_Guide.pdf and b/doc/PsPM_Developers_Guide.pdf differ diff --git a/doc/PsPM_Manual.lyx b/doc/PsPM_Manual.lyx index 4ce1efad5..54a03405a 100644 --- a/doc/PsPM_Manual.lyx +++ b/doc/PsPM_Manual.lyx @@ -14227,12 +14227,12 @@ You can have a look at the imported data by loading this file into MATLAB. placement H wide false sideways false -status collapsed +status open \begin_layout Plain Layout \begin_inset Graphics filename Figures/YY1_import.png - scale 60 + scale 40 \end_inset @@ -14277,12 +14277,12 @@ Most of the time, the SCR recording is switched on some time before the placement H wide false sideways false -status collapsed +status open \begin_layout Plain Layout \begin_inset Graphics filename Figures/YY2_trim.png - scale 60 + scale 40 \end_inset @@ -14535,12 +14535,12 @@ Nuisance File placement H wide false sideways false -status collapsed +status open \begin_layout Plain Layout \begin_inset Graphics filename Figures/YY3_glm.png - scale 60 + scale 40 \end_inset @@ -15532,7 +15532,7 @@ New: Session \emph on Data File \emph default -: choose tscr_s1.mat from your hard drive +: choose tpspm_s1.mat from your hard drive \end_layout \begin_layout Itemize diff --git a/doc/PsPM_Manual.pdf b/doc/PsPM_Manual.pdf index cd1eed9be..40d77b908 100644 Binary files a/doc/PsPM_Manual.pdf and b/doc/PsPM_Manual.pdf differ diff --git a/src/pspm_cfg/pspm_cfg_artefact_rm.m b/src/pspm_cfg/pspm_cfg_artefact_rm.m index 123348b8a..4b76a8436 100644 --- a/src/pspm_cfg/pspm_cfg_artefact_rm.m +++ b/src/pspm_cfg/pspm_cfg_artefact_rm.m @@ -175,7 +175,7 @@ overwrite.val = {false}; overwrite.labels = {'No', 'Yes'}; overwrite.values = {false, true}; - overwrite.help = {'Overwrite existing file?'}; + overwrite.help = {'Overwrite if a file with the same name has existed?'}; %% Executable branch artefact_rm = cfg_exbranch; diff --git a/src/pspm_cfg/pspm_cfg_import.m b/src/pspm_cfg/pspm_cfg_import.m index 7e6f7b5ed..fe1c64e5a 100644 --- a/src/pspm_cfg/pspm_cfg_import.m +++ b/src/pspm_cfg/pspm_cfg_import.m @@ -405,7 +405,7 @@ overwrite.val = {false}; overwrite.labels = {'No', 'Yes'}; overwrite.values = {false, true}; -overwrite.help = {'Overwrite existing file?'}; +overwrite.help = {'Overwrite if a file with the same name has existed?'}; %% Executable branch import_data = cfg_exbranch; diff --git a/src/pspm_cfg/pspm_cfg_split_sessions.m b/src/pspm_cfg/pspm_cfg_split_sessions.m index 2e3b3f20b..f29bf48d1 100644 --- a/src/pspm_cfg/pspm_cfg_split_sessions.m +++ b/src/pspm_cfg/pspm_cfg_split_sessions.m @@ -96,7 +96,7 @@ overwrite.val = {false}; overwrite.labels = {'No', 'Yes'}; overwrite.values = {false, true}; - overwrite.help = {'Overwrite existing file?'}; + overwrite.help = {'Overwrite if a file with the same name has existed?'}; %% Executable branch diff --git a/src/pspm_cfg/pspm_cfg_trim.m b/src/pspm_cfg/pspm_cfg_trim.m index d5d1cc86a..fd02d78cc 100644 --- a/src/pspm_cfg/pspm_cfg_trim.m +++ b/src/pspm_cfg/pspm_cfg_trim.m @@ -197,7 +197,7 @@ overwrite.val = {false}; overwrite.labels = {'No', 'Yes'}; overwrite.values = {false, true}; -overwrite.help = {'Overwrite existing file?'}; +overwrite.help = {'Overwrite if a file with the same name has existed?'}; %% Executable branch trim = cfg_exbranch;