diff --git a/PlottingTool.mlapp b/PlottingTool.mlapp index 6065590..198a949 100644 Binary files a/PlottingTool.mlapp and b/PlottingTool.mlapp differ diff --git a/fourierPlotFnc.m b/fourierPlotFnc.m index d63f82b..d79cda2 100644 --- a/fourierPlotFnc.m +++ b/fourierPlotFnc.m @@ -14,8 +14,23 @@ function fourierPlotFnc(data, fileSettings, checkboxes, start, stop, yAxis, chan if fileSettings{2}.Value == 0 [timeArray, yData] = timeAxisWithIncrement(data, fileSettings{3}.Value, beginning, ending, channel); else - timeArray = data(:,1); - yData = data(:, channel); + 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 fs = 1 / fileSettings{3}.Value; diff --git a/graphPlotFnc.m b/graphPlotFnc.m index 2b1d177..acaf919 100644 --- a/graphPlotFnc.m +++ b/graphPlotFnc.m @@ -14,8 +14,24 @@ function graphPlotFnc(data, fileSettings, checkboxes, start, stop, yAxis, channe if fileSettings{2}.Value == 0 [timeArray, yData] = timeAxisWithIncrement(data, fileSettings{3}.Value, beginning, ending, channel); else - timeArray = data(:,1); - yData = data(:, channel); + + 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 diff --git a/meanPlotFnc.m b/meanPlotFnc.m index 453402a..c2d8bbd 100644 --- a/meanPlotFnc.m +++ b/meanPlotFnc.m @@ -14,8 +14,23 @@ function meanPlotFnc(data, fileSettings, checkboxes, start, stop, yAxis, channel if fileSettings{2}.Value == 0 [timeArray, yData] = timeAxisWithIncrement(data, fileSettings{3}.Value, beginning, ending, channel); else - timeArray = data(:,1); - yData = data(:, channel); + 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