merge save_issue

Author: stephanie

odmtools/controller/frmSeriesSelector.py

@@ -85,6 +85,9 @@ def refreshTableSeries(self, db):
 
         :return:
         """
+        chcklist=  self.tblSeries.GetCheckedObjects()
+
+
         self.memDB.set_series_service(db)
         object = self.series_service.get_all_series()
         #checkedObjs = self.tblSeries.GetCheckedObjects()
@@ -94,6 +97,11 @@ def refreshTableSeries(self, db):
             if x.id not in idList:
                 self.tblSeries.AddObject(x)
 
+
+        for c in chcklist:
+            self.tblSeries.SetCheckState(c, True)
+
+
         #for x in checkedObjs:
         #    super(FastObjectListView, self.tblSeries).SetCheckState(x, True)
 
@@ -102,11 +110,22 @@ def refreshSeries(self):
 
         :return:
         """
+        chcklist=  self.tblSeries.GetCheckedObjects()
         self.series_service = None
+
         self.series_service = self.parent.Parent.createService()
         #self.refreshTableSeries(self.dbservice)
         self.resetDB(self.series_service)
-        logger.info("Repopulate Series Selector")
+
+        for c in chcklist:
+            for val in self.tblSeries.GetObjects():
+                if c == val:
+                    self.tblSeries.SetCheckState(val, True)
+                    break
+
+        logger.debug("Repopulate Series Selector")
+
+
 
     def initSVBoxes(self):
         """
@@ -557,14 +576,19 @@ def onReadyToEdit(self):
 
     def stopEdit(self):
         """When edit button is untoggled, the editing feature closes
-
         :return:
         """
+
         self.isEditing = False
+        chcklist= self.tblSeries.GetCheckedObjects()
+
         self.tblSeries.RefreshObject(self.tblSeries.editingObject)
-        self.tblSeries.editingObject = None
+        for c in chcklist:
+            self.tblSeries.SetCheckState(c, True)
+
         self.memDB.stopEdit()
 
+
     def isEditing(self):
         """
 

odmtools/controller/pageExisting.py

@@ -13,7 +13,7 @@
 
 ########################################################################
 class pageExisting(wiz.WizardPageSimple):
-    def __init__(self, parent, title, service_man, site):
+    def __init__(self, parent, title, series_service , site):
         """Constructor"""
         wiz.WizardPageSimple.__init__(self, parent)
 
@@ -30,7 +30,7 @@ def __init__(self, parent, title, service_man, site):
         #pos=wx.Point(536, 285), size=wx.Size(439, 357),
         #style=wx.TAB_TRAVERSAL)#, sm = service_man, series = series)
         self.sizer.Add(self.pnlExisting, 85, wx.ALL, 5)
-        self._init_data(service_man.get_series_service(), site.id)
+        self._init_data(series_service, site.id)
 
 
         self.pnlExisting.olvSeriesList.Bind(wx.EVT_LIST_ITEM_SELECTED, self.OnOLVItemSelected)

odmtools/gui/frmODMTools.py

@@ -446,6 +446,7 @@ def stopEdit(self, event):
         self.dataTable.stopEdit()
         self.pnlPlot.stopEdit()
         Publisher.sendMessage("toggleEdit", checked=False)
+        self.memDB.reset_edit()
         self.record_service = None
         self._ribbon.toggleEditButtons(False)
 

odmtools/gui/mnuPlotToolbar.py

@@ -134,7 +134,7 @@ def __init__(self, plotCanvas, multPlots=False, allowselect=False):
 
         self.msg = wx.StaticText(self, -1, "")
         self.AddControl(self.msg)
-        self.canvas.mpl_connect('scroll_event', self.on_scroll_zoom)
+
         self.Realize()
 
     def editSeries(self, xys, edit):
@@ -151,6 +151,8 @@ def stopEdit(self):
         self.xys = None
         self.editCurve = None
         self.lassoAction = None
+        # untoggle select button
+        self.ToggleTool(self.select_tool.Id, False)
         # disable select button
         self.select_tool.Enable(False)
         self.zoom_to_data.Enable(False)
@@ -159,7 +161,7 @@ def stopEdit(self):
         #self.ToggleTool(self.select_tool.Id, False)
 
 
