Created a python package from sources

.idea/lasercontrol.iml

@@ -2,10 +2,9 @@
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/LaserControl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/LaserControl" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/.venv_Chris_PC" />
       <excludeFolder url="file://$MODULE_DIR$/src/LaserControlOld" />
-      <excludeFolder url="file://$MODULE_DIR$/src" />
       <excludeFolder url="file://$MODULE_DIR$/.venv" />
     </content>
     <orderEntry type="jdk" jdkName="Python 3.11 (.venv312_al) (2)" jdkType="Python SDK" />

JetBrains.gitignore

+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# SonarLint plugin
+.idea/sonarlint/
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser

LaserControl/__init__.py

-from LaserControl.view.LaserControlView import LaserControlView as View
-from LaserControl.LaserConfig import LaserConfig as Config
-from LaserControl.controller.LaserControlController import LaserControlController as Controller
-from LaserControl.model.LaserControlModel import LaserControlModel as Model

Python.gitignore

+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
\ No newline at end of file

application.log

-INFO:Laser Driver (Simulator):Laser (Generic): Laser Simulator initialized.
-INFO:controller.LaserConn:Connection to Laser on Port USB0.
-DEBUG:Laser Driver (Simulator):Laser (Generic):Connecting to Laser Simulator.
-INFO:Laser Driver (Simulator):Laser (Generic): Connected to Laser Simulator.
-DEBUG:FieldInt:Field FieldInt created with value 840 of type <class 'int'>
-DEBUG:FieldInt:Field FieldInt created with value 850 of type <class 'int'>
-DEBUG:FieldFloat:Field FieldFloat created with value 2.0 of type <class 'float'>
-DEBUG:FieldFloat:Field FieldFloat created with value 1.0 of type <class 'float'>
-DEBUG:FieldFloat:Field FieldFloat created with value 1.0 of type <class 'float'>
-DEBUG:FieldList:Field FieldList created with value ['USB0', 'USB1', 'USB2', 'USB3', 'USB4', 'USB5', 'USB6', 'USB7', 'USB8', 'USB9'] of type <class 'list'>
-DEBUG:FieldString:Field FieldString created with value USB0 of type <class 'str'>
-INFO:FieldInt:Field assigned to LaserConfig with name wl_sweep_start
-INFO:FieldInt:Field assigned to LaserConfig with name wl_sweep_stop
-INFO:FieldFloat:Field assigned to LaserConfig with name velocity
-INFO:FieldFloat:Field assigned to LaserConfig with name acceleration
-INFO:FieldFloat:Field assigned to LaserConfig with name deceleration
-INFO:FieldList:Field assigned to LaserConfig with name available_ports
-INFO:FieldString:Field assigned to LaserConfig with name port
-DEBUG:LaserControlWindow:Attempting to connect to laser on port: USB0
-INFO:Laser Driver (Simulator):Laser (Generic): Laser Simulator initialized.
-INFO:controller.LaserConn:Connection to Laser on Port USB0.
-DEBUG:Laser Driver (Simulator):Laser (Generic):Connecting to Laser Simulator.
-INFO:Laser Driver (Simulator):Laser (Generic): Connected to Laser Simulator.
-INFO:Laser Driver (Simulator):Laser (Generic): Laser Simulator initialized.
-INFO:controller.LaserConn:Connection to Laser on Port USB0.
-DEBUG:Laser Driver (Simulator):Laser (Generic):Connecting to Laser Simulator.
-INFO:Laser Driver (Simulator):Laser (Generic): Connected to Laser Simulator.
-DEBUG:Laser Driver (Simulator):Laser (Generic): Current wavelength is 830 nm
-DEBUG:Laser Driver (Simulator):Laser (Generic): Current wavelength is 830 nm
-INFO:Laser Driver (Simulator):Laser (Generic): Disconnecting from Laser Simulator
-INFO:controller.LaserConn:Laser Connection Closed

main.py → examples/main.py

@@ -3,7 +3,7 @@ import sys
 from rich.logging import RichHandler
 from PySide6.QtWidgets import QApplication
 
-import LaserControl as Laser
+from src import LaserControl as Laser
 
 if __name__ == "__main__":
     FORMAT = "%(message)s"

pyproject.toml

+[project]
+name = "lasercontrol"
+version = "0.0.1"
+authors = [
+  { name="Christoph Schmidt", email="cschmidt.fs@gmail.com" },
+]
+description = "A UI for controlling the Sacher TEC Laser"
+readme = "README.md"
+requires-python = ">=3.7"
+dependencies = [
+    'pyside6', 'rich', 'pyyaml'
+]
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: GNU General Public License v3.0",
+    "Operating System :: OS Independent",
+]
+
+[project.urls]
+"Homepage" = "https://gitlab.tugraz.at/flexsensor-public/lasercontrol"
\ No newline at end of file

src/LaserControl/__init__.py

+

LaserControl/controller/LaserControlController.py → src/LaserControl/controller/LaserControlController.py

 import logging
-import os
 import time
-from multiprocessing import Value, Lock, Process, Array
+from multiprocessing import Value, Lock, Process
 
 from PySide6.QtCore import QThreadPool
 
-from LaserControl.model.LaserControlModel import LaserControlModel
+from model.LaserControlModel import LaserControlModel
 from controller.LaserCon import LaserCon
 from controller.multiprocess.LaserStateArray import LaserStateArray
 from controller.multiprocess.move_to_wavelength import move_to_wavelength

LaserControl/model/LaserControlModel.py → src/LaserControl/model/LaserControlModel.py

 #import mcpy
-from LaserControl.LaserConfig import LaserConfig
-from LaserControl.model.LaserControlSignals import LaserControlSignals
+from LaserConfig import LaserConfig
+from model.LaserControlSignals import LaserControlSignals
 
 
 #from LaserControl.model.LaserControlSignals import LaserControllerSignals