From 8bbd435518cadd1f8c51dec780045eab73b509a3 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Thu, 25 Nov 2021 09:45:26 +0800 Subject: [PATCH] 12223 --- config/DeviceSettings.txt | 14 ++++++++++++++ ...ttings.ini => DeviceSettings_Test_OSIF.ini} | 2 ++ source/Thread/ThreadiSIFController.h | 18 ------------------ 3 files changed, 16 insertions(+), 18 deletions(-) create mode 100644 config/DeviceSettings.txt rename config/{DeviceSettings.ini => DeviceSettings_Test_OSIF.ini} (91%) delete mode 100644 source/Thread/ThreadiSIFController.h diff --git a/config/DeviceSettings.txt b/config/DeviceSettings.txt new file mode 100644 index 0000000..4c090cf --- /dev/null +++ b/config/DeviceSettings.txt @@ -0,0 +1,14 @@ +[DEVICE INFO] +TotalSpectrometer=1 +[FS1] +Model=ISIF +Port=2 +UID= +[FS2] +Model=IS1 +Port=3 +UID= +[LinearShutter] +TotalPosition=2 +Position0=100000 +Position1=200000 diff --git a/config/DeviceSettings.ini b/config/DeviceSettings_Test_OSIF.ini similarity index 91% rename from config/DeviceSettings.ini rename to config/DeviceSettings_Test_OSIF.ini index df5c34a..6c94c14 100644 --- a/config/DeviceSettings.ini +++ b/config/DeviceSettings_Test_OSIF.ini @@ -2,6 +2,8 @@ TotalSpectrometer=1 [FS1] Model=OSIFAlpha +Port=-1 +UID= [FS2] Model=Null [LinearShutter] diff --git a/source/Thread/ThreadiSIFController.h b/source/Thread/ThreadiSIFController.h deleted file mode 100644 index 3b9be39..0000000 --- a/source/Thread/ThreadiSIFController.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once -#include "ATPAbstractController.h" - - - -class ZZ_iSIFControlThread :public ZZ_ATPAbsCtrlThread -{ - Q_OBJECT -public: - -private: -public: - ZZ_iSIFControlThread(QObject* parent = nullptr); - ~ZZ_iSIFControlThread(); -public slots: - int StartTestAcquisition(); - int test();// -}; \ No newline at end of file