should fix issue with add points. issue #243

Author: sreeder

ODMTools.py

@@ -18,9 +18,9 @@
 from multiprocessing import cpu_count, freeze_support
 from odmtools.odmdata import MemoryDatabase
 
-import pyodbc
-import pymysql
-import psycopg2
+# import pyodbc
+# import pymysql
+# import psycopg2
 
 tool = LoggerTool()
 logger = tool.setupLogger(__name__, __name__ + '.log', 'w', logging.DEBUG)

doc/developer_docs/source/build/executable.rst

@@ -48,6 +48,9 @@ Installing using pyinstaller
 
             easy_install pywin32-219.win-amd64-py2.7.exe
 
+    Install Microsoft C++ Redistributable either 2008 or 2010 x86/x64 from https://www.microsoft.com/en-us/download/details.aspx?id=29
+        Install it to your system
+
     See the `Example <https://mborgerson.com/creating-an-executable-from-a-python-script/>`_ to see how a simple wxpython application can be built with pyinstaller
 
     .. Note::
@@ -56,6 +59,9 @@ Installing using pyinstaller
     .. Warning::
             Prepare to do a lot of googling as there are a lot of features that aren't clear
 
+    .. Warning::
+            Make sure that you close command prompt and reopen it if you installed any of these packages/software
+
     Here is an example of building a program. There isn't a messy setup.py needed unlike py2exe. These are automatically generated when a user runs the command
 
     ::

odmtools/controller/logicEditTools.py

@@ -221,7 +221,7 @@ def saveFactory(self, var=None, method=None, qcl=None):
         #values['override'] = override
         return values['var'], values['method'], values['qcl']#, values['isSave']
 
