Adding extra argument to execution of ProgramPlugin update listeners so that a GUI figure does not need to be found in GUI plugins.

Author: caster

Projects/caster/plugins/vis_control/vis_control.m

@@ -421,23 +421,27 @@ function spot_color_select_CreateFcn(hObject, eventdata, handles)
     set(hObject,'BackgroundColor','white');
 end
 
-function ViscoreUpdate(core, eventdata)
-results = findall(core.guiPluginHandles,'tag','vis_control_figure');
-if numel(results) == 0
+function ViscoreUpdate(core, eventdata, plugin)
+
+fig = plugin.guiPluginHandle;
+if ~ishandle(plugin.guiPluginHandle)
     error('ViscoreUpdate in vis_control cannot find vis_control.');
 end
-fig = results(1);
+
 handles = guidata(fig);
+
 set(handles.connection_status_display,'string','UPDATE PENDING');
 
 
-function ViscorePostUpdate(core, eventdata)
-results = findall(core.guiPluginHandles,'tag','vis_control_figure');
-if numel(results) == 0
+function ViscorePostUpdate(core, eventdata, plugin)
+
+fig = plugin.guiPluginHandle;
+if ~ishandle(plugin.guiPluginHandle)
     error('ViscorePostUpdate in vis_control cannot find vis_control.');
 end
-fig = results(1);
+
 handles = guidata(fig);
+
 set(handles.connection_status_display,'string','UPDATING GUI');
 set(handles.spot_color_select,'Value',...
     handles.plugin.core.settings.misc.colors.SpotColorDefault);
@@ -463,7 +467,7 @@ function ViscorePostUpdate(core, eventdata)
 guidata(fig,handles);
 
 
-function ViscoreShutdown(core, eventdata)
+function ViscoreShutdown(core, eventdata, plugin)
 
 function UpdateTrajectory(handles,Vi,Ri,pivot_point)
 

Projects/caster/plugins/vis_display/vis_display.m

@@ -57,21 +57,22 @@
 
 guidata(gui, handles);
 
-function ViscoreUpdate(core, eventdata)
-results = findall(core.guiPluginHandles,'Name','Visualizer Display');
-if numel(results) == 0
-    error('ViscoreUpdate in Visualizer Display cannot find Visualizer Display.');
+function ViscoreUpdate(core, eventdata, plugin)
+
+fig = plugin.guiPluginHandle;
+if ~ishandle(plugin.guiPluginHandle)
+    error('ViscoreUpdate in Visualizer Display cannot find Display.');
 end
-fig = results(1);
+
 handles = guidata(fig);
 handles.world.UpdateVisual();
 notify(core,'PostUpdateEvent');
 
-function ViscoreShutdown(core, eventdata)
-results = findall(core.guiPluginHandles,'Name','Visualizer Display');
-if numel(results) == 0
-    error('ViscoreShutdown cannot find Visualizer Display.');
+function ViscoreShutdown(core, eventdata, plugin)
+
+fig = plugin.guiPluginHandle;
+if ~ishandle(plugin.guiPluginHandle)
+    error('ViscoreUpdate in vis_control cannot find vis_control.');
 end
-fig = results(1);
-handles = guidata(fig);
+
 delete(fig);

SupportTools/ProgramPlugin.m

@@ -107,7 +107,7 @@ function ConnectGui(obj,guiHandle)
 
             if ~isempty(obj.updateFcn)
                 % execute assigned shutdown function
-                obj.preUpdateFcn(core, eventdata);
+                obj.preUpdateFcn(core, eventdata, obj);
             end
         end                 
 
@@ -118,7 +118,7 @@ function ConnectGui(obj,guiHandle)
 
             if ~isempty(obj.updateFcn)
                 % execute assigned shutdown function
-                obj.updateFcn(core, eventdata);
+                obj.updateFcn(core, eventdata, obj);
             end
 
         end
@@ -130,7 +130,7 @@ function ConnectGui(obj,guiHandle)
 
             if ~isempty(obj.shutdownFcn)
                 % execute assigned shutdown function
-                obj.shutdownFcn(core, eventdata);
+                obj.shutdownFcn(core, eventdata, obj);
             end
         end
 
@@ -141,7 +141,7 @@ function ConnectGui(obj,guiHandle)
 
             if ~isempty(obj.postUpdateFcn)
                 % execute assigned shutdown function
-                obj.postUpdateFcn(core, eventdata);
+                obj.postUpdateFcn(core, eventdata, obj);
             end
 
         end