fix deprecated sort

Author: Stephanie Reeder

odmtools/controller/olvDataTable.py

@@ -31,7 +31,7 @@ def init(self, memDB):
         self.SetColumns(columns)
         self.dataframe = self.memDB.getDataValuesDF()
         sort_by_index = list(self.dataframe.columns).index("LocalDateTime")
-        self.dataframe.sort(self.dataframe.columns[sort_by_index], inplace=True)
+        self.dataframe.sort_values(self.dataframe.columns[sort_by_index], inplace=True)
         self.dataObjects = self.dataframe.values.tolist()
 
         self.SetObjectGetter(self.ObjectGetter)

odmtools/gui/plotProbability.py

@@ -136,8 +136,10 @@ 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.order().values
+                xValues = oneSeries.Probability.xAxis.sort_values()#.order().values
+                # yValues = oneSeries.Probability.yAxis.order().values
+                yValues = oneSeries.Probability.yAxis.sort_values()#order().values
 
                 ax = self.plots.plot(xValues, yValues, 'bs', color=oneSeries.color,
                                    label=oneSeries.plotTitle)

odmtools/odmservices/edit_service.py

@@ -150,17 +150,19 @@ def fill_gap(self, gap, period):
         series= self.memDB.series
         timegap = np.timedelta64(gap, self.time_units[period])
 
-        for g in gaps.iterrows():
-            row= g[0]
-            e = row["datetime"]
-            s= row["prevdate"]
-            print (s)
-            print (e)
 
+        for g in gaps.iterrows():
+            print ("i am g[0]", g[0])
+            e = g[1]#row["datetime"]
+            s= g[-1]#row["prevdate"]
+            print ( " i am the start", s)
+            print (" I am the end", e)
+            s = s+timegap
             # for each gap time period in the larger gap ( until datetime = prev value)
-            while s != e:
-                s= s + timegap
-                points.append(('-9999', None, s, series.begin_date_time_utc, s, None, None, u'nc', None, None, series.site_id, series.variable_id, series.method_id, series.source_id, series.quality_control_level_id))
+            # while s != e:
+            #     points.append(('-9999', None, s, series.begin_date_time_utc, s, None, None, u'nc', None, None, series.site_id, series.variable_id, series.method_id, series.source_id, series.quality_control_level_id))
+            #     s= s + timegap
+
                 #add a row points.append() [('-9999', None, datetime.datetime(2007, 9, 28, 0, 10), '-7', datetime.datetime(2007, 9, 28, 7, 10), None, None, u'nc', None, None, 1, 4, 2, 1, 0)
                 #('-9999', None, DATE, series.begin_date_time_utc, UTCDATE, None, None, u'nc', None, None, series.site_id, series.variable_id, series.method_id, series.source_id, series.quality_control_level_id