diff --git a/PlottingTool.mlapp b/PlottingTool.mlapp index 198a949..3c37f9a 100644 Binary files a/PlottingTool.mlapp and b/PlottingTool.mlapp differ diff --git a/fourierPlotFnc.m b/fourierPlotFnc.m index d79cda2..8e253b6 100644 --- a/fourierPlotFnc.m +++ b/fourierPlotFnc.m @@ -14,22 +14,28 @@ 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 - timeIndex = 1; - while data(timeIndex,1) < str2double(start{channel}.Value) - timeIndex = timeIndex + 1; - end + if ending == 0 + timeArray = data(:,1); + yData = data(:, channel); + else - 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); + 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 diff --git a/graphPlotFnc.m b/graphPlotFnc.m index acaf919..57d6ecf 100644 --- a/graphPlotFnc.m +++ b/graphPlotFnc.m @@ -15,22 +15,28 @@ function graphPlotFnc(data, fileSettings, checkboxes, start, stop, yAxis, channe [timeArray, yData] = timeAxisWithIncrement(data, fileSettings{3}.Value, beginning, ending, channel); else - timeIndex = 1; - while data(timeIndex,1) < str2double(start{channel}.Value) - timeIndex = timeIndex + 1; - end + if ending == 0 + timeArray = data(:,1); + yData = data(:, channel); + else - 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); + 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 diff --git a/meanPlotFnc.m b/meanPlotFnc.m index c2d8bbd..eaf28c9 100644 --- a/meanPlotFnc.m +++ b/meanPlotFnc.m @@ -14,22 +14,28 @@ 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 - timeIndex = 1; - while data(timeIndex,1) < str2double(start{channel}.Value) - timeIndex = timeIndex + 1; - end + if ending == 0 + timeArray = data(:,1); + yData = data(:, channel); + else - 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); + 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