update gui

pirl-unc · Sep 12, 2023 · 7518a14 · 7518a14
1 parent 2799f4a
commit 7518a14
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 2,772 deletions.
diff --git a/docs/developer_notes.qmd b/docs/developer_notes.qmd
@@ -7,7 +7,7 @@ The following command generates the standalone graphical user interface (on Mac)
 ```bash
 cd gui/
 python -m eel ace_gui.py views \
-    --onedir --noconsole --clean \
+    --onefile --noconsole --clean \
     --icon ace_gui.ico \
     --name ACE \
     --copy-metadata tqdm \

diff --git a/gui/ACE.spec b/gui/ACE.spec
@@ -0,0 +1,61 @@
+# -*- mode: python ; coding: utf-8 -*-
+from PyInstaller.utils.hooks import copy_metadata
+
+datas = [('/Users/leework/miniconda3/envs/ace/lib/python3.10/site-packages/eel/eel.js', 'eel'), ('views', 'views'), ('trained_model_w_data_augmentation_b3000.pt', '.')]
+datas += copy_metadata('tqdm')
+datas += copy_metadata('regex')
+datas += copy_metadata('filelock')
+datas += copy_metadata('requests')
+datas += copy_metadata('packaging')
+datas += copy_metadata('numpy')
+datas += copy_metadata('torch')
+
+
+block_cipher = None
+
+
+a = Analysis(
+    ['ace_gui.py'],
+    pathex=[],
+    binaries=[],
+    datas=datas,
+    hiddenimports=['bottle_websocket'],
+    hookspath=[],
+    hooksconfig={},
+    runtime_hooks=[],
+    excludes=[],
+    win_no_prefer_redirects=False,
+    win_private_assemblies=False,
+    cipher=block_cipher,
+    noarchive=False,
+)
+pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
+
+exe = EXE(
+    pyz,
+    a.scripts,
+    a.binaries,
+    a.zipfiles,
+    a.datas,
+    [],
+    name='ACE',
+    debug=False,
+    bootloader_ignore_signals=False,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    runtime_tmpdir=None,
+    console=False,
+    disable_windowed_traceback=False,
+    argv_emulation=False,
+    target_arch=None,
+    codesign_identity=None,
+    entitlements_file=None,
+    icon=['ace_gui.ico'],
+)
+app = BUNDLE(
+    exe,
+    name='ACE.app',
+    icon='ace_gui.ico',
+    bundle_identifier=None,
+)
diff --git a/gui/views/about.html b/gui/views/about.html
@@ -6,6 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>ACE</title>
+    <script type="text/javascript" src="/eel.js"></script>
     <link rel="stylesheet" href="css/bootstrap.css">
     <link rel="stylesheet" href="css/bootstrap-icons-1.3.0/bootstrap-icons.css">
     <link rel="stylesheet" href="style.css">
@@ -16,7 +17,6 @@
     <script src="js/xlsx.full.min.js"></script>
     <script src="js/read-excel-file.min.js"></script>
     <script src="common.js"></script>
-    <script type="text/javascript" src="/eel.js"></script>
     <script type="text/javascript" src="generate.js"></script>
     <script>
         $(function () {

diff --git a/gui/views/configuration.html b/gui/views/configuration.html
@@ -6,11 +6,11 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>ACE</title>
+    <script type="text/javascript" src="/eel.js"></script>
     <link rel="stylesheet" href="css/bootstrap.css">
     <link rel="stylesheet" href="style.css">
     <link rel="icon" type="image/x-icon" href="res/logo_ace_white_background.svg">
     <script src="js/bootstrap.bundle.js"></script>
-    <script type="text/javascript" src="/eel.js"></script>
     <script type="text/javascript" src="generate.js"></script>
     <script src="js/read-excel-file.min.js"></script>
 </head>

diff --git a/gui/views/deconvolve.html b/gui/views/deconvolve.html
@@ -6,6 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>ACE</title>
+    <script type="text/javascript" src="/eel.js"></script>
     <link rel="stylesheet" href="css/bootstrap.css">
     <link rel="stylesheet" href="css/bootstrap-icons-1.3.0/bootstrap-icons.css">
     <link rel="stylesheet" href="style.css">
@@ -17,7 +18,6 @@
     <script src="js/Chart.bundle.min.js"></script>
     <script src="js/read-excel-file.min.js"></script>
     <script src="common.js"></script>
-    <script type="text/javascript" src="/eel.js"></script>
     <script type="text/javascript" src="deconvolve.js"></script>
     <script>
         $(function () {

diff --git a/gui/views/generate.html b/gui/views/generate.html
@@ -6,6 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>ACE</title>
+    <script type="text/javascript" src="/eel.js"></script>
     <link rel="stylesheet" href="css/bootstrap.css">
     <link rel="stylesheet" href="css/bootstrap-icons-1.3.0/bootstrap-icons.css">
     <link rel="stylesheet" href="style.css">
@@ -16,7 +17,6 @@
     <script src="js/xlsx.full.min.js"></script>
     <script src="js/read-excel-file.min.js"></script>
     <script src="common.js"></script>
-    <script type="text/javascript" src="/eel.js"></script>
     <script type="text/javascript" src="generate.js"></script>
     <script>
         $(function () {