Merge pull request #496 from HJZollner/develop

Prepare Release v.2.4.0
schorschinho · Aug 4, 2022 · cfb0196 · cfb0196
2 parents 6c129d3 + f639140
commit cfb0196
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/GUI/Osprey.m b/GUI/Osprey.m
@@ -30,7 +30,7 @@
 logoFcn = @()imread('osprey.png', 'BackgroundColor', gui.colormap.Background);
 logoBanner = uiw.utility.loadIcon(logoFcn);
 % Here the intro banner is created
-gui.d = uiw.dialog.About('Name', 'Osprey','Version','2.3.0','Date', 'June 24, 2022',...
+gui.d = uiw.dialog.About('Name', 'Osprey','Version','2.4.0','Date', 'August 8, 2022',...
 'Timeout', 3,'CustomText', 'Osprey is provided by Johns Hopkins University.',...
 'ContactInfo', '[email protected]','LogoCData', logoBanner);
 

diff --git a/GUI/osp_Toolbox_Check.m b/GUI/osp_Toolbox_Check.m
@@ -32,7 +32,7 @@
 %       2020-05-15: First version of the code.
 %% % 1. SAVE OSPREY VERSION%%%
 %%% 1. SAVE OSPREY VERSION%%%
-OspreyVersion = 'Osprey 2.3.0';
+OspreyVersion = 'Osprey 2.4.0';
 fprintf(['Timestamp %s ' OspreyVersion '  ' Module '\n'], datestr(now,'mmmm dd, yyyy HH:MM:SS'));
 hasSPM = 1; % For the compiled GUI
 %% % 2. GET SPMPATH AND TOOLBOXES%%%

diff --git a/job/OspreyJob.m b/job/OspreyJob.m
@@ -713,7 +713,7 @@
 %%% 7. SET FLAGS AND VERSION %%%
 MRSCont.flags.didJob        = 1;
 MRSCont.loadedJob           = jobFile;
-MRSCont.ver.Osp             = 'Osprey 2.3.0';
+MRSCont.ver.Osp             = 'Osprey 2.4.0';
 
 
 %%% 8. CHECK IF OUTPUT STRUCTURE ALREADY EXISTS IN OUTPUT FOLDER %%%

diff --git a/utilities/CompileOspreyStandalone.m b/utilities/CompileOspreyStandalone.m
@@ -168,7 +168,7 @@ function CompileOspreyStandalone(OutputDir,SPM12Dir,WidgetsDir,GUILayoutDir)
     'OutputDir',OutputDirHBCD,...
     'ExecutableIcon',fullfile(OspreyDir, 'graphics','osprey.gif'),...
     'ExecutableSplashScreen',fullfile(OspreyDir, 'graphics','osprey.gif'),...
-    'ExecutableVersion','2.3.0',...
+    'ExecutableVersion','2.4.0',...
     'ExecutableName','OspreyHBCD',...
     'AdditionalFiles',{ fullfile(SPM12Dir),...
                        fullfile(OspreyDir,'coreg'),...
@@ -225,7 +225,7 @@ function CompileOspreyStandalone(OutputDir,SPM12Dir,WidgetsDir,GUILayoutDir)
     'OutputDir',OutputDirCmd,...
     'ExecutableIcon',fullfile(OspreyDir, 'graphics','osprey.gif'),...
     'ExecutableSplashScreen',fullfile(OspreyDir, 'graphics','osprey.gif'),...
-    'ExecutableVersion','2.3.0',...
+    'ExecutableVersion','2.4.0',...
     'ExecutableName','OspreyCMD',...
     'AdditionalFiles',{ fullfile(SPM12Dir),...
                        fullfile(OspreyDir,'coreg'),...
@@ -264,7 +264,7 @@ function CompileOspreyStandalone(OutputDir,SPM12Dir,WidgetsDir,GUILayoutDir)
         'OutputDir',OutputDirGUI,...
         'ExecutableIcon',fullfile(OspreyDir, 'graphics','osprey.gif'),...
         'ExecutableSplashScreen',fullfile(OspreyDir, 'graphics','osprey.gif'),...
-        'ExecutableVersion','2.3.0',...
+        'ExecutableVersion','2.4.0',...
         'ExecutableName','Osprey',...
         'AdditionalFiles',{fullfile(WidgetsDir),...
                            fullfile(GUILayoutDir),...

diff --git a/utilities/osp_CheckRunPreviousModule.m b/utilities/osp_CheckRunPreviousModule.m
@@ -74,7 +74,7 @@
 end
 
 %Do the toolbox check here
-OspreyVersion = 'Osprey 2.3.0';
+OspreyVersion = 'Osprey 2.4.0';
 hasSPM = 1;
 [hasSPM,OspreyVersion ] = osp_Toolbox_Check (module,MRSCont.flags.isGUI);