staging commit for v6.0

Changed help links to GitHub wiki.

Changed the version to v6.0 and updated the checks so this works.

GUIs/aboutext.txt

@@ -3,7 +3,7 @@ Copyright Regents of the University of California, 2008-2016 #
 #
 Designed by Steve Luck and Javier Lopez-Calderon #
 #
-Main developers for version 5:
+Main developers for v5 and v6:
 Andrew X Stewart
 axstewart@ucdavis.edu
 Center for Mind and Brain, University of California, Davis #

eegplugin_erplab.m

@@ -50,15 +50,21 @@
 %
 % CHECK VERSION NUMBER & FOLDER NAME
 %
-foldernum = p(end-7:end-1);   % Grab the end of the path, like '5.1.1.0'
-if isempty(foldernum)
-        fprintf('\nERPLAB WARNING: ERPLAB''s folder name was found to be modified from the original.\n\n')
-else
-        if ~strcmp(foldernum, erplabver)
-                fprintf('\nERPLAB''s folder does not show the current version number.\n\n')
-        end
+% Grab the end of the path, like '6.0'
+char_i_erplab = regexp(p, 'erplab','end'); 
+char_i_erplab = char_i_erplab(end);
+
+try
+    foldernum = p(char_i_erplab+1:char_i_erplab+3);
+    if ~strcmp(foldernum, erplabver)
+        fprintf('\nERPLAB''s folder does not show the current version number.\n')
+    end
+
+catch
+    fprintf('\nERPLAB''s folder does not show the current version number.\n')
 end
 
+
 %
 % CHECK EEGLAB Version
 %
@@ -356,6 +362,12 @@
 submenu = uimenu( menuERPLAB,'Label','ERPLAB','separator','on','tag','ERPLAB','userdata','startup:on;continuous:on;epoch:on;study:on;erpset:on');
 set(submenu,'position', 6); % thanks Arno!
 
+erpverMenu = uimenu( submenu,                              ...
+    'Label'    , [' *** ERPLAB v' erplabver ' ***'],               ...
+    'tag'      , 'erpver',                 ... 
+    'separator', 'off',                                      ...  
+    'userdata' , 'startup:off;continuous:off;epoch:off;study:off;erpset:off');
+
 
 %% Continuous EEG Preprocessing Submenu
 
@@ -523,9 +535,9 @@
 
 
 
-%% Data Transformations submenu
+%% Datatype Transformations submenu
 %
-mDTF = uimenu( submenu,'Label','Data Transformations','tag','Data Transformations','separator','on','userdata','startup:on;continuous:on;epoch:on;study:on;erpset:on');
+mDTF = uimenu( submenu,'Label','Datatype Transformations','tag','Data Transformations','separator','on','userdata','startup:on;continuous:on;epoch:on;study:on;erpset:on');
 uimenu( mDTF,'Label','Compute Evoked Power Spectrum from current averaged ERP data','CallBack', comEPSerp,'userdata','startup:off;continuous:off;epoch:off;study:off;erpset:on');
 uimenu( mDTF,'Label','Compute Current Source Density (CSD) data from EEG set data','CallBack',comEEG2CSD,'separator','on' );
 uimenu( mDTF,'Label','Compute Current Source Density (CSD) data from averaged ERP data','CallBack',comERP2CSD,'separator','off' );

erplab_default_values.m

@@ -1,5 +1,5 @@
-erplabver = '5.1.1.0';                  % current erplab version
-erplabrel = '27-May-2016';             % DOB
+erplabver = '6.0';                  % current erplab version
+erplabrel = '27-Sep-2016';             % DOB
 %ColorB = [170 180 195]/255;          % old background color (until version 3)
 %ColorB = [0.9216 0.8353 0.6078];     % background color for version 4
 %ColorB = [0.7020 0.7647 0.8392];     % background color since version 4.0.0.3

functions/geterplabversion.m

@@ -55,7 +55,7 @@
                 version = char(cv{:});
         end
 else
-        cv = regexp(p, 'erplab_(\d*.\d*.\d*.\d*)', 'tokens');
+        cv = regexp(p, 'erplab[-_ ](\d*.\d*.\d*.\d*)', 'tokens');
         version = char(cv{:});
 end
 

functions/localpeak.m

@@ -247,9 +247,9 @@
       if ~isempty(frac)
             if frac>0 && ltypeoutput~=3
 
-                a_change = -1;  % by default, have the index decrease by one, moving back thru the datapoints
+                a_change = -1;  % by default, have the index decrease by one, moving back thru the datapoints, looking for peak onset
                 if peakonset == 2
-                    a_change = 1; % if instead looking for the offset, have the index increase by one on each loop
+                    a_change = 1; % if instead looking for the peak 'offset', have the index increase by one on each loop
                 end
 
 

functions/olderpscan.m

@@ -55,7 +55,14 @@
 [pspliter, dvdigits] = regexp(dataversion, '\.','match','split');
 ndd = length(dvdigits);
 
-if ndd==3
+if ndd==2 && str2num(dvdigits{1}) >= 6
+    % if after 6.0
+    dmayor       = str2num(dvdigits{1});
+    dminor       = str2num(dvdigits{2});
+    dformat      = 1;
+    dmaintenance = 0;
+
+elseif ndd==3
     dmayor       = str2num(dvdigits{1});
     dminor       = 0;
     dformat      = 0;
@@ -87,8 +94,16 @@
 [pspliter, cvdigits] = regexp(cversion, '\.','match','split');
 cmayor       = str2num(cvdigits{1}); % A
 cminor       = str2num(cvdigits{2}); % B
-cformat      = str2num(cvdigits{3}); % C
-cmaintenance = str2num(cvdigits{4}); % D
+
+% For after v6, take format to be 1
+if cmayor >= 6
+    cformat      = '1'; % C
+    cmaintenance = '0'; % D
+
+else  % if older, get format from version
+    cformat      = str2num(cvdigits{3}); % C
+    cmaintenance = str2num(cvdigits{4}); % D
+end
 
 %
 % Greater allowed version number :  999999999.999999999.999999999.999999999

pop_functions/pop_erphelp.m

@@ -41,6 +41,6 @@
 % along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 function com = pop_erphelp
-web http://erpinfo.org/erplab/erplab-documentation/manual_4 -browser 
+web https://github.com/lucklab/erplab/wiki/Manual -browser 
 com = 'pop_erphelp';
 return

pop_functions/pop_erphelpscript.m

@@ -41,6 +41,6 @@
 % along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 function com = pop_erphelpscript
-web http://erpinfo.org/erplab/erplab-documentation/scripting_4 -browser 
+web https://github.com/lucklab/erplab/wiki/Scripting-Guide -browser 
 com = 'pop_erphelpscript';
 return

pop_functions/pop_erphelptut.m

@@ -41,6 +41,6 @@
 % along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 function com = pop_erphelptut
-web http://erpinfo.org/erplab/erplab-documentation/tutorial_4 -browser 
+web https://github.com/lucklab/erplab/wiki/Tutorial -browser 
 com = 'pop_erphelptut';
 return