Merge pull request #22 from hicsail/custom-tracking

Loading screen changed
hicsail · Nov 10, 2023 · 2ce3a24 · 2ce3a24
2 parents aea5383 + f896c75
commit 2ce3a24
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,5 @@ build
 .DS_Store
 __pycache__
 .env
+.venv2/*
+.venv2
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "git.ignoreLimitWarning": true
+}
diff --git a/movement_log.txt b/movement_log.txt
diff --git a/package.json b/package.json
@@ -35,9 +35,10 @@
           "name": "@electron-forge/maker-squirrel",
           "config": {
             "name": "cameramouse",
-            "authors": "Manny and Hao",
-            "description": "Rewrite of cameramouse.org",
-            "certificateFile": "certificate.pfx"
+            "authors": "Manny, Hao and Farid",
+            "description": "Rewrite of cameramouse.org", 
+            "certificateFile": "certificate.pfx",
+            "loadingGif": "src/assets/LOADING GIF 1.gif"
           }
         },
         {

diff --git a/src/assets/Loading GIF 1.gif b/src/assets/Loading GIF 1.gif
diff --git a/src/assets/loading-gif.gif b/src/assets/loading-gif.gif
diff --git a/src/pyTracker/main.spec b/src/pyTracker/main.spec
@@ -28,21 +28,13 @@ a = Analysis(
 )
 pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
 
-splash = Splash('src/assets/bu.png',
-                binaries=a.binaries,
-                datas=a.datas,
-                text_pos=(35, 50),
-                text_size=15,
-                text_color='white')
-
 exe = EXE(
     pyz,
     a.scripts,
     a.binaries,
     a.zipfiles,
     a.datas,
-    splash,
-    splash.binaries,   
+
     [],
     name='main',
     debug=False,

diff --git a/src/pyTracker/src/main.py b/src/pyTracker/src/main.py
@@ -8,15 +8,6 @@
 
 if __name__ == "__main__":
 
-    # close splash screen
-    try:  
-        # pyi_splash may not be resolved in some environments.
-        import pyi_splash
-        # Update the text on the splash screen
-        pyi_splash.update_text("App is ready. You can start tracking now.")
-        pyi_splash.close()
-    except:
-        pass
 
     frameSize = getFrameSize()
     trackerState.setWebcamFrameSize(frameSize[0], frameSize[1])