pyForceDAQ 2.0.5.dev3__tar.gz → 2.0.6__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyForceDAQ
-Version: 2.0.5.dev3
+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.dev3 → pyforcedaq-2.0.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyForceDAQ"
-version = "2.0.5-dev3"
+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.dev3 → 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.5.dev3 → pyforcedaq-2.0.6}/src/pyforcedaq/_lib/settings.py

@@ -7,7 +7,7 @@ from typing import Any, Dict, List, Tuple
 
 import tomlkit
 
-from ..constants import CALIBRATION_FOLDER, DATA_FOLDER
+from ..constants import CALIBRATION_FOLDER, DATA_FOLDER, SETTINGS_FILE_EXTENSION
 
 
 class DAQConfiguration(object):
@@ -185,11 +185,12 @@ class AppSettings(object):
         self.recording_section = "Recording"
 
         self.filepath = Path(filename)
+        self.filepath = self.filepath.with_suffix(SETTINGS_FILE_EXTENSION)
         if os.path.isfile(self.filepath):
             self.load()
         else:
             self.save()  # defaults
-
+            print(f"WARNING: {self.filepath} not found, creating new settings file with defaults")
         self.output_filename = ""
 
     def _asdict(self):

{pyforcedaq-2.0.5.dev3 → pyforcedaq-2.0.6}/src/pyforcedaq/constants.py

@@ -5,8 +5,8 @@ MOCK_SENSOR = 9
 DAQ_TYPE = NIDAQMX # default to nidaqmx, use constants.MOCK_SENSOR for mock sensor, constants.PYDAQMX for PyDAQmx
 USE_AIFTT = True # <-- change to False to use ATI DLL for calibration conversion, otherwise use atiiaftt
 
-SETTINGS_FILE_EXTENSION = ".settings.toml"
-DEFAULT_SETTINGS_FILE = "pyForceDAQ" + SETTINGS_FILE_EXTENSION
+SETTINGS_FILE_EXTENSION = ".toml"
+DEFAULT_SETTINGS_FILE = "pyForceDAQ.settings" + SETTINGS_FILE_EXTENSION
 DEFAULT_OUTPUT_FILENAME = None
-CALIBRATION_FOLDER = "calibration"
+CALIBRATION_FOLDER = "."
 DATA_FOLDER = "data"

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.dev3 → pyforcedaq-2.0.6}/src/pyforcedaq/gui/_gui_status.py

@@ -2,7 +2,7 @@ __author__ = "Oliver Lindemann"
 
 
 from time import sleep
-from typing import Tuple
+from typing import List, Tuple
 
 from expyriment import io, misc
 
@@ -27,16 +27,19 @@ def _text2number_array(txt):
 
 
 class GUIStatus(object):
+
     def __init__(
         self,
         gui_settings: GUISettings,
         recorder: DataRecorder,
         screen_size: Tuple[int, int],
+        top_left_info:List[str] = [""]
     ):
 
         self.gs = gui_settings
         self.recorder = recorder
         self.screen_size = screen_size
+        self.top_left_info = top_left_info
 
         self.scaling_plotter = Scaling(
             min=gui_settings.data_min_max[0],
@@ -133,8 +136,9 @@ class GUIStatus(object):
 
         return RecordingScreen(
             window_size=self.screen_size,
-            txt_top_center=info_file,
-            txt_top_left=info_recording,
+            txt_top_left=self.top_left_info,
+            txt_top_right=info_file,
+            txt_top_center=info_recording,
             text_colour=txt_col,
             no_pause_option = not self.recorder.has_file_writer
             )

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

@@ -2,6 +2,7 @@ __author__ = "Oliver Lindemann"
 
 # helper functions
 import os
+from typing import List
 
 import pygame
 from expyriment import stimuli
@@ -18,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)
@@ -31,6 +31,7 @@ def get_pygame_rect(stimulus, screen_size):
     return pygame.Rect(rect_pos, stim_size)
 
 
