81 changed files with 331 additions and 433 deletions
--- a/Cigarette.sln
+++ b/Cigarette.sln
@ -5,6 +5,8 @@ VisualStudioVersion = 17.3.32929.385
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cigarette", "Cigarette\Cigarette.vcxproj", "{B12702AD-ABFB-343A-A199-8E24837244A3}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CigaretteSingle", "CigaretteSingle\CigaretteSingle.vcxproj", "{795A8611-044A-46D3-8DD9-13A338925BC4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@ -21,12 +23,20 @@ Global
 		{B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x64.Build.0 = Release|x64
 		{B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x86.ActiveCfg = Release|Win32
 		{B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x86.Build.0 = Release|Win32
+		{795A8611-044A-46D3-8DD9-13A338925BC4}.Debug|x64.ActiveCfg = Debug|x64
+		{795A8611-044A-46D3-8DD9-13A338925BC4}.Debug|x64.Build.0 = Debug|x64
+		{795A8611-044A-46D3-8DD9-13A338925BC4}.Debug|x86.ActiveCfg = Debug|x64
+		{795A8611-044A-46D3-8DD9-13A338925BC4}.Debug|x86.Build.0 = Debug|x64
+		{795A8611-044A-46D3-8DD9-13A338925BC4}.Release|x64.ActiveCfg = Release|x64
+		{795A8611-044A-46D3-8DD9-13A338925BC4}.Release|x64.Build.0 = Release|x64
+		{795A8611-044A-46D3-8DD9-13A338925BC4}.Release|x86.ActiveCfg = Release|x64
+		{795A8611-044A-46D3-8DD9-13A338925BC4}.Release|x86.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {0AF1A30E-A12C-4014-ACD5-65A1E6D54D46}
 		Qt5Version = 5.15.2_msvc2019_64
+		SolutionGuid = {0AF1A30E-A12C-4014-ACD5-65A1E6D54D46}
 	EndGlobalSection
 EndGlobal
--- a/Cigarette/CaptureThreadHIK.cpp
+++ b/Cigarette/CaptureThreadHIK.cpp
@ -259,18 +259,17 @@ void CaptureThreadHIK::process( void )
 		MVCC_INTVALUE_EX stIntValue = { 0 };
 		nRet = MV_CC_GetIntValueEx(CamHandle, "PayloadSize", &stIntValue);
 		if (nRet) { std::cout << "Get PayloadSize error" << std::endl; }
-		nDataSize = stIntValue.nCurValue*3;///
+		nDataSize = stIntValue.nCurValue;
 		MV_CC_StartGrabbing(CamHandle);
 		Ready = true;
 		while(!boTerminated_)
 		{
-			//nRet = MV_CC_GetOneFrameTimeout(CamHandle, g_pImage_buf, nDataSize, &stFrameInfo, 200);
-			nRet = MV_CC_GetImageForBGR(CamHandle, g_pImage_buf, nDataSize, &stFrameInfo, 200);
+			nRet = MV_CC_GetOneFrameTimeout(CamHandle, g_pImage_buf, nDataSize, &stFrameInfo, 200);
 			if (MV_OK == nRet)
 			{
 				m_cntGrabbedImages++;

-				cv::Mat openCVImage(stFrameInfo.nHeight, stFrameInfo.nWidth, CV_8UC3, g_pImage_buf);
+				cv::Mat openCVImage(stFrameInfo.nHeight, stFrameInfo.nWidth, CV_8UC1, g_pImage_buf);
 				cv::Mat image_clone = openCVImage.clone();
 				if (!g_debug_mode)
 				{
--- a/Cigarette/Cigarette.vcxproj
+++ b/Cigarette/Cigarette.vcxproj
@ -126,7 +126,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(ProjectDir)MvIMPACT;$(ProjectDir)OpenCV455Simple\include;$(ProjectDir)Common;$(ProjectDir)Pylon6.2\include;$(ProjectDir)modbus;$(ProjectDir)MVS3.2.1\Include;$(ProjectDir)PLC;$(QTDIR)\include\QtNetwork;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@ -359,7 +359,7 @@
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing cigarette.h...</Message>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D%(PreprocessorDefinitions)  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)OpenCV455Simple\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D%(PreprocessorDefinitions)  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(ProjectDir)MvIMPACT" "-IG:\code_library\c\opencv\4.3\build-opencv+cuda\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"</Command>
    </CustomBuild>
  </ItemGroup>
  <ItemGroup>
@ -443,7 +443,7 @@
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D%(PreprocessorDefinitions)  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)OpenCV455Simple\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D%(PreprocessorDefinitions)  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(ProjectDir)MvIMPACT" "-IG:\code_library\c\opencv\4.3\build-opencv+cuda\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"</Command>
    </CustomBuild>
    <CustomBuild Include="alarmdialog.hpp">
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
@ -461,7 +461,7 @@
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing alarmdialog.hpp...</Message>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D%(PreprocessorDefinitions)  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)OpenCV455Simple\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D%(PreprocessorDefinitions)  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(ProjectDir)MvIMPACT" "-IG:\code_library\c\opencv\4.3\build-opencv+cuda\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"</Command>
    </CustomBuild>
    <ClInclude Include="AlarmInfo.h" />
    <ClInclude Include="alg_jd.h" />
@ -483,7 +483,7 @@
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing CaptureThread.h...</Message>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D%(PreprocessorDefinitions)  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)OpenCV455Simple\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D%(PreprocessorDefinitions)  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(ProjectDir)MvIMPACT" "-IG:\code_library\c\opencv\4.3\build-opencv+cuda\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"</Command>
    </CustomBuild>
    <ClInclude Include="baslercamera.h" />
    <CustomBuild Include="CaptureThreadBasler.h">
@ -502,7 +502,7 @@
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D%(PreprocessorDefinitions)  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)OpenCV455Simple\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D%(PreprocessorDefinitions)  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(ProjectDir)MvIMPACT" "-IG:\code_library\c\opencv\4.3\build-opencv+cuda\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"</Command>
    </CustomBuild>
    <CustomBuild Include="CaptureThreadHIK.h">
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
@ -520,7 +520,7 @@
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D%(PreprocessorDefinitions)  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)OpenCV455Simple\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D%(PreprocessorDefinitions)  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(ProjectDir)MvIMPACT" "-IG:\code_library\c\opencv\4.3\build-opencv+cuda\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"</Command>
    </CustomBuild>
    <CustomBuild Include="camera_glue.h">
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
@ -593,7 +593,7 @@
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing plcsetup.hpp...</Message>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D%(PreprocessorDefinitions)  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)OpenCV455Simple\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D%(PreprocessorDefinitions)  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(ProjectDir)MvIMPACT" "-IG:\code_library\c\opencv\4.3\build-opencv+cuda\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"</Command>
    </CustomBuild>
    <CustomBuild Include="db_label.h">
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
@ -611,7 +611,7 @@
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing db_label.h...</Message>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D%(PreprocessorDefinitions)  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)OpenCV455Simple\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D%(PreprocessorDefinitions)  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(ProjectDir)MvIMPACT" "-IG:\code_library\c\opencv\4.3\build-opencv+cuda\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"</Command>
    </CustomBuild>
    <CustomBuild Include="debugthread.h">
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
@ -629,7 +629,7 @@
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing debugthread.h...</Message>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D%(PreprocessorDefinitions)  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)OpenCV455Simple\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D%(PreprocessorDefinitions)  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(ProjectDir)MvIMPACT" "-IG:\code_library\c\opencv\4.3\build-opencv+cuda\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"</Command>
    </CustomBuild>
    <CustomBuild Include="dialogin.hpp">
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
@ -647,7 +647,7 @@
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing dialogin.hpp...</Message>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D%(PreprocessorDefinitions)  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)OpenCV455Simple\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D%(PreprocessorDefinitions)  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(ProjectDir)MvIMPACT" "-IG:\code_library\c\opencv\4.3\build-opencv+cuda\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"</Command>
    </CustomBuild>
    <ClInclude Include="GeneratedFiles\ui_alarmdialog.h" />
    <ClInclude Include="GeneratedFiles\ui_camera_glue.h" />
@ -710,7 +710,7 @@
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D%(PreprocessorDefinitions)  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)OpenCV455Simple\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D%(PreprocessorDefinitions)  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(ProjectDir)MvIMPACT" "-IG:\code_library\c\opencv\4.3\build-opencv+cuda\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"</Command>
    </CustomBuild>
    <ClInclude Include="SyncQueue.h" />
    <CustomBuild Include="dialogsetuppasswd.hpp">
@ -729,7 +729,7 @@
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing dialogsetuppasswd.hpp...</Message>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D%(PreprocessorDefinitions)  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)OpenCV455Simple\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D%(PreprocessorDefinitions)  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(ProjectDir)MvIMPACT" "-IG:\code_library\c\opencv\4.3\build-opencv+cuda\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"</Command>
    </CustomBuild>
    <CustomBuild Include="dialogsetup.hpp">
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
@ -747,7 +747,7 @@
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing dialogsetup.hpp...</Message>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D%(PreprocessorDefinitions)  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)OpenCV455Simple\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D%(PreprocessorDefinitions)  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(ProjectDir)MvIMPACT" "-IG:\code_library\c\opencv\4.3\build-opencv+cuda\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"</Command>
    </CustomBuild>
    <ClInclude Include="basecamera.h" />
    <ClInclude Include="GeneratedFiles\ui_cigarette.h" />
--- a/Cigarette/CryptoToolLib.h
+++ b/Cigarette/CryptoToolLib.h
@ -1,13 +1,11 @@
 #pragma once
+#include "Windows.h"

 typedef enum _EncMethod {
-	Device = 0,
-	License = 1
+	none = 0,
+	addtime = 1
 }EncMethod;

 extern "C" bool GenerateDeviceID(void);
