adapted some function to be compatible with R2018b (wrt legend function)

bbci · Mar 19, 2019 · a30ce0b · a30ce0b
1 parent 875ee45
commit a30ce0b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/visualization/plot_scalpEvolutionPlusChannel.m b/visualization/plot_scalpEvolutionPlusChannel.m
@@ -185,6 +185,8 @@
     else
       hhh= H.channel;
     end
+    % The following part can be removed. We do not allow numeric values
+    % for LegendPos anymore.
     % Check matlab version for downward compatability
     if str2double(strtok(version,'.'))<7
       H.leg= legend(hhh.plot, erp.className, opt.LegendPos);

diff --git a/visualization/plot_scalpPatternsPlusChannel.m b/visualization/plot_scalpPatternsPlusChannel.m
@@ -15,7 +15,7 @@
 %       defines the interval for the k-th Class.
 % OPTS: struct or property/value list of optional fields/properties:
 %  .LegendPos - specifies the position of the legend in the ERP plot,
-%               default 0 (see help of legend for choices).
+%               default 'best' (see man page of legend for choices).
 %  .MarkIval  - When true, the time interval is marked in the channel plot.
 %
 %The opts struct is passed to plot_scalpPattern
@@ -36,7 +36,7 @@
          'XUnit',               '[ms]',             'CHAR';
          'PlotChannel',         1,                  'BOOL';
          'ScalePos',            'vert',             'CHAR';
-         'LegendPos',           0,                  'CHAR|DOUBLE[1]|DOUBLE[4]';
+         'LegendPos',           'best',             'CHAR';
          'NewColormap',         0,                  'BOOL';
          'MarkPatterns',        [],                 'DOUBLE|CHAR';
          'MarkStyle',           {'LineWidth',3},    'CELL';
@@ -188,7 +188,7 @@
   end
   set(get(h.ax_erp, 'title'), 'FontSize',12, 'fontWeight','bold');
   if ~isequal(opt.LegendPos, 'none'),
-    h.leg= legend(erp.className, opt.LegendPos);
+    h.leg= legend(erp.className, 'Location',opt.LegendPos);
   end
 end
 

diff --git a/visualization/utils/axis_title.m b/visualization/utils/axis_title.m
@@ -25,7 +25,7 @@
             'HorizontalAlignment'   'center'               '!CHAR(left center right)';
             'VerticalAlignment'     'bottom'               '!CHAR(bottom center baseline top)';
             'FontWeight'            get(gca, 'FontWeight') '!CHAR(normal bold light demi)';
-            'FontSize'              get(gca, 'FontSize')   '!INT'
+            'FontSize'              get(gca, 'FontSize')   '!DOUBLE'
             };
 
 if nargin==0,

diff --git a/visualization/utils/plotutil_channel1D.m b/visualization/utils/plotutil_channel1D.m
@@ -81,7 +81,7 @@
          'ColorOrder',                      get(gca,'ColorOrder'),  'DOUBLE[- 3]';
          'GridOverPatches',                 1,                      'BOOL';
          'Legend',                          1,                      'BOOL';
-         'LegendPos',                       0,                      'CHAR|DOUBLE[1]|DOUBLE[4]';
+         'LegendPos',                       'best',                 'CHAR';
          'LineWidth',                       2,                      'DOUBLE';
          'LineStyle',                       '-',                    'CHAR';
          'LineStyleOrder',                  {},                     'CELL{CHAR}'
@@ -478,7 +478,7 @@
 end
 
 if opt.Legend && opt.Butterfly==0
-  H.leg= legend(H.plot, epo.className, opt.LegendPos);
+  H.leg= legend(H.plot, epo.className, 'Location',opt.LegendPos);
 else
   H.leg= NaN;
 end