+
 def logo_text_line(text):
     blank = stimuli.Canvas(size=(600, 400))
     logo = stimuli.Picture(
@@ -56,7 +57,11 @@ def make_text_line(text, position, text_size, text_colour):
 
 class RecordingScreen(object):
 
-    def __init__(self, window_size, txt_top_center, txt_top_left, text_colour,
+    def __init__(self, window_size,
+                 txt_top_left: List[str],
+                 txt_top_center:str,
+                 txt_top_right:str,
+                 text_colour,
                  no_pause_option:bool = False):
         # NOTE: Expyriment has to be intialized
         margin = 30
@@ -67,12 +72,12 @@ class RecordingScreen(object):
 
         self.text_colour = text_colour
         self.elements = []
-        self.add_text_line_left(
-            f"{forceDAQVersion}",
-            [self.left, self.top],
-            text_size=15,
-            text_colour=None
-        )
+
+        for cnt, txt in enumerate(txt_top_left):
+            self.add_text_line_left(
+                txt,
+                [self.left, self.top - cnt * 20],
+                text_size=15,text_colour=None)
         col = expy_constants.C_GREY
         if not no_pause_option:
             self.add_text_line_left("P: pause/unpause saving", [self.left, self.bottom + 20], text_colour=col)
@@ -88,8 +93,8 @@ class RecordingScreen(object):
         )
         self.add_text_line_right("Q: quit recording", [self.right, self.bottom], text_colour=col)
 
-        self.add_text_line_right(txt_top_center, [self.right, self.top], text_size=15)
-        self.add_text_line_centered(txt_top_left, [0, self.top], text_size=15)
+        self.add_text_line_right(txt_top_right, [self.right, self.top], text_size=15)
+        self.add_text_line_centered(txt_top_center, [0, self.top], text_size=15)
 
     def add_text_line_centered(
         self, text, position, text_size=12, text_colour=None

{pyforcedaq-2.0.5.dev3 → 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
@@ -19,7 +20,7 @@ from .._lib.clock import wait_ms
 from .._lib.data_recorder import DataRecorder
 from .._lib.sensor_process import SensorProcess
 from .._lib.settings import AppSettings, GUISettings, SensorSettings
-from ..constants import DEFAULT_OUTPUT_FILENAME, DEFAULT_SETTINGS_FILE
+from ..constants import DEFAULT_OUTPUT_FILENAME
 from ._gui_status import GUIStatus
 from ._layout import colours, get_pygame_rect, logo_text_line, make_text_line
 from ._level_indicator import level_indicator
@@ -32,8 +33,7 @@ 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):
+def _main_loop(exp, recorder: DataRecorder, gs: GUISettings, info_strings: List[str]):
     """udp command:
     "start", "pause", "stop"
     "thresholds = [x,...]" : start level detection for Fz parameter and set threshold
@@ -44,7 +44,8 @@ def _main_loop(exp, recorder: DataRecorder, gs: GUISettings):
     plotter_width = 900
     plotter_position = (0, -30)
 
-    s = GUIStatus(gui_settings=gs, recorder=recorder, screen_size=exp.screen.size)
+    s = GUIStatus(gui_settings=gs, recorder=recorder, screen_size=exp.screen.size,
+                  top_left_info=info_strings)
 
     # plotter
     plotter_thread = None
@@ -295,14 +296,15 @@ def _main_loop(exp, recorder: DataRecorder, gs: GUISettings):
                     update_rects.append(get_pygame_rect(txt, exp.screen.size))
 
             # counter
-            pos = (-230, 250)
+            pos = (-270, 240)
+
             stimuli.Canvas(
-                position=pos, size=(400, 50), colour=misc.constants.C_BLACK
+                position=pos, size=(400, 20), colour=misc.constants.C_BLACK
             ).present(update=False, clear=False)
 
             txt = stimuli.TextBox(
                 position=pos,
-                size=(400, 50),
+                size=(400, 20),
                 # background_colour=(30,30,30),
                 text_size=15,
                 text="n samples (total): {0}".format(
@@ -314,7 +316,9 @@ def _main_loop(exp, recorder: DataRecorder, gs: GUISettings):
             txt.present(update=False, clear=False)
             update_rects.append(get_pygame_rect(txt, exp.screen.size))
 
-            # Infos
+            #FIXME Threshold levels down work
+
+            # Sensor info
             pos = (200, 250)
             tmp = stimuli.Canvas(
                 position=pos, size=(400, 50), colour=misc.constants.C_BLACK
@@ -329,6 +333,7 @@ def _main_loop(exp, recorder: DataRecorder, gs: GUISettings):
                     ]
                 else:
                     tmp = s.thresholds.get_level(s.level_detection_parameter_average(0))
+
                 txt = stimuli.TextBox(
                     position=pos,
                     size=(400, 50),
@@ -387,11 +392,6 @@ def _main_loop(exp, recorder: DataRecorder, gs: GUISettings):
 
 
 def run_settings_file(settings_file: str | Path = ""):
-
-    if isinstance(settings_file, str) and len(settings_file) < 2:
-        # load default settings file if not specified
-        settings_file = DEFAULT_SETTINGS_FILE
-
     return run(AppSettings(settings_file))
 
 
@@ -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(
@@ -456,7 +462,8 @@ def run(settings: AppSettings):
 
     sleep(show_logo_time)
 
-    _main_loop(exp, recorder=recorder, gs=settings.gui)
+    _main_loop(exp, recorder=recorder, gs=settings.gui,
+               info_strings=[f"{settings.filepath.name}"])
 
     recorder.quit()
     control.end()

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

@@ -1,3 +1,4 @@
+import glob
 from os import path
 from pathlib import Path
 from typing import List
@@ -139,7 +140,13 @@ def load_settings_file(settings_file: str | Path) -> AppSettings:
 
 def run_launcher():
     _sg.theme("DarkBlue14")  # please make your windows colorful
-    settings = load_settings_file(constants.DEFAULT_SETTINGS_FILE)
+
+    toml_files = glob.glob("*.toml")
+    if len(toml_files) == 0:
+        settings_file = constants.DEFAULT_SETTINGS_FILE
+    else:
+        settings_file = toml_files[0]
+    settings = load_settings_file(settings_file)
 
     while True:
         event, values, settings = _windows_run(settings)
@@ -161,7 +168,6 @@ def run_launcher():
             if ch == "No":
                 return  # quit
         from . import gui
-
         gui.run(settings)
     else:
         pass

pyforcedaq-2.0.5.dev3/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,
-)