renaming and shifting between folders

bbci · Sep 10, 2012 · c9311d2 · c9311d2
1 parent e88e27c
commit c9311d2
Show file tree

Hide file tree

Showing 51 changed files with 128 additions and 276 deletions.
diff --git a/classification/apply_separatingHyperplane.m b/classification/apply_separatingHyperplane.m
diff --git a/demos/demo_analysis_ERD.m b/demos/demo_analysis_ERD.m
@@ -18,7 +18,7 @@
               'FC5,FC3,FC1,FCz,FC2,FC4,FC6\n' ...
               'C5,C3,C1,Cz,C2,C4,C6\n' ...
               'CP5,CP3,CP1,CPz,CP2,CP4,CP6']);
-mnt= get_electrodePositions(cnt.clab);
+mnt= mnt_setElectrodePositions(cnt.clab);
 mnt= mnt_setGrid(mnt, grd);
 
 colOrder= [245 159 0; 0 150 200]/255;

diff --git a/demos/demo_analysis_ERPs.m b/demos/demo_analysis_ERPs.m
@@ -28,7 +28,7 @@
               'T7,C5,C3,C1,Cz,C2,C4,C6,T8\n' ...
               'P7,P5,P3,P1,Pz,P2,P4,P6,P8\n' ...
               'PO9,PO7,PO3,O1,Oz,O2,PO4,PO8,PO10']);
-mnt= get_electrodePositions(cnt.clab);
+mnt= mnt_setElectrodePositions(cnt.clab);
 mnt= mnt_setGrid(mnt, grd);
 
 % Define some settings

diff --git a/demos/demo_analysis_Spectra.m b/demos/demo_analysis_Spectra.m
@@ -18,7 +18,7 @@
               'C5,C3,C1,Cz,C2,C4,C6\n' ...
               'CP5,CP3,CP1,CPz,CP2,CP4,CP6\n' ...
               'EMGl,scale,O1,_,O2,legend,EMGr']);
-mnt= get_electrodePositions(cnt.clab);
+mnt= mnt_setElectrodePositions(cnt.clab);
 mnt= mnt_setGrid(mnt, grd);
 
 colOrder= [245 159 0; 0 150 200]/255;

diff --git a/misc/misc_getFuncParam.m b/misc/misc_getFuncParam.m
diff --git a/misc/procutil_getClabForLaplacian.m → ...sing/utils/procutil_getClabForLaplacian.m b/misc/procutil_getClabForLaplacian.m → ...sing/utils/procutil_getClabForLaplacian.m
diff --git a/processing/utils/select_time_intervals.m b/processing/utils/select_time_intervals.m
@@ -80,7 +80,7 @@
          'VisuScalps'           0               '!BOOL';
          'OptVisu'              []              'CELL|STRUCT';
          'Title'                ''              'CHAR'
-         'Mnt'                  get_electrodePositions(epo_r.clab)  'STRUCT';
+         'Mnt'                  mnt_setElectrodePositions(epo_r.clab)  'STRUCT';
          'Constraint'           {}              'CELL';
          'IntersampleTiming'    0               '!DOUBLE';
          'Verbose'              1               '!BOOL'};

diff --git a/utils/cprintf.m b/utils/cprintf.m
diff --git a/utils/util_toString.m b/utils/util_toString.m
diff --git a/visualization/private/backaxes.m → visualization/axis_getQuitely.m b/visualization/private/backaxes.m → visualization/axis_getQuitely.m
@@ -1,4 +1,4 @@
-function h_out= backaxes(varargin)
+function h_out= axis_getQuitely(varargin)
 
 vis= get(gcf, 'Visible');
 if nargin==1,

diff --git a/visualization/axis_redrawFrame.m b/visualization/axis_redrawFrame.m
@@ -21,7 +21,7 @@
         isequal(get(ax(ii),'YColor'),[1 1 1]),
     continue;
   end
-  backaxes(ax(ii));
+  visutil_backaxes(ax(ii));
 
   xLim= get(ax(ii), 'XLim');
   yLim= get(ax(ii), 'YLim');
@@ -64,5 +64,5 @@
 end
 
 %if old_ax~=ax(end),  %% if this was not checked the legend would disappear
-  backaxes(old_ax);
+  visutil_backaxes(old_ax);
 %end