-    # TODO Create save_as & save_existing
+
     def save(self, var=None, method=None, qcl=None):
         """
 

odmtools/gui/pnlScript.py

@@ -161,7 +161,7 @@ def OnSaveAs(self, e):
             dlg.Destroy()
             return False
     def runCommand(self, text):
-        #TODO Stop recording
+
         # get ahold of record service and turn it off do i need a publisher command?
 
         self.parent.record_service.toggle_record(False)

odmtools/odmdata/__init__.py

@@ -65,10 +65,4 @@
     'copy_data_value'
 ]
 
-# pyinstaller needs pymysql, psycopg2, and pyodbc (If on windows)
-import sys
-if sys.platform is not 'darwin':
-    import pymysql
-    import psycopg2
-    import pyodbc
-    
+

odmtools/odmdata/memory_database.py

@@ -91,9 +91,12 @@ def rollback(self):
         #self.updateDF()
 
     def update(self, updates):
+        '''
+        updates : list of dictionary that contains 2 items, id and value
+        '''
 
         stmt = (DataValue.__table__.update().
-                where(DataValue.id == bindparam('id')).
+                where(DataValue.local_date_time == bindparam('id')).
                 values(DataValue=bindparam('value'))
         )
 
@@ -117,19 +120,19 @@ def updateValue(self, ids, operator, value):
         #break into chunks to get around sqlites restriction. allowing user to send in only 999 arguments at once
         chunks=self.chunking(ids)
         for c in chunks:
-            q=self.mem_service._edit_session.query(DataValue).filter(DataValue.id.in_(c))
+            q=self.mem_service._edit_session.query(DataValue).filter(DataValue.local_date_time.in_(c))
             q.update({DataValue.data_value: query}, False)
 
         #self.updateDF()
 
     def chunking(self, data):
         return [data[x:x+998] for x in xrange(0, len(data), 998)]
 
-    #break into chunks to get around sqlites restriction. allowing user to send in only 999 arguments at once
+    #break into chunks to get around sqlite's restriction. allowing user to send in only 999 arguments at once
     def updateFlag(self, ids, value):
         chunks=self.chunking(ids)
         for c in chunks:
-            self.mem_service._edit_session.query(DataValue).filter(DataValue.id.in_(c))\
+            self.mem_service._edit_session.query(DataValue).filter(DataValue.local_date_time.in_(c))\
                 .update({DataValue.qualifier_id: value}, False)
 
 

odmtools/odmdata/series.py

@@ -92,7 +92,7 @@ class Series(Base):
     source = relationship(Source)
     quality_control_level = relationship(QualityControlLevel)
 
-    # TODO add all to repr
+
     def __repr__(self):
         return "<Series('%s', '%s', '%s', '%s')>" % (self.id, self.site_name, self.variable_code, self.variable_name)
 

odmtools/odmservices/__init__.py

@@ -7,7 +7,7 @@
 # need to explicitly import these for pyinstaller
 import pymysql
 import pyodbc
-import psycopg2
+#import psycopg2
 
 __all__ = [
     'EditService',

odmtools/odmservices/edit_service.py

@@ -294,12 +294,12 @@ def get_variable(self, variable_id):
     def change_value(self, value, operator):
         filtered_points = self.get_filtered_points()
 
-        ids = filtered_points["ValueID"].astype(int).tolist()
+        ids = filtered_points.index.tolist()
         self.memDB.updateValue(ids, operator, float(value))
         self._populate_series()
 
         ## update filtered_dataframe
-        self.filtered_dataframe = self._series_points_df[self._series_points_df['ValueID'].isin(ids)]
+        self.filtered_dataframe = self._series_points_df[self._series_points_df.index.isin(ids)]
 
     def add_points(self, points):
         # todo: add the ability to send in multiple datetimes to a single 'point'
@@ -312,7 +312,7 @@ def add_points(self, points):
     def delete_points(self):
         filtered_points = self.get_filtered_points()
         if not filtered_points.empty:
-            values = filtered_points['ValueID'].astype(float).tolist()
+            values = filtered_points.index.tolist()
 
             self.memDB.delete(values)
             self._populate_series()
@@ -333,17 +333,17 @@ def interpolate(self):
         mdf = df["DataValue"].mask(issel)
         mdf.interpolate(method = "time", inplace=True)
         tmp_filter_list["DataValue"]=mdf[issel]
-        ids = tmp_filter_list['ValueID'].tolist()
+        ids = tmp_filter_list.index.tolist()
 
         #update_list = [(row["DataValue"], row["ValueID"]) for index, row in tmp_filter_list.iterrows()]
-        update_list = [{"value": row["DataValue"], "id": row["ValueID"]} for index, row in tmp_filter_list.iterrows()]
+        update_list = [{"value": row["DataValue"], "id": index} for index, row in tmp_filter_list.iterrows()]
 
         self.memDB.update(update_list)
 
 
         self._populate_series()
 
-        self.filtered_dataframe = self._series_points_df[self._series_points_df['ValueID'].isin(ids)]
+        self.filtered_dataframe = self._series_points_df[self._series_points_df.index.isin(ids)]
 
     def drift_correction(self, gap_width):
         if self.isOneGroup():
@@ -355,15 +355,15 @@ def drift_correction(self, gap_width):
             f = lambda row :  row["DataValue"]+(gap_width * ((row.name-startdate).total_seconds() / x_l))
             tmp_filter_list["DataValue"]=tmp_filter_list.apply(f, axis = 1)
 
-            update_list = [{"value": row["DataValue"], "id": row["ValueID"]} for index, row in tmp_filter_list.iterrows()]
+            update_list = [{"value": row["DataValue"], "id":index} for index, row in tmp_filter_list.iterrows()]
 
-            ids = tmp_filter_list['ValueID'].tolist()
+            ids = tmp_filter_list.index.tolist()
             self.memDB.update(update_list)
 
 
             self._populate_series()
 
-            self.filtered_dataframe = self._series_points_df[self._series_points_df['ValueID'].isin(ids)]
+            self.filtered_dataframe = self._series_points_df[self._series_points_df.index.isin(ids)]
             return True
         return False
 
@@ -396,7 +396,7 @@ def flag(self, qualifier_id):
         #self._cursor.executemany(query, [(str(x[0]),) for x in filtered_points])
         self._cursor.executemany(query, [(str(x),) for x in filtered_points["ValueID"].astype(int).tolist()])
         '''
-        self.memDB.updateFlag(filtered_points["ValueID"].astype(int).tolist(), qualifier_id)
+        self.memDB.updateFlag(filtered_points.index.astype(int).tolist(), qualifier_id)
 
     ###################
     # Save/Restore

odmtools/view/clsAddPoints.py

@@ -134,7 +134,7 @@ def onEdit(self, event):
         #print "Editing Cell!", event.subItemIndex
 
         ## Ignore editing on first cell
-        ## TODO this is needed for the windows version
+        ##  this is needed for the windows version
         #if event.subItemIndex == 0:
         #    event.Veto()
         #pass