resolved missing 'stop edit' function.Fixed wxResizeBorder not found issue.

Author: jmeline

odmtools/controller/frmDataTable.py

@@ -48,6 +48,14 @@ def onChangeSelection(self,  datetime_list=None):
                 self.enableSelectDataTable = False
             except:
                 pass
+    def clear(self):
+        self.memDB = None
+        self.olvDataTable.DeleteAllItems()
+        self.olvDataTable.dataframe = None
+        self.dataObjects = None
+
+    def stopEdit(self):
+        self.clear()
 
     def clear(self):
         self.memDB = None

odmtools/view/clsDataFilters.py

@@ -21,7 +21,7 @@ class clsDataFilters(wx.Dialog):
     def __init__(self, parent):
 
         wx.Dialog.__init__(self, parent, id=wx.ID_ANY, title=u"Data Filter", pos=wx.Point(599, 384),
-                           size=wx.Size(382, 500), style=wx.DEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+                           size=wx.Size(382, 500), style=wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER)
 
         self.SetSizeHintsSz(wx.Size(358, 452), wx.DefaultSize)
 

tests/test_gui/test_pnlDataTable.py

@@ -1,3 +1,4 @@
+from odmtools.controller.frmDataTable import FrmDataTable
 from odmtools.odmdata import MemoryDatabase, DataValue
 from odmtools.gui.pnlDataTable import pnlDataTable
 from odmtools.odmdata import SessionFactory
@@ -28,7 +29,7 @@ def setup(self):
 
         self.app = wx.App()
         self.frame = wx.Frame(None)
-        self.dataTable = pnlDataTable(self.frame)
+        self.dataTable = FrmDataTable(self.frame)
 
     def test_build_series(self):
         dvs = self.session.query(DataValue).all()
@@ -47,11 +48,11 @@ def test_init_pnlDataTable(self):
 
     def test_selecting_points(self):
         self.dataTable.init(self.memory_database)
-        values = self.dataTable.myOlvDataFrame
+        values = self.dataTable.olvDataTable.dataframe
         assert not values.empty
 
         self.dataTable.onChangeSelection(values)
-        myOlv = self.dataTable.myOlv
+        myOlv = self.dataTable.olvDataTable
 
         count = 0
 
@@ -66,20 +67,20 @@ def test_selecting_points(self):
         assert count == self.dvs_size
     def test_deselecting_all(self):
         self.dataTable.init(self.memory_database)
-        assert self.dataTable.myOlv.GetItemCount() == self.dvs_size
-        values = self.dataTable.myOlvDataFrame
+        assert self.dataTable.olvDataTable.GetItemCount() == self.dvs_size
+        values = self.dataTable.olvDataTable.dataframe
 
         self.dataTable.onChangeSelection(values)
-        self.dataTable.onDeselectAll()
-        selected_item = self.dataTable.myOlv.GetFirstSelected()
+        self.dataTable.olvDataTable.onDeselectAll()
+        selected_item = self.dataTable.olvDataTable.GetFirstSelected()
         assert selected_item == -1
 
     def test_clear_data_table(self):
         self.dataTable.init(self.memory_database)
-        assert self.dataTable.myOlv.GetItemCount() == self.dvs_size
+        assert self.dataTable.olvDataTable.GetItemCount() == self.dvs_size
         self.dataTable.clear()
-        assert not self.dataTable.myOlvDataFrame
-        assert self.dataTable.myOlv.GetItemCount() == 0
+        assert not self.dataTable.olvDataTable.dataframe
+        assert self.dataTable.olvDataTable.GetItemCount() == 0