-    # pan the graph to the left    
+    # pan the graph to the left
     def _on_custom_pan_left(self, evt):
         ONE_SCREEN = 7  # we default to 1 week
         axes = self.canvas.figure.axes[0]
@@ -250,8 +252,6 @@ def on_toggle_zoom_data_tool(self, event):
         self.canvas.draw()
 
 
-
-
 #must add these methods for mac functionality
     def release_zoom(self, event):
         super(self.__class__, self).release_zoom(event)
@@ -268,37 +268,3 @@ def forward(self, event):
     def home(self, event):
         super(self.__class__, self).home(event)
         self.canvas.draw()
-
-
-
-
-    def on_scroll_zoom(self, event):
-        axes = self.canvas.figure.axes[0]
-        base_scale = 1.2
-        # get the current x and y limits
-        cur_xlim = axes.get_xlim()
-        cur_ylim = axes.get_ylim()
-        cur_xrange = (cur_xlim[1] - cur_xlim[0])*.5
-        cur_yrange = (cur_ylim[1] - cur_ylim[0])*.5
-        xdata = event.xdata # get event x location
-        ydata = event.ydata # get event y location
-        if event.button == 'up':
-            # deal with zoom in
-            scale_factor = 1/base_scale
-        elif event.button == 'down':
-            # deal with zoom out
-            scale_factor = base_scale
-        else:
-            # deal with something that should never happen
-            scale_factor = 1
-            print event.button
-        # set new limits
-        axes.set_xlim([xdata - cur_xrange*scale_factor,
-                     xdata + cur_xrange*scale_factor])
-        axes.set_ylim([ydata - cur_yrange*scale_factor,
-                     ydata + cur_yrange*scale_factor])
-        self.canvas.draw() # force re-draw
-
-    # fig = ax.get_figure() # get the figure of interest
-    # attach the call back
-

odmtools/gui/pageMethod.py

@@ -70,8 +70,8 @@ def _init_ctrls(self, prnt):
 
 
 
-    def __init__(self, parent, id, pos, size, style, name, sm, method):
-        self.series_service = sm.get_series_service()
+    def __init__(self, parent, id, pos, size, style, name, ss, method):
+        self.series_service = ss
         self.prev_val = method
         self._init_ctrls(parent)
 
@@ -114,10 +114,10 @@ def getMethod(self):
         m =  Method()
         if self.rbGenerate.Value:
             genmethod = "Values derived from ODM Tools Python"
-
-            try:
-                m= self.series_service.get_method_by_description(genmethod)
-            except:
+            m= self.series_service.get_method_by_description(genmethod)
+            if m is None:
+                logger.debug("assigning new method description")
+                m =  Method()
                 m.description = genmethod
 
         elif self.rbSelect.Value:
@@ -130,5 +130,6 @@ def getMethod(self):
 
 
         elif self.rbCreateNew.Value:
+            logger.debug("assigning new method description")
             m.description = self.txtMethodDescrip.GetValue()
         return m

odmtools/gui/pageQCL.py

@@ -85,8 +85,8 @@ def _init_ctrls(self, prnt):
               label=u'Explanation:', name=u'lblExplanation', parent=self,
               pos=wx.Point(16, 248), size=wx.Size(61, 13), style=0)
 
-    def __init__(self, parent, id, pos, size, style, name, sm, qcl):
-        self.series_service = sm.get_series_service()
+    def __init__(self, parent, id, pos, size, style, name, ss, qcl):
+        self.series_service = ss
         self.prev_val = qcl
         self._init_ctrls(parent)
 

odmtools/gui/pageSummary.py

@@ -35,8 +35,8 @@ def _init_ctrls(self, prnt):
 
         self._init_sizers()
 
-    def __init__(self, parent, id, size, style, name, sm, pos= (0,0)):
-        self.series_service = sm.get_series_service()
+    def __init__(self, parent, id, size, style, name, ss, pos= (0,0)):
+        self.series_service = ss
         self._init_ctrls(parent)
 
 

odmtools/gui/plotHistogram.py

@@ -101,6 +101,7 @@ def _createPlot(self, oneSeries, rows, cols, index):
         ax = self.figure.add_subplot(repr(rows) + repr(cols) + repr(index))
 
         logger.debug("HISTOGRAM: %s"% ax)
