Merge pull request #553 from bachlab/545-issue-running-first-level-co…

…ntrasts-in-dcmnon-linear-tutorial
bachlab · Jan 17, 2024 · 664fc29 · 664fc29
2 parents f847699 + c11035a
commit 664fc29
Show file tree

Hide file tree

Showing 14 changed files with 12 additions and 11 deletions.
diff --git 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
diff --git a/doc/Figures/YY1_import_legacy.png b/doc/Figures/YY1_import_legacy.png
diff --git a/doc/Figures/YY2_trim.png b/doc/Figures/YY2_trim.png
diff --git a/doc/Figures/YY2_trim_legacy.png b/doc/Figures/YY2_trim_legacy.png
diff --git a/doc/Figures/YY3_glm.png b/doc/Figures/YY3_glm.png
diff --git a/doc/Figures/YY3_glm_legacy.png b/doc/Figures/YY3_glm_legacy.png
diff --git a/doc/PsPM_Developers_Guide.pdf b/doc/PsPM_Developers_Guide.pdf
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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;