From 56c1d75563494bcdb658b414848d45b0795c6f9c Mon Sep 17 00:00:00 2001
From: Christoph Schmidt <christoph.,schmidt@tugraz.at>
Date: Tue, 21 Nov 2023 15:48:42 +0100
Subject: [PATCH] Minor changes
---
.idea/captdevicecontrol.iml | 3 ++-
.idea/misc.xml | 2 +-
examples/config.yaml | 2 +-
examples/main.py | 4 ++--
requirements.txt | 4 ++--
.../adcaptdevicecontrol/.idea/adcaptdevicecontrol.iml | 0
6 files changed, 8 insertions(+), 7 deletions(-)
rename src/{CaptDeviceControl (1) => CaptDeviceControl}/adcaptdevicecontrol/.idea/adcaptdevicecontrol.iml (100%)
diff --git a/.idea/captdevicecontrol.iml b/.idea/captdevicecontrol.iml
index 90ae042..26456f5 100644
--- a/.idea/captdevicecontrol.iml
+++ b/.idea/captdevicecontrol.iml
@@ -6,8 +6,9 @@
<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" />
</content>
- <orderEntry type="jdk" jdkName="Python 3.11 (.venv312_al) (3)" jdkType="Python SDK" />
+ <orderEntry type="jdk" jdkName="Python 3.10 (captdevicecontrol)" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="PyDocumentationSettings">
diff --git a/.idea/misc.xml b/.idea/misc.xml
index e3b41e7..c29ee7b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,5 +3,5 @@
<component name="Black">
<option name="sdkName" value="Python 3.11 (.venv312_al) (3)" />
</component>
- <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11 (.venv312_al) (3)" project-jdk-type="Python SDK" />
+ <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (captdevicecontrol)" project-jdk-type="Python SDK" />
</project>
\ No newline at end of file
diff --git a/examples/config.yaml b/examples/config.yaml
index e71a55b..d3bf9f9 100644
--- a/examples/config.yaml
+++ b/examples/config.yaml
@@ -1,4 +1,4 @@
-# - Configuration file stored 2023-11-11 17:00:09.246929 -
+# - Configuration file stored 2023-11-21 15:48:11.683307 -
CaptDeviceConfig: #!!python/object:controller.CaptDeviceConfig
sample_rate: 50000 # Sample rate: Sample rate of the device
streaming_rate: 500 # Streaming rate: Streaming rate in Hz (should be below 1kHz)
diff --git a/examples/main.py b/examples/main.py
index 765617a..d91a43c 100644
--- a/examples/main.py
+++ b/examples/main.py
@@ -2,13 +2,13 @@ import logging
import sys
import os
-sys.path.append('../src/')
+sys.path.append('..')
from PySide6.QtWidgets import QApplication
from rich.logging import RichHandler
-import src.CaptDeviceControl as CaptDevice
+import CaptDeviceControl as CaptDevice
if __name__ == "__main__":
diff --git a/requirements.txt b/requirements.txt
index 52b462d..e061be5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,5 +6,5 @@ scipy~=1.10.1
rich
# add the git repo
git+https://gitlab.tugraz.at/flexsensor-public/confighandler.git@develop
-#git+https://gitlab.tugraz.at/flexsensor-public/fswidgets.git@develop
-../fswidgets
+git+https://gitlab.tugraz.at/flexsensor-public/fswidgets.git@develop
+#../fswidgets
diff --git a/src/CaptDeviceControl (1)/adcaptdevicecontrol/.idea/adcaptdevicecontrol.iml b/src/CaptDeviceControl/adcaptdevicecontrol/.idea/adcaptdevicecontrol.iml
similarity index 100%
rename from src/CaptDeviceControl (1)/adcaptdevicecontrol/.idea/adcaptdevicecontrol.iml
rename to src/CaptDeviceControl/adcaptdevicecontrol/.idea/adcaptdevicecontrol.iml
--
GitLab