fixes and snap re-added

CHANGES

@@ -10,6 +10,7 @@ Added editable parameter to Table
 Added enable_menus parameter
 Option to import numbers as string
 Changed to pickle for dataexplore project files
+Fixes to syncing of rowcolors
 
 ------
 0.12.1

gui/dataexplore.desktop

@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=DataExplore
+Exec=dataexplore
+Type=Application
+Icon=${SNAP}/meta/gui/icon.png
+Categories=Education;

pandastable/app.py

@@ -506,13 +506,13 @@ def loadProject(self, filename=None, asksave=False):
         if ext != '.dexpl':
             print ('does not appear to be a project file')
             return
-        if os.path.isfile(filename):            
+        if os.path.isfile(filename):
             #new format uses pickle
             try:
                 data = pickle.load(gzip.GzipFile(filename, 'r'))
             except:
                 data = pd.read_msgpack(filename)
-                print ('your file is using the old format.')
+                print ('WARNING: your file is using the old format.')
             #create backup file before we change anything
             #backupfile = filename+'.bak'
             #pd.to_msgpack(backupfile, data, encoding='utf-8')

pandastable/core.py

@@ -572,6 +572,9 @@ def colorRows(self):
         rows = self.visiblerows
         offset = rows[0]
         idx = df.index[rows]
+        #diff = df.index.difference(rc.index)
+        #print (diff)
+        #print (rc)
         for col in self.visiblecols:
             colname = df.columns[col]
             if colname in list(rc.columns):
@@ -607,7 +610,8 @@ def setRowColors(self, rows=None, clr=None, cols=None):
         for c in colnames:
             if c not in rc.columns:
                 rc[c] = pd.Series(np.nan,index=df.index)
-            rc[c][idx] = clr
+            #rc[c][idx] = clr
+            rc.at[idx,c] = clr
         self.redraw()
         return
 
@@ -805,12 +809,12 @@ def sortTable(self, columnIndex=None, ascending=1, index=False):
             columnIndex = 0
         if isinstance(columnIndex, int):
             columnIndex = [columnIndex]
-        
+
         if index == True:
             df.sort_index(inplace=True)
-        else:  
-            colnames = list(df.columns[columnIndex])   
-            try:                
+        else:
+            colnames = list(df.columns[columnIndex])
+            try:
                 df.sort_values(by=colnames, inplace=True, ascending=ascending)
             except Exception as e:
                 print('could not sort')
@@ -872,6 +876,7 @@ def resetIndex(self, ask=True):
         #self.drawSelectedCol()
         if hasattr(self, 'pf'):
             self.pf.updateData()
+        self.update_rowcolors()
         self.tableChanged()
         return
 
@@ -929,16 +934,26 @@ def set_rowcolors_index(self):
         self.rowcolors.set_index(df.index, inplace=True)
 
     def update_rowcolors(self):
-        """Update row colors if present"""
+        """Update row colors if present so that it syncs with current dataframe."""
 
         df = self.model.df
+        rc = self.rowcolors
         if len(df) == len(self.rowcolors):
-            self.rowcolors.set_index(df.index, inplace=True)
-        elif len(df)>len(self.rowcolors):
-            idx = df.index.difference(self.rowcolors.index)
-            self.rowcolors = self.rowcolors.append(pd.DataFrame(index=idx))
-
-        #print (self.rowcolors)
+            rc.set_index(df.index, inplace=True)
+        elif len(df)>len(rc):        
+            idx = df.index.difference(rc.index)
+            self.rowcolors = rc.append(pd.DataFrame(index=idx))
+        else:
+            idx = rc.index.difference(df.index)
+            rc.drop(idx,inplace=True)
+        #check columns
+        cols = list(rc.columns.difference(df.columns))
+        if len(cols)>0:
+            rc.drop(cols,1,inplace=True)
+        cols = list(df.columns.difference(rc.columns))
+        if len(cols)>0:
+            for col in cols:
+                rc[col] = np.nan
         return
 
     def set_xviews(self,*args):
@@ -977,9 +992,9 @@ def addRows(self, num=None):
             return
         self.storeCurrent()
         keys = self.model.autoAddRows(num)
+        self.update_rowcolors()
         self.redraw()
         self.tableChanged()
-        self.update_rowcolors()
         return
 
     def addColumn(self, newname=None):
@@ -1008,6 +1023,7 @@ def addColumn(self, newname=None):
                 self.storeCurrent()
                 self.model.addColumn(newname, dtype)
                 self.parentframe.configure(width=self.width)
+                self.update_rowcolors()
                 self.redraw()
                 self.tableChanged()
         return
@@ -1025,6 +1041,7 @@ def deleteRow(self):
                 self.model.deleteRows(rows)
                 self.setSelectedRow(0)
                 self.clearSelected()
+                self.update_rowcolors()
                 self.redraw()
         else:
             n = messagebox.askyesno("Delete",
@@ -1036,6 +1053,7 @@ def deleteRow(self):
                 self.model.deleteRows([row])
                 self.setSelectedRow(row-1)
                 self.clearSelected()
+                self.update_rowcolors()
                 self.redraw()
         return
 
@@ -1061,6 +1079,7 @@ def deleteColumn(self):
         cols = self.multiplecollist
         self.model.deleteColumns(cols)
         self.setSelectedCol(0)
+        self.update_rowcolors()
         self.redraw()
         #self.drawSelectedCol()
         self.tableChanged()
@@ -3500,7 +3519,7 @@ def saveAs(self, filename=None):
         """Save dataframe to file"""
 
         if filename == None:
-            filename = filedialog.asksaveasfilename(parent=self.master,                                                     
+            filename = filedialog.asksaveasfilename(parent=self.master,
                                                      initialdir = self.currentdir,
                                                      filetypes=[("pickle","*.pickle"),
                                                                 ("All files","*.*")])

setup.py

@@ -19,7 +19,7 @@
                                   'datasets/*.csv',
                                   'plugins/*.py','plugins/*.R']},
     install_requires=['matplotlib>=2.0',
-                      'pandas>=0.21',                     
+                      'pandas>=0.24',                     
                       'numexpr>=2.4',
                       'xlrd>=0.9',
                       'future'],

snapcraft.yaml

@@ -0,0 +1,43 @@
+name: dataexplore
+version: '0.12.2'
+#version-script: git describe --abbrev=1 --tags
+summary: data plotting and analysis package
+description: |
+  DataExplore is an open source desktop application for data analysis and plotting
+  intended for use in both research and education. The program allows quick
+  visualization of data, table manipulation tools and supports large data tables.
+
+base: core18
+grade: stable
+confinement: strict
+icon: img/logo.png
+#adopt-info: dataexplore
+
+apps:
+  dataexplore:
+    command: desktop-launch $SNAP/bin/dataexplore
+    plugs: [desktop,desktop-legacy,unity7,home]
+
+parts:
+  dataexplore:
+    plugin: python
+    python-version: python3
+    source: .
+    stage-packages:
+      [python3-tk,xsel,fontconfig-config,fonts-freefont-ttf,ttf-ubuntu-font-family,
+      fonts-liberation,ttf-dejavu-core,ttf-mscorefonts-installer]
+    after: [desktop-glib-only]
+
+#  files: #to deal with problem finding init.tcl
+#    plugin: dump
+#    source: /usr/share/tcltk/
+#    organize:
+#         '*': ./usr/lib/
+  desktop-glib-only:
+      source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
+      source-subdir: glib-only
+      plugin: make
+      build-packages:
+        - libglib2.0-dev
+      stage-packages:
+        - libglib2.0-bin