Commit b5bd5e22 authored by Jay Dubb's avatar Jay Dubb
Browse files

v1.29.4

-- Fix broken browse synching in StimEditGUI. Changed getting of data and labels to be done in an object-oriented way by using only class functions to retrieve stim data and labels.
parent a3e3afb5
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -199,6 +199,18 @@ classdef AcqDataClass < matlab.mixin.Copyable
        end
        
                
        % ----------------------------------------------------------------------------------
        function data = GetStimData(~, ~)
            data = [];
        end
        
        
        % ----------------------------------------------------------------------------------
        function val = GetStimDataLabels(~, ~)
            val = {};
        end
                        
        
        % ----------------------------------------------------------------------------------
        function b = equal(obj, obj2)
            b = true;
+12 −0
Original line number Diff line number Diff line
@@ -1366,6 +1366,18 @@ classdef SnirfClass < AcqDataClass & FileLoadSaveClass
        end
        
        
        % ----------------------------------------------------------------------------------
        function val = GetStimData(obj, icond)
            val = obj.stim(icond).GetData();
        end
        
        
        % ----------------------------------------------------------------------------------
        function val = GetStimDataLabels(obj, icond)
            val = obj.stim(icond).GetDataLabels();
        end
        
        
        % ----------------------------------------------------------------------------------
        function SetStimDuration(obj, icond, duration)
            obj.stim(icond).SetDuration(duration);
+8 −2
Original line number Diff line number Diff line
@@ -113,7 +113,9 @@ classdef StimClass < FileLoadSaveClass
                if all(obj.data(:)==0)
                    obj.data = [];
                end
                
                if isempty(obj.dataLabels)
                    obj.dataLabels = {'Onset', 'Duration', 'Amplitude'};
                end
                err = obj.ErrorCheck();

                % Close group
@@ -290,11 +292,14 @@ classdef StimClass < FileLoadSaveClass
            obj.updateStates();
        end
        
        
        % -------------------------------------------------------
        function val = GetStates(obj)
            val = obj.states;
        end

        
        % -------------------------------------------------------
        function SetDataLabels(obj, dataLabels)
            if length(dataLabels) < size(obj.data, 2)
               for i = 1:size(obj.data, 2) - length(dataLabels)
@@ -304,6 +309,7 @@ classdef StimClass < FileLoadSaveClass
            obj.dataLabels = dataLabels(1:size(obj.data, 2));
        end
        
        
        % -------------------------------------------------------
        function val = GetDataLabels(obj)
            val = obj.dataLabels;            
+8 −4
Original line number Diff line number Diff line
@@ -318,10 +318,14 @@ classdef ProcInputClass < handle
        
        
        % ----------------------------------------------------------------------------------
        function [tpts, duration, vals] = GetStimData(obj, icond)
            tpts     = obj.GetStimTpts(icond);
            duration = obj.GetStimDuration(icond);
            vals     = obj.GetStimAmplitudes(icond);
        function data = GetStimData(obj, icond)
            data = obj.acquired.GetStimData(icond);
        end
        
    
        % ----------------------------------------------------------------------------------
        function val = GetStimDataLabels(obj, icond)
            val = obj.acquired.GetStimDataLabels(icond);
        end
        
        
+17 −4
Original line number Diff line number Diff line
@@ -1382,10 +1382,14 @@ classdef ProcStreamClass < handle
        
        
        % ----------------------------------------------------------------------------------
        function [tpts, duration, vals] = GetStimData(obj, icond)
            tpts     = obj.GetStimTpts(icond);
            duration = obj.GetStimDuration(icond);
            vals     = obj.GetStimAmplitudes(icond);
        function data = GetStimData(obj, icond)
            data = obj.input.GetStimData(icond);
        end
        
    
        % ----------------------------------------------------------------------------------
        function val = GetStimDataLabels(obj, icond)
            val = obj.input.GetStimDataLabels(icond);
        end
        
        
@@ -1434,6 +1438,15 @@ classdef ProcStreamClass < handle
        end
                       
        
        % ----------------------------------------------------------------------------------
        function vals = GetAmplitudes(obj, icond)
            if ~exist('icond','var')
                icond=1;
            end
            vals = obj.input.GetStimAmplitudes(icond);
        end
                       
        
        % ---------------------------------------------------------
        function CondNames = GetConditions(obj)
            CondNames = obj.input.GetConditions();
Loading