v7 staging commit

ucdavis · Dec 15, 2017 · a41f313 · a41f313
1 parent 9978267
commit a41f313
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 42 deletions.
diff --git a/GUIs/aboutext.txt b/GUIs/aboutext.txt
@@ -3,7 +3,7 @@ Copyright Regents of the University of California, 2008-2017 #
 #
 Designed by Steve Luck and Javier Lopez-Calderon #
 #
-Main developers for v5 and v6:
+Main developers since v5:
 Andrew X Stewart
 axstewart@ucdavis.edu
 Center for Mind and Brain, University of California, Davis #
@@ -52,12 +52,12 @@ tested using EEG collected with a Biosemi ActiveTwo System, #
 along with a smaller amount of testing using EEG collected #
 with Neuroscan and EGI systems. Consequently, you should be #
 particularly careful when using this version of ERPLAB with #
-data collected with systems other than the Biosemi ActiveTwo. # 
+data collected with systems other than the Biosemi ActiveTwo. #
 #
 #
 This program is free software: you can redistribute it and/or #
 modify it under the terms of the GNU General Public License #
-as published by the Free Software Foundation, either version # 
+as published by the Free Software Foundation, either version #
 3 of the License, or at your option) any later version. #
 #
 This program is distributed in the hope that it will be useful, #
@@ -84,4 +84,4 @@ License long with this program.  If not, see #
 Davis, California #
 a great place to live, work, and study #
 #
