diff --git a/code/ConcTimecourseView.m b/code/ConcTimecourseView.m index 57ca81c..48da3b3 100644 --- a/code/ConcTimecourseView.m +++ b/code/ConcTimecourseView.m @@ -1,8 +1,6 @@ classdef ConcTimecourseView < handle - properties ( Access = private ) - Model - + properties ( Access = private ) ConcColors = [0.30,0.75,0.93;... 0.86,0.55,0.41;... 0.91,0.73,0.42]; % colors to plot concentrations @@ -60,7 +58,6 @@ obj.DataListener = dataListener; % save objects - obj.Model = model; obj.Axes = ax; end % constructor @@ -70,8 +67,8 @@ methods ( Access = private ) - function update(obj,~,~) - t = obj.Model.SimDataTable; + function update(obj,srcModel,~) + t = srcModel.SimDataTable; set(obj.lhDrug,'XData',t.Time, 'YData',t.Drug); set(obj.lhReceptor,'XData',t.Time, 'YData',t.Receptor); diff --git a/code/LampView.m b/code/LampView.m index 5bb823b..9e2d1b0 100644 --- a/code/LampView.m +++ b/code/LampView.m @@ -15,10 +15,6 @@ LampObj end - properties ( Access=private ) - Model - end - properties( Access = private ) DataListener % listener end @@ -42,7 +38,6 @@ obj.DataListener = dataListener; obj.LampObj = lampObj; - obj.Model = model; end % constructor @@ -68,8 +63,8 @@ methods ( Access = private ) - function update(obj,~,~) - obj.IsOn = obj.Model.ROIsBetweenThresholds; + function update(obj,srcModel,~) + obj.IsOn = srcModel.ROIsBetweenThresholds; end % update end % private method diff --git a/code/NCAView.m b/code/NCAView.m index db36c3e..1e658d5 100644 --- a/code/NCAView.m +++ b/code/NCAView.m @@ -1,7 +1,6 @@ classdef NCAView < handle - properties ( Access = private ) - Model + properties ( Access = private ) NCApanel GridLayout BackgroundColor = [1,1,1] @@ -67,7 +66,6 @@ obj.DataListener = dataListener; % save objects - obj.Model = model; obj.NCAoptions = opt; obj.NCApanel = ncapanel; obj.GridLayout = gl; @@ -89,10 +87,10 @@ methods ( Access = private ) - function update(obj,~,~) + function update(obj,srcModel,~) % compute NCA parameters and display them in table - ncaParameters = sbionca(obj.Model.SimDataTable, obj.NCAoptions); + ncaParameters = sbionca(srcModel.SimDataTable, obj.NCAoptions); obj.NCAtable.ColumnName = ncaParameters.Properties.VariableNames(2:end); obj.NCAtable.Data = ncaParameters(:,2:end); diff --git a/code/ROTimecourseView.m b/code/ROTimecourseView.m index cea3fbb..eeda351 100644 --- a/code/ROTimecourseView.m +++ b/code/ROTimecourseView.m @@ -1,8 +1,6 @@ classdef ROTimecourseView < handle - properties ( Access = private ) - Model - + properties ( Access = private ) ThresholdStyle = {'Color','r','Linewidth',2,'LineStyle','--',... 'FontWeight','bold','LabelVerticalAlignment','middle'}; % style for threshold lines @@ -60,7 +58,6 @@ obj.DataListener = dataListener; % save objects - obj.Model = model; obj.Axes = ax; end % constructor @@ -70,8 +67,8 @@ methods ( Access = private ) - function update(obj,~,~) - t = obj.Model.SimDataTable; + function update(obj,srcModel,~) + t = srcModel.SimDataTable; set(obj.lhRO,'XData',t.Time, 'YData',100*t.RO);