merge changes from master

Author: sreeder

odmtools/controller/logicEditTools.py

@@ -153,6 +153,15 @@ def select_points(self, id_list=[], dataframe=[]):
     ###################
     # Editing
     ###################
+    def updateValues(self, values):
+        """
+
+        :param values: pandas Dataframe - must contain a "datavalues" column and a date time as the index
+        :return:
+        """
+        self._edit_service.updateValues(values)
+        self.refresh_edit()
+
     def _create_dataframe(self, points):
         return pd.DataFrame(points)
 

odmtools/gui/wizSave.py

@@ -119,6 +119,7 @@ def __init__(self, parent):
         # pageMethod.pnlMethod.__init__(self, parent)
         wiz.WizardPageSimple.__init__(self, parent)
 
+
         main_sizer = wx.BoxSizer(wx.VERTICAL)
         self.page_method_view = pageMethod.pnlMethod(self)
         main_sizer.Add(self.page_method_view, 1, wx.EXPAND | wx.ALL, 0)
@@ -161,6 +162,7 @@ def __init__(self, parent):
 #         self.panel.lstMethods.Select(index)
 
 
+
 ########################################################################
 class SummaryPage(wiz.WizardPageSimple):
     def __init__(self, parent, title, series_service):

odmtools/odmservices/edit_service.py

@@ -471,6 +471,23 @@ def flag(self, qualifier_id):
         '''
         self.memDB.updateFlag(filtered_points.index.tolist(), qualifier_id)
 
+    def updateValues(self, values):
+        """
+
+        :param values: pandas Dataframe - must contain a "datavalues" column and a date time as the index
+        :return:
+        """
+        if values is None:
+            print("please send in a valid DataFrame object")
+            return
+        update_list = [{"value": row["DataValue"], "id": index} for index, row in values.iterrows()]
+
+        ids = values.index.tolist()
+        self.memDB.update(update_list)
+        self._populate_series()
+
+        self.filtered_dataframe = self._series_points_df[self._series_points_df.index.isin(ids)]
+
     ###################
     # Save/Restore
     ###################