-#2007-2016
+#2007-2017
diff --git a/README.md b/README.md
@@ -1,7 +1,9 @@
 
 ERPLAB Toolbox is a free, open-source Matlab package for analyzing ERP data.  It is tightly integrated with [EEGLAB Toolbox](http://sccn.ucsd.edu/eeglab/), extending EEGLAB’s capabilities to provide robust, industrial-strength tools for ERP processing, visualization, and analysis.  A graphical user interface makes it easy for beginners to learn, and Matlab scripting provides enormous power for intermediate and advanced users.
 
-## ERPLAB v6.1.4
+
+
+## ERPLAB v7.0.0
 
 <p align="center" >
   <a href="https://github.com/lucklab/erplab/releases/download/6.1.4/erplab6.1.4.zip"><img src="https://cloud.githubusercontent.com/assets/8988119/8532773/873b2af0-23e5-11e5-9869-c900726713a2.jpg">
@@ -13,7 +15,7 @@ ERPLAB Toolbox is a free, open-source Matlab package for analyzing ERP data.  It
 
 To install ERPLAB v6.1.4, download the zip file (linked above), unzip and place the folder in the 'plugins' folder of your existing [EEGLAB](https://sccn.ucsd.edu/eeglab/download.php) installation (e.g.  `~/Documents/MATLAB/eeglab13_6_4b/plugins/erplab6.1.4/`). [Additional installation help can be found here](https://github.com/lucklab/erplab/wiki/Installation).
 
-To run ERPLAB, ensure that the correct EEGLAB folder is in your current Matlab path, and run **eeglab** as a command from the Matlab Command Window. [Find our tutorial here.](http://erpinfo.org/erplab/erplab-documentation).
+To run ERPLAB, ensure that the correct EEGLAB folder is in your current Matlab path, and run **eeglab** as a command from the Matlab Command Window. [Find our tutorial here.](https://github.com/lucklab/erplab/wiki/Tutorial)
 
 We encourage most users to use this latest major version.
 
@@ -26,32 +28,43 @@ We anticipate that ERPLAB will work with most recent OSs, Matlab versions and EE
 - We recommend a 64 bit OS, 64 bit Matlab, and at least 4 GB RAM. Most modern computers meet this.
 - The Matlab Signal Processing Toolbox is required
   - Entering in the command `ver` in the Command Window will produce a list of installed toolboxes. Check this list to see whether the Signal Processing Toolbox is installed
-- Caution: EEGLAB v11 is _not_ recommended.
+- EEGLAB v12 or later is recommended. EEGLAB v11 is not recommended.
 
 Find installation help [here](http://erpinfo.org/erplab)
 
 ### ERPLAB compatibility table
 
 Here is a list of some confirmed-working environments for ERPLAB.
 
-**ERPLAB v6.1.4**
+**ERPLAB v7.0.0*
 
 | **OS** | **Matlab** | **EEGLAB** | Working? |
 | --- | --- | --- | --- |
 | Mac OS X 10.11.5 'El Capitan' | Matlab R2015a | EEGLAB v13.5.4b | ✓ |
-| Mac OS X 10.11.4 'El Capitan' | Matlab R2016a | EEGLAB v13.5.4b | ✓ * |
+| MacOS 10.12 'Sierra' | Matlab R2016a | EEGLAB v13.5.4b | ✓  |
 | Windows 7 | Matlab R2014a | EEGLAB v13.5.4b | ✓ |
 | Windows 8.1 | Matlab R2014a | EEGLAB v13.5.4b | ✓ |
 | Windows 10 | Matlab R2015a | EEGLAB v13.5.4b | ✓ |
 | Ubuntu 14.04 LTS | Matlab R2014a | EEGLAB v13.5.4b | ✓ |
 
-`*` - (but with some non-critical warnings)
 <br/>
 <br/>
 
-## <br/>
 
-# ERPLAB v6.1.4
+
+## ERPLAB v7.0.0 Release Notes
+
+- Updated tools for [pre-processing continuous EEG](https://github.com/lucklab/erplab/wiki/Continuous-EEG-Preprocessing), including functions for
+   - deleting time segments
+   - shifting event codes
+   - selective electrode interpolation
+
+- Crucial [compatibility fixes](https://github.com/lucklab/erplab/issues/56) to allow running in R2017b and later, while still being backwards-compatible with older versions of Matlab. No more yellow warnings about NARGCHK in R2016a or later.
+
+
+
+
+### ERPLAB v6.1.4
 Some additions and minor bugfixes, including:
 - Removing channels can now avoid deleting all channel location information
 - More channel location tools
@@ -61,36 +74,22 @@ Some additions and minor bugfixes, including:
 - Improved Current-Source-Density compatibility
 - Replaced the error 'Quack' noise with a beep, and replaced some error pictures.
 
-# ERPLAB v6.1.3
+### ERPLAB v6.1.3
 Minor bugfixes, including:
 - Cleaned up the Measurement Viewer text and options
 - Measurement Viewer helper text now only shown when relevant
 
-# ERPLAB v6.1.2
+### ERPLAB v6.1.2
 Minor bugfixes, including:
 - Fixed BDF Library url-link in BDF-Visualizer
 - Swapped artifact and user-flag display in BDF-Visualizer
 
-# ERPLAB v6.1.1
+### ERPLAB v6.1.1
 Minor bugfixes, including:
 - Shift Event Codes GUI fix - now doesn't crash on launch.
 - Adopted [Major].[Minor].[Patch] version numbers, this being v6.1.1, with backward-compatible file loading. Note - from v6.0, we no longer indicate the file type usage in the version number, and this is now always taken to be 1.
 
-
------
-# ERPLAB v6.1 Release Notes
-
-## Shift Event Codes
-The new Shift Event Codes tool has been updated so that when you shift event codes beyond a continuous EEG boundary marker (e.g. -99, "boundary" event codes) then that code will be deleted
-
-## New Github-based documentation & ERPInfo.org website
-We have fully migrated of all our ERPLAB documentation (i.e. manual, tutorial, etc) now to Github, and so have now updated the help links in ERPLAB.
-
-
------
-
-
-# ERPLAB v6.0 Release Notes
+### ERPLAB v6.0 Release Notes
 
 With ERPLAB v6.0, we include a variety of new features, user-interface improvements, bug-fixes, and improvements to existing functions. Among these, we have:
 
@@ -109,20 +108,11 @@ Find [CSD documentation here](https://github.com/lucklab/erplab/wiki/Current-Sou
 In the ERP Measurement tool, ERPLAB can record measurements of local peaks and the time of a fractional peak, like 50% peak. Previously, this fractional peak measurement was taken from the 'onset' of the peak, before the peak. In v6.0, ERPLAB also has an option to measure the fractional peak 'offset', the 50% peak value after the peak.
 
 
+
 ### - ERPLAB documentation on GitHub
 
 For more easy editing, ERPLAB documentation has been moved to a [wiki here](https://github.com/lucklab/erplab/wiki).
 
-### - Continuous EEG Preprocessing tools
-
-#### - Delete Time Segments tool
-With the new `Delete Time Segments` tool you can now remove segments of irrelevant continuous EEG data, like data recorded during breaks in the experiment.
-
-#### - Time delay event code shifting tool
-With the new `Shift Event Codes` tool you can now time-shift specific event codes either to either earlier or later timepoints in the EEG data. This tool was created to counter the delay between visual stimulus onset on the monitor and its corresponding event code recorded in the EEG data.
-
-#### - Selective Electrode Interpolation tool
-The new `Selective Electrode Interpolation` tool is based off of EEGLAB's own interpolation function and adds the ability to specify which electrodes to use as input for interpolation.
 
 
 ----

diff --git a/erplab_default_values.m b/erplab_default_values.m
@@ -1,5 +1,5 @@
-erplabver = '6.1.4';                  % current erplab version
-erplabrel = '18-Jul-2017';             % DOB
+erplabver = '7.0.0';                  % current erplab version
+erplabrel = '14-Dec-2017';             % 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