Commit b42f455e authored by Jay Dubb's avatar Jay Dubb
Browse files

v1.26.1 

These are comments/requests from fNIRS course 2020
-- Add dataTree node name and condition display to PlotProbeGUI
-- Don't display aux by default in MainGUI when Homer3 starts up
-- Make display font smaller so that you don't get button names cut off with ...
-- Fix incorrect display of HD space available vs free switched
-- Fix guiOutsideScreenBorders for multiple screens
parent 6fff75cc

MainGUI/MainGUI.fig

+23 B (82.7 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

PlotProbeGUI/PlotProbeGUI.fig

−9.88 KiB (47.8 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

PlotProbeGUI/PlotProbeGUI.m

+43 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ if ~isempty(maingui) 
    plotprobe.updateParentGui = maingui.Update;

end

DisplayData(handles, hObject);



SetTextFilename(handles);





% ----------------------------------------------------------------------
@@ -506,6 +506,14 @@ axis off 
pos = getNewFigPos(handles);

set(handles.figureDup, 'position',pos);



% Display name label and divider

hdata = get(handles.textFilename);

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);

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

       

% Display data

nDataBlks = plotprobe.dataTree.currElem.GetDataBlocksNum();

for iBlk=1:nDataBlks

    plotProbeAndSetProperties(handles, iBlk, length(plotprobe.handles.data)+1);
@@ -513,6 +521,8 @@ end 
plotprobe.handles.figureDup = handles.figureDup;









% ---------------------------------------------

function pos = getNewFigPos(handles)
@@ -598,10 +608,12 @@ if isempty(plotprobe) 
    return

end





ParseArgs(varargin);

axes(handles.axes1);



SetWindowTitle(handles)

SetTextFilename(handles);



condition = plotprobe.condition;

datatype  = plotprobe.datatype;
@@ -683,3 +695,33 @@ if ishandles(handles.figure) 
end







% -----------------------------------------------------------

function SetTextFilename(handles)

global plotprobe



filename = plotprobe.dataTree.currElem.GetName();

CondNames = plotprobe.dataTree.currElem.GetConditions();



[~, treeNodeName, ext] = fileparts(filename);

if isempty(handles)

    return;

end



if ~ishandles(handles.textFilename)

    return;

end



if ~isempty(CondNames)

    name = sprintf('%s,   condition: ''%s''', treeNodeName, CondNames{plotprobe.condition});

else

    name = sprintf('%s,   condition:  none', treeNodeName, CondNames{plotprobe.condition});

end

n = length(name);

set(handles.textFilename, 'units','characters');

p = get(handles.textFilename, 'position');

set(handles.textFilename, 'position',[p(1), p(2), n+.50*n, p(4)]);

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

set(handles.textFilename, 'string',name);

Utils/PrintSystemInfo.m

+2 −2
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ try 
        logger.Write(sprintf('RAM Total      : Not available on this platform\n'))

        logger.Write(sprintf('RAM Free       : Not available on this platform\n'))

    end

	logger.Write(sprintf('HD Space Total : %0.1f GB\n', hdSpaceAvail/1e9));

	logger.Write(sprintf('HD Space Free  : %0.1f GB\n', hdSpaceTotal/1e9));

	logger.Write(sprintf('HD Space Total : %0.1f GB\n', hdSpaceTotal/1e9));

	logger.Write(sprintf('HD Space Free  : %0.1f GB\n', hdSpaceAvail/1e9));

	logger.Write(sprintf('\n')) %#ok<*SPRINTFN>

catch ME

	logger.Write(sprintf('%s\n', ME.message));

Utils/getVernum.m

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ function vrnnum = getVernum() 


vrnnum{1} = '1';   % Major version #

vrnnum{2} = '26';  % Major sub-version #

vrnnum{3} = '0';   % Minor version #

vrnnum{3} = '1';   % Minor version #

vrnnum{4} = '0';   % Minor sub-version # or patch #: 'p1', 'p2', etc

CRA Git | Maintained and supported by SUSTech CRA and CCSE