From fff4dfaebd46f06041472b345d6432514e91fa02 Mon Sep 17 00:00:00 2001
From: Christoph Schmidt <christoph.,schmidt@tugraz.at>
Date: Thu, 4 Jan 2024 15:21:16 +0100
Subject: [PATCH] Fixed IDE related errors in version 1.0.0.
---
.idea/captdevicecontrol.iml | 1 -
pyproject.toml | 6 +++---
requirements.txt | 12 ++++++------
src/CaptDeviceControl/__init__.py | 5 +++++
4 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/.idea/captdevicecontrol.iml b/.idea/captdevicecontrol.iml
index e158d0b..6ddec6b 100644
--- a/.idea/captdevicecontrol.iml
+++ b/.idea/captdevicecontrol.iml
@@ -3,7 +3,6 @@
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/CaptDeviceControl" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/src/CaptDeviceControl/adcaptdevicecontrol" />
<excludeFolder url="file://$MODULE_DIR$/src/CaptDeviceControl/old" />
<excludeFolder url="file://$MODULE_DIR$/.venv" />
diff --git a/pyproject.toml b/pyproject.toml
index 336fd1c..3b30cfc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -15,9 +15,9 @@ dependencies = [
'scipy',
'rich',
'pyqtgraph',
- 'fswidgets@git+https://gitlab.tugraz.at/flexsensor-public/modules/fswidgets.git@develop',
- 'confighandler@git+https://gitlab.tugraz.at/flexsensor-public/modules/confighandler.git@develop',
- 'cmp@git+https://gitlab.tugraz.at/flexsensor-public/modules/cmp.git@develop'
+ 'fswidgets@git+https://gitlab.tugraz.at/flexsensor-public/modules/fswidgets.git@main',
+ 'confighandler@git+https://gitlab.tugraz.at/flexsensor-public/modules/confighandler.git@main',
+ 'cmp@git+https://gitlab.tugraz.at/flexsensor-public/modules/cmp.git@main'
]
classifiers = [
"Programming Language :: Python :: 3",
diff --git a/requirements.txt b/requirements.txt
index 9a1ec90..ebcfa72 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,11 +7,11 @@ rich
pyqtgraph
# add the git repo
-git+https://gitlab.tugraz.at/flexsensor-public/modules/fswidgets.git@develop
-#git+https://gitlab.tugraz.at/flexsensor-public/modules/confighandler.git@develop
-#git+https://gitlab.tugraz.at/flexsensor-public/modules/cmp.git@develop
+git+https://gitlab.tugraz.at/flexsensor-public/modules/fswidgets.git@main
+git+https://gitlab.tugraz.at/flexsensor-public/modules/confighandler.git@main
+git+https://gitlab.tugraz.at/flexsensor-public/modules/cmp.git@main
# Local installs
-../tools/confighandler
-#../captdevicecontrol
-../tools/cmp
\ No newline at end of file
+#../tools/confighandler
+#../tools/fswidgets
+#../tools/cmp
\ No newline at end of file
diff --git a/src/CaptDeviceControl/__init__.py b/src/CaptDeviceControl/__init__.py
index 47b8d7d..45828bd 100644
--- a/src/CaptDeviceControl/__init__.py
+++ b/src/CaptDeviceControl/__init__.py
@@ -4,3 +4,8 @@ Author(s): Christoph Schmidt <christoph.schmidt@tugraz.at>
Created: 2023-10-19 12:35
Package Version:
"""
+import sys
+from .CaptDeviceConfig import CaptDeviceConfig as Config
+from .controller.BaseAD2CaptDevice import BaseAD2CaptDevice as Controller
+from .model.AD2CaptDeviceModel import AD2CaptDeviceModel as Model
+from .view.AD2CaptDeviceView import ControlWindow as View
--
GitLab