appimage builder

Author: dmnfarrell

README.md

@@ -16,6 +16,17 @@ For all operating systems with Python and pip installed:
 pip install -e git+https://github.com/dmnfarrell/tablexplore.git#egg=tablexplore
 ```
 
+### Linux
+
+The pip method above should work fine for most distributions but if you prefer you can also try the AppImage (experimental). Download from the latest [release page](https://github.com/dmnfarrell/tablexplore/releases) and run as follows:
+
+```
+chmod +x tablexplore-0.3.0-x86_64.AppImage
+./tablexplore-0.3.0-x86_64.AppImage
+```
+
+### Windows
+
 A Windows standalone binary can be downloaded [here](https://dmnfarrell.github.io/tablexplore/).
 
 ## Current features

appimage-builder.yml

@@ -0,0 +1,57 @@
+#AppImage script
+#https://appimage-builder.readthedocs.io/en/latest/examples/pyqt.html
+version: 1
+script:
+  # Remove any previous build
+  - rm -rf AppDir  | true
+  # Make usr and icons dirs
+  - mkdir -p AppDir/usr/src
+  - mkdir -p AppDir/usr/share/icons/hicolor/256x256/apps
+  # Copy the python application code into the AppDir
+  - cp main.py  AppDir/usr/src -r
+  - cp -r tablexplore AppDir/usr/src -r
+  - cp img/logo.svg AppDir/usr/share/icons/hicolor/256x256/apps/tablexplore.svg
+  # Install application dependencies
+  - pip3 install --system --ignore-installed --prefix=/usr --root=AppDir -r ./requirements.txt
+
+AppDir:
+  path: ./AppDir
+
+  app_info:
+    id: org.tablexplore.python-tablexplore
+    name: tablexplore
+    icon: tablexplore
+    version: 0.3.0
+    # Set the python executable as entry point
+    exec: usr/bin/python3
+    # Set the application main script path as argument. Use '$@' to forward CLI parameters
+    exec_args: "$APPDIR/usr/src/main.py $@"
+
+  apt:
+    arch: amd64
+    sources:
+      - sourceline: 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse'
+        key_url: 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x871920D1991BC93C'
+    #  - sourceline: 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ bionic main restricted universe multiverse'
+    #    key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3b4fe6acc0b21f32'
+
+    include:
+      - python3
+      - python3-pkg-resources
+
+    exclude: []
+
+  runtime:
+    env:
+      PATH: '${APPDIR}/usr/bin:${PATH}'
+      # Set python home
+      # See https://docs.python.org/3/using/cmdline.html#envvar-PYTHONHOME
+      PYTHONHOME: '${APPDIR}/usr'
+      # Path to the site-packages dir or other modules dirs
+      # See https://docs.python.org/3/using/cmdline.html#envvar-PYTHONPATH
+      PYTHONPATH: '${APPDIR}/usr/lib/python3.8/site-packages'
+
+AppImage:
+  update-information: 'gh-releases-zsync|AppImageCrafters|python-tablexplore|latest|tablexplore-*x86_64.AppImage.zsync'
+  sign-key: None
+  arch: x86_64

main.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-"""    
+"""
     TablExplore app
     Created November 2020
     Copyright (C) Damien Farrell
@@ -38,9 +38,10 @@ def main():
     #                    help="Import an excel file", metavar="FILE")
     #parser.add_argument("-t", "--test", dest="test",  action="store_true",
     #                    default=False, help="Run a basic test app")
-    args = vars(parser.parse_args())
+    args, unknown = parser.parse_known_args()
+    args = vars(args)
     qapp = QApplication(sys.argv)
-    aw = app.Application()
+    aw = app.Application(**args)
     aw.show()
     qapp.exec_()
 

requirements.txt

@@ -0,0 +1,5 @@
+pyside2
+numpy
+pandas
+matplotlib
+xlrd

snap/gui/tablexplore.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=tablexplore
+Name=Tablexplore
 Exec=tablexplore
 Type=Application
 Icon=${SNAP}/meta/gui/icon.png

snapcraft.yaml

@@ -1,4 +1,4 @@
-name: Tablexplore
+name: tablexplore
 version: '0.3.0'
 #version-script: git describe --abbrev=1 --tags
 summary: data plotting and analysis package
@@ -22,6 +22,8 @@ apps:
       - opengl
       - network
       - network-bind
+      - network-control
+      - mount-observe
 
 parts:
   tablexplore:

tablexplore/app.py

@@ -100,6 +100,7 @@ def __init__(self, project_file=None, csv_file=None):
         if project_file != None:
             self.openProject(project_file)
         elif csv_file != None:
+            self.newProject()
             self.importFile(csv_file)
         else:
             self.newProject()

tablexplore/core.py

@@ -667,7 +667,7 @@ def applyTransformFunction(self, column):
         if result is None:
             return
         if newcol == '':
-            name = col+suffix
+            newcol = winfunc+'('+col+')'
         if inplace == True:
             df[col] = result
         else:

tablexplore/plotting.py

@@ -153,8 +153,8 @@ def createWidgets(self):
         self.addPlotWidget()
 
         dock = QDockWidget('options',self)
-        dock.setMaximumWidth(270)
-        dock.setMinimumWidth(200)
+        dock.setMaximumWidth(280)
+        dock.setMinimumWidth(220)
         scrollarea = QScrollArea(dock)
         scrollarea.setWidgetResizable(True)
         dock.setWidget(scrollarea)