diff --git a/visualization/shift_axesUp.m → visualization/axis_shiftUp.m b/visualization/shift_axesUp.m → visualization/axis_shiftUp.m
@@ -1,5 +1,5 @@
-function shift_axesUp(up, hc)
-%shift_axesUp(<up=0.1, hc>)
+function axis_shiftUp(up, hc)
+%axis_shiftUp(<up=0.1, hc>)
 
 if ~exist('up','var') | isempty(up), up=0.1; end
 if ~exist('hc','var'), hc= get(gcf, 'children'); end

diff --git a/misc/cmap_bluewhite.m → visualization/cmap_bluewhite.m b/misc/cmap_bluewhite.m → visualization/cmap_bluewhite.m
diff --git a/misc/cmap_greenwhitelila.m → visualization/cmap_greenwhitelila.m b/misc/cmap_greenwhitelila.m → visualization/cmap_greenwhitelila.m
diff --git a/misc/cmap_hsvFade.m → visualization/cmap_hsvFade.m b/misc/cmap_hsvFade.m → visualization/cmap_hsvFade.m
diff --git a/misc/cmap_posneg.m → visualization/cmap_posneg.m b/misc/cmap_posneg.m → visualization/cmap_posneg.m
diff --git a/misc/cmap_rainbow.m → visualization/cmap_rainbow.m b/misc/cmap_rainbow.m → visualization/cmap_rainbow.m
diff --git a/misc/cmap_whitered.m → visualization/cmap_whitered.m b/misc/cmap_whitered.m → visualization/cmap_whitered.m
diff --git a/visualization/get_backgroundAxis.m → visualization/fig_getBackgroundAxis.m b/visualization/get_backgroundAxis.m → visualization/fig_getBackgroundAxis.m
@@ -21,11 +21,11 @@
              'tickLength',[0 0], 'XLim',[0 1], 'YLim',[0 1]);
 %% If you want to have a non transparent background (e.g. for printing)
 %% you can do the following
-%% >> set(ax, 'Visible','on'); move_objectBack(ax);
+%% >> set(ax, 'Visible','on'); obj_moveBack(ax);
 %% To this end we set tickLength to 0.
 else
   h_bax= [];
 end
 if ~isempty(h_bax),
-  get_backAxes(h_bax);
+  axis_getQuitely(h_bax);
 end
diff --git a/misc/fig_set.m → visualization/fig_set.m b/misc/fig_set.m → visualization/fig_set.m
diff --git a/misc/fig_toolsoff.m → visualization/fig_toolsoff.m b/misc/fig_toolsoff.m → visualization/fig_toolsoff.m
diff --git a/visualization/get_backAxes.m b/visualization/get_backAxes.m
diff --git a/visualization/grid_addBars.m b/visualization/grid_addBars.m
@@ -137,7 +137,7 @@
 if isnumeric(opt.Channels)
   ax= opt.Channels;
 else
-  ax= grid_getSubplots(opt.Channels);
+  ax= gridutil_getSubplots(opt.Channels);
 end
 
 %% For image_localColormap we have to determine the CLim in advance.
@@ -247,7 +247,7 @@
           'CLim',opt.CLim);
 
 if opt.MoveBack,
-  move_objectBack(H.ax);
+  obj_moveBack(H.ax);
 end
 
 if ~isempty(opt.HScale),

diff --git a/visualization/grid_imagesc.m b/visualization/grid_imagesc.m
@@ -10,8 +10,8 @@
 % OPT: property/value list or struct of options with fields/properties:
 %  .ScaleGroup -  groups of channels, where each group should
 %                 get the same y limits, cell array of cells,
-%                 default {get_scalpChannels, {'EMG*'},{'EOGh'},{'EOGv'}};
-%                 As group you can also use get_scalpChannels (without quotes!)
+%                 default {util_scalpChannels, {'EMG*'},{'EOGh'},{'EOGv'}};
+%                 As group you can also use util_scalpChannels (without quotes!)
 %                 or 'all' (with quotes!).
 %  .ScalePolicy - says how the y limits are chosen:
 %                 'auto': choose automatically,
@@ -25,7 +25,7 @@
 %                 [lower upper]: define y limits;
 %                 .scapePolicy is usually a cell array, where
 %                 each cell corresponds to one .ScaleGroup. Otherwise it
