add form

Author: Stephanie Reeder

odmtools/controller/logicEditTools.py

@@ -50,16 +50,16 @@ def filter_date(self, endDate, startDate):
         else:
             return "Cannot filter: %s" % (self._edit_error)
 
-    def fill_gap(self, value, time_period):
-        self._edit_service.fill_gap(value, time_period)
+    def fill_gap(self, gap, fill):
+        self._edit_service.fill_gap(gap , fill)
         self.refresh_edit()
         if self._record:
-            self._script("edit_service.fill_gap(%s, '%s')\n" % (value, time_period), 'black')
+            self._script("edit_service.fill_gap(gap = %s, fill= %s)\n" % (gap, fill), 'black')
             Publisher.sendMessage("scroll")
-        print ("gaps filled")
 
 
-        
+
+
 
     def data_gaps(self, value, time_period):
         self._edit_service.data_gaps(value, time_period)

odmtools/gui/mnuRibbon.py

@@ -14,6 +14,7 @@
 from frmFlagValues import frmFlagValues
 from odmtools.controller.frmLinearDrift import frmLinearDrift
 from odmtools.controller.frmAbout import frmAbout
+from odmtools.controller.frmGapFill import frmGapFill
 import wizSave
 from odmtools.common.icons import *
 import pandas as pd
@@ -472,7 +473,18 @@ def onEditAddPoint(self, event):
     #   Gap fill
     # ###################################
     def onGapFill(self, event):
-        self.parent.getRecordService().fill_gap(30, 'minute')
+
+        gap_fill = frmGapFill(self.parent, self.parent.getRecordService())
+
+        if gap_fill.Show() == wx.OK:
+            gap_fill.Destroy()
+
+
+
+
+
+
+
         event.Skip()
     # ###################################
     #   Delete Point

odmtools/odmservices/edit_service.py

@@ -17,6 +17,21 @@
 # logger = tool.setupLogger(__name__, __name__ + '.log', 'w', logging.DEBUG)
 logger =logging.getLogger('main')
 
+class time(object):
+    time_units = {
+        'second': 's',
+        'minute': 'm',
+        'hour': 'h',
+        'day': 'D',
+        'week': 'W',
+        'month': 'M',
+        'year': 'Y'
+    }
+
+    def __init__(self, value, time_period):
+        self.value = value
+        self.time_period = time_period
+
 class EditService():
     # Mutual exclusion: cursor, or connection_string
     def __init__(self, series_id, connection=None, connection_string="", debug=False):
@@ -142,13 +157,13 @@ def filter_date(self, before, after):
         if before and after:
             self.filtered_dataframe = df[(df.index < before) & (df.index > after)]
 
-    def fill_gap(self, gap, period):
+    def fill_gap(self, gap, fill):
 
         df = self.memDB.getDataValuesDF()
-        gaps= self.find_gaps(df, gap, period)
+        gaps= self.find_gaps(df, gap[0], gap[1])
         points = []
         series= self.memDB.series
-        timegap = np.timedelta64(gap, self.time_units[period])
+        timegap = np.timedelta64(fill[0], self.time_units[fill[1]])
 
         #if gaps is not of type dataframe- put it in a dataframe
         #if not isinstance(gaps, pd.DataFrame