Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion libs/Dashboard/DashboardEngine.m
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,10 @@
SliderDebounceTimer = [] % MATLAB timer for coalescing rapid slider events
ResizeDebounceTimer = [] % MATLAB timer for coalescing rapid resize events (260513-q7w)
ResizeFinalRedrawTimer = [] % Longer-period backstop timer: unconditional rerenderWidgets after resize fully settles (260513-q7w fu)
IsRerendering_ = false % true while rerenderWidgets is in flight — suppresses spurious resize-timer scheduling that the panel teardown/recreate cascade would otherwise trigger (260513-q7w fu2)
% 260513-q7w fu2: true while rerenderWidgets is in flight — suppresses
% spurious resize-timer scheduling that the panel teardown/recreate
% cascade would otherwise trigger.
IsRerendering_ = false
TimeRangeSelector_ = [] % TimeRangeSelector handle (replaces dual sliders)
% [tStart tEnd] cache of most recent broadcast (260508-llw); used by
% switchPage to re-apply the current synced window to widgets that
Expand Down
4 changes: 2 additions & 2 deletions libs/Dashboard/DashboardToolbar.m
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,8 @@ function applyFollowToWidgets_(obj, widgets, mode, snap)
continue;
end
if isa(w, 'FastSenseWidget')
if ~isempty(w.FastSenseObj) && isvalid(w.FastSenseObj) ...
&& w.FastSenseObj.IsRendered
if ~isempty(w.FastSenseObj) && isvalid(w.FastSenseObj) && ...
w.FastSenseObj.IsRendered
try
w.FastSenseObj.setViewMode(mode);
if snap
Expand Down
4 changes: 2 additions & 2 deletions libs/Dashboard/FastSenseWidget.m
Original file line number Diff line number Diff line change
Expand Up @@ -450,8 +450,8 @@ function autoScaleY_(obj, y)
if obj.UserZoomedY
return;
end
if ~isempty(obj.FastSenseObj) && isvalid(obj.FastSenseObj) ...
&& strcmp(obj.FastSenseObj.LiveViewMode, 'follow')
if ~isempty(obj.FastSenseObj) && isvalid(obj.FastSenseObj) && ...
strcmp(obj.FastSenseObj.LiveViewMode, 'follow')
return;
end
if isempty(obj.FastSenseObj) || ~obj.FastSenseObj.IsRendered
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
classdef TestClearPanelHelper_ < DashboardWidget
classdef TestClearPanelHelper < DashboardWidget
%TESTCLEARPANELHELPER_ Minimal DashboardWidget subclass used by
% tests/test_create_event_dialog.m to drive the
% `clearPanelControls` protected-static through a real subclass.
Expand All @@ -24,7 +24,7 @@ function refresh(~)
methods (Static)
function run(hp)
%RUN Expose the protected clearPanelControls static for tests.
TestClearPanelHelper_.clearPanelControls(hp);
TestClearPanelHelper.clearPanelControls(hp);
end
end
end
2 changes: 1 addition & 1 deletion tests/test_create_event_dialog.m
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ function add_create_event_dialog_path()
function clear_panel_controls_via_subclass_(hp)
%CLEAR_PANEL_CONTROLS_VIA_SUBCLASS_ Drive DashboardWidget.clearPanelControls
% via a lightweight subclass that exposes the protected static.
TestClearPanelHelper_.run(hp);
TestClearPanelHelper.run(hp);
end

function safe_close_(h)
Expand Down
8 changes: 4 additions & 4 deletions tests/test_event_pick_mode.m
Original file line number Diff line number Diff line change
Expand Up @@ -407,15 +407,15 @@ function add_test_path_()
function teardown_(engine, fs)
%TEARDOWN_ Per-handle delete; never close all force.
try
if ~isempty(fs) && ~isempty(fs.hEventDetails_) ...
&& ishandle(fs.hEventDetails_)
if ~isempty(fs) && ~isempty(fs.hEventDetails_) && ...
ishandle(fs.hEventDetails_)
delete(fs.hEventDetails_);
end
catch
end
try
if ~isempty(engine) && ~isempty(engine.hFigure) ...
&& ishandle(engine.hFigure)
if ~isempty(engine) && ~isempty(engine.hFigure) && ...
ishandle(engine.hFigure)
delete(engine.hFigure);
end
catch
Expand Down
Loading