fix date time plot filter #293

ODM2 · Oct 17, 2016 · fc16537 · fc16537
1 parent 3b914f9
commit fc16537
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/odmtools/gui/plotProbability.py b/odmtools/gui/plotProbability.py
@@ -136,8 +136,8 @@ def updatePlot(self):
                 #self.prob.append(
                 #prop = oneSeries.Probability.plot(column="DataValue", ax=self.plots)
                 #todo FutureWarning: order is deprecated, use sort_values(...)
-                xValues = oneSeries.Probability.xAxis.order().values
-                yValues = oneSeries.Probability.yAxis.order().values
+                xValues = oneSeries.Probability.xAxis.sort_values().values
+                yValues = oneSeries.Probability.yAxis.sort_values().values
 
                 ax = self.plots.plot(xValues, yValues, 'bs', color=oneSeries.color,
                                    label=oneSeries.plotTitle)

diff --git a/odmtools/odmservices/series_service.py b/odmtools/odmservices/series_service.py
@@ -489,6 +489,9 @@ def get_plot_values(self, seriesID, noDataValue, startDate = None, endDate = Non
 
         Values = self.get_values_by_series(seriesID)
         data = Values[['datavalue', 'censorcodecv', 'valuedatetime']]
+        # data = data[data['datavalue'] != noDataValue]
+        data = data[(data['datavalue'] != noDataValue) & (data['valuedatetime'] >= startDate) & (
+        data['valuedatetime'] <= endDate)]
 
 
         #data.set_index(data['LocalDateTime'], inplace=True)