Commit 8e244c74 authored by Jay Dubb's avatar Jay Dubb
Browse files

v1.26.4 

-- Fix bug when starting StimEditGUI. DataTreeClass constructor changed and was not compatible with the way it was being called from StimEditGUI to create dataTree copy locDataTree.
-- Same as in AtlasViewer fix GUI repositioning for MAC
-- Fix problem in MainGUI where you can't see full text of Excluded Data checkboxes.
-- Duplicate figure in plot probe not fully copying text label object from original GUI.
parent ac5fa5d1

DataTree/DataTreeClass.m

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ classdef DataTreeClass < handle 
            % Arg 1: get folder of the group being loaded

            if ~exist('groupDirs','var') || isempty(groupDirs)

                groupDirs{1} = pwd;

            elseif ~iscell(groupDirs)

            elseif ~isa(groupDirs, 'DataTreeClass') && ~iscell(groupDirs)

                groupDirs = {groupDirs};

            end

MainGUI/MainGUI.fig

−7 B (82.7 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

MainGUI/MainGUI.m

+2 −8
Original line number Diff line number Diff line
@@ -1457,8 +1457,7 @@ hf = figure(); 
set(hf, 'units','characters');

p = get(hf, 'position');

set(hf,'position',[p(1), p(2), xf*p(3), yf*p(4)]);

p = guiOutsideScreenBorders(hf);

set(hf, 'position', [p(1), p(2)-5, p(3), p(4)]);

rePositionGuiWithinScreen(hf);



figure(hf);
@@ -1690,9 +1689,7 @@ else 
end

pause(.2)

set(handles.MainGUI, 'position', p);

p = guiOutsideScreenBorders(handles.MainGUI);

set(handles.MainGUI, 'units','characters', 'position',p);

set(handles.MainGUI, 'units',u0);

rePositionGuiWithinScreen(handles.MainGUI);
@@ -1716,6 +1713,3 @@ if isa(maingui.dataTree.currElem, 'RunClass') 
else

    errordlg('Select a run to reset its excluded channels and time points.','No run selected');

end

PlotProbeGUI/PlotProbeGUI.m

+6 −3
Original line number Diff line number Diff line
@@ -509,10 +509,13 @@ pos = getNewFigPos(handles); 
set(handles.figureDup, 'position',pos);



% Display name label and divider

hdata = get(handles.textFilename);

hname = get(handles.textFilename);

hnameFrame = get(handles.textFilenameFrame);

hdiv = get(handles.uipanelDivider);

uicontrol('parent',handles.figureDup, 'style','text', 'string',hdata.String, 'units',hdata.Units, 'position',hdata.Position, ...

           'backgroundcolor',hdata.BackgroundColor, 'fontsize',hdata.FontSize, 'fontweight',hdata.FontWeight);

uicontrol('parent',handles.figureDup, 'style','text', 'string',hnameFrame.String, 'units',hnameFrame.Units, 'position',hnameFrame.Position, ...

           'backgroundcolor',hnameFrame.BackgroundColor, 'fontsize',hnameFrame.FontSize, 'fontweight',hnameFrame.FontWeight);

uicontrol('parent',handles.figureDup, 'style','text', 'string',hname.String, 'units',hname.Units, 'position',hname.Position, ...

           'backgroundcolor',hname.BackgroundColor, 'fontsize',hname.FontSize, 'fontweight',hname.FontWeight);

uipanel('parent',handles.figureDup, 'units',hdiv.Units, 'position',hdiv.Position, 'bordertype',hdiv.BorderType);

       

% Display data

ProcStreamEditGUI/ProcStreamOptionsGUI.m

+1 −2
Original line number Diff line number Diff line
@@ -352,8 +352,7 @@ set(h, 'units','normalized'); 
% % to as these are the units used to reposition GUI later if needed

% set(hObject, 'units','pixels');

setGuiFonts(hObject);

p = guiOutsideScreenBorders(hObject);

set(handles.figure, 'position', p);

rePositionGuiWithinScreen(hObject);



figure(handles.figure);

set(handles.pushbuttonExit, 'units','normalized');

CRA Git | Maintained and supported by SUSTech CRA and CCSE