diff --git a/src/main/python/input_backend.py b/src/main/python/input_backend.py index da17e04..e586638 100644 --- a/src/main/python/input_backend.py +++ b/src/main/python/input_backend.py @@ -176,7 +176,7 @@ def processExternalData(datapoints, plotNameKey, fromTime, toTime, dtype, qtText def read_in_file(path, backend=None, outsideData=False, plotOutsideTemp=True, - plotOutsideHum=True, qtTextBrowser=None): + plotOutsideHum=True, qtTextBrowser=None, fromTime=None, toTime=None): '''Read in a file, add outside data if requested, optionally give a QtTextBrowser to output information, warnings and errors to.''' @@ -237,8 +237,9 @@ def read_in_file(path, backend=None, outsideData=False, plotOutsideTemp=True, # if nessesary download and process external data # if outsideData: - fromTime = datapoints[CFG("plot_temperatur_key")].getFirstTime() - toTime = datapoints[CFG("plot_temperatur_key")].getLastTime() + # removed in favor of parameter passed selected time from gui # + #fromTime = datapoints[CFG("plot_temperatur_key")].getFirstTime() + #toTime = datapoints[CFG("plot_temperatur_key")].getLastTime() dtypeTemp = CFG("dtype_temperatur") dtypeHum = CFG("dtype_humidity") diff --git a/src/main/python/main.py b/src/main/python/main.py index a1f4917..50b37bc 100755 --- a/src/main/python/main.py +++ b/src/main/python/main.py @@ -170,13 +170,20 @@ class WidgetGallery(QDialog): # workaround for checkboxes changed # outsideDataNeeded = self.boxOTemp.isChecked() or self.boxOHumidity.isChecked() + # read time early to use for external file # + zeroTime = dt.time(0, 0) + endDateTime = dt.datetime.combine(self.endDateEdit.date().toPyDate(), zeroTime) + startDateTime = dt.datetime.combine(self.startDateEdit.date().toPyDate(), zeroTime) + # build dates # try: self.datapoints = input_backend.read_in_file(self.srcFileString, outsideData=outsideDataNeeded, plotOutsideTemp=self.boxOTemp.isChecked(), plotOutsideHum=self.boxOHumidity.isChecked(), - qtTextBrowser=self.infoTextBox) + qtTextBrowser=self.infoTextBox, + fromTime=startDateTime, + toTime=endDateTime) startTimeHelper = dt.datetime.strptime(self.startTimeEdit.text(),"%H:%M") endTimeHelper = dt.datetime.strptime(self.endTimeEdit.text(),"%H:%M") @@ -193,10 +200,7 @@ class WidgetGallery(QDialog): startTimeOffset = dt.timedelta(hours=startTimeHelper.hour, minutes=startTimeHelper.minute) endTimeOffset = dt.timedelta(hours=endTimeHelper.hour, minutes=endTimeHelper.minute) - zeroTime = dt.time(0, 0) - startDateTime = dt.datetime.combine(self.startDateEdit.date().toPyDate(), zeroTime) startDateTime += startTimeOffset - endDateTime = dt.datetime.combine(self.endDateEdit.date().toPyDate(), zeroTime) endDateTime += endTimeOffset try: