pyForceDAQ 2.0.5.dev4__tar.gz → 2.0.6__tar.gz

{pyforcedaq-2.0.5.dev4 → pyforcedaq-2.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyForceDAQ
-Version: 2.0.5.dev4
+Version: 2.0.6
 Summary: A Python package for data acquisition and analysis in force-based experiments.
 Author: Oliver Lindemann
 Author-email: Oliver Lindemann <lindemann@essb.eur.nl>

{pyforcedaq-2.0.5.dev4 → pyforcedaq-2.0.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyForceDAQ"
-version = "2.0.5-dev4"
+version = "2.0.6"
 description = "A Python package for data acquisition and analysis in force-based experiments."
 authors = [
     { name = "Oliver Lindemann", email = "lindemann@essb.eur.nl" },

{pyforcedaq-2.0.5.dev4 → pyforcedaq-2.0.6}/src/pyforcedaq/__main__.py

@@ -21,14 +21,6 @@ def cli():
 
     parser.add_argument("SETTINGS_FILE", nargs="?", default="", help="settings file")
 
-    parser.add_argument(
-        "-l",
-        "--launcher",
-        action="store_true",
-        default=False,
-        help="Run with launcher GUI to edit settings and start recording",
-    )
-
     parser.add_argument(
         "-o",
         "--omit-launcher",
@@ -70,9 +62,12 @@ def cli():
     else:
         from .gui import run_settings_file
 
+        if len(args.SETTINGS_FILE) == 0:
+            print("No settings file provided, can't start recording")
+            exit()
+
         run_settings_file(args.SETTINGS_FILE)
 
 
 if __name__ == "__main__":  # required because of threading
     cli()
-    cli()

pyforcedaq-2.0.6/src/pyforcedaq/gui/__init__.py

@@ -0,0 +1,5 @@
+
+print("\nStarting pyforceDAQ GUI...")
+from .._lib import settings  # # read settings
+from ._run import run  # for running with options from Python script
+from ._run import run_settings_file

{pyforcedaq-2.0.5.dev4 → pyforcedaq-2.0.6}/src/pyforcedaq/gui/_layout.py

@@ -2,7 +2,6 @@ __author__ = "Oliver Lindemann"
 
 # helper functions
 import os
-from copy import copy
 from typing import List
 
 import pygame
@@ -20,7 +19,6 @@ colours = [
     expy_constants.C_EXPYRIMENT_PURPLE,
 ]
 
-
 def get_pygame_rect(stimulus, screen_size):
     """little helper function that returns the pygame rect from stimuli"""
     half_screen_size = (screen_size[0] / 2, screen_size[1] / 2)
@@ -75,9 +73,7 @@ class RecordingScreen(object):
         self.text_colour = text_colour
         self.elements = []
 
-        txt_list = copy(txt_top_left)
-        txt_list.insert(0, f"Version {forceDAQVersion}")
-        for cnt, txt in enumerate(txt_list):
+        for cnt, txt in enumerate(txt_top_left):
             self.add_text_line_left(
                 txt,
                 [self.left, self.top - cnt * 20],

{pyforcedaq-2.0.5.dev4 → pyforcedaq-2.0.6}/src/pyforcedaq/gui/_run.py

@@ -5,6 +5,7 @@ See COPYING file distributed along with the pyForceDAQ copyright and license ter
 __author__ = "Oliver Lindemann"
 
 import logging
+import os
 from pathlib import Path
 from pickle import dumps
 from time import sleep
@@ -32,7 +33,6 @@ RESPONSE_MINMAX2 = COMMAND_STR + b"xRM2"
 CHANGED_LEVEL = COMMAND_STR + b"xCL1"
 CHANGED_LEVEL2 = COMMAND_STR + b"xCL2"
 
-
 def _main_loop(exp, recorder: DataRecorder, gs: GUISettings, info_strings: List[str]):
     """udp command:
     "start", "pause", "stop"
@@ -432,6 +432,12 @@ def run(settings: AppSettings):
 
     control.initialize(exp)
     exp.mouse.show_cursor()  # type: ignore #
+    pygame.display.set_caption(f"pyforceDAQ {forceDAQVersion}")
+
+    icon_path = os.path.join(os.path.dirname(__file__), "rf_icon.png")
+    print(f"Loading icon from {icon_path}")
+    pygame.display.set_icon(pygame.image.load(icon_path))
+
     logo_text_line("Initializing Force Recording").present()
     show_logo_time = 0.5
     recorder = DataRecorder(

{pyforcedaq-2.0.5.dev4 → pyforcedaq-2.0.6}/src/pyforcedaq/launcher.py

@@ -168,7 +168,6 @@ def run_launcher():
             if ch == "No":
                 return  # quit
         from . import gui
-
         gui.run(settings)
     else:
         pass

pyforcedaq-2.0.5.dev4/src/pyforcedaq/gui/__init__.py

@@ -1,5 +0,0 @@
-from .._lib import settings  # # read settings
-from ._run import (
-    run,  # for running with options from Python script
-    run_settings_file,
-)