Skip to content

Fix GUI warnings and add missing GUI update in example 2 #857

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

Merged
merged 4 commits into from
Jul 23, 2025
Merged

Fix GUI warnings and add missing GUI update in example 2 #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
24ed588
fix conf3D warnings in GUI
wahln Jul 23, 2025
3053d6b
fix issue in pln and stf comparison
wahln Jul 23, 2025
769323f
typo in conf3D check
wahln Jul 23, 2025
d3368b0
Add GUI update in second example
wahln Jul 23, 2025
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
8 changes: 6 additions & 2 deletions examples/matRad_example2_photons.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,17 @@
pln.propStf.couchAngles = zeros(1,numel(pln.propStf.gantryAngles));
pln.propStf.numOfBeams = numel(pln.propStf.gantryAngles);



%Let's rerun the dose calculation and optimization
stf = matRad_generateStf(ct,cst,pln);
pln.propStf.isoCenter = vertcat(stf.isoCenter);
dij = matRad_calcDoseInfluence(ct,cst,stf,pln);
resultGUI_coarse = matRad_fluenceOptimization(dij,cst,pln);

%We append the new result to the resultGUI variable (recognized by the GUI)
%using the identifier coarse
resultGUI = matRad_appendResultGUI(resultGUI,resultGUI_coarse,false,'coarse');
%A GUI update ensures the current values are updated
matRadGUI;

%% Visual Comparison of results
% Let's compare the new recalculation against the optimization result.
Expand Down
16 changes: 10 additions & 6 deletions matRad/gui/widgets/matRad_WorkflowWidget.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ function btnLoadMat_Callback(this, hObject, event)
set(handles.txtInfo,'String','loaded and ready');

if evalin('base','exist(''pln'')')

pln = evalin('base','pln');

% ct cst and pln available; ready for dose calculation
set(handles.txtInfo,'String','ready for dose calculation');
Expand All @@ -287,9 +287,10 @@ function btnLoadMat_Callback(this, hObject, event)
set(handles.exportDicomButton,'Enable','on');

% check if stf exists
if evalin('base','exist(''stf'')')
if evalin('base','exist(''stf'')')
stf = evalin('base','stf');
% check if dij, stf and pln match
[plnStfMatch, msg] = matRad_comparePlnStf(evalin('base','pln'),evalin('base','stf'));
[plnStfMatch, msg] = matRad_comparePlnStf(pln,stf);
if plnStfMatch
% plan is ready for optimization
set(handles.txtInfo,'String','ready for dose calculation');
Expand All @@ -301,8 +302,11 @@ function btnLoadMat_Callback(this, hObject, event)
end

% check if dij exist
if evalin('base','exist(''dij'')') && plnStfMatch && ~evalin('base','pln.propOpt.conf3D')
[dijStfMatch, msg] = matRad_compareDijStf(evalin('base','dij'),evalin('base','stf'));
conf3D = isfield(pln,'propOpt') && isfield(pln.propOpt,'conf3D') && pln.propOpt.conf3D;

if evalin('base','exist(''dij'')') && plnStfMatch && ~conf3D
dij = evalin('base','dij');
[dijStfMatch, msg] = matRad_compareDijStf(dij,stf);
if dijStfMatch
set(handles.txtInfo,'String','ready for optimization');
set(handles.btnOptimize ,'Enable','on');
Expand Down Expand Up @@ -416,7 +420,7 @@ function btnCalcDose_Callback(this, hObject, eventdata)
dij = matRad_calcDoseInfluence(evalin('base','ct'),evalin('base','cst'),stf,pln);

% prepare dij for 3d conformal
if isfield(pln.propOpt,'conf3D') && pln.propOpt.conf3D
if isfield(pln,'propOpt') && isfield(pln.propOpt,'conf3D') && pln.propOpt.conf3D
dij = matRad_collapseDij(dij);
end
% assign results to base worksapce
Expand Down
19 changes: 12 additions & 7 deletions matRad/util/matRad_comparePlnStf.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,18 @@
end

%% compare gantry angles in stf and pln
stf_gantryAngles=[stf.gantryAngle];
if ~isfield(pln.propStf,'gantryAngles') || numel(stf_gantryAngles) ~= numel(pln.propStf.gantryAngles) ... % different size
|| ~isempty(find(stf_gantryAngles-pln.propStf.gantryAngles, 1)) % values in stf and pln do not match % values in stf and pln do not match
stfGantryAngles=[stf.gantryAngle];
if ~isfield(pln.propStf,'gantryAngles') || numel(stfGantryAngles) ~= numel(pln.propStf.gantryAngles) ... % different size
|| ~isempty(find(stfGantryAngles-pln.propStf.gantryAngles, 1)) % values in stf and pln do not match % values in stf and pln do not match
allMatch=false;
msg= 'Gantry angles do not match';
return
end

%% compare couch angles in stf and pln
stf_couchAngles=[stf.couchAngle];
if ~isfield(pln.propStf,'couchAngles') || numel(stf_couchAngles) ~= numel(pln.propStf.couchAngles) ... % different size
|| ~isempty(find(stf_couchAngles-pln.propStf.couchAngles, 1)) % values in stf and pln do not match
stfCouchAngles=[stf.couchAngle];
if ~isfield(pln.propStf,'couchAngles') || numel(stfCouchAngles) ~= numel(pln.propStf.couchAngles) ... % different size
|| ~isempty(find(stfCouchAngles-pln.propStf.couchAngles, 1)) % values in stf and pln do not match
allMatch=false;
msg= 'Couch angles do not match';
return
Expand Down Expand Up @@ -88,7 +88,12 @@

%% compare isocenter in stf and pln for each gantry angle
for i = 1:numel(pln.propStf.gantryAngles)
if ~isempty(find(stf(i).isoCenter - pln.propStf.isoCenter(i,:) ,1))
if size(pln.propStf.isoCenter,1) == 1
isoCenter = repmat(pln.propStf.isoCenter,numel(stf),1);
else
isoCenter = pln.propStf.isoCenter;
end
if size(isoCenter,1) ~= numel(stf) || any(stf(i).isoCenter - isoCenter(i,:) ~= 0)
allMatch=false;
msg= 'Isocenters do not match';
return
Expand Down
Loading