pass indented time spacing to new results panel #33

Author: sreeder

src/StreamingDataLoaderWizard.py

@@ -1,19 +1,4 @@
-# import os
-# import sys
 
-# import ObjectListView
-# import pyodbc
-# import pymysql
-# import sqlite3
-# sys.path.insert(0,os.path.dirname(os.path.dirname(__file__)))
-# from src.wizard.controller.frmMain import MainController
-# import wx
-# if __name__ == '__main__':
-    # app = wx.App()
-    # frame = MainController(None)
-    # frame.CenterOnScreen()
-    # frame.Show()
-    # app.MainLoop()
 
 import os
 import sys

src/controllers/Mapper.py

@@ -197,9 +197,7 @@ def _buildTables(self):
             # SDL Test Data is just for our testing purposes.
             df['QualityCodeCV'] = 'None'
             # df['QualityCodeCV'] = 'SDL Test Data'
-            # TODO add unknown to database.
-            #df['CensorCodeCV'] = 'Unknown'
-            # df['CensorCodeCV'] = 'Non-detect'
+
             df['CensorCodeCV'] = 'Not censored'
             df['ResultID'] = series['ResultID']
             df['ValueDateTimeUTCOffset'] = self.mapping['Settings']['UTCOffset']

src/wizard/controller/WizardDialog.py

@@ -62,8 +62,8 @@ def addButtons(self):
         self.btnNext.Bind(wx.EVT_BUTTON, self.onFinish)
         self.btnPrev.Bind(wx.EVT_BUTTON, self.onPrev)
 
-    def addPage(self, pnl):
-        newPnl = pnl(self, self.existingResult)
+    def addPage(self, pnl, **kwargs):
+        newPnl = pnl(self, existing_result= self.existingResult, **kwargs)
         newPnl.Hide()
         self.pnlList.append(newPnl)
         self.pnlSizer.Add(newPnl, 1, wx.ALL|wx.EXPAND, 5)

src/wizard/controller/frmDataConfigPanel.py

@@ -340,9 +340,12 @@ def onSelectUnit(self, event):
 
 
     def runSeriesSelectDialog(self):
+        unitid = self.parent.db.getReadSession().getUnits(name = self.choiceUnitID.GetString(self.choiceUnitID.Selection))[0].UnitsID
         dlg = SeriesSelectDialog(self,
                 variable=self.selectedColumn,
-                database=self.parent.db)
+                database=self.parent.db,
+                time_spacing = {"value": self.spinTimeSpacing.Value, "unit": unitid}
+                )
         #dlg.CenterOnParent()
         if dlg.ShowModal() == wx.ID_OK:
             dlg.selectedResult.variableName = self.selectedColumn

src/wizard/controller/frmResultSummaryPanel.py

@@ -10,14 +10,20 @@
 
 
 class ResultSummaryPanel(ResultPageView):
-    def __init__( self, parent, existing_result=None):
+    def __init__( self, parent, existing_result=None, **kwargs):
         super(ResultSummaryPanel, self).__init__(parent)
 
         self.parent = parent
         self.existing_result = existing_result
         self.read_session = self.parent.database.getReadSession()
         self.length_units = self.read_session.getUnits(type="length")
         self.time_units = self.read_session.getUnits(type="time")
+        if kwargs is not None:
+            try:
+
+                self.time_spacing = kwargs.pop("time_spacing")
+            except:
+                pass
         self.fontColor = wx.Colour(67, 79, 112)
 
         self.populateFields()
@@ -243,8 +249,8 @@ def createResult(self):
                                 ZLocation=z,
                                 ZLocationUnitsID=zUnit,
                                 SpatialReferenceID=sr,
-                                IntendedTimeSpacing=timeSpacing,
-                                IntendedTimeSpacingUnitsID=timeUnit)
+                                IntendedTimeSpacing=self.time_spacing["value"],
+                                IntendedTimeSpacingUnitsID=self.time_spacing["unit"])
         result = write.createResult(tsr)
 
         print result

src/wizard/controller/frmSeriesDialog.py

@@ -13,9 +13,10 @@
 
 
 class SeriesSelectDialog(CustomDialog):
-    def __init__(self, parent, variable, database):
+    def __init__(self, parent, variable, database, time_spacing):
         super(SeriesSelectDialog, self).__init__(parent=parent, title="Select Result for %s" % variable, size=wx.Size(700, 500))
         self.database = database
