diff --git a/make_desktop_file.bat b/make_desktop_file.bat index 8ac5c12..7e87391 100644 --- a/make_desktop_file.bat +++ b/make_desktop_file.bat @@ -2,7 +2,7 @@ set SCRIPT="%TEMP%\%RANDOM%-%RANDOM%-%RANDOM%-%RANDOM%.vbs" echo Set oWS = WScript.CreateObject("WScript.Shell") >> %SCRIPT% echo sLinkFile = "%USERPROFILE%\Desktop\AVVIO PROGRAMMA COLLAUDO.lnk" >> %SCRIPT% echo Set oLink = oWS.CreateShortcut(sLinkFile) >> %SCRIPT% -echo oLink.TargetPath = "%userprofile%\PycharmProjects\st-ten-1\runme.sh" >> %SCRIPT% +echo oLink.TargetPath = "%userprofile%\PycharmProjects\st-ten-1\runme.bat" >> %SCRIPT% echo oLink.IconLocation = "%userprofile%\PycharmProjects\st-ten-1\src\ui\imgs\neo.ico" echo oLink.Save >> %SCRIPT% cscript /nologo %SCRIPT% diff --git a/runme.bat b/runme.bat new file mode 100644 index 0000000..2bd6bf6 --- /dev/null +++ b/runme.bat @@ -0,0 +1,4 @@ +echo on +SET mypath=%~dp0 +cd %mypath% +.\venv\Scripts\activate.bat && python -O "./src/main.py" --no-edgetpu --no-tflite diff --git a/src/components/usb_586x.py b/src/components/usb_586x.py index b7fe3bc..4a08205 100644 --- a/src/components/usb_586x.py +++ b/src/components/usb_586x.py @@ -12,14 +12,14 @@ is_win = platform.system() == "Windows" if "--sim-io" not in sys.argv: if is_win: - from Automation.BDaq import * - from Automation.BDaq.InstantDoCtrl import InstantDoCtrl - from Automation.BDaq.InstantDiCtrl import InstantDiCtrl + from components.Automation.BDaq import * + from components.Automation.BDaq.InstantDoCtrl import InstantDoCtrl + from components.Automation.BDaq.InstantDiCtrl import InstantDiCtrl else: libbiodaq = ctypes.CDLL("/opt/advantech/libs/libbiodaq.so") else: is_win=False - import src.components.dummies.libbiodaq as libbiodaq + import components.dummies.libbiodaq as libbiodaq class USB_586x(Component): diff --git a/src/main.py b/src/main.py index 1ebf70c..76995dc 100644 --- a/src/main.py +++ b/src/main.py @@ -3,6 +3,7 @@ import argparse import faulthandler import logging import os +import platform # import pdb import signal import sys @@ -11,6 +12,9 @@ import weakref from datetime import datetime from pathlib import Path +if platform.system() == "Windows": + sys.path.append(f"{os.getcwd()}\src\components") + from components.usb_586x import USB_586x app = None diff --git a/src/ui/test_leak/test_leak.py b/src/ui/test_leak/test_leak.py index c27a10c..062ce4c 100644 --- a/src/ui/test_leak/test_leak.py +++ b/src/ui/test_leak/test_leak.py @@ -5,7 +5,7 @@ import weakref from PyQt5.QtWidgets import QMessageBox from ui.test_test import Test_Test -from src.components.Automation.BDaq import ErrorCode +from components.Automation.BDaq import ErrorCode class Test_Leak(Test_Test): def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, reset_on_start=True, enable_override=True):