-extern "C" bool GenerateLicenseData(const char* flag, const char* suffix);
-extern "C" bool VerifyLicense(void);
-extern "C" bool AddParaForLicenseData(char* flag, char* suffix);
-extern "C" bool DeleteParaForLicenseData(char* flag);
-extern "C" bool AnalysisLicense(const char* flag);
+extern "C" bool GenerateLicenseData(EncMethod Method, char* suffix);
+extern "C" bool VerifyLicense(EncMethod Method);
--- a/Cigarette/CryptoToolLib.lib
+++ b/Cigarette/CryptoToolLib.lib
--- a/Cigarette/GeneratedFiles/qrc_cigarette.cpp
+++ b/Cigarette/GeneratedFiles/qrc_cigarette.cpp
@ -7,7 +7,7 @@
 *****************************************************************************/

 static const unsigned char qt_resource_data[] = {
-  // D:/????/????/???/230801-??????/Cigarette/Resources/cam1_yes.png
+  // D:/????/????/???/230708-??????????/Cigarette/Resources/cam1_yes.png
  0x0,0x0,0x24,0xa3,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -597,7 +597,7 @@ static const unsigned char qt_resource_data[] = {
  0x7f,0x11,0x4d,0xfe,0x2b,0x4,0xff,0xa,0xd0,0xb,0x6a,0xff,0x7f,0x0,0x76,0xda,
  0xa3,0x6d,0xc9,0x88,0xe6,0xed,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,
  0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/unlock.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/unlock.png
  0x0,0x0,0x1f,0x8b,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -1105,7 +1105,7 @@ static const unsigned char qt_resource_data[] = {
  0xaf,0x87,0x2b,0x2,0x28,0x28,0x2,0x28,0x28,0x2,0x28,0x28,0x2,0x28,0x28,0x2,
  0x28,0xcc,0x34,0xfc,0xff,0x0,0x40,0xf,0x90,0x81,0x7e,0x5a,0x4c,0x2,0x0,0x0,
  0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/cam1_no.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/cam1_no.png
  0x0,0x0,0x25,0x6e,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -1707,7 +1707,7 @@ static const unsigned char qt_resource_data[] = {
  0xaf,0xa,0x2,0x6b,0x1,0xf6,0xf8,0xe9,0xb8,0xf9,0xef,0xba,0x1e,0xf4,0x7b,0xdf,
  0xe4,0xff,0x87,0xe0,0xe4,0xed,0xff,0xe,0x0,0x61,0xa1,0x87,0xf9,0xf9,0x59,0x53,
  0xfb,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/pause.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/pause.png
  0x0,0x0,0x57,0x5c,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -3108,7 +3108,7 @@ static const unsigned char qt_resource_data[] = {
  0x56,0x14,0x60,0x65,0xac,0x28,0xc0,0xca,0x58,0x51,0x80,0x95,0xb1,0xa2,0x0,0x2b,
  0xe3,0x7b,0x7b,0xfc,0xff,0x3,0x0,0xd3,0xa,0x30,0x4c,0xf9,0x35,0x1d,0x32,0x0,
  0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/cam2_no.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/cam2_no.png
  0x0,0x0,0x25,0xb9,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -3715,7 +3715,7 @@ static const unsigned char qt_resource_data[] = {
  0xb0,0xc7,0x4f,0xc7,0xcd,0x7f,0xd7,0xf5,0xa0,0x7f,0xf2,0x4d,0xfe,0x7f,0x8,0x4e,
  0xde,0xfe,0xef,0x0,0x7d,0x6,0x9d,0x3a,0xc2,0x0,0x4d,0x73,0x0,0x0,0x0,0x0,
  0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/plc.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/plc.png
  0x0,0x0,0x1d,0xda,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -4196,7 +4196,7 @@ static const unsigned char qt_resource_data[] = {
  0x4d,0x79,0xfc,0xcd,0xd1,0x4f,0xf9,0xf5,0x18,0x80,0xc7,0x0,0x3c,0x6,0xe0,0xd3,
  0x7d,0xfd,0x9f,0x1,0x0,0xc2,0x2f,0x26,0xbc,0x8d,0x57,0xc,0x7f,0x0,0x0,0x0,
  0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/cam8_yes.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/cam8_yes.png
  0x0,0x0,0x25,0x28,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -4794,7 +4794,7 @@ static const unsigned char qt_resource_data[] = {
  0xe3,0xa4,0x23,0xfa,0x5f,0x67,0xc2,0xec,0xff,0x89,0x22,0xff,0x3f,0x4,0x27,0x2e,
  0xff,0x67,0x0,0xf0,0xcf,0xa9,0x38,0x5c,0x72,0xfa,0x36,0x0,0x0,0x0,0x0,0x49,
  0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/setup.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/setup.png
  0x0,0x0,0x56,0x30,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -6176,7 +6176,7 @@ static const unsigned char qt_resource_data[] = {
  0x1,0xee,0x1c,0x77,0x18,0xe0,0xce,0x71,0x87,0x1,0xee,0x1c,0x77,0x18,0xe0,0xce,
  0x71,0x87,0x1,0xee,0x1c,0x7f,0x8d,0x8f,0xff,0x7f,0x0,0xc3,0xd4,0x5d,0x81,0xf3,
  0xd7,0xda,0xf7,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/start.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/start.png
  0x0,0x0,0x49,0x25,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -7350,7 +7350,7 @@ static const unsigned char qt_resource_data[] = {
  0x98,0x6e,0xd3,0x0,0x98,0x6e,0xd3,0x0,0x98,0x6e,0xbf,0x63,0xed,0xff,0xd,0x0,
  0xb6,0xfb,0xb9,0xa8,0x38,0x36,0xb7,0x97,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,
  0xae,0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/lock.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/lock.png
  0x0,0x0,0x1e,0xe2,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -7848,7 +7848,7 @@ static const unsigned char qt_resource_data[] = {
  0x0,0x37,0x4e,0x0,0x6e,0x9c,0x0,0xdc,0x52,0xcd,0xfe,0x7f,0x0,0xd3,0x78,0xfb,
  0x1e,0x64,0xfe,0x33,0xcd,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,
  0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/cam6_yes.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/cam6_yes.png
  0x0,0x0,0x25,0xa,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -8444,7 +8444,7 @@ static const unsigned char qt_resource_data[] = {
  0x60,0x31,0x4e,0x3a,0xa2,0xff,0x75,0x26,0xcc,0xfe,0x9f,0x68,0xf2,0xff,0x43,0x70,
  0xe2,0xf6,0x7f,0x7,0x0,0xfc,0x50,0xa3,0xdb,0xb4,0x1f,0xa7,0x27,0x0,0x0,0x0,
  0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/exit.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/exit.png
  0x0,0x0,0x2c,0x64,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -9158,7 +9158,7 @@ static const unsigned char qt_resource_data[] = {
  0x0,0x99,0x2d,0x43,0x80,0xcc,0x96,0x21,0x40,0x66,0xbb,0xa6,0xb6,0xff,0x7,0x18,
  0xb3,0x1,0x20,0x5d,0x4b,0x48,0x18,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,
  0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/alarm.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/alarm.png
  0x0,0x0,0x26,0x7f,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -9777,7 +9777,7 @@ static const unsigned char qt_resource_data[] = {
  0x17,0xf4,0x3a,0x54,0x49,0xe2,0x88,0xed,0xdb,0x27,0x49,0xd3,0x14,0x13,0x59,0x6a,
  0x59,0xde,0x1e,0x1a,0x8c,0xf6,0xff,0xbf,0x1,0x0,0xf2,0x2,0x50,0xe0,0x45,0xc0,
  0x32,0x49,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/cam4_yes.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/cam4_yes.png
  0x0,0x0,0x24,0xe3,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -10371,7 +10371,7 @@ static const unsigned char qt_resource_data[] = {
  0x9,0xb3,0xff,0x27,0x9a,0xfc,0xff,0x10,0x9c,0xb8,0xfd,0x9f,0x1,0x0,0x38,0xf3,
  0x98,0x47,0x5e,0xf7,0xee,0xc3,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,
  0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/rotate.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/rotate.png
  0x0,0x0,0x3b,0xee,
  0xff,
  0xd8,0xff,0xe0,0x0,0x10,0x4a,0x46,0x49,0x46,0x0,0x1,0x1,0x1,0x0,0x48,0x0,
@ -11333,7 +11333,7 @@ static const unsigned char qt_resource_data[] = {
  0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
  0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
  0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3f,0xff,0xd9,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/cam2_yes.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/cam2_yes.png
  0x0,0x0,0x24,0xe6,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -11927,7 +11927,7 @@ static const unsigned char qt_resource_data[] = {
  0xce,0x7c,0xd0,0xbf,0x88,0x26,0xff,0x15,0x82,0x7f,0x5,0xe8,0x25,0xb5,0xff,0x3f,
  0x0,0xb2,0xb2,0x99,0x2f,0xae,0x96,0x2b,0xa0,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,
  0x44,0xae,0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/keyboard.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/keyboard.png
  0x0,0x0,0x72,0x17,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -13756,7 +13756,7 @@ static const unsigned char qt_resource_data[] = {
  0xfa,0xc7,0xc0,0x48,0xc4,0xfb,0x48,0xef,0x38,0xad,0x94,0xff,0x7c,0xbe,0xfe,0xff,
  0x3f,0x0,0xfa,0xd3,0x67,0x31,0x16,0xd2,0x4f,0xee,0x0,0x0,0x0,0x0,0x49,0x45,
  0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/cam8_no.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/cam8_no.png
  0x0,0x0,0x25,0x42,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -14356,7 +14356,7 @@ static const unsigned char qt_resource_data[] = {
  0x98,0xfd,0x3f,0xd3,0xe4,0xff,0x87,0xe0,0xb9,0xdb,0xff,0x1d,0x0,0xd0,0xa5,0xbd,
  0xae,0xce,0x52,0x5a,0x92,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,
  0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/cam1.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/cam1.png
  0x0,0x0,0x25,0xe,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -14952,7 +14952,7 @@ static const unsigned char qt_resource_data[] = {
  0x15,0xb6,0x0,0xb3,0xb0,0x3,0xc0,0x85,0x7b,0x9d,0x4a,0xec,0x56,0x30,0x23,0x9f,
  0xd4,0xff,0x5c,0xed,0x93,0x32,0xfe,0xdf,0x0,0x54,0xa5,0x5f,0xcf,0x23,0x70,0xf1,
  0x5f,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/cam2.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/cam2.png
  0x0,0x0,0x25,0x60,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -15553,7 +15553,7 @@ static const unsigned char qt_resource_data[] = {
  0x77,0xd9,0xe7,0xcf,0x21,0x61,0x56,0x18,0x3,0x66,0x61,0x17,0x80,0xb,0x77,0x3b,
  0x94,0xb8,0xa3,0x8c,0xe2,0xff,0x3f,0x80,0xff,0x3b,0x0,0x75,0x26,0x15,0x55,0x32,
  0xac,0x4f,0x22,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/cam3.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/cam3.png
  0x0,0x0,0x25,0x5c,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -16154,7 +16154,7 @@ static const unsigned char qt_resource_data[] = {
  0xfe,0x17,0xb5,0x60,0xb6,0x1d,0x23,0x77,0x63,0xe9,0xad,0x18,0xbc,0xe7,0xb1,0x27,
  0x80,0xfe,0xff,0x0,0xfe,0xef,0x0,0x2a,0x0,0x89,0x4b,0x4a,0xf9,0xc1,0x3e,0x0,
  0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/cam4.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/cam4.png
  0x0,0x0,0x25,0x52,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -16755,7 +16755,7 @@ static const unsigned char qt_resource_data[] = {
  0xaf,0x43,0x89,0xbb,0xca,0x28,0xfe,0xff,0x6,0xfc,0xdf,0x1,0x0,0xd,0x9b,0xa5,
  0x9c,0xa3,0x74,0x1,0x2,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,
  0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/cam5_no.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/cam5_no.png
  0x0,0x0,0x25,0x33,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -17354,7 +17354,7 @@ static const unsigned char qt_resource_data[] = {
  0xbf,0xe0,0xfd,0xbf,0x3c,0xe4,0xff,0x87,0xe0,0xe4,0xe3,0xff,0xe,0x0,0xc6,0xf6,
  0xcd,0xac,0xf4,0xeb,0xe7,0x15,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,
  0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/cam5.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/cam5.png
  0x0,0x0,0x22,0xd5,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -17915,7 +17915,7 @@ static const unsigned char qt_resource_data[] = {
  0x14,0x4e,0xc,0x94,0x6a,0xbb,0x5d,0xf8,0x44,0x9,0xfa,0xf4,0xc3,0xec,0xff,0x0,
  0x7,0x47,0xda,0xf2,0xbe,0x3,0xb7,0x47,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,
  0xae,0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/cam6_no.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/cam6_no.png
  0x0,0x0,0x25,0x27,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -18513,7 +18513,7 @@ static const unsigned char qt_resource_data[] = {
  0xfb,0xee,0x79,0xa9,0x17,0xcc,0xfe,0x9f,0x19,0xf2,0xff,0x43,0xf0,0xe2,0xe3,0xff,
  0xe,0x0,0xac,0xa,0xad,0x6,0x32,0x6f,0x68,0x81,0x0,0x0,0x0,0x0,0x49,0x45,
  0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/cam7_yes.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/cam7_yes.png
  0x0,0x0,0x24,0xe0,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -19106,7 +19106,7 @@ static const unsigned char qt_resource_data[] = {
  0xb5,0xfb,0xec,0x32,0xfd,0x77,0xc,0x2c,0xc6,0x29,0x47,0xf4,0xbf,0xca,0x84,0xd9,
  0xff,0x13,0x4d,0xfe,0x7f,0x8,0x4e,0xdc,0xfe,0xcf,0x0,0x14,0xf4,0x98,0x18,0x55,
  0x55,0x63,0xfe,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/cam6.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/cam6.png
  0x0,0x0,0x23,0xa,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -19670,7 +19670,7 @@ static const unsigned char qt_resource_data[] = {
  0x30,0x8b,0x3,0xcd,0x27,0x2,0x14,0xb2,0x2b,0xc5,0xae,0xdd,0x2e,0x7c,0xa4,0x4,
  0x7d,0xfc,0x61,0xf6,0xbf,0x41,0x70,0xe8,0xa8,0x41,0x4a,0x36,0xf6,0x0,0x0,0x0,
  0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/cam7_no.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/cam7_no.png
  0x0,0x0,0x25,0x9,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -20266,7 +20266,7 @@ static const unsigned char qt_resource_data[] = {
  0xd8,0xd5,0xb1,0xed,0xce,0xe7,0xbb,0x61,0xf6,0xff,0xcd,0x90,0xff,0x4,0xc1,0x89,
  0xc7,0xff,0x1d,0x0,0xf9,0x67,0xa5,0x23,0x8d,0x2,0x6a,0x6f,0x0,0x0,0x0,0x0,
  0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/cam5_yes.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/cam5_yes.png
  0x0,0x0,0x25,0x0,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -20861,7 +20861,7 @@ static const unsigned char qt_resource_data[] = {
  0x76,0x9f,0x3f,0xce,0xf5,0xdb,0x86,0x26,0xe3,0xa4,0x33,0xfa,0x5f,0x65,0xc1,0xec,
  0xff,0x89,0x26,0xff,0x3f,0x4,0x27,0x6e,0xff,0x77,0x0,0x44,0x6f,0xc3,0xab,0xe5,
  0xd3,0xdb,0xe,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/cam7.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/cam7.png
  0x0,0x0,0x22,0xb5,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -21420,7 +21420,7 @@ static const unsigned char qt_resource_data[] = {
  0x14,0x4e,0xc,0x94,0xaa,0xbb,0x59,0xf8,0x48,0x9,0xfa,0xf8,0xc3,0xec,0xff,0x0,
  0x70,0xf9,0xd2,0xa7,0xe2,0xb8,0xb5,0xce,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,
  0xae,0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/cam8.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/cam8.png
  0x0,0x0,0x23,0x7,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -21984,7 +21984,7 @@ static const unsigned char qt_resource_data[] = {
  0x85,0x44,0x80,0x62,0x76,0xa5,0xd4,0xb5,0x95,0xc2,0x87,0x4a,0xd0,0x47,0x1f,0x66,
  0xff,0xb,0x7f,0xec,0xfb,0x6e,0x7f,0xc4,0xad,0xf1,0x0,0x0,0x0,0x0,0x49,0x45,
  0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/logo.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/logo.png
  0x0,0x0,0x22,0x1b,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -22533,7 +22533,7 @@ static const unsigned char qt_resource_data[] = {
  0x85,0xfe,0x36,0xa0,0xc1,0x6,0x6,0x76,0x3a,0xa4,0xc1,0xb8,0x5e,0xe8,0x21,0x3c,
  0x5a,0x54,0xd4,0xff,0xf,0x0,0x4a,0x2e,0xd8,0xdb,0x9e,0x96,0xe8,0xcd,0x0,0x0,
  0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/cam3_yes.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/cam3_yes.png
  0x0,0x0,0x25,0xf,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -23129,7 +23129,7 @@ static const unsigned char qt_resource_data[] = {
  0xfe,0x38,0xfd,0xb7,0xd,0x3d,0x8c,0x93,0xce,0xe8,0x7f,0x95,0x5,0xb3,0xff,0x27,
  0x9a,0xfc,0xff,0x10,0x9c,0xb8,0xfd,0x9f,0x1,0x0,0x13,0x1f,0x8d,0x5d,0x10,0x6e,
  0x5,0x9d,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/cam3_no.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/cam3_no.png
  0x0,0x0,0x25,0xbd,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@ -23736,7 +23736,7 @@ static const unsigned char qt_resource_data[] = {
  0x35,0x24,0x4a,0x27,0x18,0x4f,0x9e,0x8c,0x9b,0xff,0xae,0x2d,0xe8,0xf7,0xbe,0xc9,
  0xff,0xf,0xc1,0xf1,0xdb,0xff,0x1d,0x0,0x7e,0xed,0x8b,0x71,0x18,0x17,0x76,0x30,
  0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/????/????/???/230801-??????/Cigarette/Resources/cam4_no.png
+    // D:/????/????/???/230708-??????????/Cigarette/Resources/cam4_no.png
  0x0,0x0,0x25,0x27,
  0x89,
  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
--- a/Cigarette/alg_jd.cpp
+++ b/Cigarette/alg_jd.cpp
@ -2,7 +2,6 @@
 #include "common.h"
 // 主界面基本参数配置文件
 #define CONFIGURE_FILE    "D:/conf/conf.txt"
-extern SysConf g_sys_conf;
 // Remove the bounding boxes with low confidence using non-maxima suppression
 static void post_process(cv::Mat& frame, std::vector<cv::Mat>& outs, std::vector<std::pair<int, cv::Rect> > &results);

@ -15,7 +14,7 @@ static std::vector<cv::String> getOutputsNames(const cv::dnn::Net& net);
 static void drawPred(int classId, float conf, int left, int top, int right, int bottom, cv::Mat& frame);

 // Initialize the parameters
-static float confThreshold = g_sys_conf.ConfThreshold*0.01; // Confidence threshold
+static float confThreshold = 0.1; // Confidence threshold
 static float nmsThreshold = 0.4;  // Non-maximum suppression threshold
 static int inpWidth = 416;        // Width of network's input image
 static int inpHeight = 416;       // Height of network's input image
@ -316,7 +315,6 @@ void AlgJd::detect_batch(std::vector<cv::Mat>& vec_in, std::vector<cv::Mat> &vec
 static void post_process_batch(std::vector<cv::Mat>& vec_frame, std::vector<cv::Mat>& outs, std::vector<std::vector<std::pair<int, cv::Rect> > > &vec_results)
 {
 	int batch = vec_frame.size();
-    double confidence;///
 	for (int k = 0; k < batch; k++)
 	{
 		std::vector<int> classIds;
@ -341,7 +339,7 @@ static void post_process_batch(std::vector<cv::Mat>& vec_frame, std::vector<cv::
 			{
 				cv::Mat scores = m0.row(j).colRange(5, m0.cols);
 				cv::Point classIdPoint;
-				//double confidence;
+				double confidence;
 				// Get the value and location of the maximum score
 				cv::minMaxLoc(scores, 0, &confidence, 0, &classIdPoint);

@ -371,15 +369,12 @@ static void post_process_batch(std::vector<cv::Mat>& vec_frame, std::vector<cv::
 		{
 			int idx = indices[i];
 			cv::Rect box = boxes[idx];
-            
-            if (confidences[idx] > g_sys_conf.ConfThreshold * 0.01)///识别度低于阈值NG处理
+            //识别框宽度大于15显示识别，小于认为无胶点，NG处理
+            if (box.width > 15)
            {
-                if (box.width > 15)
-                {//识别框宽度大于15显示识别，小于认为无胶点，NG处理
-                    drawPred(classIds[idx], confidences[idx], box.x, box.y,
-                        box.x + box.width, box.y + box.height, vec_frame[k]);
-                    results.push_back(std::make_pair(classIds[idx], box));
-                }
+                drawPred(classIds[idx], confidences[idx], box.x, box.y,
+                    box.x + box.width, box.y + box.height, vec_frame[k]);
+                results.push_back(std::make_pair(classIds[idx], box));
            }
 			
 		}
--- a/Cigarette/cigarette.cpp
+++ b/Cigarette/cigarette.cpp
@ -336,7 +336,7 @@ Cigarette::Cigarette(QWidget *parent)

 	clean_pTimer = new QTimer(this);
 	connect(clean_pTimer,SIGNAL(timeout()), this, SLOT(CleanThreadStartAuto()));
-	clean_pTimer->start(3600000);
+	clean_pTimer->start(86400000);

 	connect(ui.label_alarm, SIGNAL(QlabelDoubleClick()), this, SLOT(OnCancelAlarm()));//报警标签双击消警

@ -1925,19 +1925,15 @@ bool Cigarette::read_sys_config(SysConf &conf)
 			{	/// 照片保存天数
 				conf.save_days = atoi(line.substr(pos + 1).c_str());
 			}
-			else if (tmp_key == "FREESIZE") 
-			{
+			else if (tmp_key == "FREESIZE") {
 				/// 清理图片设定最小空间值
 				conf.freesize = atoi(line.substr(pos + 1).c_str());
 			}
 			else if (tmp_key == "ComPort")
-			{	/// COM¿Ú
+			{/// COM¿Ú
 				conf.ComPort = line.substr(pos + 1);
 			}
-			else if (tmp_key == "CONFTHRESHOLD")
-			{	///ÏàËÆ¶È
-				conf.ConfThreshold = atoi(line.substr(pos + 1).c_str());
-			}
+
 			else if (tmp_key == "AUTO_OPEN")
 			{	/// 是否自动打开相机：0否；1是
 				conf.auto_open = atoi(line.substr(pos + 1).c_str());
--- a/Cigarette/common.h
+++ b/Cigarette/common.h
@ -42,7 +42,6 @@ public:
 	int save_days;					///照片保存天数
 	int freesize;					/// 设定清理图片最小空间
 	std::string ComPort;			///COM口
-	int ConfThreshold;			//识别率
 	int auto_open;					//是否自动打开相机，0否，1是
 	int auto_work;					//是否自动开始工作，0否，1是
 	int auto_shift;					//是否自动换班，0否，1是
@ -74,9 +73,8 @@ public:
 		save=0;						//图片是否保存，0不保存，1保存NG, 2全部保存
 		MisMatchAct=1;				//错位行为，1：NG,0：ok
 		save_days = 1;				///照片保存天数
-		freesize = 10;				/// 设定清理图片最小空间
-		ComPort = "COM1";			///COM口
-		ConfThreshold = 1;			///百分比识别率
+		freesize = 10;
+		ComPort = "COM1";
 		auto_open=1;				//是否自动打开相机，0否，1是
 		auto_work=1;				//是否自动开始工作，0否，1是
 		auto_shift=0;				//是否自动换班，0否，1是
--- a/Cigarette/dialogsetup.cpp
+++ b/Cigarette/dialogsetup.cpp
@ -28,7 +28,7 @@ void task_osk()
 DialogSetup::DialogSetup(QWidget * parent) : QDialog(parent) {
 	ui.setupUi(this);
 	InitPtrMat();
-	//this->setWindowFlags(Qt::FramelessWindowHint);//窗口可移动
+	this->setWindowFlags(Qt::FramelessWindowHint);//窗口可移动

 	for(int i=0;i<NumberOfSupportedCameras;i++)
 	{
@ -278,7 +278,7 @@ void DialogSetup::on_toolButton_choose_path_jpg_released() {
 void DialogSetup::write_pswd()
 {
 	std::fstream cfg_file;
-	cfg_file.open("D:/Release/pswd.txt", std::ios::out | std::ios::trunc);
+	cfg_file.open("pswd.txt", std::ios::out | std::ios::trunc);
 	if (cfg_file.good())
 	{
 		char buf[256];
@ -291,7 +291,7 @@ void DialogSetup::write_pswd()
 void DialogSetup::write_pswd_op()
 {
 	std::fstream cfg_file;
-	cfg_file.open("D:/Release/pswd_op.txt", std::ios::out | std::ios::trunc);
+	cfg_file.open("pswd_op.txt", std::ios::out | std::ios::trunc);
 	if (cfg_file.good())
 	{
 		char buf[256];
@ -304,7 +304,7 @@ void DialogSetup::write_pswd_op()
 void DialogSetup::write_config()
 {
 	std::fstream cfg_file;
-	cfg_file.open("D:/conf/conf.txt", std::ios::out | std::ios::trunc);
+	cfg_file.open("../conf/conf.txt", std::ios::out | std::ios::trunc);
 	if (cfg_file.good())
 	{
 		char buf[256];
@ -320,12 +320,6 @@ void DialogSetup::write_config()
 		memset(buf, 0, 256);///
 		sprintf(buf, "FREESIZE=%d\n", g_sys_conf.freesize);
 		cfg_file.write(buf, strlen(buf));
-		memset(buf, 0, 256);///
-		sprintf(buf, "ComPort=%s\n", g_sys_conf.ComPort);
-		cfg_file.write(buf, strlen(buf));
-		memset(buf, 0, 256);///
-		sprintf(buf, "CONFTHRESHOLD=%d\n", g_sys_conf.ConfThreshold);
-		cfg_file.write(buf, strlen(buf));
 		memset(buf, 0, 256);
 		sprintf(buf, "AUTO_OPEN=%d\n", g_sys_conf.auto_open);
 		cfg_file.write(buf, strlen(buf));
--- a/Cigarette/main.cpp
+++ b/Cigarette/main.cpp
@ -9,7 +9,7 @@
 int main(int argc, char *argv[])
 {
 #if defined LICENSE_VERIFY
-	if(!VerifyLicense())
+	if(!VerifyLicense(addtime))
 	{
 		exit(0);
 	}
--- a/Cigarette/workthread.cpp
+++ b/Cigarette/workthread.cpp
@ -53,7 +53,6 @@ void WorkThread::run()
 			local_SysConf.save = g_sys_conf.save;
 			local_SysConf.shoot[local_camera_number] = g_sys_conf.shoot[local_camera_number];
 			local_SysConf.MisMatchAct = g_sys_conf.MisMatchAct;
-			local_SysConf.ConfThreshold = g_sys_conf.ConfThreshold;//
 			for (int i = 0; i < 3; i++)local_SysConf.no[local_camera_number][i] = g_sys_conf.no[local_camera_number][i];

 			std::lock_guard<std::mutex> locker2(g_display_label_conf[local_camera_number].lock);
@ -135,7 +134,6 @@ void WorkThread::run()
 			{
 				if(vec_results[index].size() < local_SysConf.no[local_camera_number][index])IsNG |= true;
 				//if (vec_results[index].size() != 1)IsNG |= true;//反向训练
-				if (local_SysConf.ConfThreshold == 0)IsNG = false;
 				if (local_SysConf.save == 2)//三张照片分别存储
 				{
 					cv::Mat m = vec_in[index].clone();
--- a/Cigarette/x64/Release/ASyncQueue.obj
+++ b/Cigarette/x64/Release/ASyncQueue.obj
--- a/Cigarette/x64/Release/AlarmInfo.obj
+++ b/Cigarette/x64/Release/AlarmInfo.obj
--- a/Cigarette/x64/Release/CaptureThread.obj
+++ b/Cigarette/x64/Release/CaptureThread.obj
--- a/Cigarette/x64/Release/CaptureThreadBasler.obj
+++ b/Cigarette/x64/Release/CaptureThreadBasler.obj
--- a/Cigarette/x64/Release/CaptureThreadHIK.obj
+++ b/Cigarette/x64/Release/CaptureThreadHIK.obj
--- a/Cigarette/x64/Release/Cigarette.exe.recipe
+++ b/Cigarette/x64/Release/Cigarette.exe.recipe
@ -2,7 +2,7 @@
 <Project>
  <ProjectOutputs>
    <ProjectOutput>
-      <FullPath>D:\烟厂资料\程序测试\客户端\230801-解决编译报错\x64\Release\Cigarette.exe</FullPath>
+      <FullPath>D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\x64\Release\Cigarette.exe</FullPath>
    </ProjectOutput>
  </ProjectOutputs>
  <ContentFiles />
--- a/Cigarette/x64/Release/Cigarette.log
+++ b/Cigarette/x64/Release/Cigarette.log
@ -1,92 +1,3 @@
-  Moc'ing cigarette.h...
-  Uic'ing cigarette.ui...
-  Moc'ing threadReceive.h...
-  Moc'ing workthread.h...
-  Moc'ing alarmdialog.hpp...
-  Moc'ing CaptureThread.h...
-  Moc'ing CaptureThreadBasler.h...
-  Moc'ing CaptureThreadHIK.h...
-  Moc'ing camera_glue.h...
-  Moc'ing change_shift.h...
-  Moc'ing Cleanthread.h...
-  Moc'ing plcsetup.hpp...
-  Moc'ing db_label.h...
-  Moc'ing debugthread.h...
-  Moc'ing dialogin.hpp...
-  Moc'ing output_statistic.h...
-  Moc'ing Logthread.h...
-  Moc'ing savethread.h...
-  Moc'ing dialogsetuppasswd.hpp...
-  Moc'ing dialogsetup.hpp...
-  Rcc'ing cigarette.qrc...
-  Uic'ing dialogsetuppasswd.ui...
-  Uic'ing dialogsetup.ui...
-  Uic'ing plcsetup.ui...
-  Uic'ing alarmdialog.ui...
-  Uic'ing dialogin.ui...
-  Uic'ing camera_glue.ui...
-  Uic'ing change_shift.ui...
-  Uic'ing output_statistic.ui...
-  alarmdialog.cpp
-  AlarmInfo.cpp
-  alg_jd.cpp
-  ASyncQueue.cpp
-  balluffcamera.cpp
-  basecamera.cpp
-  baslercamera.cpp
-  camera_glue.cpp
-  CaptureThread.cpp
-  CaptureThreadBasler.cpp
+  workthread.cpp
  Automatically linking with mvDeviceManager.lib
-  CaptureThreadHIK.cpp
-  change_shift.cpp
-  Automatically linking with mvDeviceManager.lib
-  cigarette.cpp
-  Cleanthread.cpp
-  common.cpp
-  db_label.cpp
-  debugthread.cpp
-  dialogin.cpp
-  dialogsetup.cpp
-  dialogsetuppasswd.cpp
-  Automatically linking with mvDeviceManager.lib
-  moc_alarmdialog.cpp
-  moc_camera_glue.cpp
-  moc_CaptureThread.cpp
-  moc_CaptureThreadBasler.cpp
-  moc_CaptureThreadHIK.cpp
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\cigarette.cpp(2453,16): warning C4477: “sprintf”: 格式字符串“%s”需要类型“char *”的参数，但可变参数 1 拥有了类型“std::string”
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\cigarette.cpp(2453,16): warning C4477: “sprintf”: 格式字符串“%s”需要类型“char *”的参数，但可变参数 2 拥有了类型“std::string”
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\cigarette.cpp(2453,16): warning C4477: “sprintf”: 格式字符串“%s”需要类型“char *”的参数，但可变参数 3 拥有了类型“std::string”
-  moc_change_shift.cpp
-  Automatically linking with mvDeviceManager.lib
-  moc_cigarette.cpp
-  moc_Cleanthread.cpp
-  moc_db_label.cpp
-  moc_debugthread.cpp
-  moc_dialogin.cpp
-  moc_dialogsetup.cpp
-  moc_dialogsetuppasswd.cpp
-  moc_Logthread.cpp
-  moc_output_statistic.cpp
-  moc_plcsetup.cpp
-  Automatically linking with mvDeviceManager.lib
-  moc_savethread.cpp
-  moc_threadReceive.cpp
-  moc_workthread.cpp
-  hikcamera.cpp
-  Logthread.cpp
-  main.cpp
-  output_statistic.cpp
-  plcsetup.cpp
-  PLCDevice.cpp
-  plc_item.cpp
-  SyncQueue.cpp
-  threadReceive.cpp
-  threadSend.cpp
-  workthread.cpp
-  Automatically linking with mvDeviceManager.lib
-  Automatically linking with mvDeviceManager.lib
-  Automatically linking with mvDeviceManager.lib
-  qrc_cigarette.cpp
-  Cigarette.vcxproj -> D:\烟厂资料\程序测试\客户端\230801-解决编译报错\x64\Release\Cigarette.exe
+  Cigarette.vcxproj -> D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\x64\Release\Cigarette.exe
--- a/Cigarette/x64/Release/Cigarette.tlog/CL.command.1.tlog
+++ b/Cigarette/x64/Release/Cigarette.tlog/CL.command.1.tlog
--- a/Cigarette/x64/Release/Cigarette.tlog/CL.read.1.tlog
+++ b/Cigarette/x64/Release/Cigarette.tlog/CL.read.1.tlog
--- a/Cigarette/x64/Release/Cigarette.tlog/CL.write.1.tlog
+++ b/Cigarette/x64/Release/Cigarette.tlog/CL.write.1.tlog
--- a/Cigarette/x64/Release/Cigarette.tlog/Cigarette.lastbuildstate
+++ b/Cigarette/x64/Release/Cigarette.tlog/Cigarette.lastbuildstate
@ -1,2 +1,2 @@
 PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.36.32532:TargetPlatformVersion=10.0.22000.0:
-Release|x64|D:\烟厂资料\程序测试\客户端\230801-解决编译报错\|
+Release|x64|D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\|
--- a/Cigarette/x64/Release/Cigarette.tlog/Cl.items.tlog
+++ b/Cigarette/x64/Release/Cigarette.tlog/Cl.items.tlog
@ -1,51 +1,51 @@
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\alarmdialog.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\alarmdialog.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\AlarmInfo.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\AlarmInfo.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\alg_jd.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\alg_jd.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\ASyncQueue.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\ASyncQueue.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\balluffcamera.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\balluffcamera.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\basecamera.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\basecamera.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\baslercamera.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\baslercamera.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\camera_glue.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\camera_glue.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\CaptureThread.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\CaptureThread.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\CaptureThreadBasler.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\CaptureThreadBasler.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\CaptureThreadHIK.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\CaptureThreadHIK.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\change_shift.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\change_shift.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\cigarette.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\cigarette.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Cleanthread.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\Cleanthread.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\common.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\common.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\db_label.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\db_label.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\debugthread.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\debugthread.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\dialogin.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\dialogin.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\dialogsetup.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\dialogsetup.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\dialogsetuppasswd.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\dialogsetuppasswd.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\GeneratedFiles\qrc_cigarette.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\qrc_cigarette.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\GeneratedFiles\Release\moc_alarmdialog.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\moc_alarmdialog.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\GeneratedFiles\Release\moc_camera_glue.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\moc_camera_glue.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\GeneratedFiles\Release\moc_CaptureThread.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\moc_CaptureThread.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\GeneratedFiles\Release\moc_CaptureThreadBasler.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\moc_CaptureThreadBasler.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\GeneratedFiles\Release\moc_CaptureThreadHIK.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\moc_CaptureThreadHIK.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\GeneratedFiles\Release\moc_change_shift.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\moc_change_shift.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\GeneratedFiles\Release\moc_cigarette.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\moc_cigarette.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\GeneratedFiles\Release\moc_Cleanthread.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\moc_Cleanthread.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\GeneratedFiles\Release\moc_db_label.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\moc_db_label.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\GeneratedFiles\Release\moc_debugthread.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\moc_debugthread.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\GeneratedFiles\Release\moc_dialogin.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\moc_dialogin.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\GeneratedFiles\Release\moc_dialogsetup.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\moc_dialogsetup.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\GeneratedFiles\Release\moc_dialogsetuppasswd.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\moc_dialogsetuppasswd.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\GeneratedFiles\Release\moc_Logthread.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\moc_Logthread.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\GeneratedFiles\Release\moc_output_statistic.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\moc_output_statistic.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\GeneratedFiles\Release\moc_plcsetup.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\moc_plcsetup.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\GeneratedFiles\Release\moc_savethread.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\moc_savethread.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\GeneratedFiles\Release\moc_threadReceive.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\moc_threadReceive.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\GeneratedFiles\Release\moc_workthread.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\moc_workthread.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\hikcamera.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\hikcamera.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Logthread.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\Logthread.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\main.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\main.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\output_statistic.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\output_statistic.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\plcsetup.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\plcsetup.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\PLC\PLCDevice.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\PLCDevice.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\plc_item.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\plc_item.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\SyncQueue.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\SyncQueue.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\threadReceive.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\threadReceive.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\threadSend.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\threadSend.obj
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\workthread.cpp;D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\x64\Release\workthread.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\alarmdialog.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\alarmdialog.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\AlarmInfo.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\AlarmInfo.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\alg_jd.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\alg_jd.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\ASyncQueue.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\ASyncQueue.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\balluffcamera.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\balluffcamera.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\basecamera.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\basecamera.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\baslercamera.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\baslercamera.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\camera_glue.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\camera_glue.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\CaptureThread.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\CaptureThread.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\CaptureThreadBasler.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\CaptureThreadBasler.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\CaptureThreadHIK.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\CaptureThreadHIK.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\change_shift.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\change_shift.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\cigarette.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\cigarette.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Cleanthread.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\Cleanthread.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\common.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\common.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\db_label.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\db_label.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\debugthread.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\debugthread.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\dialogin.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\dialogin.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\dialogsetup.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\dialogsetup.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\dialogsetuppasswd.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\dialogsetuppasswd.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\GeneratedFiles\qrc_cigarette.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\qrc_cigarette.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\GeneratedFiles\Release\moc_alarmdialog.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\moc_alarmdialog.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\GeneratedFiles\Release\moc_camera_glue.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\moc_camera_glue.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\GeneratedFiles\Release\moc_CaptureThread.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\moc_CaptureThread.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\GeneratedFiles\Release\moc_CaptureThreadBasler.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\moc_CaptureThreadBasler.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\GeneratedFiles\Release\moc_CaptureThreadHIK.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\moc_CaptureThreadHIK.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\GeneratedFiles\Release\moc_change_shift.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\moc_change_shift.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\GeneratedFiles\Release\moc_cigarette.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\moc_cigarette.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\GeneratedFiles\Release\moc_Cleanthread.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\moc_Cleanthread.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\GeneratedFiles\Release\moc_db_label.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\moc_db_label.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\GeneratedFiles\Release\moc_debugthread.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\moc_debugthread.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\GeneratedFiles\Release\moc_dialogin.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\moc_dialogin.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\GeneratedFiles\Release\moc_dialogsetup.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\moc_dialogsetup.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\GeneratedFiles\Release\moc_dialogsetuppasswd.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\moc_dialogsetuppasswd.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\GeneratedFiles\Release\moc_Logthread.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\moc_Logthread.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\GeneratedFiles\Release\moc_output_statistic.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\moc_output_statistic.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\GeneratedFiles\Release\moc_plcsetup.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\moc_plcsetup.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\GeneratedFiles\Release\moc_savethread.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\moc_savethread.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\GeneratedFiles\Release\moc_threadReceive.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\moc_threadReceive.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\GeneratedFiles\Release\moc_workthread.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\moc_workthread.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\hikcamera.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\hikcamera.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Logthread.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\Logthread.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\main.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\main.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\output_statistic.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\output_statistic.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\plcsetup.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\plcsetup.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\PLC\PLCDevice.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\PLCDevice.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\plc_item.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\plc_item.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\SyncQueue.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\SyncQueue.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\threadReceive.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\threadReceive.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\threadSend.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\threadSend.obj
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\workthread.cpp;D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\x64\Release\workthread.obj
--- a/Cigarette/x64/Release/Cigarette.tlog/CustomBuild.command.1.tlog
+++ b/Cigarette/x64/Release/Cigarette.tlog/CustomBuild.command.1.tlog
@ -1,58 +1,58 @@
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CIGARETTE.H
-"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\cigarette.h" -o ".\GeneratedFiles\Release\moc_cigarette.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D  "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MvIMPACT" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\OpenCV455Simple\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CIGARETTE.UI
-"C:\Qt\5.15.2\msvc2019_64\bin\uic.exe" -o ".\GeneratedFiles\ui_cigarette.h" "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\cigarette.ui"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\THREADRECEIVE.H
-"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\threadReceive.h" -o ".\GeneratedFiles\Release\moc_threadReceive.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DNOMINMAX -DQT_CHARTS_LIB -DQT_CORE_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_WEBCHANNEL_LIB -DQT_WEBSOCKETS_LIB -DQT_WIDGETS_LIB -D "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MvIMPACT" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\OpenCV455Simple\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCharts" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWebChannel" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWebSockets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\WORKTHREAD.H
-"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\workthread.h" -o ".\GeneratedFiles\Release\moc_workthread.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D  "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MvIMPACT" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\OpenCV455Simple\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\ALARMDIALOG.HPP
-"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\alarmdialog.hpp" -o ".\GeneratedFiles\Release\moc_alarmdialog.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D  "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MvIMPACT" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\OpenCV455Simple\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CAPTURETHREAD.H
-"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\CaptureThread.h" -o ".\GeneratedFiles\Release\moc_CaptureThread.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D  "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MvIMPACT" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\OpenCV455Simple\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CAPTURETHREADBASLER.H
-"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\CaptureThreadBasler.h" -o ".\GeneratedFiles\Release\moc_CaptureThreadBasler.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D  "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MvIMPACT" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\OpenCV455Simple\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CAPTURETHREADHIK.H
-"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\CaptureThreadHIK.h" -o ".\GeneratedFiles\Release\moc_CaptureThreadHIK.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D  "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MvIMPACT" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\OpenCV455Simple\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CAMERA_GLUE.H
-"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\camera_glue.h" -o ".\GeneratedFiles\Release\moc_camera_glue.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MvIMPACT" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\OpenCV455Simple\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CHANGE_SHIFT.H
-"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\change_shift.h" -o ".\GeneratedFiles\Release\moc_change_shift.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MvIMPACT" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\OpenCV455Simple\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CLEANTHREAD.H
-"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Cleanthread.h" -o ".\GeneratedFiles\Release\moc_Cleanthread.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MvIMPACT" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\OpenCV455Simple\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\PLCSETUP.HPP
-"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\plcsetup.hpp" -o ".\GeneratedFiles\Release\moc_plcsetup.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D  "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MvIMPACT" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\OpenCV455Simple\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\DB_LABEL.H
-"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\db_label.h" -o ".\GeneratedFiles\Release\moc_db_label.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D  "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MvIMPACT" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\OpenCV455Simple\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\DEBUGTHREAD.H
-"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\debugthread.h" -o ".\GeneratedFiles\Release\moc_debugthread.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D  "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MvIMPACT" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\OpenCV455Simple\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\DIALOGIN.HPP
-"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\dialogin.hpp" -o ".\GeneratedFiles\Release\moc_dialogin.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D  "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MvIMPACT" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\OpenCV455Simple\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\OUTPUT_STATISTIC.H
-"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\output_statistic.h" -o ".\GeneratedFiles\Release\moc_output_statistic.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MvIMPACT" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\OpenCV455Simple\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\LOGTHREAD.H
-"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Logthread.h" -o ".\GeneratedFiles\Release\moc_Logthread.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MvIMPACT" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\OpenCV455Simple\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\SAVETHREAD.H
-"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\savethread.h" -o ".\GeneratedFiles\Release\moc_savethread.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D  "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MvIMPACT" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\OpenCV455Simple\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\DIALOGSETUPPASSWD.HPP
-"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\dialogsetuppasswd.hpp" -o ".\GeneratedFiles\Release\moc_dialogsetuppasswd.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D  "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MvIMPACT" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\OpenCV455Simple\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\DIALOGSETUP.HPP
-"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\dialogsetup.hpp" -o ".\GeneratedFiles\Release\moc_dialogsetup.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D  "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MvIMPACT" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\OpenCV455Simple\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CIGARETTE.QRC
-"C:\Qt\5.15.2\msvc2019_64\bin\rcc.exe" -name "cigarette" -no-compress "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\cigarette.qrc" -o .\GeneratedFiles\qrc_cigarette.cpp
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\DIALOGSETUPPASSWD.UI
-"C:\Qt\5.15.2\msvc2019_64\bin\uic.exe" -o ".\GeneratedFiles\ui_dialogsetuppasswd.h" "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\dialogsetuppasswd.ui"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\DIALOGSETUP.UI
-"C:\Qt\5.15.2\msvc2019_64\bin\uic.exe" -o ".\GeneratedFiles\ui_dialogsetup.h" "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\dialogsetup.ui"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\PLCSETUP.UI
-"C:\Qt\5.15.2\msvc2019_64\bin\uic.exe" -o ".\GeneratedFiles\ui_plcsetup.h" "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\plcsetup.ui"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\ALARMDIALOG.UI
-"C:\Qt\5.15.2\msvc2019_64\bin\uic.exe" -o ".\GeneratedFiles\ui_alarmdialog.h" "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\alarmdialog.ui"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\DIALOGIN.UI
-"C:\Qt\5.15.2\msvc2019_64\bin\uic.exe" -o ".\GeneratedFiles\ui_dialogin.h" "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\dialogin.ui"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CAMERA_GLUE.UI
-"C:\Qt\5.15.2\msvc2019_64\bin\uic.exe" -o ".\GeneratedFiles\ui_camera_glue.h" "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\camera_glue.ui"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CHANGE_SHIFT.UI
-"C:\Qt\5.15.2\msvc2019_64\bin\uic.exe" -o ".\GeneratedFiles\ui_change_shift.h" "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\change_shift.ui"
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\OUTPUT_STATISTIC.UI
-"C:\Qt\5.15.2\msvc2019_64\bin\uic.exe" -o ".\GeneratedFiles\ui_output_statistic.h" "D:\烟厂资料\程序测试\客户端\230801-解决编译报错\Cigarette\output_statistic.ui"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CIGARETTE.H
+"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\cigarette.h" -o ".\GeneratedFiles\Release\moc_cigarette.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D  "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MvIMPACT" "-IG:\code_library\c\opencv\4.3\build-opencv+cuda\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CIGARETTE.UI
+"C:\Qt\5.15.2\msvc2019_64\bin\uic.exe" -o ".\GeneratedFiles\ui_cigarette.h" "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\cigarette.ui"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\THREADRECEIVE.H
+"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\threadReceive.h" -o ".\GeneratedFiles\Release\moc_threadReceive.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DNOMINMAX -DQT_CHARTS_LIB -DQT_CORE_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_WEBCHANNEL_LIB -DQT_WEBSOCKETS_LIB -DQT_WIDGETS_LIB -D "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MvIMPACT" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\OpenCV455Simple\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCharts" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWebChannel" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWebSockets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\WORKTHREAD.H
+"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\workthread.h" -o ".\GeneratedFiles\Release\moc_workthread.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D  "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MvIMPACT" "-IG:\code_library\c\opencv\4.3\build-opencv+cuda\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\ALARMDIALOG.HPP
+"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\alarmdialog.hpp" -o ".\GeneratedFiles\Release\moc_alarmdialog.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D  "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MvIMPACT" "-IG:\code_library\c\opencv\4.3\build-opencv+cuda\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CAPTURETHREAD.H
+"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\CaptureThread.h" -o ".\GeneratedFiles\Release\moc_CaptureThread.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D  "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MvIMPACT" "-IG:\code_library\c\opencv\4.3\build-opencv+cuda\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CAPTURETHREADBASLER.H
+"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\CaptureThreadBasler.h" -o ".\GeneratedFiles\Release\moc_CaptureThreadBasler.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D  "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MvIMPACT" "-IG:\code_library\c\opencv\4.3\build-opencv+cuda\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CAPTURETHREADHIK.H
+"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\CaptureThreadHIK.h" -o ".\GeneratedFiles\Release\moc_CaptureThreadHIK.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D  "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MvIMPACT" "-IG:\code_library\c\opencv\4.3\build-opencv+cuda\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CAMERA_GLUE.H
+"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\camera_glue.h" -o ".\GeneratedFiles\Release\moc_camera_glue.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MvIMPACT" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\OpenCV455Simple\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CHANGE_SHIFT.H
+"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\change_shift.h" -o ".\GeneratedFiles\Release\moc_change_shift.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MvIMPACT" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\OpenCV455Simple\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CLEANTHREAD.H
+"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Cleanthread.h" -o ".\GeneratedFiles\Release\moc_Cleanthread.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MvIMPACT" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\OpenCV455Simple\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\PLCSETUP.HPP
+"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\plcsetup.hpp" -o ".\GeneratedFiles\Release\moc_plcsetup.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D  "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MvIMPACT" "-IG:\code_library\c\opencv\4.3\build-opencv+cuda\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\DB_LABEL.H
+"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\db_label.h" -o ".\GeneratedFiles\Release\moc_db_label.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D  "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MvIMPACT" "-IG:\code_library\c\opencv\4.3\build-opencv+cuda\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\DEBUGTHREAD.H
+"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\debugthread.h" -o ".\GeneratedFiles\Release\moc_debugthread.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D  "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MvIMPACT" "-IG:\code_library\c\opencv\4.3\build-opencv+cuda\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\DIALOGIN.HPP
+"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\dialogin.hpp" -o ".\GeneratedFiles\Release\moc_dialogin.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D  "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MvIMPACT" "-IG:\code_library\c\opencv\4.3\build-opencv+cuda\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\OUTPUT_STATISTIC.H
+"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\output_statistic.h" -o ".\GeneratedFiles\Release\moc_output_statistic.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MvIMPACT" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\OpenCV455Simple\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\LOGTHREAD.H
+"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Logthread.h" -o ".\GeneratedFiles\Release\moc_Logthread.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MvIMPACT" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\OpenCV455Simple\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\SAVETHREAD.H
+"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\savethread.h" -o ".\GeneratedFiles\Release\moc_savethread.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D  "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MvIMPACT" "-IG:\code_library\c\opencv\4.3\build-opencv+cuda\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\DIALOGSETUPPASSWD.HPP
+"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\dialogsetuppasswd.hpp" -o ".\GeneratedFiles\Release\moc_dialogsetuppasswd.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D  "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MvIMPACT" "-IG:\code_library\c\opencv\4.3\build-opencv+cuda\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\DIALOGSETUP.HPP
+"C:\Qt\5.15.2\msvc2019_64\bin\moc.exe"  "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\dialogsetup.hpp" -o ".\GeneratedFiles\Release\moc_dialogsetup.cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DNOMINMAX -DQT_NETWORK_LIB -D  "-I.\GeneratedFiles" "-I." "-IC:\Qt\5.15.2\msvc2019_64\include" "-I.\GeneratedFiles\Release" "-IC:\Qt\5.15.2\msvc2019_64\include\QtCore" "-IC:\Qt\5.15.2\msvc2019_64\include\QtWidgets" "-IC:\Qt\5.15.2\msvc2019_64\include\QtGui" "-IC:\Qt\5.15.2\msvc2019_64\include\QtANGLE" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MvIMPACT" "-IG:\code_library\c\opencv\4.3\build-opencv+cuda\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Common" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\Pylon6.2\include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\modbus" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\MVS3.2.1\Include" "-ID:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\PLC" "-IC:\Qt\5.15.2\msvc2019_64\include\QtNetwork"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CIGARETTE.QRC
+"C:\Qt\5.15.2\msvc2019_64\bin\rcc.exe" -name "cigarette" -no-compress "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\cigarette.qrc" -o .\GeneratedFiles\qrc_cigarette.cpp
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\DIALOGSETUPPASSWD.UI
+"C:\Qt\5.15.2\msvc2019_64\bin\uic.exe" -o ".\GeneratedFiles\ui_dialogsetuppasswd.h" "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\dialogsetuppasswd.ui"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\DIALOGSETUP.UI
+"C:\Qt\5.15.2\msvc2019_64\bin\uic.exe" -o ".\GeneratedFiles\ui_dialogsetup.h" "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\dialogsetup.ui"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\PLCSETUP.UI
+"C:\Qt\5.15.2\msvc2019_64\bin\uic.exe" -o ".\GeneratedFiles\ui_plcsetup.h" "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\plcsetup.ui"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\ALARMDIALOG.UI
+"C:\Qt\5.15.2\msvc2019_64\bin\uic.exe" -o ".\GeneratedFiles\ui_alarmdialog.h" "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\alarmdialog.ui"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\DIALOGIN.UI
+"C:\Qt\5.15.2\msvc2019_64\bin\uic.exe" -o ".\GeneratedFiles\ui_dialogin.h" "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\dialogin.ui"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CAMERA_GLUE.UI
+"C:\Qt\5.15.2\msvc2019_64\bin\uic.exe" -o ".\GeneratedFiles\ui_camera_glue.h" "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\camera_glue.ui"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CHANGE_SHIFT.UI
+"C:\Qt\5.15.2\msvc2019_64\bin\uic.exe" -o ".\GeneratedFiles\ui_change_shift.h" "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\change_shift.ui"
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\OUTPUT_STATISTIC.UI
+"C:\Qt\5.15.2\msvc2019_64\bin\uic.exe" -o ".\GeneratedFiles\ui_output_statistic.h" "D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\Cigarette\output_statistic.ui"
--- a/Cigarette/x64/Release/Cigarette.tlog/CustomBuild.read.1.tlog
+++ b/Cigarette/x64/Release/Cigarette.tlog/CustomBuild.read.1.tlog
@ -1,57 +1,57 @@
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CIGARETTE.H
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CIGARETTE.H
 C:\QT\5.15.2\MSVC2019_64\BIN\MOC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CIGARETTE.UI
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CIGARETTE.UI
 C:\QT\5.15.2\MSVC2019_64\BIN\UIC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\THREADRECEIVE.H
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\THREADRECEIVE.H
 C:\QT\5.15.2\MSVC2019_64\BIN\MOC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\WORKTHREAD.H
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\WORKTHREAD.H
 C:\QT\5.15.2\MSVC2019_64\BIN\MOC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\ALARMDIALOG.HPP
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\ALARMDIALOG.HPP
 C:\QT\5.15.2\MSVC2019_64\BIN\MOC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CAPTURETHREAD.H
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CAPTURETHREAD.H
 C:\QT\5.15.2\MSVC2019_64\BIN\MOC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CAPTURETHREADBASLER.H
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CAPTURETHREADBASLER.H
 C:\QT\5.15.2\MSVC2019_64\BIN\MOC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CAPTURETHREADHIK.H
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CAPTURETHREADHIK.H
 C:\QT\5.15.2\MSVC2019_64\BIN\MOC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CAMERA_GLUE.H
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CAMERA_GLUE.H
 C:\QT\5.15.2\MSVC2019_64\BIN\MOC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CHANGE_SHIFT.H
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CHANGE_SHIFT.H
 C:\QT\5.15.2\MSVC2019_64\BIN\MOC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CLEANTHREAD.H
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CLEANTHREAD.H
 C:\QT\5.15.2\MSVC2019_64\BIN\MOC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\PLCSETUP.HPP
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\PLCSETUP.HPP
 C:\QT\5.15.2\MSVC2019_64\BIN\MOC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\DB_LABEL.H
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\DB_LABEL.H
 C:\QT\5.15.2\MSVC2019_64\BIN\MOC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\DEBUGTHREAD.H
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\DEBUGTHREAD.H
 C:\QT\5.15.2\MSVC2019_64\BIN\MOC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\DIALOGIN.HPP
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\DIALOGIN.HPP
 C:\QT\5.15.2\MSVC2019_64\BIN\MOC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\OUTPUT_STATISTIC.H
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\OUTPUT_STATISTIC.H
 C:\QT\5.15.2\MSVC2019_64\BIN\MOC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\LOGTHREAD.H
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\LOGTHREAD.H
 C:\QT\5.15.2\MSVC2019_64\BIN\MOC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\SAVETHREAD.H
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\SAVETHREAD.H
 C:\QT\5.15.2\MSVC2019_64\BIN\MOC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\DIALOGSETUPPASSWD.HPP
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\DIALOGSETUPPASSWD.HPP
 C:\QT\5.15.2\MSVC2019_64\BIN\MOC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\DIALOGSETUP.HPP
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\DIALOGSETUP.HPP
 C:\QT\5.15.2\MSVC2019_64\BIN\MOC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CIGARETTE.QRC
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\DIALOGSETUPPASSWD.UI
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CIGARETTE.QRC
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\DIALOGSETUPPASSWD.UI
 C:\QT\5.15.2\MSVC2019_64\BIN\UIC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\DIALOGSETUP.UI
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\DIALOGSETUP.UI
 C:\QT\5.15.2\MSVC2019_64\BIN\UIC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\PLCSETUP.UI
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\PLCSETUP.UI
 C:\QT\5.15.2\MSVC2019_64\BIN\UIC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\ALARMDIALOG.UI
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\ALARMDIALOG.UI
 C:\QT\5.15.2\MSVC2019_64\BIN\UIC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\DIALOGIN.UI
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\DIALOGIN.UI
 C:\QT\5.15.2\MSVC2019_64\BIN\UIC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CAMERA_GLUE.UI
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CAMERA_GLUE.UI
 C:\QT\5.15.2\MSVC2019_64\BIN\UIC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CHANGE_SHIFT.UI
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CHANGE_SHIFT.UI
 C:\QT\5.15.2\MSVC2019_64\BIN\UIC.EXE
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\OUTPUT_STATISTIC.UI
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\OUTPUT_STATISTIC.UI
 C:\QT\5.15.2\MSVC2019_64\BIN\UIC.EXE
--- a/Cigarette/x64/Release/Cigarette.tlog/CustomBuild.write.1.tlog
+++ b/Cigarette/x64/Release/Cigarette.tlog/CustomBuild.write.1.tlog
@ -1,58 +1,58 @@
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CIGARETTE.H
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\RELEASE\MOC_CIGARETTE.CPP
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CIGARETTE.UI
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\UI_CIGARETTE.H
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\THREADRECEIVE.H
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\RELEASE\MOC_THREADRECEIVE.CPP
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\WORKTHREAD.H
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\RELEASE\MOC_WORKTHREAD.CPP
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\ALARMDIALOG.HPP
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\RELEASE\MOC_ALARMDIALOG.CPP
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CAPTURETHREAD.H
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\RELEASE\MOC_CAPTURETHREAD.CPP
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CAPTURETHREADBASLER.H
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\RELEASE\MOC_CAPTURETHREADBASLER.CPP
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CAPTURETHREADHIK.H
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\RELEASE\MOC_CAPTURETHREADHIK.CPP
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CAMERA_GLUE.H
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\RELEASE\MOC_CAMERA_GLUE.CPP
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CHANGE_SHIFT.H
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\RELEASE\MOC_CHANGE_SHIFT.CPP
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CLEANTHREAD.H
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\RELEASE\MOC_CLEANTHREAD.CPP
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\PLCSETUP.HPP
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\RELEASE\MOC_PLCSETUP.CPP
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\DB_LABEL.H
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\RELEASE\MOC_DB_LABEL.CPP
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\DEBUGTHREAD.H
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\RELEASE\MOC_DEBUGTHREAD.CPP
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\DIALOGIN.HPP
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\RELEASE\MOC_DIALOGIN.CPP
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\OUTPUT_STATISTIC.H
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\RELEASE\MOC_OUTPUT_STATISTIC.CPP
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\LOGTHREAD.H
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\RELEASE\MOC_LOGTHREAD.CPP
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\SAVETHREAD.H
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\RELEASE\MOC_SAVETHREAD.CPP
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\DIALOGSETUPPASSWD.HPP
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\RELEASE\MOC_DIALOGSETUPPASSWD.CPP
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\DIALOGSETUP.HPP
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\RELEASE\MOC_DIALOGSETUP.CPP
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CIGARETTE.QRC
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\QRC_CIGARETTE.CPP
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\DIALOGSETUPPASSWD.UI
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\UI_DIALOGSETUPPASSWD.H
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\DIALOGSETUP.UI
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\UI_DIALOGSETUP.H
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\PLCSETUP.UI
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\UI_PLCSETUP.H
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\ALARMDIALOG.UI
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\UI_ALARMDIALOG.H
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\DIALOGIN.UI
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\UI_DIALOGIN.H
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CAMERA_GLUE.UI
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\UI_CAMERA_GLUE.H
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\CHANGE_SHIFT.UI
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\UI_CHANGE_SHIFT.H
-^D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\OUTPUT_STATISTIC.UI
-D:\烟厂资料\程序测试\客户端\230801-解决编译报错\CIGARETTE\GENERATEDFILES\UI_OUTPUT_STATISTIC.H
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CIGARETTE.H
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\RELEASE\MOC_CIGARETTE.CPP
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CIGARETTE.UI
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\UI_CIGARETTE.H
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\THREADRECEIVE.H
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\RELEASE\MOC_THREADRECEIVE.CPP
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\WORKTHREAD.H
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\RELEASE\MOC_WORKTHREAD.CPP
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\ALARMDIALOG.HPP
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\RELEASE\MOC_ALARMDIALOG.CPP
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CAPTURETHREAD.H
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\RELEASE\MOC_CAPTURETHREAD.CPP
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CAPTURETHREADBASLER.H
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\RELEASE\MOC_CAPTURETHREADBASLER.CPP
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CAPTURETHREADHIK.H
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\RELEASE\MOC_CAPTURETHREADHIK.CPP
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CAMERA_GLUE.H
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\RELEASE\MOC_CAMERA_GLUE.CPP
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CHANGE_SHIFT.H
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\RELEASE\MOC_CHANGE_SHIFT.CPP
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CLEANTHREAD.H
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\RELEASE\MOC_CLEANTHREAD.CPP
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\PLCSETUP.HPP
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\RELEASE\MOC_PLCSETUP.CPP
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\DB_LABEL.H
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\RELEASE\MOC_DB_LABEL.CPP
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\DEBUGTHREAD.H
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\RELEASE\MOC_DEBUGTHREAD.CPP
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\DIALOGIN.HPP
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\RELEASE\MOC_DIALOGIN.CPP
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\OUTPUT_STATISTIC.H
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\RELEASE\MOC_OUTPUT_STATISTIC.CPP
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\LOGTHREAD.H
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\RELEASE\MOC_LOGTHREAD.CPP
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\SAVETHREAD.H
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\RELEASE\MOC_SAVETHREAD.CPP
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\DIALOGSETUPPASSWD.HPP
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\RELEASE\MOC_DIALOGSETUPPASSWD.CPP
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\DIALOGSETUP.HPP
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\RELEASE\MOC_DIALOGSETUP.CPP
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CIGARETTE.QRC
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\QRC_CIGARETTE.CPP
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\DIALOGSETUPPASSWD.UI
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\UI_DIALOGSETUPPASSWD.H
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\DIALOGSETUP.UI
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\UI_DIALOGSETUP.H
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\PLCSETUP.UI
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\UI_PLCSETUP.H
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\ALARMDIALOG.UI
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\UI_ALARMDIALOG.H
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\DIALOGIN.UI
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\UI_DIALOGIN.H
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CAMERA_GLUE.UI
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\UI_CAMERA_GLUE.H
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\CHANGE_SHIFT.UI
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\UI_CHANGE_SHIFT.H
+^D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\OUTPUT_STATISTIC.UI
+D:\烟厂资料\程序测试\客户端\230708-添加巴鲁夫新型号相机\CIGARETTE\GENERATEDFILES\UI_OUTPUT_STATISTIC.H
--- a/Cigarette/x64/Release/Cigarette.tlog/link.command.1.tlog
+++ b/Cigarette/x64/Release/Cigarette.tlog/link.command.1.tlog
--- a/Cigarette/x64/Release/Cigarette.tlog/link.read.1.tlog
+++ b/Cigarette/x64/Release/Cigarette.tlog/link.read.1.tlog
--- a/Cigarette/x64/Release/Cigarette.tlog/link.write.1.tlog
+++ b/Cigarette/x64/Release/Cigarette.tlog/link.write.1.tlog
--- a/Cigarette/x64/Release/Cleanthread.obj
+++ b/Cigarette/x64/Release/Cleanthread.obj
--- a/Cigarette/x64/Release/Logthread.obj
+++ b/Cigarette/x64/Release/Logthread.obj
--- a/Cigarette/x64/Release/PLCDevice.obj
+++ b/Cigarette/x64/Release/PLCDevice.obj
--- a/Cigarette/x64/Release/SyncQueue.obj
+++ b/Cigarette/x64/Release/SyncQueue.obj
--- a/Cigarette/x64/Release/alarmdialog.obj
+++ b/Cigarette/x64/Release/alarmdialog.obj
--- a/Cigarette/x64/Release/alg_jd.obj
+++ b/Cigarette/x64/Release/alg_jd.obj
--- a/Cigarette/x64/Release/balluffcamera.obj
+++ b/Cigarette/x64/Release/balluffcamera.obj
--- a/Cigarette/x64/Release/basecamera.obj
+++ b/Cigarette/x64/Release/basecamera.obj
--- a/Cigarette/x64/Release/baslercamera.obj
+++ b/Cigarette/x64/Release/baslercamera.obj
--- a/Cigarette/x64/Release/camera_glue.obj
+++ b/Cigarette/x64/Release/camera_glue.obj
--- a/Cigarette/x64/Release/change_shift.obj
+++ b/Cigarette/x64/Release/change_shift.obj
--- a/Cigarette/x64/Release/cigarette.obj
+++ b/Cigarette/x64/Release/cigarette.obj
--- a/Cigarette/x64/Release/common.obj
+++ b/Cigarette/x64/Release/common.obj
--- a/Cigarette/x64/Release/db_label.obj
+++ b/Cigarette/x64/Release/db_label.obj
--- a/Cigarette/x64/Release/debugthread.obj
+++ b/Cigarette/x64/Release/debugthread.obj
--- a/Cigarette/x64/Release/dialogin.obj
+++ b/Cigarette/x64/Release/dialogin.obj
--- a/Cigarette/x64/Release/dialogsetup.obj
+++ b/Cigarette/x64/Release/dialogsetup.obj
--- a/Cigarette/x64/Release/dialogsetuppasswd.obj
+++ b/Cigarette/x64/Release/dialogsetuppasswd.obj
--- a/Cigarette/x64/Release/hikcamera.obj
+++ b/Cigarette/x64/Release/hikcamera.obj
--- a/Cigarette/x64/Release/main.obj
+++ b/Cigarette/x64/Release/main.obj
--- a/Cigarette/x64/Release/moc_CaptureThread.obj
+++ b/Cigarette/x64/Release/moc_CaptureThread.obj
--- a/Cigarette/x64/Release/moc_CaptureThreadBasler.obj
+++ b/Cigarette/x64/Release/moc_CaptureThreadBasler.obj
--- a/Cigarette/x64/Release/moc_CaptureThreadHIK.obj
+++ b/Cigarette/x64/Release/moc_CaptureThreadHIK.obj
--- a/Cigarette/x64/Release/moc_Cleanthread.obj
+++ b/Cigarette/x64/Release/moc_Cleanthread.obj
--- a/Cigarette/x64/Release/moc_Logthread.obj
+++ b/Cigarette/x64/Release/moc_Logthread.obj
--- a/Cigarette/x64/Release/moc_alarmdialog.obj
+++ b/Cigarette/x64/Release/moc_alarmdialog.obj
--- a/Cigarette/x64/Release/moc_camera_glue.obj
+++ b/Cigarette/x64/Release/moc_camera_glue.obj
--- a/Cigarette/x64/Release/moc_change_shift.obj
+++ b/Cigarette/x64/Release/moc_change_shift.obj
--- a/Cigarette/x64/Release/moc_cigarette.obj
+++ b/Cigarette/x64/Release/moc_cigarette.obj
--- a/Cigarette/x64/Release/moc_db_label.obj
+++ b/Cigarette/x64/Release/moc_db_label.obj
--- a/Cigarette/x64/Release/moc_debugthread.obj
+++ b/Cigarette/x64/Release/moc_debugthread.obj
--- a/Cigarette/x64/Release/moc_dialogin.obj
+++ b/Cigarette/x64/Release/moc_dialogin.obj
--- a/Cigarette/x64/Release/moc_dialogsetup.obj
+++ b/Cigarette/x64/Release/moc_dialogsetup.obj
--- a/Cigarette/x64/Release/moc_dialogsetuppasswd.obj
+++ b/Cigarette/x64/Release/moc_dialogsetuppasswd.obj
--- a/Cigarette/x64/Release/moc_output_statistic.obj
+++ b/Cigarette/x64/Release/moc_output_statistic.obj
--- a/Cigarette/x64/Release/moc_plcsetup.obj
+++ b/Cigarette/x64/Release/moc_plcsetup.obj
--- a/Cigarette/x64/Release/moc_savethread.obj
+++ b/Cigarette/x64/Release/moc_savethread.obj
--- a/Cigarette/x64/Release/moc_threadReceive.obj
+++ b/Cigarette/x64/Release/moc_threadReceive.obj
--- a/Cigarette/x64/Release/moc_workthread.obj
+++ b/Cigarette/x64/Release/moc_workthread.obj
--- a/Cigarette/x64/Release/output_statistic.obj
+++ b/Cigarette/x64/Release/output_statistic.obj
--- a/Cigarette/x64/Release/plc_item.obj
+++ b/Cigarette/x64/Release/plc_item.obj
--- a/Cigarette/x64/Release/plcsetup.obj
+++ b/Cigarette/x64/Release/plcsetup.obj
--- a/Cigarette/x64/Release/qrc_cigarette.obj
+++ b/Cigarette/x64/Release/qrc_cigarette.obj
--- a/Cigarette/x64/Release/threadReceive.obj
+++ b/Cigarette/x64/Release/threadReceive.obj
--- a/Cigarette/x64/Release/threadSend.obj
+++ b/Cigarette/x64/Release/threadSend.obj
--- a/Cigarette/x64/Release/vc143.pdb
+++ b/Cigarette/x64/Release/vc143.pdb
--- a/Cigarette/x64/Release/workthread.obj
+++ b/Cigarette/x64/Release/workthread.obj
--- a/conf/conf.txt
+++ b/conf/conf.txt
@ -1,76 +1,75 @@
 SAVE=0
 MISMATCHACT=1
-SAVE_DAYS=7
+SAVE_DAYS=1
 FREESIZE=10
-ComPort=COM1
-CONFTHRESHOLD=1
+ComPort=COM2
 AUTO_OPEN=1
 AUTO_WORK=1
 AUTO_SHIFT=0
-TIMING_SHIFT=1
+TIMING_SHIFT=0
 SHIFT_BYHAND=1
-SHIFT_A=10|19
-SHIFT_B=10|21
-SHIFT_C=10|23
-LOCATION=CDTHV1.0.1
-MODELPATH=
-JPGPATH=
+SHIFT_A=1|0
+SHIFT_B=2|0
+SHIFT_C=3|0
+LOCATION=CDTHV1.0
+MODELPATH=D:/model/jd.weights
+JPGPATH=D:/Release455/alg_jd.jpg
 *****************************************
-EXPO1=1000
+EXPO1=500
 GAIN1=0
 FILTER1=500
-USERID1=1
-NO1=1|1|1
-SHOOT1=3
+USERID1=0
+NO1=3|0|0
+SHOOT1=1
 *****************************************
 EXPO2=500
 GAIN2=0
 FILTER2=500
-USERID2=4
-NO2=0|0|0
-SHOOT2=3
+USERID2=1
+NO2=2|1|0
+SHOOT2=1
 *****************************************
 EXPO3=500
 GAIN3=0
 FILTER3=500
-USERID3=255
-NO3=0|0|0
-SHOOT3=3
+USERID3=2
+NO3=2|1|0
+SHOOT3=1
 *****************************************
 EXPO4=500
 GAIN4=0
 FILTER4=500
-USERID4=2
+USERID4=3
 NO4=0|0|0
-SHOOT4=3
+SHOOT4=1
 *****************************************
-EXPO5=2000
+EXPO5=555
 GAIN5=0
 FILTER5=500
-USERID5=255
+USERID5=4
 NO5=0|0|0
-SHOOT5=3
+SHOOT5=1
 *****************************************
-EXPO6=2000
+EXPO6=555
 GAIN6=0
 FILTER6=500
-USERID6=255
+USERID6=5
 NO6=0|0|0
-SHOOT6=3
+SHOOT6=1
 *****************************************
-EXPO7=2000
+EXPO7=555
 GAIN7=0
 FILTER7=500
-USERID7=255
+USERID7=6
 NO7=0|0|0
-SHOOT7=3
+SHOOT7=1
 *****************************************
-EXPO8=2000
-GAIN8=0
-FILTER8=500
-USERID8=255
+EXPO8=555
+GAIN8=2
+FILTER8=666
+USERID8=7
 NO8=0|0|0
-SHOOT8=3
+SHOOT8=1
 *****************************************
-MonitorIP=192.168.1.144
+MonitorIP=192.168.1.118
 MonitorPort=1234
--- a/conf/modbus.txt
+++ b/conf/modbus.txt
@ -1,7 +1,7 @@
-KICK1=46118
+KICK1=46112
 KICK2=46114
 KICK3=46116
-KICK4=46112
+KICK4=46118
 KICK5=46120
 KICK6=46122
 KICK7=46124
@ -9,7 +9,6 @@ KICK8=46126
 QUANTITY=46008
 SHIFT=30100
 WORK=30101
-SEND_MESSAGE=30200
 NO_KICK=37102
 DEBUG=30103
 RESET=30104
--- a/conf/plc.txt
+++ b/conf/plc.txt
@ -1,13 +1,13 @@
 以下数据实验使用|0|0|********************
-脉冲速度|46712|1600|范围0Hz~200KHz
+脉冲速度|46712|6000|范围0Hz~200KHz
 相机校验ON|47000|450|上升沿
 相机校验OFF|47002|900|下降沿
 1#相机拍照1ON|47004|500|上升沿
 1#相机拍照1OFF|47006|520|下降沿
-1#相机拍照2ON|47008|600|上升沿
-1#相机拍照2OFF|47010|620|下降沿
-1#相机拍照3ON|47012|700|上升沿
-1#相机拍照3OFF|47014|720|下降沿
+1#相机拍照2ON|47008|1650|上升沿
+1#相机拍照2OFF|47010|1670|下降沿
+1#相机拍照3ON|47012|1800|上升沿
+1#相机拍照3OFF|47014|1820|下降沿
 以下数据视现场情况自行修改|0|0|********************
 开始/暂停|30101|0|1开始，0暂停
 报警|46018|0|0无报警，非零参考报警代码
@ -24,3 +24,4 @@
 2通道亮度|46610|80|范围0~255
 3通道亮度|46620|111|范围0~255
 4通道亮度|46630|111|范围0~255
+
--- a/conf/rotate.txt
+++ b/conf/rotate.txt
@ -1 +1 @@
-0,3,0,3,0,3,0,3,0,3,0,3,0,3,0,3,
+1,2,1,3,1,2,1,0,1,3,1,3,1,3,1,3,