diff --git a/PlottingTool.mlapp b/PlottingTool.mlapp index b6f437c..4f9eecc 100644 Binary files a/PlottingTool.mlapp and b/PlottingTool.mlapp differ diff --git a/diffPlotFnc.m b/diffPlotFnc.m new file mode 100644 index 0000000..c0ac404 --- /dev/null +++ b/diffPlotFnc.m @@ -0,0 +1,63 @@ +function diffPlotFnc(data, fileSettings, checkboxes, start, stop, yAxis, xAxis, channels, path, order) + + %Iterate through all channels + for channel = 1:width(data) + + %If Graph is checked + if checkboxes{channel}.Value == 1 + + %Convert start and ending time + beginning = str2double(start{channel}.Value); + ending = str2double(stop{channel}.Value); + + %if first row increment is not checked + if fileSettings{2}.Value == 0 + [timeArray, yData] = timeAxisWithIncrement(data, fileSettings{3}.Value, beginning, ending, channel); + else + if ending == 0 + timeArray = data(:,1); + yData = data(:, channel); + else + + timeIndex = 1; + while data(timeIndex,1) < str2double(start{channel}.Value) + timeIndex = timeIndex + 1; + end + + startIndex = timeIndex; + + while data(timeIndex, 1) <= str2double(stop{channel}.Value) || timeIndex >= length(data) + timeArray(timeIndex - startIndex + 1) = data(timeIndex,1); + timeIndex = timeIndex + 1; + end + + endIndex = timeIndex; + + for timeIndex = startIndex:endIndex - 1 + yData(timeIndex - startIndex + 1) = data(timeIndex, channel); + end + end + end + + %Plot the channel + figure(channel) + plot(timeArray, yData, '-b'); + hold all + plot(timeArray, diff(yData), '-r'); + ylabel(yAxis{channel}.Value); + xlabel(xAxis{channel}.Value); + legend('Original', 'Derivative') + title(channels{channel}); + + %Save plot + saveFigs('median', figure(channel), channels(channel), path, fileSettings{1}.Value) + + %reset + hold off + close all; + + end + + end +end + diff --git a/fourierPlotFnc.m b/fourierPlotFnc.m index 8e253b6..d66bc70 100644 --- a/fourierPlotFnc.m +++ b/fourierPlotFnc.m @@ -1,4 +1,4 @@ -function fourierPlotFnc(data, fileSettings, checkboxes, start, stop, yAxis, channels, path) +function fourierPlotFnc(data, fileSettings, checkboxes, start, stop, yAxis, xAxis, channels, path) %Iterate through all channels for channel = 1:width(data) diff --git a/graphPlotFnc.m b/graphPlotFnc.m index 57d6ecf..db44e8b 100644 --- a/graphPlotFnc.m +++ b/graphPlotFnc.m @@ -1,4 +1,4 @@ -function graphPlotFnc(data, fileSettings, checkboxes, start, stop, yAxis, channels, path) +function graphPlotFnc(data, fileSettings, checkboxes, start, stop, yAxis, xAxis, channels, path) %Iterate through all channels for channel = 1:width(data) @@ -46,7 +46,7 @@ function graphPlotFnc(data, fileSettings, checkboxes, start, stop, yAxis, channe figure(channel) plot(timeArray, yData); ylabel(yAxis{channel}.Value); - xlabel('Time [s]'); + xlabel(xAxis{channel}.Value); title(channels{channel}); %Save plot diff --git a/meanPlotFnc.m b/meanPlotFnc.m index 6732c2b..a22ccdf 100644 --- a/meanPlotFnc.m +++ b/meanPlotFnc.m @@ -1,4 +1,4 @@ -function meanPlotFnc(data, fileSettings, checkboxes, start, stop, yAxis, channels, path, order) +function meanPlotFnc(data, fileSettings, checkboxes, start, stop, yAxis, xAxis, channels, path, order) %Iterate through all channels for channel = 1:width(data) @@ -45,7 +45,7 @@ function meanPlotFnc(data, fileSettings, checkboxes, start, stop, yAxis, channel hold all plot(timeArray, movmean(yData, str2double(order)), '-r'); ylabel(yAxis{channel}.Value); - xlabel('Time [s]'); + xlabel(xAxis{channel}.Value); legend('Without movmean', strcat('With movmean (', order, 'th order)')) title(channels{channel});