+        logger.debut("rows: %s cols: %s, index: %s"%(rows, cols, index))
 
         # oneSeries.filteredData.hist(ax= ax, color='k', alpha=0.5, bins=50)
 

odmtools/gui/pnlPlot.py

@@ -165,11 +165,12 @@ def redrawPlots(self):
         logger.debug("Plot Boxwhisker")
         self.pltBox.Plot(self._seriesPlotInfo)
 
+        logger.debug("Plot Timeseries")
+        self.pltTS.Plot(self._seriesPlotInfo)
+
         logger.debug("Plot Histogram")
         self.pltHist.Plot(self._seriesPlotInfo)
 
-        logger.debug("Plot Timeseries")
-        self.pltTS.Plot(self._seriesPlotInfo)
 
         self.onShowLegend(event=None, isVisible=self.legendVisible)
         maxStart, maxEnd, currStart, currEnd = self._seriesPlotInfo.getDates()

odmtools/gui/wizSave.py

@@ -25,7 +25,7 @@
 
 ########################################################################
 class QCLPage(wiz.WizardPageSimple):
-    def __init__(self, parent, title, service_man, qcl):
+    def __init__(self, parent, title, series_service, qcl):
         """Constructor"""
         wiz.WizardPageSimple.__init__(self, parent)
 
@@ -40,10 +40,10 @@ def __init__(self, parent, title, service_man, qcl):
         sizer.Add(wx.StaticLine(self, -1), 5, wx.EXPAND | wx.ALL, 5)
         self.panel = pageQCL.pnlQCL(self, id=wxID_PNLQCL, name=u'pnlQCL',
                                     pos=wx.Point(536, 285), size=wx.Size(439, 357),
-                                    style=wx.TAB_TRAVERSAL, sm=service_man, qcl=qcl)
+                                    style=wx.TAB_TRAVERSAL, ss=series_service, qcl=qcl)
         self.sizer.Add(self.panel, 85, wx.ALL, 5)
-        series_service = service_man.get_series_service()
-        self._init_data(series_service)
+
+        self._init_data(self.panel.series_service)
 
     def _init_data(self, series):
         qcl = series.get_all_qcls()
@@ -62,7 +62,7 @@ def _init_data(self, series):
 
 ########################################################################
 class VariablePage(wiz.WizardPageSimple):
-    def __init__(self, parent, title, service_man, var):
+    def __init__(self, parent, title, service_manager, var):
         """Constructor"""
         wiz.WizardPageSimple.__init__(self, parent)
 
@@ -77,10 +77,10 @@ def __init__(self, parent, title, service_man, var):
         sizer.Add(wx.StaticLine(self, -1), 5, wx.EXPAND | wx.ALL, 5)
         self.panel = pageVariable.pnlVariable(self, id=wxID_PNLVARIABLE, name=u'pnlVariable',
                                               pos=wx.Point(536, 285), size=wx.Size(439, 357),
-                                              style=wx.TAB_TRAVERSAL, sm=service_man, var=var)
+                                              style=wx.TAB_TRAVERSAL, sm=service_manager, var=var)
         self.sizer.Add(self.panel, 85, wx.ALL, 5)
-        series_service = service_man.get_series_service()
-        self._init_data(series_service)
+
+        self._init_data(self.panel.series_service)
 
     def _init_data(self, series_service):
         vars = series_service.get_all_variables()
@@ -109,7 +109,7 @@ def _init_data(self, series_service):
 
 ########################################################################
 class MethodPage(wiz.WizardPageSimple):
-    def __init__(self, parent, title, service_man, method):
+    def __init__(self, parent, title, series_service, method):
         """Constructor"""
         wiz.WizardPageSimple.__init__(self, parent)
 
@@ -124,10 +124,10 @@ def __init__(self, parent, title, service_man, method):
         sizer.Add(wx.StaticLine(self, -1), 5, wx.EXPAND | wx.ALL, 5)
         self.panel = pageMethod.pnlMethod(self, id=wxID_PNLMETHOD, name=u'pnlMethod',
                                           pos=wx.Point(536, 285), size=wx.Size(439, 357),
-                                          style=wx.TAB_TRAVERSAL, sm=service_man, method=method)
+                                          style=wx.TAB_TRAVERSAL, ss=series_service, method=method)
         self.sizer.Add(self.panel, 85, wx.ALL, 5)
