rename all datavalue pandas columns

Author: stephanie

odmtools/controller/olvSeriesSelector.py

@@ -67,7 +67,7 @@ def _buildColumns(self, columns):
         seriesColumns = [
             ColumnDefn(key, align="left", minimumWidth=100, valueGetter=key,
                        # stringConverter = '%s')
-                       stringConverter='%Y-%m-%d %H:%M:%S' if "date" in key.lower() else'%s')
+                       stringConverter='%Y-%m-%d %H:%M:%S' if "date" in key.lower() else '%s')
             for key in columns]
 
 

odmtools/gui/mnuPlotToolbar.py

@@ -271,7 +271,7 @@ def on_toggle_zoom_data_tool(self, event):
         #date= [x[1] for x in self.editCurve.dataTable if x[0] != self.editCurve.noDataValue]
 
         axes = self.canvas.figure.axes[0]
-        axes.set_ylim(min(nodvvals["DataValue"]), max(nodvvals["DataValue"]))
+        axes.set_ylim(min(nodvvals["datavalue"]), max(nodvvals["datavalue"]))
         axes.set_xlim(dates.date2num([min(nodvvals.index), max(nodvvals.index)]))
 
         self.push_current()

odmtools/gui/plotHistogram.py

@@ -105,7 +105,7 @@ def _createPlot(self, oneSeries, rows, cols, index):
 
         # oneSeries.filteredData.hist(ax= ax, color='k', alpha=0.5, bins=50)
 
-        his = oneSeries.dataTable.hist(column="DataValue", ax=ax, bins=self.bins,
+        his = oneSeries.dataTable.hist(column="datavalue", ax=ax, bins=self.bins,
                                           facecolor=oneSeries.color,
                                           label=oneSeries.siteName + " " + oneSeries.variableName,
                                           grid=False)

odmtools/odmservices/edit_service.py

@@ -98,9 +98,9 @@ def datetime2dataframe(self, datetime_list):
 
         if isinstance(datetime_list, list):
 
-            result = pd.DataFrame(datetime_list, columns=["LocalDateTime"])
+            result = pd.DataFrame(datetime_list, columns=["valuedatetime"])
 
-            result.set_index("LocalDateTime", inplace=True)
+            result.set_index("valuedatetime", inplace=True)
 
         return result
 
@@ -130,10 +130,10 @@ def filter_value(self, value, ops):
         df = self._test_filter_previous()
 
         if ops == '>':
-            self.filtered_dataframe = df[df['DataValue'] > value]
+            self.filtered_dataframe = df[df['datavalue'] > value]
 
         if ops == '<':
-            self.filtered_dataframe = df[df['DataValue'] < value]
+            self.filtered_dataframe = df[df['datavalue'] < value]
 
 
     def filter_date(self, before, after):
@@ -185,9 +185,9 @@ def change_value_threshold(self, value, operator):
 
         # make a copy of the dataframe in order to modify it to be in the form we need to determine data gaps
         copy_df = df
-        copy_df['values'] = df['DataValue']
+        copy_df['values'] = df['datavalue']
         copy_df['diff'] = copy_df['values'].shift()
-        copy_df["diff_date"] = copy_df['LocalDateTime'].shift()
+        copy_df["diff_date"] = copy_df['valuedatetime'].shift()
         copy_df['change_threshold'] = abs(df['values'] - df['diff'])
 
         if not isinstance(value, float):
@@ -337,13 +337,13 @@ def interpolate(self):
         df = self._series_points_df
         issel = df.index.isin(tmp_filter_list.index)
 
-        mdf = df["DataValue"].mask(issel)
+        mdf = df["datavalue"].mask(issel)
         mdf.interpolate(method = "time", inplace=True)
-        tmp_filter_list["DataValue"]=mdf[issel]
+        tmp_filter_list["datavalue"]=mdf[issel]
         ids = tmp_filter_list.index.tolist()
 
         #update_list = [(row["DataValue"], row["ValueID"]) for index, row in tmp_filter_list.iterrows()]
-        update_list = [{"value": row["DataValue"], "id": index} for index, row in tmp_filter_list.iterrows()]
+        update_list = [{"value": row["datavalue"], "id": index} for index, row in tmp_filter_list.iterrows()]
 
         self.memDB.update(update_list)
 
@@ -359,10 +359,10 @@ def drift_correction(self, gap_width):
             x_l = (tmp_filter_list.index[-1]-startdate).total_seconds()
 
             # y_n = y_0 + G(x_i / x_l)
-            f = lambda row :  row["DataValue"]+(gap_width * ((row.name-startdate).total_seconds() / x_l))
-            tmp_filter_list["DataValue"]=tmp_filter_list.apply(f, axis = 1)
+            f = lambda row :  row["datavalue"]+(gap_width * ((row.name-startdate).total_seconds() / x_l))
+            tmp_filter_list["datavalue"]=tmp_filter_list.apply(f, axis = 1)
 
-            update_list = [{"value": row["DataValue"], "id":index} for index, row in tmp_filter_list.iterrows()]
+            update_list = [{"value": row["datavalue"], "id":index} for index, row in tmp_filter_list.iterrows()]
 
             ids = tmp_filter_list.index.tolist()
             self.memDB.update(update_list)

tests/test_odmdata/test_memory_db.py

@@ -37,13 +37,13 @@ def test_update_points(self):
 
         self.memory_db.update([{"value":15,"id":self.sdate}])
         dvs = self.memory_db.getDataValuesDF()
-        print dvs["DataValue"]
-        assert dvs["DataValue"][0] == 15
+        print dvs["datavalue"]
+        assert dvs["datavalue"][0] == 15
 
     def test_update_value(self):
         self.memory_db.updateValue([self.sdate],'+', 5 )
         dvs = self.memory_db.getDataValuesDF()
-        assert dvs["DataValue"][0] == 14
+        assert dvs["datavalue"][0] == 14
 
     def test_add_points(self):
         #with pytest.raises(NotImplementedError):
@@ -55,7 +55,7 @@ def test_add_points(self):
         dvs = self.memory_db.getDataValuesDF()
 
         assert len(dvs.index) == 11
-        assert dvs["DataValue"][0] == -9999
+        assert dvs["datavalue"][0] == -9999
 
     def test_update_flag(self):
         self.memory_db.updateFlag([self.sdate], '50')
@@ -66,7 +66,7 @@ def test_update_flag(self):
     def test_delete_points(self):
         stlen= len(self.memory_db.df.index)
 
-        self.memory_db.delete(self.memory_db.df["LocalDateTime"].tolist()[0:10])
+        self.memory_db.delete(self.memory_db.df["resultdatetime"].tolist()[0:10])
         dvs = self.memory_db.getDataValuesDF()
         assert len(dvs.index) == stlen-10