Skip to content

537 pointer can get stuck on "loading" (use onCleanup hooks to restore pointer) #536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
martinherrerias wants to merge 1 commit into
base: master
Choose a base branch
from
Open

537 pointer can get stuck on "loading" (use onCleanup hooks to restore pointer) #536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/Addons/SimMonteCarlo_Diffusion/Sim_MonteCarlo_Diffusion_GUI.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,14 @@ function Sim_SimMCdiff_OpeningFcn(hObject, eventdata, handles, varargin)

% --- Executes on button press in SimMCdiffUpdate.
function SimMCdiffUpdate_Callback(hObject, eventdata, handles)
set(findobj('Name','SimMCdiff'),'pointer', 'watch'); drawnow;

h = findobj('Name','SimMCdiff');
set(h,'pointer', 'watch'); drawnow;
pointer_restore = onCleanup(@() set(h,'pointer', 'arrow'));

MonteCarloSim(handles, handles.axonpacking.axons, handles.axonpacking.packing)
set(findobj('Name','SimMCdiff'),'pointer', 'arrow'); drawnow;

drawnow;



Expand Down
8 changes: 6 additions & 2 deletions src/Addons/SimProtocolOpt/Sim_Optimize_Protocol_GUI.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,11 @@ function Save_Callback(hObject, eventdata, handles)

% --- Executes on button press in SimOptProtUpdate.
function SimOptProtUpdate_Callback(hObject, eventdata, handles)
set(findobj('Name','SimOptProt'),'pointer', 'watch'); drawnow;

h = findobj('Name','SimOptProt');
set(h,'pointer', 'watch'); drawnow;
pointer_restore = onCleanup(@() set(h,'pointer', 'arrow'));

% Read Table
Model_new = getappdata(0,'Model');
if ~isempty(Model_new) && strcmp(class(Model_new),class(handles.Model))
Expand All @@ -142,7 +146,7 @@ function SimOptProtUpdate_Callback(hObject, eventdata, handles)
Opt = button2opts(Model.Sim_Single_Voxel_Curve_buttons);
Model.Sim_Single_Voxel_Curve(xvalues(1,:),Opt,1);
end
set(findobj('Name','SimOptProt'),'pointer', 'arrow'); drawnow;
drawnow;



Expand Down
15 changes: 11 additions & 4 deletions src/Addons/SingleVoxel/Sim_Single_Voxel_Curve_GUI.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@

% --- Executes just before Sim_Single_Voxel_Curve_GUI is made visible.
function Sim_Single_Voxel_Curve_GUI_OpeningFcn(hObject, eventdata, handles, varargin)
set(findobj('Name','qMRLab'),'pointer', 'watch'); drawnow;

h = findobj('Name','qMRLab');
set(h,'pointer', 'watch'); drawnow;
pointer_restore = onCleanup(@() set(h,'pointer', 'arrow'));

Model = varargin{1};
setappdata(0,'Model',Model);
Expand Down Expand Up @@ -97,15 +100,19 @@ function Sim_Single_Voxel_Curve_GUI_OpeningFcn(hObject, eventdata, handles, vara
end
% Update handles structure
guidata(hObject, handles);
set(findobj('Name','qMRLab'),'pointer', 'arrow'); drawnow;
drawnow;

% --- Executes on button press in UpdatePlot.
function UpdatePlot_Callback(hObject, eventdata, handles)
Model_new = getappdata(0,'Model');
if ~isempty(Model_new) && strcmp(class(Model_new),class(handles.Model))
handles.Model = Model_new;
end
set(findobj('Name','Single Voxel Curve'),'pointer', 'watch'); drawnow;

h = findobj('Name','Single Voxel Curve');
set(h,'pointer', 'watch'); drawnow;
pointer_restore = onCleanup(@() set(h,'pointer', 'arrow'));

if isgraphics(handles.SimCurveAxe)
axes(handles.SimCurveAxe)
end
Expand Down Expand Up @@ -138,7 +145,7 @@ function UpdatePlot_Callback(hObject, eventdata, handles)
xtable{ll(ii),5}=F(ii)*100;
end
set(handles.ParamTable,'Data',xtable);
set(findobj('Name','Single Voxel Curve'),'pointer', 'arrow'); drawnow;
drawnow;

% --- Executes on button press in Options panel.
function ModelSimOptions_Callback(handles)
Expand Down
8 changes: 6 additions & 2 deletions src/Common/tools/FileBrowser/BrowserSet.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,11 @@ function Visible(obj, Visibility)
% load data from file and make accessible to qMRLab fct
function DataLoad(obj,warnmissing)
if ~exist('warnmissing','var'), warnmissing=true; end
set(findobj('Name','qMRLab'),'pointer', 'watch'); drawnow;

h = findobj('Name','qMRLab');
set(h,'pointer', 'watch'); drawnow;
pointer_restore = onCleanup(@() set(h,'pointer', 'arrow'));

obj.FullFile = get(obj.FileBox, 'String');
tmp = [];
if ~isempty(obj.FullFile)
Expand Down Expand Up @@ -185,7 +189,7 @@ function DataLoad(obj,warnmissing)
end

setappdata(0, 'Data', Data);
set(findobj('Name','qMRLab'),'pointer', 'arrow'); drawnow;
drawnow;

if warnmissing
ErrMsg = Model.sanityCheck(Data.(class(Model)));
Expand Down
6 changes: 4 additions & 2 deletions src/Common/tools/FileBrowser/MethodBrowser.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,11 +276,13 @@ function WD_BrowseBtn_callback(obj, WorkDir_FullPath)
end

function DownloadBtn_callback(obj)
set(findobj('Name','qMRLab'),'pointer', 'watch')
h = findobj('Name','qMRLab');
set(h,'pointer', 'watch');
pointer_restore = onCleanup(@() set(h,'pointer', 'arrow'));

Model = getappdata(0,'Model');
qMRgenBatch(Model);
WD_BrowseBtn_callback(obj, [pwd filesep Model.ModelName '_data']);
set(findobj('Name','qMRLab'),'pointer', 'arrow')

end

Expand Down
Loading