-        series_service = service_man.get_series_service()
-        self._init_data(series_service)
+
+        self._init_data(self.panel.series_service)
 
     def _init_data(self, series):
         meth = series.get_all_methods()
@@ -147,7 +147,7 @@ def _init_data(self, series):
 
 ########################################################################
 class SummaryPage(wiz.WizardPageSimple):
-    def __init__(self, parent, title, service_man):
+    def __init__(self, parent, title, series_service):
         """Constructor"""
         wiz.WizardPageSimple.__init__(self, parent)
         self.parent = parent
@@ -161,7 +161,7 @@ def __init__(self, parent, title, service_man):
         sizer.Add(wx.StaticLine(self, -1), 5, wx.EXPAND | wx.ALL, 5)
         self.panel = pageSummary.pnlSummary(self, id=wxID_PNLSUMMARY, name=u'pnlSummary',
                                             pos=wx.Point(536, 285), size=wx.Size(439, 357),
-                                            style=wx.TAB_TRAVERSAL, sm=service_man)
+                                            style=wx.TAB_TRAVERSAL, ss=series_service)
         self.sizer.Add(self.panel, 85, wx.ALL, 5)
 
 
@@ -216,34 +216,41 @@ def _init_ctrls(self, prnt):
     def get_metadata(self):
 
         if self.pgIntro.pnlIntroduction.rbSaveAs.GetValue():
+            logger.debug("SaveAs")
             method = self.pgMethod.panel.getMethod()
             qcl = self.pgQCL.panel.getQCL()
             variable = self.pgVariable.panel.getVariable()
         elif self.pgIntro.pnlIntroduction.rbSave.GetValue():
+            logger.debug("Save")
             method = self.currSeries.method
             qcl = self.currSeries.quality_control_level
             variable = self.currSeries.variable
         elif self.pgIntro.pnlIntroduction.rbSaveExisting.GetValue():
+            logger.debug("Existing")
             method, qcl, variable = self.pgExisting.getSeries()
         site = self.currSeries.site
         source = self.currSeries.source
         logger.debug("site: %s, variable: %s, method: %s, source: %s, qcl: %s" % (
-        site.id, variable.id, method.id, source.id, qcl.id))
+        str(site), str(variable), str(method), str(source), str(qcl)))
         return site, variable, method, source, qcl
 
-    def __init__(self, parent, service_man, record_service):
+    def __init__(self, parent, service_manager, record_service):
         self._init_ctrls(parent)
-        self.series_service = service_man.get_series_service()
+        try:
+            self.series_service = record_service._edit_service.memDB.series_service #service_man.get_series_service()
+        except:
+            #for testing
+            self.series_service = record_service.memDB.series_service
         self.record_service = record_service
         # self.is_changing_series = False
         self.currSeries = record_service.get_series()
 
         self.pgIntro = pageIntro.pageIntro(self, "Intro")
-        self.pgMethod = MethodPage(self, "Method", service_man, self.currSeries.method)
-        self.pgQCL = QCLPage(self, "Quality Control Level", service_man, self.currSeries.quality_control_level)
-        self.pgVariable = VariablePage(self, "Variable", service_man, self.currSeries.variable)
-        self.pgExisting = pageExisting.pageExisting(self, "Existing Series", service_man, self.currSeries.site)
-        self.pgSummary = SummaryPage(self, "Summary", service_man)
+        self.pgMethod = MethodPage(self, "Method", self.series_service, self.currSeries.method)
+        self.pgQCL = QCLPage(self, "Quality Control Level", self.series_service, self.currSeries.quality_control_level)
+        self.pgVariable = VariablePage(self, "Variable", service_manager, self.currSeries.variable)
+        self.pgExisting = pageExisting.pageExisting(self, "Existing Series", self.series_service, self.currSeries.site)
+        self.pgSummary = SummaryPage(self, "Summary", self.series_service)
 
         self.FitToPage(self.pgIntro)