deselect lasso and fix error when edit series is not selected for plotting

Author: sreeder

odmtools/controller/frmSeriesSelector.py

@@ -562,6 +562,8 @@ def stopEdit(self):
         self.isEditing = False
         if self.tblSeries.editingObject in self.tblSeries.GetCheckedObjects():
             ischecked =True
+        else:
+            ischecked = False
         self.tblSeries.RefreshObject(self.tblSeries.editingObject)
         if ischecked and self.tblSeries.editingObject not in self.tblSeries.GetCheckedObjects():
             self.tblSeries.ToggleCheck(self.tblSeries.editingObject)

odmtools/gui/mnuPlotToolbar.py

@@ -149,8 +149,11 @@ 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)
         self.Realize()
         #untoggle lasso button

odmtools/gui/plotTimeSeries.py

@@ -176,7 +176,6 @@ def changePlotSelection(self, filtered_datetime):
     def lassoChangeSelection(self, filtered_datetime):
         self.parent.record_service.select_points(dataframe=filtered_datetime)
 
-
     def onShowLegend(self, isVisible):
         if isVisible:
             self.isShowLegendEnabled = True
@@ -304,10 +303,6 @@ def Plot(self, seriesPlotInfo):
         self.toolbar.update()
         self.toolbar.push_current()
 
-        #self._views.home()
-        #self._positions.home()
-        #self.set_history_buttons()
-
     #clear plot
     def clear(self):
         """
@@ -319,12 +314,7 @@ def clear(self):
         for key, ax in self.axislist.items():
             ax.clear()
         self.axislist = {}
-        #self.canvas.draw()
-            # self.stopEdit()
-        #print "TimeSeries: ", dir(self.timeSeries), type(self.timeSeries)
-        #plt.cla()
-        #plt.clf()
-        #self.timeSeries.plot([], [], picker=5)
+
 
 
     def setUpYAxis(self):