-%                 applies only to the first group (get_scalpChannels by defaults).
+%                 applies only to the first group (util_scalpChannels by defaults).
 %  .ScaleUpperLimit - values (in magnitude) above this limit are not 
 %                 considered, when choosing the y limits, default inf
 %  .ScaleLowerLimit - values (in magnitude) below this limit are not 
@@ -81,7 +81,7 @@
          'ScaleShowOrientation',            1,                      'BOOL';
          'PlotStd',                         0,                      'BOOL'};
 
-props_channel = plot_channel1D;
+props_channel = plotutil_channel1D;
 
 if nargin==0,
   H= opt_catProps(props, props_channel);
@@ -120,7 +120,7 @@
 %        opt_overrideIfDefault(opt, isdefault, ...
 %                              'ShrinkAxes', 0.8);
 %  end
-if isdefault.shift_axesUp & ...
+if isdefault.axis_shiftUp & ...
       (isfield(opt, 'xTick') & ~isempty(opt.xTick)), ...
       opt.ShiftAxesUp= 0.05;
 end
@@ -141,7 +141,7 @@
   opt.ScalePolicy= {opt.ScalePolicy};
 end
 if ~isfield(opt, 'ScaleGroup'),
-  grd_clab= get_clabOfGrid(mnt);
+  grd_clab= gridutil_getClabOfGrid(mnt);
   if strncmp(opt.ScalePolicy, 'individual', length('individual')),
     opt.ScaleGroup= grd_clab;
     pol= opt.ScalePolicy(length('individual')+1:end);
@@ -152,7 +152,7 @@
     end
     opt.ScalePolicy= repmat({pol}, size(grd_clab));
   else
-    scalp_idx= get_scalpChannels(epo);
+    scalp_idx= util_scalpChannels(epo);
     if isempty(scalp_idx),
       opt.ScaleGroup= {intersect(grd_clab, epo.clab)};
     else
@@ -172,7 +172,7 @@
     end
   end
 elseif isequal(opt.ScaleGroup, 'all'),
-  opt.ScaleGroup= {get_clabOfGrid(mnt)};
+  opt.ScaleGroup= {gridutil_getClabOfGrid(mnt)};
 elseif ~iscell(opt.ScaleGroup),
   opt.ScaleGroup= {opt.ScaleGroup};
 end
@@ -294,7 +294,7 @@
 
   for ia= 1:nDisps,
     ic= DisplayChannels(ia);
-    pos = get_axisGridPos(mnt, ic);
+    pos = gridutil_getAxisPos(mnt, ic);
     if sum(isnan(pos)) == 0
       H{ih}.ax(ia)= axes('position', pos);
 
@@ -338,7 +338,7 @@
   %      if ic==DisplayChannels(1),
   %        opt_plot{2}= 0;
   %        H{ih}.leg= H{ih}.chan(ia).leg;
-  %        leg_pos= get_axisGridPos(mnt, 0);
+  %        leg_pos= gridutil_getAxisPos(mnt, 0);
   %        if ~any(isnan(leg_pos)),
   %          leg_pos_orig= get(H{ih}.leg, 'position');
   %          if leg_pos(4)>leg_pos_orig(4),
@@ -366,15 +366,15 @@
     H{ih}.scale= grid_addScale(mnt, opt);
   end
 
-    pos = get_axisGridPos(mnt, ic+1);
+    pos = gridutil_getAxisPos(mnt, ic+1);
     pos(3) = 0.075*pos(3);
     H{ih}.ax(ia+1) = axes('position', pos);
     set(gca, 'YTicklabel', '', 'XTicklabel', '')
     fa = find(H{ih}.ax);
     axes(H{ih}.ax(fa(1)))
     cb = Colorbar(H{ih}.ax(ia+1));
     set(get(cb, 'ylabel'), 'String', opt.CUnit)
-%    plot_gridOverPatches('Axes',H{ih}.ax);
+%    plotutil_gridOverPatches('Axes',H{ih}.ax);
 
   if ~strcmp(opt.TitleDir, 'none'),
     tit= '';
@@ -405,7 +405,7 @@
   end
 
   if ~isempty(opt.ShiftAxesUp) & opt.ShiftAxesUp~=0,
