kk/3D_EDFM_SIM-X
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clarify GUIDE helper names

Browse Source 
Agent-Logs-Url: https://github.com/kk14222/3D_EDFM_SIM-X/sessions/a128ab7f-6b94-4048-a847-f2dc37bbe0ab

Co-authored-by: kk14222 <217880052+kk14222@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-04-28 03:36:55 +00:00
committed by GitHub
co-authored by kk14222
parent 421696c5e0
commit 0018b44cea
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui_support/app/EDFMAppController.m
+2 -2
View File
@@ -1527,11 +1527,11 @@ classdef EDFMAppController < handle
try try
uialert(obj.App.UIFigure, message, titleText, varargin{:}); uialert(obj.App.UIFigure, message, titleText, varargin{:});
catch catch
errordlg(obj.toDialogText(message), obj.toDialogText(titleText), 'modal'); errordlg(obj.formatDialogMessage(message), obj.formatDialogMessage(titleText), 'modal');
end end
end end
function textValue = toDialogText(~, value) function textValue = formatDialogMessage(~, value)
if iscell(value) if iscell(value)
textValue = strjoin(string(value), newline); textValue = strjoin(string(value), newline);
else else
gui_support/app/EDFMGuideComponent.m
+5 -1
View File
@@ -1,6 +1,10 @@
classdef EDFMGuideComponent < handle classdef EDFMGuideComponent < handle
%EDFMGUIDECOMPONENT Compatibility adapter from GUIDE/uicontrol to App Designer-style properties. %EDFMGUIDECOMPONENT Compatibility adapter from GUIDE/uicontrol to App Designer-style properties.
properties (Constant, Access = private)
NUMERIC_FIELD_TYPE = 'numeric'
end
properties (SetAccess = private) properties (SetAccess = private)
Handle Handle
end end
@@ -277,7 +281,7 @@ classdef EDFMGuideComponent < handle
function tf = isNumericEditField(obj) function tf = isNumericEditField(obj)
userData = get(obj.Handle, 'UserData'); userData = get(obj.Handle, 'UserData');
tf = isstruct(userData) && isfield(userData, 'Type') && strcmp(userData.Type, 'numeric'); tf = isstruct(userData) && isfield(userData, 'Type') && strcmp(userData.Type, obj.NUMERIC_FIELD_TYPE);
end end
end end
gui_support/app/createEDFMSimulatorGuideLayout.m
+10 -10
View File
@@ -10,7 +10,7 @@ handles.UIFigure = fig;
handles.TemplateDropDown = uicontrol('Parent', fig, 'Style', 'popupmenu', 'Units', 'pixels', 'Position', [18 774 120 22], ... handles.TemplateDropDown = uicontrol('Parent', fig, 'Style', 'popupmenu', 'Units', 'pixels', 'Position', [18 774 120 22], ...
'String', {'', ''}, 'Value', 1, 'Tag', 'TemplateDropDown'); 'String', {'', ''}, 'Value', 1, 'Tag', 'TemplateDropDown');
setGuidePopupValue(handles.TemplateDropDown, ''); setPopupDefaultValue(handles.TemplateDropDown, '');
handles.LoadTemplateButton = uicontrol('Parent', fig, 'Style', 'pushbutton', 'Units', 'pixels', 'Position', [177 774 94 23], ... handles.LoadTemplateButton = uicontrol('Parent', fig, 'Style', 'pushbutton', 'Units', 'pixels', 'Position', [177 774 94 23], ...
'String', 'Load Template', 'Tag', 'LoadTemplateButton'); 'String', 'Load Template', 'Tag', 'LoadTemplateButton');
@@ -42,14 +42,14 @@ handles.GridModelDropDownLabel = uicontrol('Parent', handles.ModelTab, 'Style',
handles.ModelGridModelDropDown = uicontrol('Parent', handles.ModelTab, 'Style', 'popupmenu', 'Units', 'pixels', 'Position', [137 630 100 22], ... handles.ModelGridModelDropDown = uicontrol('Parent', handles.ModelTab, 'Style', 'popupmenu', 'Units', 'pixels', 'Position', [137 630 100 22], ...
'String', {'1', '2', '', ''}, 'Value', 1, 'Tag', 'ModelGridModelDropDown'); 'String', {'1', '2', '', ''}, 'Value', 1, 'Tag', 'ModelGridModelDropDown');
setGuidePopupValue(handles.ModelGridModelDropDown, ''); setPopupDefaultValue(handles.ModelGridModelDropDown, '');
handles.FlowModelDropDownLabel = uicontrol('Parent', handles.ModelTab, 'Style', 'text', 'Units', 'pixels', 'Position', [67 566 63 22], ... handles.FlowModelDropDownLabel = uicontrol('Parent', handles.ModelTab, 'Style', 'text', 'Units', 'pixels', 'Position', [67 566 63 22], ...
'String', 'FlowModel', 'HorizontalAlignment', 'right', 'Tag', 'FlowModelDropDownLabel'); 'String', 'FlowModel', 'HorizontalAlignment', 'right', 'Tag', 'FlowModelDropDownLabel');
handles.ModelFlowModelDropDown = uicontrol('Parent', handles.ModelTab, 'Style', 'popupmenu', 'Units', 'pixels', 'Position', [145 566 100 22], ... handles.ModelFlowModelDropDown = uicontrol('Parent', handles.ModelTab, 'Style', 'popupmenu', 'Units', 'pixels', 'Position', [145 566 100 22], ...
'String', {'1', '2', '3'}, 'Value', 1, 'Tag', 'ModelFlowModelDropDown'); 'String', {'1', '2', '3'}, 'Value', 1, 'Tag', 'ModelFlowModelDropDown');
setGuidePopupValue(handles.ModelFlowModelDropDown, '1'); setPopupDefaultValue(handles.ModelFlowModelDropDown, '1');
handles.GridTab = uitab('Parent', handles.TabGroup, 'Title', 'Grid', 'Tag', 'GridTab'); handles.GridTab = uitab('Parent', handles.TabGroup, 'Title', 'Grid', 'Tag', 'GridTab');
@@ -346,7 +346,7 @@ handles.oil_modelLabel = uicontrol('Parent', handles.OilWaterTab, 'Style', 'text
handles.OWoil_modelDropDown = uicontrol('Parent', handles.OilWaterTab, 'Style', 'popupmenu', 'Units', 'pixels', 'Position', [121 205 100 22], ... handles.OWoil_modelDropDown = uicontrol('Parent', handles.OilWaterTab, 'Style', 'popupmenu', 'Units', 'pixels', 'Position', [121 205 100 22], ...
'String', {''}, 'Value', 1, 'Tag', 'OWoil_modelDropDown'); 'String', {''}, 'Value', 1, 'Tag', 'OWoil_modelDropDown');
setGuidePopupValue(handles.OWoil_modelDropDown, ''); setPopupDefaultValue(handles.OWoil_modelDropDown, '');
handles.MultiComponentTab = uitab('Parent', handles.TabGroup2, 'Title', 'MultiComponent', 'Tag', 'MultiComponentTab'); handles.MultiComponentTab = uitab('Parent', handles.TabGroup2, 'Title', 'MultiComponent', 'Tag', 'MultiComponentTab');
@@ -630,7 +630,7 @@ handles.SelectedFractureWellLabel = uicontrol('Parent', handles.WellsTab, 'Style
handles.SelectedFracWellDropDown = uicontrol('Parent', handles.WellsTab, 'Style', 'popupmenu', 'Units', 'pixels', 'Position', [864 464 70 22], ... handles.SelectedFracWellDropDown = uicontrol('Parent', handles.WellsTab, 'Style', 'popupmenu', 'Units', 'pixels', 'Position', [864 464 70 22], ...
'String', {''}, 'Value', 1, 'Tag', 'SelectedFracWellDropDown'); 'String', {''}, 'Value', 1, 'Tag', 'SelectedFracWellDropDown');
setGuidePopupValue(handles.SelectedFracWellDropDown, ''); setPopupDefaultValue(handles.SelectedFracWellDropDown, '');
handles.SolverRunTab = uitab('Parent', handles.TabGroup, 'Title', 'Solver&Run', 'Tag', 'SolverRunTab'); handles.SolverRunTab = uitab('Parent', handles.TabGroup, 'Title', 'Solver&Run', 'Tag', 'SolverRunTab');
@@ -703,28 +703,28 @@ handles.PlotLayerDropDownLabel = uicontrol('Parent', handles.ResultsTab, 'Style'
handles.PlotLayerDropDown = uicontrol('Parent', handles.ResultsTab, 'Style', 'popupmenu', 'Units', 'pixels', 'Position', [86 224 78 22], ... handles.PlotLayerDropDown = uicontrol('Parent', handles.ResultsTab, 'Style', 'popupmenu', 'Units', 'pixels', 'Position', [86 224 78 22], ...
'String', {''}, 'Value', 1, 'Tag', 'PlotLayerDropDown'); 'String', {''}, 'Value', 1, 'Tag', 'PlotLayerDropDown');
setGuidePopupValue(handles.PlotLayerDropDown, ''); setPopupDefaultValue(handles.PlotLayerDropDown, '');
handles.PlotPropertyDropDownLabel = uicontrol('Parent', handles.ResultsTab, 'Style', 'text', 'Units', 'pixels', 'Position', [8 182 71 22], ... handles.PlotPropertyDropDownLabel = uicontrol('Parent', handles.ResultsTab, 'Style', 'text', 'Units', 'pixels', 'Position', [8 182 71 22], ...
'String', 'PlotProperty', 'HorizontalAlignment', 'right', 'Tag', 'PlotPropertyDropDownLabel'); 'String', 'PlotProperty', 'HorizontalAlignment', 'right', 'Tag', 'PlotPropertyDropDownLabel');
handles.PlotPropertyDropDown = uicontrol('Parent', handles.ResultsTab, 'Style', 'popupmenu', 'Units', 'pixels', 'Position', [94 182 68 22], ... handles.PlotPropertyDropDown = uicontrol('Parent', handles.ResultsTab, 'Style', 'popupmenu', 'Units', 'pixels', 'Position', [94 182 68 22], ...
'String', {''}, 'Value', 1, 'Tag', 'PlotPropertyDropDown'); 'String', {''}, 'Value', 1, 'Tag', 'PlotPropertyDropDown');
setGuidePopupValue(handles.PlotPropertyDropDown, ''); setPopupDefaultValue(handles.PlotPropertyDropDown, '');
handles.PlotMetricDropDownLabel = uicontrol('Parent', handles.ResultsTab, 'Style', 'text', 'Units', 'pixels', 'Position', [5 97 58 22], ... handles.PlotMetricDropDownLabel = uicontrol('Parent', handles.ResultsTab, 'Style', 'text', 'Units', 'pixels', 'Position', [5 97 58 22], ...
'String', 'PlotMetric', 'HorizontalAlignment', 'right', 'Tag', 'PlotMetricDropDownLabel'); 'String', 'PlotMetric', 'HorizontalAlignment', 'right', 'Tag', 'PlotMetricDropDownLabel');
handles.PlotMetricDropDown = uicontrol('Parent', handles.ResultsTab, 'Style', 'popupmenu', 'Units', 'pixels', 'Position', [78 97 86 22], ... handles.PlotMetricDropDown = uicontrol('Parent', handles.ResultsTab, 'Style', 'popupmenu', 'Units', 'pixels', 'Position', [78 97 86 22], ...
'String', {''}, 'Value', 1, 'Tag', 'PlotMetricDropDown'); 'String', {''}, 'Value', 1, 'Tag', 'PlotMetricDropDown');
setGuidePopupValue(handles.PlotMetricDropDown, ''); setPopupDefaultValue(handles.PlotMetricDropDown, '');
handles.PlotWellDropDownLabel = uicontrol('Parent', handles.ResultsTab, 'Style', 'text', 'Units', 'pixels', 'Position', [12 139 49 22], ... handles.PlotWellDropDownLabel = uicontrol('Parent', handles.ResultsTab, 'Style', 'text', 'Units', 'pixels', 'Position', [12 139 49 22], ...
'String', 'PlotWell', 'HorizontalAlignment', 'right', 'Tag', 'PlotWellDropDownLabel'); 'String', 'PlotWell', 'HorizontalAlignment', 'right', 'Tag', 'PlotWellDropDownLabel');
handles.PlotWellDropDown = uicontrol('Parent', handles.ResultsTab, 'Style', 'popupmenu', 'Units', 'pixels', 'Position', [76 139 87 22], ... handles.PlotWellDropDown = uicontrol('Parent', handles.ResultsTab, 'Style', 'popupmenu', 'Units', 'pixels', 'Position', [76 139 87 22], ...
'String', {''}, 'Value', 1, 'Tag', 'PlotWellDropDown'); 'String', {''}, 'Value', 1, 'Tag', 'PlotWellDropDown');
setGuidePopupValue(handles.PlotWellDropDown, ''); setPopupDefaultValue(handles.PlotWellDropDown, '');
handles.PlotTimeStepSlider = uicontrol('Parent', handles.ResultsTab, 'Style', 'slider', 'Units', 'pixels', 'Position', [15 578 150 3], ... handles.PlotTimeStepSlider = uicontrol('Parent', handles.ResultsTab, 'Style', 'slider', 'Units', 'pixels', 'Position', [15 578 150 3], ...
'Min', 0, 'Max', 100, 'Value', 0, 'Tag', 'PlotTimeStepSlider'); 'Min', 0, 'Max', 100, 'Value', 0, 'Tag', 'PlotTimeStepSlider');
@@ -748,7 +748,7 @@ zlabel(handles.ResultAxes, 'Z');
set(fig, 'Visible', 'on'); set(fig, 'Visible', 'on');
end end
function setGuidePopupValue(handleObj, value) function setPopupDefaultValue(handleObj, value)
items = get(handleObj, 'String'); items = get(handleObj, 'String');
if ischar(items), items = cellstr(items); end if ischar(items), items = cellstr(items); end
idx = find(strcmp(items, char(string(value))), 1); idx = find(strcmp(items, char(string(value))), 1);