Skip to content

fix(octave): guard isvalid calls so Octave CI passes #146

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
HanSur94 merged 3 commits into from
May 19, 2026
+15 −5
Merged

fix(octave): guard isvalid calls so Octave CI passes #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67ee033
fix(octave): guard isvalid in refreshActivePageWidgetsAfterResize_
HanSur94 May 19, 2026
6667e6d
fix(octave): guard isvalid in FastSenseWidget.autoScaleY_
HanSur94 May 19, 2026
e19b113
fix(octave): guard isvalid in syncYLimitButtonsState_
HanSur94 May 19, 2026
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: 6 additions & 3 deletions libs/Dashboard/DashboardEngine.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2016,10 +2016,13 @@ function refreshActivePageWidgetsAfterResize_(obj)
return;
end
ws = obj.activePageWidgets();
isOctave = exist('OCTAVE_VERSION', 'builtin') ~= 0;
% --- Pass 1: cheap data re-push ---
for i = 1:numel(ws)
w = ws{i};
if isempty(w) || ~isvalid(w)
% Octave 7+ has no isvalid() for classdef handles, so treat
% as valid there and rely on downstream guards / try-catch.
if isempty(w) || (~isOctave && ~isvalid(w))
continue;
end
if ~w.Realized || isempty(w.hPanel) || ~ishandle(w.hPanel)
Expand All @@ -2042,10 +2045,10 @@ function refreshActivePageWidgetsAfterResize_(obj)
stillWhite = false;
for i = 1:numel(ws)
w = ws{i};
if isempty(w) || ~isvalid(w) || ~isa(w, 'FastSenseWidget')
if isempty(w) || (~isOctave && ~isvalid(w)) || ~isa(w, 'FastSenseWidget')
continue;
end
if isempty(w.FastSenseObj) || ~isvalid(w.FastSenseObj) || ~w.FastSenseObj.IsRendered
if isempty(w.FastSenseObj) || (~isOctave && ~isvalid(w.FastSenseObj)) || ~w.FastSenseObj.IsRendered
continue;
end
if ~obj.isWidgetLineWhite_(w)
Expand Down
5 changes: 4 additions & 1 deletion libs/Dashboard/DashboardLayout.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,7 +1035,10 @@ function syncYLimitButtonsState_(bar, mode)
inactiveBg = [];
if isfield(ud, 'YLimitWidget') && ~isempty(ud.YLimitWidget)
w = ud.YLimitWidget;
if isobject(w) && isvalid(w) && ...
% Octave 7+ has no isvalid() for classdef handles; treat as
% valid there and rely on the property-access guards below.
isOctave = exist('OCTAVE_VERSION', 'builtin') ~= 0;
if isobject(w) && (isOctave || isvalid(w)) && ...
~isempty(w.ParentTheme) && isstruct(w.ParentTheme) && ...
isfield(w.ParentTheme, 'ToolbarBackground')
inactiveBg = w.ParentTheme.ToolbarBackground;
Expand Down
6 changes: 5 additions & 1 deletion libs/Dashboard/FastSenseWidget.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,11 @@ function autoScaleY_(obj, y)
if obj.UserZoomedY
return;
end
if ~isempty(obj.FastSenseObj) && isvalid(obj.FastSenseObj) && ...
% Octave 7+ has no isvalid() for classdef handles, so treat the
% FastSense handle as valid there and let downstream property
% access surface real failures.
isOctave = exist('OCTAVE_VERSION', 'builtin') ~= 0;
if ~isempty(obj.FastSenseObj) && (isOctave || isvalid(obj.FastSenseObj)) && ...
strcmp(obj.FastSenseObj.LiveViewMode, 'follow')
return;
end
Expand Down
Loading