Merge pull request #170 from lucklab/erplab_ver9.2

ERPLAB version 9.2
ucdavis · May 25, 2023 · cfa2f3e · cfa2f3e
2 parents 90c969d + c986435
commit cfa2f3e
Show file tree

Hide file tree

Showing 525 changed files with 87,651 additions and 2,595 deletions.
diff --git a/GUIs/DQ_Spectra_GUI.fig b/GUIs/DQ_Spectra_GUI.fig
diff --git a/GUIs/DQ_Spectra_GUI.m b/GUIs/DQ_Spectra_GUI.m
diff --git a/GUIs/DQ_Table_GUI.fig b/GUIs/DQ_Table_GUI.fig
diff --git a/GUIs/DQ_Table_GUI.m b/GUIs/DQ_Table_GUI.m
diff --git a/GUIs/DQ_preavg.fig b/GUIs/DQ_preavg.fig
diff --git a/GUIs/DQ_preavg.m b/GUIs/DQ_preavg.m
diff --git a/GUIs/averagerGUI.fig b/GUIs/averagerGUI.fig
diff --git a/GUIs/averagerGUI.m b/GUIs/averagerGUI.m
diff --git a/GUIs/averagerxGUI.fig b/GUIs/averagerxGUI.fig
diff --git a/GUIs/averagerxGUI.m b/GUIs/averagerxGUI.m
diff --git a/GUIs/avg_data_quality.fig b/GUIs/avg_data_quality.fig
diff --git a/GUIs/avg_data_quality.m b/GUIs/avg_data_quality.m
diff --git a/GUIs/binoperGUI.fig b/GUIs/binoperGUI.fig
diff --git a/GUIs/binoperGUI.m b/GUIs/binoperGUI.m
diff --git a/GUIs/chanoperGUI.fig b/GUIs/chanoperGUI.fig
diff --git a/GUIs/chanoperGUI.m b/GUIs/chanoperGUI.m
@@ -75,8 +75,34 @@ function chanoperGUI_OpeningFcn(hObject, eventdata, handles, varargin)
 %
 % Name & version
 %
-version = geterplabversion;
+ERPtooltype = erpgettoolversion('tooltype');
+if ~isempty(ERPtooltype)
+    if strcmpi(ERPtooltype,'EStudio')
+        Toolabel = 1;%%Get  label from work space to confirm whether EStudio was executed. 
+    else
+        Toolabel = 0;
+    end
+else
+    Toolabel = 1;
+end
+
+if Toolabel
+    erplab_studio_default_values;
+    version = erplabstudiover;
+    set(handles.gui_chassis,'Name', ['EStudio',version,'  -   Channel Operation > Advanced GUI for ',typedata])
+    handles = painterplabstudio(handles);
+    handles = setfonterplabestudio(handles);
+    handles.pushbutton_RUN.String = 'OK';
+else
+    version = geterplabversion;
 set(handles.gui_chassis,'Name', ['ERPLAB ' version '   -   Channel Operation GUI for ' typedata])
+    %
+    handles = painterplab(handles);
+    handles = setfonterplab(handles);
+end
+
+
+
 
 % formulas = erpworkingmemory(formtype);
 
@@ -172,12 +198,12 @@ function chanoperGUI_OpeningFcn(hObject, eventdata, handles, varargin)
 %
 % Color GUI
 %
-handles = painterplab(handles);
+% handles = painterplab(handles);
 
 %
 % Set font size
 %
-handles = setfonterplab(handles);
+% handles = setfonterplab(handles);
 
 % Update handles structure
 guidata(hObject, handles);

diff --git a/GUIs/continuousFFT.fig b/GUIs/continuousFFT.fig
diff --git a/GUIs/continuousFFT.m b/GUIs/continuousFFT.m
diff --git a/GUIs/continuousartifactGUI.m b/GUIs/continuousartifactGUI.m
diff --git a/GUIs/f_ERP_simulation_GUI.fig b/GUIs/f_ERP_simulation_GUI.fig