-    shift_axesUp(opt.ShiftAxesUp);
+    axis_shiftUp(opt.ShiftAxesUp);
   end
 
   if nargout==0,

diff --git a/visualization/grid_markByBox.m b/visualization/grid_markByBox.m
@@ -36,7 +36,7 @@
 end
 
 old_ax= gca;
-hsp= grid_getSubplots(opt.clab);
+hsp= gridutil_getSubplots(opt.clab);
 for ii= 1:length(hsp),
   ih= hsp(ii);
   axes(ih);
@@ -51,5 +51,5 @@
                       opt.Linespec{:})';
   H(ii).box= line(fractiles([2 4 4 2 2]), yy([1 1 2 2 1]), opt.Linespec{:});
 end
-move_objectBack(struct2array(H));
+obj_moveBack(struct2array(H));
 Axes(old_ax);
diff --git a/visualization/grid_markInterval.m b/visualization/grid_markInterval.m
@@ -31,27 +31,27 @@
 if isnumeric(chans) && ~isempty(chans),
   hsp= chans;
 else
-  hsp= grid_getSubplots(chans);
+  hsp= gridutil_getSubplots(chans);
 end
 k= 0;
 for ih= hsp,
   k= k+1;
-  get_backAxes(ih);  %% this lets the legend vanish behind the axis
+  axis_getQuitely(ih);  %% this lets the legend vanish behind the axis
   yPatch= get(ih, 'yLim');
   H.line(:,k)= line(ival([1 2; 1 2]), yPatch([1 1; 2 2]), ...
                   'Color',0.5*markCol, 'LineWidth',0.3);
 
-  move_objectBack(H.line(:,k));
+  obj_moveBack(H.line(:,k));
   H.patch(k)= patch(ival([1 2 2 1]), yPatch([1 1 2 2]), markCol);
-  move_objectBack(H.patch(k));
-  plot_gridOverPatches;
+  obj_moveBack(H.patch(k));
+  plotutil_gridOverPatches;
   if ~isnan(getfield(get(ih,'UserData'), 'hleg')), %% restore legend
     legend;
   end
 end
 set(H.line, 'UserData','ival line');
 set(H.patch, 'EdgeColor','none', 'UserData','ival patch');
-get_backAxes(old_ax);
+axis_getQuitely(old_ax);
 if isfield(get(old_ax,'UserData'),'hleg') & ...
       ~isnan(getfield(get(old_ax,'UserData'), 'hleg')),
   legend;

diff --git a/visualization/grid_markRange.m b/visualization/grid_markRange.m
@@ -7,12 +7,12 @@
 if ~exist('chans','var'), chans=[]; end
 if length(yRange)==1, yRange=[-yRange yRange]; end
 
-hsp= grid_getSubplots(chans);
+hsp= gridutil_getSubplots(chans);
 for ih= hsp,
   axes(ih);
   xl= get(ih, 'xLim');
   hl= line(xl, yRange([1 1]), varargin{:});
-  move_objectBack(hl);
+  obj_moveBack(hl);
   hl= line(xl, yRange([2 2]), varargin{:});
-  move_objectBack(hl);
+  obj_moveBack(hl);
 end
diff --git a/visualization/grid_markTimeBox.m b/visualization/grid_markTimeBox.m
@@ -32,7 +32,7 @@
 end
 
 old_ax= gca;
-hsp= grid_getSubplots(opt.clab);
+hsp= gridutil_getSubplots(opt.clab);
 for ii= 1:length(hsp),
   ih= hsp(ii);
   axes(ih);
@@ -46,6 +46,6 @@
   end
 end
 if opt.MoveToBackground,
-  move_objectBack(struct2array(H));
+  obj_moveBack(struct2array(H));
 end
 Axes(old_ax);
diff --git a/visualization/grid_markTimePoint.m b/visualization/grid_markTimePoint.m
@@ -6,10 +6,10 @@
 
 if ~exist('chans','var'), chans=[]; end
 
-hsp= grid_getSubplots(chans);
+hsp= gridutil_getSubplots(chans);
 for ih= hsp,
   axes(ih);
   yl= get(ih, 'yLim');
   hl= line([tp tp], yl, varargin{:});
-  move_objectBack(hl);
+  obj_moveBack(hl);
 end