+        self.time_spacing = time_spacing
 
         self.parent = parent
         self.read = database.getReadSession()
@@ -72,7 +73,7 @@ def onNew(self, event):
         wiz.addPage(UnitSelectPanel) 
         wiz.addPage(ProcLevelSelectPanel) 
         wiz.addPage(ActionsSelectPanel) 
-        wiz.addPage(ResultSummaryPanel)
+        wiz.addPage(ResultSummaryPanel, time_spacing= self.time_spacing)
 
         wiz.CenterOnParent()
         if wiz.ShowModal() == wx.ID_OK:
@@ -81,7 +82,6 @@ def onNew(self, event):
 
             r = read.getDetailedResultInfo("Time series coverage", 
                                             wiz.result.ResultID)
-            r_id = r[0].ResultID ###DetailedResult instance has no attribute resultID
 
             r_id = r[0].ResultID
 

src/wizard/view/clsSeriesSelectPanel.py

@@ -78,59 +78,6 @@ def __init__(self, parent):
         footer_panel_sizer.Add(footer_panel_button_sizer, 0, wx.ALIGN_RIGHT)
         footer_panel.SetSizer(footer_panel_sizer)
 
-        # A sizer that is oriented vertically.
-        # fgSizer = wx.BoxSizer(wx.VERTICAL)
-        # sbSizer = wx.StaticBoxSizer(wx.StaticBox(self, wx.ID_ANY, "Select or create a time series result."), wx.VERTICAL)
-        #
-        # # ObjectListView table.
-        # self.listCtrl = \
-        #     ObjectListView(sbSizer.GetStaticBox(), id=wx.ID_ANY,
-        #                    pos=wx.DefaultPosition,
-        #                    size=wx.DefaultSize,
-        #                    style=wx.LC_REPORT|wx.SUNKEN_BORDER)
-        # # Customize the list control's message
-        # # when it is empty.
-        # self.listCtrl.oddRowsBackColor = wx.Colour(255, 248, 229)
-        # self.listCtrl.evenRowsBackColor = wx.Colour(204, 229, 255)
-        # self.listCtrl.SetEmptyListMsg("No existing time series results.")
-        # self.listCtrl.SetObjects(None)
-        #
-        # columns = [
-        #     'ResultID', 'SamplingFeatureCode', 'SamplingFeatureName', 'MethodCode', 'MethodName',
-        #     'VariableCode', 'VariableNameCV', 'ProcessingLevelCode', 'ProcessingLevelDefinition',
-        #     'UnitsName', 'ValueCount'
-        # ]
-        #
-        # defn = [
-        #     ColumnDefn(title=key, align="left", minimumWidth=100, valueGetter=key,
-        #                stringConverter='%s')
-        #     for key in columns]
-        #
-        # self.listCtrl.SetColumns(defn)
-        # self.editBtn = wx.Button(self, label="Edit Result")
-        # self.newBtn = wx.Button(self, label="Create New Result")
-        #
-        # self.editBtn.Enable(False)
-        #
-        # dlgBtnSizer = wx.StdDialogButtonSizer()
-        # editBtnSizer = wx.BoxSizer(wx.HORIZONTAL)
-        # self.okBtn = wx.Button(self, wx.ID_OK)
-        # cancelBtn = wx.Button(self, wx.ID_CANCEL)
-        #
-        # editBtnSizer.Add(self.editBtn)
-        # dlgBtnSizer.AddButton(self.okBtn)
-        # dlgBtnSizer.AddButton(cancelBtn)
-        # editBtnSizer.Add(self.newBtn)
-        # dlgBtnSizer.Realize()
-        # # Add it to the sizer.
-        # # The EXPAND flag along with the number 1 will
-        # # enable the list to fill the panel.
-        # sbSizer.Add(self.listCtrl, 1, wx.ALL|wx.EXPAND, 5)
-        # fgSizer.Add(sbSizer, 1, wx.EXPAND, 5)
-        # fgSizer.Add(editBtnSizer, 0, wx.ALL|wx.ALIGN_RIGHT, 5)
-        # fgSizer.Add(dlgBtnSizer, 0, wx.ALL|wx.ALIGN_RIGHT, 5)
-        # # Assign the sizer to the panel.
-        # self.SetSizer(fgSizer)
 
         master_sizer = wx.BoxSizer(wx.VERTICAL)
         master_sizer.Add(top_panel, 0, wx.EXPAND | wx.ALL, 0)