merging

Author: stephanie

odmtools/controller/frmLinearDrift.py

@@ -13,7 +13,10 @@ def OnBtnOKButton(self, event):
         Perform Drift Correction based on given input. Catch errors if the user enters something invalid
         """
         try:
-            self._record_service.drift_correction(float(self.txtFinalGapValue.GetValue()))
+            result = self._record_service.drift_correction(float(self.txtFinalGapValue.GetValue()))
+            if not result:
+                dial = wx.MessageDialog( None, "Linear drift can only be performed on one continuous data selection. \nPlease modify your selection and try again.", "Bad Input", wx.OK)
+                dial.ShowModal()
         except Exception as e:
             dial = wx.MessageDialog(None, "Unable to convert value to float %s" % e, "Bad Input",
                 wx.OK | wx.ICON_ERROR)

odmtools/controller/logicEditTools.py

@@ -196,10 +196,11 @@ def interpolate(self):
 
     def drift_correction(self, gap_width):
         ret = self._edit_service.drift_correction(gap_width)
-        self.refresh_edit()
-        if self._record:
-            self._script("edit_service.drift_correction(%s)\n" % (gap_width), 'black')
-            Publisher.sendMessage("scroll")
+        if ret:
+            self.refresh_edit()
+            if self._record:
+                self._script("edit_service.drift_correction(%s)\n" % (gap_width), 'black')
+                Publisher.sendMessage("scroll")
         return ret
 
     def reset_filter(self):

odmtools/odmdata/memory_database.py

@@ -21,6 +21,7 @@ def __init__(self, taskserver=None):
         self.df = None
         # Series_Service handles remote database
         self.series_service = None
+
         # Memory_service handles in memory database
         self.mem_service = SeriesService("sqlite:///:memory:")
         # TODO clean up closing of program

odmtools/odmservices/edit_service.py

@@ -404,19 +404,22 @@ def interpolate(self):
 
         self.memDB.update(update_list)
 
-
         self._populate_series()
 
         self.filtered_dataframe = self._series_points_df[self._series_points_df.index.isin(ids)]
 
+
     def drift_correction(self, gap_width):
+
+
         if self.isOneGroup():
             tmp_filter_list =self.get_filtered_points()
             startdate =tmp_filter_list.index[0]
             x_l = (tmp_filter_list.index[-1]-startdate).total_seconds()
-
+            #nodv= self.memDB.series_service.get_variable_by_id(self.memDB.df["VariableID"][0])
+            nodv = self.memDB.series.variable.no_data_value
             # y_n = y_0 + G(x_i / x_l)
-            f = lambda row :  row["DataValue"]+(gap_width * ((row.name-startdate).total_seconds() / x_l))
+            f = lambda row :  row["DataValue"]+(gap_width * ((row.name-startdate).total_seconds() / x_l)) if row["DataValue"] != nodv else row["DataValue"]
             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()]