diff --git a/1280x800 TH/Cigarette/Cigarette.qtvscr b/1280x800 TH/Cigarette/Cigarette.qtvscr deleted file mode 100644 index 95ac3a77..00000000 --- a/1280x800 TH/Cigarette/Cigarette.qtvscr +++ /dev/null @@ -1,13513 +0,0 @@ - - -
- - - Qt Visual Studio Tools - - - Project Format Conversion - - - Report generated on 2024-04-28 10:11:55 - -
-
- - Files - - - - - [Before] - [After] - - [Diff before/after] - - - [Diff before/current] - - - [Diff after/current] - - - - - - - [Before] - [After] - - [Diff before/after] - - - [Diff before/current] - - - [Diff after/current] - - - - - - - [Before] - [After] - - [Diff before/after] - - - [Diff before/current] - - - [Diff after/current] - - - -
-
- - Changes - - - - - - - - - - - - - - - - - - - - - - - - ]]>]]> - - - - - ]]>]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - $(QTDIR)]]> - - - - - - - - - - %(FullPath)]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - UNICODE;_UNICODE;$(Platform);WIN64;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_NETWORK_LIB;%(PreprocessorDefinitions)]]> - - - - - - - - - - Moc'ing %(Identity)...]]> - - - - - - - - - - output]]> - - - - - - - - - - .;.\GeneratedFiles;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtNetwork]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - %(Filename)]]> - - - - - - - - - - .\GeneratedFiles\qrc_%(Filename).cpp]]> - - - - - - - - - - %(FullPath)]]> - - - - - - - - - - $(QTDIR)]]> - - - - - - - - - - default]]> - - - - - - - - - - true]]> - - - - - - - - - - Rcc'ing %(Identity)...]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - $(QTDIR)]]> - - - - - - - - - - %(FullPath)]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h]]> - - - - - - - - - - Uic'ing %(Identity)...]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]>]]> - - - - - ]]>]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - $(QTDIR)]]> - - - - - - - - - - %(FullPath)]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%(PreprocessorDefinitions)]]> - - - - - - - - - - Moc'ing %(Identity)...]]> - - - - - - - - - - output]]> - - - - - - - - - - .;.\GeneratedFiles;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;G:\code_library\c\opencv\4.3\build-opencv-cpu\include;$(ProjectDir)MvIMPACT;$(ProjectDir)Pylon6.2\include;$(ProjectDir)Common;$(ProjectDir)modbus;$(ProjectDir)MVS3.2.1\Include;$(ProjectDir)PLC;$(QTDIR)\include\QtNetwork]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - $(QTDIR)]]> - - - - - - - - - - %(FullPath)]]> - - - - - - - - - - .\GeneratedFiles\qrc_%(Filename).cpp]]> - - - - - - - - - - %(Filename)]]> - - - - - - - - - - default]]> - - - - - - - - - - true]]> - - - - - - - - - - Rcc'ing %(Identity)...]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - $(QTDIR)]]> - - - - - - - - - - %(FullPath)]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h]]> - - - - - - - - - - Uic'ing %(Identity)...]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]>]]> - - - - - ]]>]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - $(QTDIR)]]> - - - - - - - - - - %(FullPath)]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - UNICODE;_UNICODE;$(Platform);WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_NETWORK_LIB;%(PreprocessorDefinitions)]]> - - - - - - - - - - Moc'ing %(Identity)...]]> - - - - - - - - - - output]]> - - - - - - - - - - .;.\GeneratedFiles;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtNetwork]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - $(QTDIR)]]> - - - - - - - - - - %(FullPath)]]> - - - - - - - - - - .\GeneratedFiles\qrc_%(Filename).cpp]]> - - - - - - - - - - %(Filename)]]> - - - - - - - - - - default]]> - - - - - - - - - - true]]> - - - - - - - - - - Rcc'ing %(Identity)...]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - $(QTDIR)]]> - - - - - - - - - - %(FullPath)]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h]]> - - - - - - - - - - Uic'ing %(Identity)...]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]>]]> - - - - - ]]>]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - $(QTDIR)]]> - - - - - - - - - - %(FullPath)]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - Moc'ing %(Identity)...]]> - - - - - - - - - - output]]> - - - - - - - - - - .;.\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]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - $(QTDIR)]]> - - - - - - - - - - %(FullPath)]]> - - - - - - - - - - .\GeneratedFiles\qrc_%(Filename).cpp]]> - - - - - - - - - - %(Filename)]]> - - - - - - - - - - default]]> - - - - - - - - - - true]]> - - - - - - - - - - Rcc'ing %(Identity)...]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - $(QTDIR)]]> - - - - - - - - - - %(FullPath)]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h]]> - - - - - - - - - - Uic'ing %(Identity)...]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - true]]> - - - - - - - - - - true]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - $(QTDIR)\bin\moc.exe]]>]]> - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB]]>]]> - - - - - - - Moc%27ing cigarette.h...]]> - - - - - ]]> - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing cigarette.h...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -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" "-IG:\code_library\c\opencv\4.3\build-opencv-cpu\include" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing cigarette.h...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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 -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing cigarette.h...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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"]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%]]>]]> - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%]]>]]> - - - - - - - Moc%27ing %(Identity)...]]> - - - - - ]]> - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - $(QTDIR)\bin\moc.exe]]>]]> - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB]]>]]> - - - - - - - Moc%27ing %(Identity)...]]> - - - - - ]]> - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -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" "-IG:\code_library\c\opencv\4.3\build-opencv-cpu\include" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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 -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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"]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - $(QTDIR)\bin\moc.exe]]>]]> - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB]]>]]> - - - - - - - Moc%27ing %(Identity)...]]> - - - - - ]]> - - - - - - - ]]>]]> - - - - - ]]> - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -D%]]>]]> - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%]]>]]> - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - ]]> - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -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" "-IG:\code_library\c\opencv\4.3\build-opencv-cpu\include" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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 -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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"]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing alarmdialog.hpp...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing alarmdialog.hpp...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -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" "-IG:\code_library\c\opencv\4.3\build-opencv-cpu\include" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing alarmdialog.hpp...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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 -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing alarmdialog.hpp...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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"]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - $(QTDIR)\bin\moc.exe]]>]]> - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB]]>]]> - - - - - - - Moc%27ing CaptureThread.h...]]> - - - - - ]]> - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing CaptureThread.h...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -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" "-IG:\code_library\c\opencv\4.3\build-opencv-cpu\include" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing CaptureThread.h...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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 -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing CaptureThread.h...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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"]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - $(QTDIR)\bin\moc.exe]]>]]> - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB]]>]]> - - - - - - - Moc%27ing %(Identity)...]]> - - - - - ]]> - - - - - - - ]]>]]> - - - - - ]]> - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -D%]]>]]> - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%]]>]]> - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - ]]> - - - - - - - Moc%27ing %(Identity)...]]> - - - - - ]]> - - - - - - - .\GeneratedFiles\$]]>]]> - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%]]>]]> - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -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" "-IG:\code_library\c\opencv\4.3\build-opencv-cpu\include" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"]]> - - - - - ]]> - - - - - - - $(QTDIR)\bin\moc]]>]]> - - - - - ]]> - - - - - - - Moc%27ing ]]>]]> - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;]]>]]> - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - ]]> - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o "]]>]]> - - - - - ]]> - - - - - - - $(QTDIR)\bin\moc.exe]]>]]> - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB]]>]]> - - - - - - - Moc%27ing %(Identity)...]]> - - - - - ]]> - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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"]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -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" "-IG:\code_library\c\opencv\4.3\build-opencv-cpu\include" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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 -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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"]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -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" "-IG:\code_library\c\opencv\4.3\build-opencv-cpu\include" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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 -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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"]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -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" "-IG:\code_library\c\opencv\4.3\build-opencv-cpu\include" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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 -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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"]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -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" "-IG:\code_library\c\opencv\4.3\build-opencv-cpu\include" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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 -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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"]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - $(QTDIR)\bin\moc.exe]]>]]> - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB]]>]]> - - - - - - - Moc%27ing plcsetup.hpp...]]> - - - - - ]]> - - - - - - - ]]>]]> - - - - - ]]> - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -D%]]>]]> - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%]]>]]> - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - ]]> - - - - - - - Moc%27ing plcsetup]]>]]> - - - - - ]]> - - - - - - - .\GeneratedFiles\$]]>]]> - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%]]>]]> - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -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" "-IG:\code_library\c\opencv\4.3\build-opencv-cpu\include" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"]]> - - - - - ]]> - - - - - - - $(QTDIR)\bin\moc]]>]]> - - - - - ]]> - - - - - - - Moc%27ing plcsetup.hpp...]]> - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%(PreprocessorDefinitions]]>]]> - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - ]]> - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o "]]>]]> - - - - - ]]> - - - - - - - $(QTDIR)\bin\moc.exe]]>]]> - - - - - 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]]>]]> - - - - - - - Moc%27ing plcsetup.hpp...]]> - - - - - ]]> - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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"]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing db_label.h...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing db_label.h...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -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" "-IG:\code_library\c\opencv\4.3\build-opencv-cpu\include" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing db_label.h...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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 -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing db_label.h...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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"]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing debugthread.h...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing debugthread.h...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -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" "-IG:\code_library\c\opencv\4.3\build-opencv-cpu\include" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing debugthread.h...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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 -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing debugthread.h...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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"]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing dialogin.hpp...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing dialogin.hpp...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -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" "-IG:\code_library\c\opencv\4.3\build-opencv-cpu\include" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing dialogin.hpp...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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 -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing dialogin.hpp...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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"]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -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" "-IG:\code_library\c\opencv\4.3\build-opencv-cpu\include" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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 -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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 -DWIN32_LEAN_AND_MEAN -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"]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - $(QTDIR)\bin\moc.exe]]>]]> - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB]]>]]> - - - - - - - Moc%27ing %(Identity)...]]> - - - - - ]]> - - - - - - - ]]>]]> - - - - - ]]> - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -D%]]>]]> - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%]]>]]> - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - ]]> - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -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" "-IG:\code_library\c\opencv\4.3\build-opencv-cpu\include" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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 -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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"]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -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" "-IG:\code_library\c\opencv\4.3\build-opencv-cpu\include" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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 -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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"]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - $(QTDIR)\bin\moc.exe]]>]]> - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB]]>]]> - - - - - - - Moc%27ing %(Identity)...]]> - - - - - ]]> - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -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" "-IG:\code_library\c\opencv\4.3\build-opencv-cpu\include" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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 -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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"]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - $(QTDIR)\bin\moc.exe]]>]]> - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB]]>]]> - - - - - - - Moc%27ing dialogsetuppasswd.hpp...]]> - - - - - ]]> - - - - - - - ]]>]]> - - - - - ]]> - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -D%]]>]]> - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%]]>]]> - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - ]]> - - - - - - - Moc%27ing dialogsetuppasswd.hpp...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -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" "-IG:\code_library\c\opencv\4.3\build-opencv-cpu\include" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing dialogsetuppasswd.hpp...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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 -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing dialogsetuppasswd.hpp...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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"]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing dialogsetup.hpp...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing dialogsetup.hpp...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -D_UNICODE -DWIN32 -DWIN64 -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" "-IG:\code_library\c\opencv\4.3\build-opencv-cpu\include" "-I$(ProjectDir)MvIMPACT" "-I$(ProjectDir)Pylon6.2\include" "-I$(ProjectDir)Common" "-I$(ProjectDir)modbus" "-I$(ProjectDir)MVS3.2.1\Include" "-I$(ProjectDir)PLC" "-I$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing dialogsetup.hpp...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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 -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$(QTDIR)\include\QtNetwork"]]> - - - - - - - - - - $(QTDIR)\bin\moc.exe;%(FullPath)]]> - - - - - - - - - - Moc%27ing dialogsetup.hpp...]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - "$(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"]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - %(FullPath);%(AdditionalInputs)]]> - - - - - - - - - - Rcc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp]]> - - - - - - - - - - %(FullPath);%(AdditionalInputs)]]> - - - - - - - - - - Rcc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp]]> - - - - - - - - - - %(FullPath);%(AdditionalInputs)]]> - - - - - - - - - - Rcc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp]]> - - - - - - - - - - %(FullPath);%(AdditionalInputs)]]> - - - - - - - - - - Rcc%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs)]]> - - - - - - - - - - Uic%27ing %(Identity)...]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h;%(Outputs)]]> - - - - - - - - - - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"]]> - - - - - - - - - - ]]> - - - - - - - -
- - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Debug]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Release]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Debug]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Release]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Debug]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Release]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Debug]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Release]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Debug]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Release]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Debug]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Release]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Debug]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Release]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Debug]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Release]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Debug]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Release]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Debug]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Release]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Debug]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Release]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Debug]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Release]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Debug]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Release]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Debug]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Release]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Debug]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Release]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Debug]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Release]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Debug]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Release]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Debug]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Release]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Debug]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Release]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Debug]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files\Release]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - Source Files]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - Generated Files]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - Generated Files]]> - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - true]]> - - - - - - - - - - - - - true]]> - - - - -
- - - - - - - - - - - - - - - - - - - - - - - Qt4VSv1.0]]> - - - - - QtVS_v304]]> - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - $(MSBuildProjectDirectory)\QtMsBuild]]> - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - -
- - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - 5.15.2_msvc2019_64]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - 5.15.2_msvc2019_64]]> - - - - - - - - - - ]]> - - - - -
- - - - - - - - - - - - - - - - - - - - - - - UNICODE;_UNICODE;WIN32;WIN64;]]>]]> - - - - - UNICODE;_UNICODE;WIN32;WIN64;]]>]]> - - - - - - - - - - UNICODE;_UNICODE;WIN32;WIN64;]]>]]> - - - - - UNICODE;_UNICODE;WIN32;WIN64;]]>]]> - - - - - - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;]]>]]> - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;]]>]]> - - - - - - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;]]>]]> - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;]]>]]> - - - - -
- - - - - - - - - - - - - - - - - - - - - - - .;.\GeneratedFiles]]>]]> - - - - - .;.\GeneratedFiles]]>]]> - - - - - - - - - - .;.\GeneratedFiles]]>]]> - - - - - .;.\GeneratedFiles]]>]]> - - - - - - - - - - .;.\GeneratedFiles]]>]]> - - - - - .;.\GeneratedFiles]]>]]> - - - - - - - - - - .;.\GeneratedFiles]]>]]> - - - - - .;.\GeneratedFiles]]>]]> - - - - -
- - - - - - - - - - - - - - - - - - - - - - - qtmaind.lib;Qt5Cored.lib;Qt5Widgetsd.lib;Qt5Guid.lib;Qt5Networkd.lib;%]]>]]> - - - - - %]]>]]> - - - - - - - - - - qtmaind.lib;Qt5Cored.lib;Qt5Widgetsd.lib;Qt5Guid.lib;opencv_world430d]]>]]> - - - - - opencv_world430d]]>]]> - - - - - - - - - - qtmain.lib;Qt5Core.lib;Qt5Widgets.lib;Qt5Gui.lib;Qt5Network.lib;%]]>]]> - - - - - %]]>]]> - - - - - - - - - - qtmain.lib;Qt5Core.lib;Qt5Widgets.lib;Qt5Gui.lib;opencv_world455]]>]]> - - - - - opencv_world455]]>]]> - - - - -
- - - - - - - - - - - - - - - - - - - - - - - $(QTDIR)\lib;%]]>]]> - - - - - %]]>]]> - - - - - - - - - - $(QTDIR)\lib;G:\code_library\c\opencv\4]]>]]> - - - - - G:\code_library\c\opencv\4]]>]]> - - - - - - - - - - $(QTDIR)\lib;%]]>]]> - - - - - %]]>]]> - - - - - - - - - - $(]]>]]> - - - - - $(]]>]]> - - - - -
- - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - - - - core;network;gui;widgets]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - core;network;gui;widgets]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - core;network;gui;widgets]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - - - - core;network;gui;widgets]]> - - - - -
- - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - -
- - - - - - - - - - - - - - - - - - - - - - - C:\Qt\5.15.2\msvc2019_64]]> - - - - - - - - - - - - - C:\Qt\5.15.2\msvc2019_64]]> - - - - - - - -
- - Dir and FileName]]> - - - - - - - - - - - - - - - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)]]> - - - - - - - - - - moc_%(Filename).cpp]]> - - - - - - - - - - - - - .\GeneratedFiles]]> - - - - - - - - - - qrc_%(Filename).cpp]]> - - - - - - - - - - - - - .\GeneratedFiles]]> - - - - - - - - - - ui_%(Filename).h]]> - - - - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)]]> - - - - - - - - - - moc_%(Filename).cpp]]> - - - - - - - - - - - - - .\GeneratedFiles]]> - - - - - - - - - - qrc_%(Filename).cpp]]> - - - - - - - - - - - - - .\GeneratedFiles]]> - - - - - - - - - - ui_%(Filename).h]]> - - - - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)]]> - - - - - - - - - - moc_%(Filename).cpp]]> - - - - - - - - - - - - - .\GeneratedFiles]]> - - - - - - - - - - qrc_%(Filename).cpp]]> - - - - - - - - - - - - - .\GeneratedFiles]]> - - - - - - - - - - ui_%(Filename).h]]> - - - - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)]]> - - - - - - - - - - moc_%(Filename).cpp]]> - - - - - - - - - - - - - .\GeneratedFiles]]> - - - - - - - - - - qrc_%(Filename).cpp]]> - - - - - - - - - - - - - .\GeneratedFiles]]> - - - - - - - - - - ui_%(Filename).h]]> - - - - -
- - - - - - - - - - - - - - - - - - - - - - - $(QTDIR)]]> - - - - - - - - - - %(FullPath)]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - UNICODE;_UNICODE;$(Platform);WIN64;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_NETWORK_LIB;%(PreprocessorDefinitions)]]> - - - - - - - - - - - - - .;.\GeneratedFiles;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtNetwork]]> - - - - - - - - - - - - - .\GeneratedFiles\qrc_%(Filename).cpp]]> - - - - - - - - - - %(FullPath)]]> - - - - - - - - - - $(QTDIR)]]> - - - - - - - - - - - - - $(QTDIR)]]> - - - - - - - - - - %(FullPath)]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h]]> - - - - - - - - - - - - - $(QTDIR)]]> - - - - - - - - - - %(FullPath)]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%(PreprocessorDefinitions)]]> - - - - - - - - - - - - - .;.\GeneratedFiles;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;G:\code_library\c\opencv\4.3\build-opencv-cpu\include;$(ProjectDir)MvIMPACT;$(ProjectDir)Pylon6.2\include;$(ProjectDir)Common;$(ProjectDir)modbus;$(ProjectDir)MVS3.2.1\Include;$(ProjectDir)PLC;$(QTDIR)\include\QtNetwork]]> - - - - - - - - - - - - - $(QTDIR)]]> - - - - - - - - - - %(FullPath)]]> - - - - - - - - - - .\GeneratedFiles\qrc_%(Filename).cpp]]> - - - - - - - - - - - - - $(QTDIR)]]> - - - - - - - - - - %(FullPath)]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h]]> - - - - - - - - - - - - - $(QTDIR)]]> - - - - - - - - - - %(FullPath)]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - UNICODE;_UNICODE;$(Platform);WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_NETWORK_LIB;%(PreprocessorDefinitions)]]> - - - - - - - - - - - - - .;.\GeneratedFiles;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtNetwork]]> - - - - - - - - - - - - - $(QTDIR)]]> - - - - - - - - - - %(FullPath)]]> - - - - - - - - - - .\GeneratedFiles\qrc_%(Filename).cpp]]> - - - - - - - - - - - - - $(QTDIR)]]> - - - - - - - - - - %(FullPath)]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h]]> - - - - - - - - - - - - - $(QTDIR)]]> - - - - - - - - - - %(FullPath)]]> - - - - - - - - - - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp]]> - - - - - - - - - - - - - .;.\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]]> - - - - - - - - - - - - - $(QTDIR)]]> - - - - - - - - - - %(FullPath)]]> - - - - - - - - - - .\GeneratedFiles\qrc_%(Filename).cpp]]> - - - - - - - - - - - - - $(QTDIR)]]> - - - - - - - - - - %(FullPath)]]> - - - - - - - - - - .\GeneratedFiles\ui_%(Filename).h]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%(PreprocessorDefinitions)]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%(PreprocessorDefinitions)]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%(PreprocessorDefinitions)]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%(PreprocessorDefinitions)]]> - - - - - ]]> - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%(PreprocessorDefinitions)]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%(PreprocessorDefinitions)]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%(PreprocessorDefinitions)]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%(PreprocessorDefinitions)]]> - - - - - ]]> - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%(PreprocessorDefinitions)]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%(PreprocessorDefinitions)]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%(PreprocessorDefinitions)]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%(PreprocessorDefinitions)]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - ]]> - - - - - ]]> - - - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%(PreprocessorDefinitions)]]> - - - - - ]]> - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%(PreprocessorDefinitions)]]> - - - - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%(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)]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%(PreprocessorDefinitions)]]> - - - - - ]]> - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%(PreprocessorDefinitions)]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%(PreprocessorDefinitions)]]> - - - - - - - - - - ]]> - - - - - - - - - - - - - ]]> - - - - - ]]> - - - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%(PreprocessorDefinitions)]]> - - - - - ]]> - - - - - - - ]]> - - - - - - - - - - ]]> - - - - - - - - - - UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;NOMINMAX;QT_NETWORK_LIB;%(PreprocessorDefinitions)]]> - - - - - - - - - - ]]> - - - - - - - -
-
-
- -
- - diff --git a/1280x800 TH/Cigarette/Cigarette/Debug/qmake/qtvars_Win32_Debug.props b/1280x800 TH/Cigarette/Cigarette/Debug/qmake/qtvars_Win32_Debug.props deleted file mode 100644 index b4a7e07f..00000000 --- a/1280x800 TH/Cigarette/Cigarette/Debug/qmake/qtvars_Win32_Debug.props +++ /dev/null @@ -1,60 +0,0 @@ - - -_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_WIDGETS_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB -C:\Users\FD\AppData\Local\Temp\iige4dcj.z1o;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtWidgets;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtGui;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtANGLE;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtNetwork;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtCore;C:\Users\FD\AppData\Local\Temp\iige4dcj.z1o;/include;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\mkspecs\win32-msvc - -MultiThreadedDebugDLL --Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\Qt5Widgetsd.lib;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\Qt5Guid.lib;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\Qt5Networkd.lib;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\Qt5Cored.lib;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\qtmaind.lib;shell32.lib -"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" - -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -C:/Qt/Qt5.14.2/Docs/Qt-5.14.2 -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/include -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/lib -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/bin -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/bin -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/tests -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/plugins -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/imports -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/qml -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/translations - -C:/Qt/Qt5.14.2/Examples/Qt-5.14.2 -C:/Qt/Qt5.14.2/Examples/Qt-5.14.2 -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/bin -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/lib -win32-msvc -win32-msvc -3.1 -5.14.2 -$(Qt_INCLUDEPATH_);.\GeneratedFiles\Debug;.\GeneratedFiles - 5.14.2_msvc2017_64 - core;network;gui;widgets - bin - bin - - - DEFINES=/Project/ItemDefinitionGroup/ClCompile/PreprocessorDefinitions;INCLUDEPATH=/Project/ItemDefinitionGroup/ClCompile/AdditionalIncludeDirectories;STDCPP=/Project/ItemDefinitionGroup/ClCompile/LanguageStandard;RUNTIME=/Project/ItemDefinitionGroup/ClCompile/RuntimeLibrary;CL_OPTIONS=/Project/ItemDefinitionGroup/ClCompile/AdditionalOptions;LIBS=/Project/ItemDefinitionGroup/Link/AdditionalDependencies;LINK_OPTIONS=/Project/ItemDefinitionGroup/Link/AdditionalOptions - - debug - 5.14.2 - 5 - 14 - 2 - - diff --git a/1280x800 TH/Cigarette/Cigarette/Debug/qmake/temp/B12702AD-ABFB-343A-A199-8E24837244A3.Cigarette.designtime.idx b/1280x800 TH/Cigarette/Cigarette/Debug/qmake/temp/B12702AD-ABFB-343A-A199-8E24837244A3.Cigarette.designtime.idx deleted file mode 100644 index 4d5f2bb7..00000000 --- a/1280x800 TH/Cigarette/Cigarette/Debug/qmake/temp/B12702AD-ABFB-343A-A199-8E24837244A3.Cigarette.designtime.idx +++ /dev/null @@ -1 +0,0 @@ -C:\Users\FD\AppData\Local\Temp\o3qvo423.oqm.designtime.props diff --git a/1280x800 TH/Cigarette/Cigarette/Debug/qmake/temp/props.txt b/1280x800 TH/Cigarette/Cigarette/Debug/qmake/temp/props.txt deleted file mode 100644 index 62a0538e..00000000 --- a/1280x800 TH/Cigarette/Cigarette/Debug/qmake/temp/props.txt +++ /dev/null @@ -1,25 +0,0 @@ -QT_SYSROOT: -QT_INSTALL_PREFIX:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -QT_INSTALL_ARCHDATA:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -QT_INSTALL_DATA:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -QT_INSTALL_DOCS:C:/Qt/Qt5.14.2/Docs/Qt-5.14.2 -QT_INSTALL_HEADERS:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/include -QT_INSTALL_LIBS:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/lib -QT_INSTALL_LIBEXECS:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/bin -QT_INSTALL_BINS:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/bin -QT_INSTALL_TESTS:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/tests -QT_INSTALL_PLUGINS:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/plugins -QT_INSTALL_IMPORTS:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/imports -QT_INSTALL_QML:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/qml -QT_INSTALL_TRANSLATIONS:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/translations -QT_INSTALL_CONFIGURATION: -QT_INSTALL_EXAMPLES:C:/Qt/Qt5.14.2/Examples/Qt-5.14.2 -QT_INSTALL_DEMOS:C:/Qt/Qt5.14.2/Examples/Qt-5.14.2 -QT_HOST_PREFIX:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -QT_HOST_DATA:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -QT_HOST_BINS:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/bin -QT_HOST_LIBS:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/lib -QMAKE_SPEC:win32-msvc -QMAKE_XSPEC:win32-msvc -QMAKE_VERSION:3.1 -QT_VERSION:5.14.2 diff --git a/1280x800 TH/Cigarette/Cigarette/Debug/qmake/temp/qtvars.log b/1280x800 TH/Cigarette/Cigarette/Debug/qmake/temp/qtvars.log deleted file mode 100644 index ea8e7712..00000000 --- a/1280x800 TH/Cigarette/Cigarette/Debug/qmake/temp/qtvars.log +++ /dev/null @@ -1 +0,0 @@ -Info: creating stash file C:\Users\FD\AppData\Local\Temp\iige4dcj.z1o\.qmake.stash diff --git a/1280x800 TH/Cigarette/Cigarette/Debug/qmake/temp/qtvars_Win32_Debug.props b/1280x800 TH/Cigarette/Cigarette/Debug/qmake/temp/qtvars_Win32_Debug.props deleted file mode 100644 index b4a7e07f..00000000 --- a/1280x800 TH/Cigarette/Cigarette/Debug/qmake/temp/qtvars_Win32_Debug.props +++ /dev/null @@ -1,60 +0,0 @@ - - -_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_WIDGETS_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB -C:\Users\FD\AppData\Local\Temp\iige4dcj.z1o;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtWidgets;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtGui;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtANGLE;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtNetwork;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtCore;C:\Users\FD\AppData\Local\Temp\iige4dcj.z1o;/include;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\mkspecs\win32-msvc - -MultiThreadedDebugDLL --Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\Qt5Widgetsd.lib;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\Qt5Guid.lib;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\Qt5Networkd.lib;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\Qt5Cored.lib;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\qtmaind.lib;shell32.lib -"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" - -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -C:/Qt/Qt5.14.2/Docs/Qt-5.14.2 -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/include -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/lib -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/bin -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/bin -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/tests -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/plugins -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/imports -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/qml -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/translations - -C:/Qt/Qt5.14.2/Examples/Qt-5.14.2 -C:/Qt/Qt5.14.2/Examples/Qt-5.14.2 -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/bin -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/lib -win32-msvc -win32-msvc -3.1 -5.14.2 -$(Qt_INCLUDEPATH_);.\GeneratedFiles\Debug;.\GeneratedFiles - 5.14.2_msvc2017_64 - core;network;gui;widgets - bin - bin - - - DEFINES=/Project/ItemDefinitionGroup/ClCompile/PreprocessorDefinitions;INCLUDEPATH=/Project/ItemDefinitionGroup/ClCompile/AdditionalIncludeDirectories;STDCPP=/Project/ItemDefinitionGroup/ClCompile/LanguageStandard;RUNTIME=/Project/ItemDefinitionGroup/ClCompile/RuntimeLibrary;CL_OPTIONS=/Project/ItemDefinitionGroup/ClCompile/AdditionalOptions;LIBS=/Project/ItemDefinitionGroup/Link/AdditionalDependencies;LINK_OPTIONS=/Project/ItemDefinitionGroup/Link/AdditionalOptions - - debug - 5.14.2 - 5 - 14 - 2 - - diff --git a/1280x800 TH/Cigarette/CryptoToolLib-1.lib b/1280x800 TH/Cigarette/CryptoToolLib-1.lib deleted file mode 100644 index 4e7d7928..00000000 Binary files a/1280x800 TH/Cigarette/CryptoToolLib-1.lib and /dev/null differ diff --git a/1280x800 TH/Cigarette/dialogsetup.ui b/1280x800 TH/Cigarette/dialogsetup.ui deleted file mode 100644 index c5ee610f..00000000 --- a/1280x800 TH/Cigarette/dialogsetup.ui +++ /dev/null @@ -1,2174 +0,0 @@ - - - DialogSetup - - - - 0 - 0 - 661 - 818 - - - - - 微软雅黑 - 14 - 75 - true - - - - DialogSetup - - - background-color: rgb(240, 240, 240); - - - - - 0 - 0 - 731 - 1091 - - - - - 0 - 0 - - - - - 0 - 0 - - - - true - - - - - 0 - 0 - 729 - 1089 - - - - - 0 - 0 - - - - - 670 - 900 - - - - - - 10 - 60 - 641 - 61 - - - - - 微软雅黑 - 12 - 75 - true - - - - å¯åŠ¨è®¾ç½® - - - - - 30 - 30 - 220 - 22 - - - - - 微软雅黑 - 12 - 75 - true - - - - 自动打开所有相机 - - - - - - 380 - 30 - 261 - 21 - - - - - 微软雅黑 - 12 - 75 - true - - - - 程åºå¯åŠ¨åŽè‡ªåŠ¨å¼€å§‹å·¥ä½œ - - - - - - - 10 - 470 - 641 - 81 - - - - - 微软雅黑 - 12 - 75 - true - - - - 管ç†å‘˜å¯†ç ä¿®æ”¹ - - - - - 540 - 20 - 91 - 51 - - - - - 微软雅黑 - 12 - 75 - true - - - - 确定 - - - - - - 190 - 30 - 61 - 31 - - - - - 微软雅黑 - 12 - 75 - true - - - - 新密ç ï¼š - - - - - - 440 - 32 - 91 - 31 - - - - - 微软雅黑 - 12 - 75 - true - - - - - - - QLineEdit::Password - - - - - - 250 - 30 - 101 - 31 - - - - - 微软雅黑 - 12 - 75 - true - - - - - - - QLineEdit::Password - - - - - - 360 - 30 - 81 - 31 - - - - - 微软雅黑 - 12 - 75 - true - - - - 确认密ç ï¼š - - - - - - 90 - 30 - 91 - 31 - - - - - 微软雅黑 - 12 - 75 - true - - - - - - - QLineEdit::Password - - - - - - 20 - 30 - 61 - 31 - - - - - 微软雅黑 - 12 - 75 - true - - - - 原密ç ï¼š - - - - - - - 10 - 180 - 640 - 131 - - - - - 微软雅黑 - 12 - 75 - true - - - - 相机å‚æ•° - - - - - 20 - 40 - 180 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - 1#相机æ›å…‰æ—¶é—´(微秒)： - - - - - - 210 - 40 - 90 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - - - - - - - 210 - 70 - 90 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - - - - - - - 20 - 70 - 180 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - 2#相机æ›å…‰æ—¶é—´(微秒)： - - - - - - 510 - 70 - 90 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - - - - - - - 320 - 40 - 180 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - 1#相机模拟增益(0~64)： - - - - - - 320 - 70 - 180 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - 2#相机模拟增益(0~64)： - - - - - - 510 - 40 - 90 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - - - - - - - 210 - 100 - 90 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - - - - - - - 20 - 1680 - 180 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - 4#相机æ›å…‰æ—¶é—´(微秒)： - - - - - - 210 - 1680 - 90 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - - - - - - - 20 - 100 - 180 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - 3#相机æ›å…‰æ—¶é—´(微秒)： - - - - - - 510 - 1680 - 90 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - - - - - - - 320 - 100 - 180 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - 3#相机模拟增益(0~64)： - - - - - - 320 - 1680 - 180 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - 4#相机模拟增益(0~64)： - - - - - - 510 - 100 - 90 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - - - - - - - 680 - 90 - 91 - 51 - - - - - 微软雅黑 - 12 - 75 - true - - - - 确定 - - - - - - 20 - 1220 - 180 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - 5#相机æ›å…‰æ—¶é—´(微秒)： - - - - - - 20 - 1250 - 180 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - 6#相机æ›å…‰æ—¶é—´(微秒)： - - - - - - 20 - 1280 - 180 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - 7#相机æ›å…‰æ—¶é—´(微秒)： - - - - - - 210 - 1220 - 90 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - - - - - - - 210 - 1250 - 90 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - - - - - - - 210 - 1280 - 90 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - - - - - - - 320 - 1220 - 180 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - 5#相机模拟增益(0~64)： - - - - - - 320 - 1250 - 180 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - 6#相机模拟增益(0~64)： - - - - - - 320 - 1280 - 180 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - 7#相机模拟增益(0~64)： - - - - - - 510 - 1220 - 90 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - - - - - - - 510 - 1250 - 90 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - - - - - - - 510 - 1280 - 90 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - - - - - - - 20 - 1310 - 180 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - 8#相机æ›å…‰æ—¶é—´(微秒)： - - - - - - 210 - 1310 - 90 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - - - - - - - 320 - 1310 - 180 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - 8#相机模拟增益(0~64)： - - - - - - 510 - 1310 - 90 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - - - - - - - - 10 - 630 - 641 - 101 - - - - - 微软雅黑 - 12 - 75 - true - - - - 滤波设置 - - - - - 20 - 30 - 180 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - 1#相机滤波时间(微秒)： - - - - - - 210 - 30 - 90 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - - - - - - - 510 - 30 - 90 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - - - - - - - 320 - 30 - 180 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - 2#相机滤波时间(微秒)： - - - - - - 510 - 1610 - 90 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - - - - - - - 20 - 60 - 180 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - 3#相机滤波时间(微秒)： - - - - - - 210 - 60 - 90 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - - - - - - - 320 - 1610 - 180 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - 4#相机滤波时间(微秒)： - - - - - - 680 - 50 - 91 - 51 - - - - - 微软雅黑 - 12 - 75 - true - - - - 确定 - - - - - - 20 - 1150 - 180 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - 5#相机滤波时间(微秒)： - - - - - - 320 - 1150 - 180 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - 6#相机滤波时间(微秒)： - - - - - - 20 - 1180 - 180 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - 7#相机滤波时间(微秒)： - - - - - - 320 - 1180 - 180 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - 8#相机滤波时间(微秒)： - - - - - - 210 - 1150 - 90 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - - - - - - - 210 - 1180 - 90 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - - - - - - - 510 - 1150 - 90 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - - - - - - - 510 - 1180 - 90 - 20 - - - - - 微软雅黑 - 10 - 75 - true - - - - - - - - - - - 10 - 120 - 641 - 61 - - - - - 微软雅黑 - 12 - 75 - true - - - - 存图设置 - - - - - 30 - 30 - 90 - 21 - - - - - 微软雅黑 - 12 - 75 - true - - - - ä¸å­˜ - - - - - - 230 - 30 - 90 - 21 - - - - - 微软雅黑 - 12 - 75 - true - - - - å­˜NG - - - - - - 440 - 30 - 90 - 21 - - - - - 微软雅黑 - 12 - 75 - true - - - - 全存 - - - - - - 570 - 25 - 50 - 30 - - - - - 微软雅黑 - 12 - 75 - true - - - - 确定 - - - - - - - 110 - 750 - 131 - 51 - - - - - 微软雅黑 - 12 - 75 - true - - - - ä¿å­˜å‚æ•° - - - - - - 520 - 10 - 130 - 50 - - - - - 微软雅黑 - 12 - 75 - true - - - - 退出系统 - - - - - - 10 - 550 - 641 - 81 - - - - - 微软雅黑 - 12 - 75 - true - - - - æ“作员密ç ä¿®æ”¹ - - - - - 190 - 30 - 61 - 31 - - - - - 微软雅黑 - 12 - 75 - true - - - - 新密ç ï¼š - - - - - - 440 - 32 - 91 - 31 - - - - - 微软雅黑 - 12 - 75 - true - - - - - - - QLineEdit::Password - - - - - - 250 - 30 - 101 - 31 - - - - - 微软雅黑 - 12 - 75 - true - - - - - - - QLineEdit::Password - - - - - - 360 - 30 - 81 - 31 - - - - - 微软雅黑 - 12 - 75 - true - - - - 确认密ç ï¼š - - - - - - 90 - 30 - 91 - 31 - - - - - 微软雅黑 - 12 - 75 - true - - - - - - - QLineEdit::Password - - - - - - 20 - 30 - 61 - 31 - - - - - 微软雅黑 - 12 - 75 - true - - - - 原密ç ï¼š - - - - - - 540 - 20 - 91 - 51 - - - - - 微软雅黑 - 12 - 75 - true - - - - 确定 - - - - - - - 370 - 750 - 131 - 51 - - - - - 微软雅黑 - 12 - 75 - true - - - - å…³é—­çª—å£ - - - - - - 220 - 10 - 130 - 50 - - - - - 微软雅黑 - 12 - 75 - true - - - - æ˜¾ç¤ºæ¡Œé¢ - - - - - - 110 - 10 - 91 - 41 - - - - - 微软雅黑 - 12 - 75 - true - - - - border-image: url(:/Cigarette/Resources/keyboard.png); - - - - - - - - - 20 - 20 - 81 - 21 - - - - - 微软雅黑 - 12 - 75 - true - - - - 系统设置 - - - - - - 40 - 320 - 101 - 41 - - - - - 微软雅黑 - 12 - 75 - true - - - - é…方设置 - - - - - - 40 - 420 - 101 - 41 - - - - - 微软雅黑 - 12 - 75 - true - - - - æ¢ç­è®¾ç½® - - - - - - 40 - 370 - 101 - 41 - - - - - 微软雅黑 - 12 - 75 - true - - - - 产é‡ç»Ÿè®¡ - - - - - - 620 - 1610 - 27 - 25 - - - - - 微软雅黑 - - - - ... - - - - - - 190 - 1610 - 171 - 30 - - - - - 微软雅黑 - 12 - 75 - true - - - - 模型存储路径 - - - Qt::AlignCenter - - - - - - 370 - 1610 - 241 - 30 - - - - - 微软雅黑 - 10 - - - - - - - 340 - 1020 - 91 - 21 - - - - - 微软雅黑 - 75 - true - - - - 图片存储路径 - - - - - - 440 - 1020 - 171 - 25 - - - - - 微软雅黑 - - - - - - - 620 - 1020 - 27 - 26 - - - - - 微软雅黑 - - - - ... - - - - - - 370 - 10 - 130 - 50 - - - - - 微软雅黑 - 12 - 75 - true - - - - 清ç†å›¾ç‰‡ - - - - - - 520 - 750 - 131 - 21 - - - - - 微软雅黑 - 75 - true - - - - 测试å•å¼ å›¾ç‰‡ - - - - - - 520 - 780 - 131 - 21 - - - - - 微软雅黑 - 75 - true - - - - 测试多张图片 - - - - - - 190 - 340 - 171 - 30 - - - - - 微软雅黑 - 12 - 75 - true - - - - é…置文件存储路径 - - - Qt::AlignCenter - - - - - - 370 - 340 - 241 - 30 - - - - - 微软雅黑 - 10 - - - - - - - 620 - 340 - 27 - 25 - - - - - 微软雅黑 - - - - ... - - - - - - 190 - 410 - 171 - 30 - - - - - 微软雅黑 - 12 - 75 - true - - - - 图片存储路径 - - - Qt::AlignCenter - - - - - - 370 - 410 - 241 - 30 - - - - - 微软雅黑 - 10 - - - - - - - 620 - 410 - 27 - 25 - - - - - 微软雅黑 - - - - ... - - - - - - - - - - - diff --git a/1280x800 TH/Cigarette/workthread.cpp b/1280x800 TH/Cigarette/workthread.cpp deleted file mode 100644 index c1ddd9de..00000000 --- a/1280x800 TH/Cigarette/workthread.cpp +++ /dev/null @@ -1,330 +0,0 @@ -#include "workthread.h" -#include "alg_jd.h" -#include "common.h" -#include "balluffcamera.h" -#include "baslercamera.h" -#include "threadSend.h" -#include -#include "exportData.h" -#include - -extern AlgJd alg_jd[NumberOfSupportedCameras]; //检测胶点的AI算法 -extern ConfPath g_conf_path; -extern SysConf g_sys_conf; //系统é…ç½®å‚æ•° -extern DisplayLabelConf g_display_label_conf[NumberOfSupportedCameras]; - -extern int rotationAngle[NumberOfSupportedCameras]; //图片旋转角度 -extern bool isNeedRotate[NumberOfSupportedCameras]; - -extern SyncQueue >* g_save_queue; //图片ä¿å­˜é˜Ÿåˆ— -extern SyncQueue>* g_image_queue[NumberOfSupportedCameras]; //int表示一个目标æ‹äº†å‡ å¼  -#ifdef __UDPSend -extern SyncQueue<_UDPSendInfo>* UDP_Info_queue; -#endif -#ifdef __TCPSend -extern SyncQueue<_TCPSendInfo>* TCP_Info_queue; -#endif -#ifdef __ExportData -extern ExportDataThread exportDataThread; -#endif -extern PLCDevice* m_PLCDevice; -extern bool g_debug_mode; - -WorkThread::~WorkThread() -{ - stop(); - local_g_image_queue->put(std::make_pair(0, cv::Mat())); - quit(); - wait(); -} - -void WorkThread::init(SyncQueue>* image_ptr, ASyncQueue* result_ptr, int classid, int Num) -{ - local_camera_number = Num; - local_classid = classid; - local_g_image_queue = image_ptr; - local_g_result_queue = result_ptr; - b_quit = false; - frame_total = 0; -} -void WorkThread::start_work() -{ - start(HighestPriority); -} -void WorkThread::stop() -{ - b_quit = true; -} - -void WorkThread::run() -{ - try { - uint32_t result_index = 0; - while (!b_quit) { - {//ä¸è¦åˆ æŽ‰è¿™ä¸ªæ‹¬å·ï¼Œç”¨æ¥å®šä¹‰é”的作用域 - std::lock_guard locker(g_sys_conf.lock); - 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]; - -#ifdef DRAW_RECT - std::lock_guard locker2(g_display_label_conf[local_camera_number].lock); - local_DisplayLabelConf.leftButtonDownFlag = g_display_label_conf[local_camera_number].leftButtonDownFlag; - local_DisplayLabelConf.Flag[0] = g_display_label_conf[local_camera_number].Flag[0]; - local_DisplayLabelConf.Flag[1] = g_display_label_conf[local_camera_number].Flag[1]; - local_DisplayLabelConf.originalPoint = g_display_label_conf[local_camera_number].originalPoint; - local_DisplayLabelConf.processPoint = g_display_label_conf[local_camera_number].processPoint; - local_DisplayLabelConf.RectVet[0] = g_display_label_conf[local_camera_number].RectVet[0]; - local_DisplayLabelConf.RectVet[1] = g_display_label_conf[local_camera_number].RectVet[1]; -#endif - } - - QDateTime now_ts = QDateTime::currentDateTime(); - std::pair element; - local_g_image_queue->take(element); - int unit_count = element.first; - cv::Mat image = element.second; - -#ifdef __UDPSend - _UDPSendInfo UDPSendInfo; - UDPSendInfo.FrameID = info_frame; - UDPSendInfo.index = local_camera_number; -#endif - -#ifdef __TCPSend - _TCPSendInfo TCPSendInfo; -#endif - if (!image.data) - { - continue; //图åƒä¸ºç©ºï¼Œè·³è¿‡ - } - if (image.channels() == 1) - { - cv::cvtColor(image, image, CV_BGR2RGB); //ç°åº¦å›¾åƒè½¬ä¸ºå½©è‰²å›¾åƒ - } - if (local_SysConf.shoot[local_camera_number] == unit_count) - { - std::vector vec_in; - int w = image.cols; - int h = image.rows / unit_count; - for (int index = 0; index < unit_count; index++) { - cv::Rect temp_Rect(0, h * index, w, h); - cv::Mat temp_image = image(temp_Rect).clone(); - if (isNeedRotate[local_camera_number]) { - if (rotationAngle[local_camera_number] != (cv::ROTATE_90_COUNTERCLOCKWISE + 1)) - { - cv::rotate(temp_image, temp_image, rotationAngle[local_camera_number]); - } - } - vec_in.push_back(temp_image.clone()); - } - - std::vector vec_out; - std::vector > > vec_results; - QDateTime ts_start = QDateTime::currentDateTime(); - if (unit_count == 1) { - std::vector > results; - cv::Mat imagein, imageout; - imagein = vec_in[0]; - alg_jd[local_camera_number].detect(imagein, imageout, results); - vec_out.push_back(imageout.clone()); - vec_results.push_back(results); - } - else { - alg_jd[local_camera_number].detect_batch(vec_in, vec_out, vec_results); - } - QDateTime ts_jd = QDateTime::currentDateTime(); - int time_process = ts_start.msecsTo(ts_jd); -#ifndef SYNC_CAMERA - emit display_timecost(local_camera_number, time_process); -#endif - -#ifdef __UDPSend - UDPSendInfo.timecost = QString::number(time_process); -#endif - cv::Mat image1; - cv::Mat image2; - - QString jd_no; - for (int index = 0; index < unit_count; index++) { - jd_no += QString::number(vec_results[index].size()) + ","; - } - jd_no.chop(1); -#ifndef SYNC_CAMERA - emit display_jd_no(local_camera_number, jd_no); -#endif -#ifdef __UDPSend - UDPSendInfo.JD = jd_no; -#endif - bool IsNG = false; - int ngReason = 0; - QMap ng_reason_maps; - ng_reason_maps[0] = "1"; - ng_reason_maps[1] = "0"; - ng_reason_maps[2] = "0"; - ng_reason_maps[3] = "0"; - for (int index = 0; index < unit_count; index++) - { - if (vec_results[index].size() < local_SysConf.no[local_camera_number][index]) - { - IsNG |= true; - ngReason = 1; - } - //if (vec_results[index].size() != 1)IsNG |= true;//åå‘训练 - if (local_SysConf.ConfThreshold == 0) - { - IsNG = false; - ngReason = 0; - } - if (local_SysConf.save == 2)//三张照片分别存储 - { - cv::Mat m = vec_in[index].clone(); - QString file_name = g_conf_path.save_pics_path + "/ALL/" + - now_ts.toString("yyyy-MM-dd") + "/" - + QString::number(local_camera_number + 1) + "/" + QString::number(index + 1) + "/" + - now_ts.toString("yyyy-MM-dd_HH-mm-ss_zzz_") + QString::number(local_camera_number + 1) + - "#" + "_" + QString::number(index + 1) + ".jpg"; - std::string filename = file_name.toLocal8Bit().constData(); - g_save_queue->put(std::make_pair(filename, m)); - - QString sendName = now_ts.toString("yyyy-MM-dd_HH-mm-ss_zzz_") + QString::number(local_camera_number + 1) + - "#" + "_" + QString::number(index + 1) + ".jpg"; -#ifdef __TCPSend - TCPSendInfo.pics_name = sendName.toLocal8Bit().constData(); - TCP_Info_queue->put(TCPSendInfo); -#endif - } - } - - if (unit_count >= 2) { - image1 = vec_out[2].clone(); -#ifdef DRAW_RECT - /*IsNG|=CheckSelectRects(image1,vec_results,(result_index) % 2,local_DisplayLabelConf,0); - if (IsNG) { - ngReason = 2; - }*/ -#endif - } - else { - image1 = vec_out[0].clone(); -#ifdef DRAW_RECT - IsNG |= CheckSelectRects(image1, vec_results, 0, local_DisplayLabelConf, 0); - if (IsNG) { - ngReason = 2; - } -#endif - } -#ifdef DRAW_RECT - DrawSelectRects(image1, local_DisplayLabelConf, 0); -#endif - - if (unit_count >= 3) { - image2 = vec_out[(result_index) % 2].clone(); -#ifdef DRAW_RECT - //DrawSelectRects(image2, local_DisplayLabelConf, 1); - //IsNG|=CheckSelectRects(image2,vec_results,2,local_DisplayLabelConf,1); - /*if (IsNG) - { - ngReason = 3; - }*/ -#endif - } - result_index++; - - if (!IsNG) - { - if (!g_debug_mode) - { -#ifndef SYNC_CAMERA - emit event_ok(local_camera_number); -#endif - local_g_result_queue->put(true); - } - } - else - { - if (!g_debug_mode) - { -#ifndef SYNC_CAMERA - emit event_ng(local_camera_number); -#endif - local_g_result_queue->put(false); - } - - if ((local_SysConf.save == 2) || (local_SysConf.save == 1)) - { - for (int index = 0; index < unit_count; index++) - { - if (vec_results[index].size() < local_SysConf.no[local_camera_number][index]) - { - cv::Mat m = vec_in[index].clone(); - QString file_name = g_conf_path.save_pics_path + "/ng/" + - now_ts.toString("yyyy-MM-dd") + "/" - + QString::number(local_camera_number + 1) + "/" + QString::number(index + 1) + "/" + - now_ts.toString("yyyy-MM-dd_HH-mm-ss_zzz_") + QString::number(local_camera_number + 1) + - "#" + "_" + QString::number(index + 1) + "_" + ng_reason_maps[ngReason] + - ".jpg"; - QString remotePath = "/image/ng/" + - now_ts.toString("yyyy-MM-dd_HH-mm-ss_zzz_") + QString::number(local_camera_number + 1) + - "#" + "_" + QString::number(index + 1) + "_" + ng_reason_maps[ngReason] + - ".jpg"; - g_save_queue->put(std::make_pair(file_name.toLocal8Bit().constData(), m)); - - m = vec_out[index].clone(); - file_name = g_conf_path.save_pics_path + "/ng_result/" + - now_ts.toString("yyyy-MM-dd") + "/" - + QString::number(local_camera_number + 1) + "/" + QString::number(index + 1) + "/" + - now_ts.toString("yyyy-MM-dd_HH-mm-ss_zzz_") + QString::number(local_camera_number + 1) + - "#" + "_" + QString::number(index + 1) + "_" + ng_reason_maps[ngReason] + - ".jpg"; - remotePath = "/image/ng_result/" + - now_ts.toString("yyyy-MM-dd_HH-mm-ss_zzz_") + QString::number(local_camera_number + 1) + - "#" + "_" + QString::number(index + 1) + "_" + ng_reason_maps[ngReason] + - ".jpg"; - //g_save_queue->put(std::make_pair(file_name.toStdString(), m)); - g_save_queue->put(std::make_pair(file_name.toLocal8Bit().constData(), m)); - } - - } - } - } -#ifndef SYNC_CAMERA - if (!g_debug_mode) - { - emit display_check_total(local_camera_number, ++frame_total); - //exportDataInfo.cameraTotal = frame_total; - - emit notify(local_camera_number, 0, image1); - if (unit_count >= 3) - emit notify(local_camera_number, 1, image2); - } -#endif - } -#ifndef SYNC_CAMERA - else - { - //ä¿è¯ä¸é”™ä½ - if (!g_debug_mode) - { - if (local_SysConf.MisMatchAct == 1)//as ng - emit event_ng(local_camera_number); - else if (local_SysConf.MisMatchAct == 0)//as ok - emit event_ok(local_camera_number); - emit display_check_total(local_camera_number, ++frame_total); - qDebug() << local_camera_number << "#camera# " << now_ts.toString("yyyy-MM-dd_HH-mm-ss_zzz_") << "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx " << unit_count; - } - } -#endif -#ifdef __UDPSend - UDP_Info_queue->put(UDPSendInfo); -#endif - } - } - catch (cv::Exception& e) - { - const char* err_msg = e.what(); - std::cout << "exception caught: " << err_msg << std::endl; - } -} diff --git a/1280x800 TH/Cigarette/x64/Debug/Cigarette.tlog/Cigarette.write.1u.tlog b/1280x800 TH/Cigarette/x64/Debug/Cigarette.tlog/Cigarette.write.1u.tlog deleted file mode 100644 index 59fe332c..00000000 Binary files a/1280x800 TH/Cigarette/x64/Debug/Cigarette.tlog/Cigarette.write.1u.tlog and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Debug/Cigarette.tlog/moc.read.1u.tlog b/1280x800 TH/Cigarette/x64/Debug/Cigarette.tlog/moc.read.1u.tlog deleted file mode 100644 index c6fbfdbb..00000000 Binary files a/1280x800 TH/Cigarette/x64/Debug/Cigarette.tlog/moc.read.1u.tlog and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Debug/Cigarette.tlog/moc.write.1u.tlog b/1280x800 TH/Cigarette/x64/Debug/Cigarette.tlog/moc.write.1u.tlog deleted file mode 100644 index 57e2785f..00000000 Binary files a/1280x800 TH/Cigarette/x64/Debug/Cigarette.tlog/moc.write.1u.tlog and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Debug/qt/qmake/qtvars.pro b/1280x800 TH/Cigarette/x64/Debug/qt/qmake/qtvars.pro deleted file mode 100644 index 77431af4..00000000 --- a/1280x800 TH/Cigarette/x64/Debug/qt/qmake/qtvars.pro +++ /dev/null @@ -1,12 +0,0 @@ -CONFIG += no_fixpath -QT = core network gui widgets - - - - DEFINES -= UNICODE _UNICODE -CONFIG += no_fixpath -QT = core network gui widgets - - - - DEFINES -= UNICODE _UNICODE diff --git a/1280x800 TH/Cigarette/x64/Debug/qt/qmake/qtvars.xml b/1280x800 TH/Cigarette/x64/Debug/qt/qmake/qtvars.xml deleted file mode 100644 index a2c8d74a..00000000 --- a/1280x800 TH/Cigarette/x64/Debug/qt/qmake/qtvars.xml +++ /dev/null @@ -1,41 +0,0 @@ - - -_WINDOWS;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_NETWORK_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB -C:\Qt5.15.2\5.15.2\msvc2019_64\include;C:\Qt5.15.2\5.15.2\msvc2019_64\include\QtNetwork;C:\Qt5.15.2\5.15.2\msvc2019_64\include\QtWidgets;C:\Qt5.15.2\5.15.2\msvc2019_64\include\QtGui;C:\Qt5.15.2\5.15.2\msvc2019_64\include\QtANGLE;C:\Qt5.15.2\5.15.2\msvc2019_64\include\QtCore;C:\Qt5.15.2\5.15.2\msvc2019_64\mkspecs\win32-msvc - -MultiThreadedDebugDLL --Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -C:\Qt5.15.2\5.15.2\msvc2019_64\lib\Qt5Networkd.lib;C:\Qt5.15.2\5.15.2\msvc2019_64\lib\Qt5Widgetsd.lib;C:\Qt5.15.2\5.15.2\msvc2019_64\lib\Qt5Guid.lib;C:\Qt5.15.2\5.15.2\msvc2019_64\lib\Qt5Cored.lib;C:\Qt5.15.2\5.15.2\msvc2019_64\lib\qtmaind.lib;shell32.lib -"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" - -C:/Qt5.15.2/5.15.2/msvc2019_64 -C:/Qt5.15.2/5.15.2/msvc2019_64 -C:/Qt5.15.2/5.15.2/msvc2019_64 -C:/Qt5.15.2/Docs/Qt-5.15.2 -C:/Qt5.15.2/5.15.2/msvc2019_64/include -C:/Qt5.15.2/5.15.2/msvc2019_64/lib -C:/Qt5.15.2/5.15.2/msvc2019_64/bin -C:/Qt5.15.2/5.15.2/msvc2019_64/bin -C:/Qt5.15.2/5.15.2/msvc2019_64/tests -C:/Qt5.15.2/5.15.2/msvc2019_64/plugins -C:/Qt5.15.2/5.15.2/msvc2019_64/imports -C:/Qt5.15.2/5.15.2/msvc2019_64/qml -C:/Qt5.15.2/5.15.2/msvc2019_64/translations - -C:/Qt5.15.2/Examples/Qt-5.15.2 -C:/Qt5.15.2/Examples/Qt-5.15.2 -C:/Qt5.15.2/5.15.2/msvc2019_64 -C:/Qt5.15.2/5.15.2/msvc2019_64 -C:/Qt5.15.2/5.15.2/msvc2019_64/bin -C:/Qt5.15.2/5.15.2/msvc2019_64/lib -win32-msvc -win32-msvc -3.1 -5.15.2 -jZFBbgMhDEWv4hNkmqip1EUWjO0SNwwgYxpFVTX3v0WY0VQjdVMWbOC/b//PtxBHE3tczofj+XCap/KFp5fj+/z2CpiUIbLdk97AV4G7kGcrMEpcD/GHRC6XIWv6ZLRBjKf1UkxS9JpqHjBgmrIEbipuQuRSku6qAhIxVOLs7Npr5YjWES5sMIm2BZIKFyhGmHOvVXDRV+e5mIvklEBra2TiXn6TBxnV6QMwzCkv6btr2bNsIDSvf+gW+zbsYCuPY/tJXOIvb307/HH5HU88Vv/zBA== - 5.15.2 - 5 - 15 - 2 - - diff --git a/1280x800 TH/Cigarette/x64/Debug/qt/qt_work.log b/1280x800 TH/Cigarette/x64/Debug/qt/qt_work.log deleted file mode 100644 index c248e0ed..00000000 Binary files a/1280x800 TH/Cigarette/x64/Debug/qt/qt_work.log and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Debug/qt/qtvars.xml b/1280x800 TH/Cigarette/x64/Debug/qt/qtvars.xml deleted file mode 100644 index a2c8d74a..00000000 --- a/1280x800 TH/Cigarette/x64/Debug/qt/qtvars.xml +++ /dev/null @@ -1,41 +0,0 @@ - - -_WINDOWS;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_NETWORK_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB -C:\Qt5.15.2\5.15.2\msvc2019_64\include;C:\Qt5.15.2\5.15.2\msvc2019_64\include\QtNetwork;C:\Qt5.15.2\5.15.2\msvc2019_64\include\QtWidgets;C:\Qt5.15.2\5.15.2\msvc2019_64\include\QtGui;C:\Qt5.15.2\5.15.2\msvc2019_64\include\QtANGLE;C:\Qt5.15.2\5.15.2\msvc2019_64\include\QtCore;C:\Qt5.15.2\5.15.2\msvc2019_64\mkspecs\win32-msvc - -MultiThreadedDebugDLL --Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -C:\Qt5.15.2\5.15.2\msvc2019_64\lib\Qt5Networkd.lib;C:\Qt5.15.2\5.15.2\msvc2019_64\lib\Qt5Widgetsd.lib;C:\Qt5.15.2\5.15.2\msvc2019_64\lib\Qt5Guid.lib;C:\Qt5.15.2\5.15.2\msvc2019_64\lib\Qt5Cored.lib;C:\Qt5.15.2\5.15.2\msvc2019_64\lib\qtmaind.lib;shell32.lib -"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" - -C:/Qt5.15.2/5.15.2/msvc2019_64 -C:/Qt5.15.2/5.15.2/msvc2019_64 -C:/Qt5.15.2/5.15.2/msvc2019_64 -C:/Qt5.15.2/Docs/Qt-5.15.2 -C:/Qt5.15.2/5.15.2/msvc2019_64/include -C:/Qt5.15.2/5.15.2/msvc2019_64/lib -C:/Qt5.15.2/5.15.2/msvc2019_64/bin -C:/Qt5.15.2/5.15.2/msvc2019_64/bin -C:/Qt5.15.2/5.15.2/msvc2019_64/tests -C:/Qt5.15.2/5.15.2/msvc2019_64/plugins -C:/Qt5.15.2/5.15.2/msvc2019_64/imports -C:/Qt5.15.2/5.15.2/msvc2019_64/qml -C:/Qt5.15.2/5.15.2/msvc2019_64/translations - -C:/Qt5.15.2/Examples/Qt-5.15.2 -C:/Qt5.15.2/Examples/Qt-5.15.2 -C:/Qt5.15.2/5.15.2/msvc2019_64 -C:/Qt5.15.2/5.15.2/msvc2019_64 -C:/Qt5.15.2/5.15.2/msvc2019_64/bin -C:/Qt5.15.2/5.15.2/msvc2019_64/lib -win32-msvc -win32-msvc -3.1 -5.15.2 -jZFBbgMhDEWv4hNkmqip1EUWjO0SNwwgYxpFVTX3v0WY0VQjdVMWbOC/b//PtxBHE3tczofj+XCap/KFp5fj+/z2CpiUIbLdk97AV4G7kGcrMEpcD/GHRC6XIWv6ZLRBjKf1UkxS9JpqHjBgmrIEbipuQuRSku6qAhIxVOLs7Npr5YjWES5sMIm2BZIKFyhGmHOvVXDRV+e5mIvklEBra2TiXn6TBxnV6QMwzCkv6btr2bNsIDSvf+gW+zbsYCuPY/tJXOIvb307/HH5HU88Vv/zBA== - 5.15.2 - 5 - 15 - 2 - - diff --git a/1280x800 TH/Cigarette/x64/Release/ASyncQueue.obj b/1280x800 TH/Cigarette/x64/Release/ASyncQueue.obj deleted file mode 100644 index 8208fd29..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/ASyncQueue.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/AlarmInfo.obj b/1280x800 TH/Cigarette/x64/Release/AlarmInfo.obj deleted file mode 100644 index 4f749c16..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/AlarmInfo.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/CaptureThread.obj b/1280x800 TH/Cigarette/x64/Release/CaptureThread.obj deleted file mode 100644 index 7034ab51..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/CaptureThread.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/CaptureThreadBasler.obj b/1280x800 TH/Cigarette/x64/Release/CaptureThreadBasler.obj deleted file mode 100644 index 9f6d532f..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/CaptureThreadBasler.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/CaptureThreadHIK.obj b/1280x800 TH/Cigarette/x64/Release/CaptureThreadHIK.obj deleted file mode 100644 index 5edc078a..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/CaptureThreadHIK.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/Cigarette.Build.CppClean.log b/1280x800 TH/Cigarette/x64/Release/Cigarette.Build.CppClean.log deleted file mode 100644 index 6c8e61f2..00000000 --- a/1280x800 TH/Cigarette/x64/Release/Cigarette.Build.CppClean.log +++ /dev/null @@ -1,138 +0,0 @@ -d:\aaa\yb628\1280\cigarette\generatedfiles\ui_cigarette.h -d:\aaa\yb628\1280\cigarette\generatedfiles\ui_dialogsetuppasswd.h -d:\aaa\yb628\1280\cigarette\generatedfiles\ui_dialogsetup.h -d:\aaa\yb628\1280\cigarette\generatedfiles\ui_plcsetup.h -d:\aaa\yb628\1280\cigarette\generatedfiles\ui_alarmdialog.h -d:\aaa\yb628\1280\cigarette\generatedfiles\ui_dialogin.h -d:\aaa\yb628\1280\cigarette\generatedfiles\ui_camera_glue.h -d:\aaa\yb628\1280\cigarette\generatedfiles\ui_change_shift.h -d:\aaa\yb628\1280\cigarette\generatedfiles\ui_output_statistic.h -d:\aaa\yb628\1280\cigarette\generatedfiles\qrc_cigarette.cpp -d:\aaa\yb628\1280\cigarette\generatedfiles\release\moc_cigarette.cpp -d:\aaa\yb628\1280\cigarette\generatedfiles\release\moc_syncworkthread.cpp -d:\aaa\yb628\1280\cigarette\generatedfiles\release\moc_threadreceive.cpp -d:\aaa\yb628\1280\cigarette\generatedfiles\release\moc_workthread.cpp -d:\aaa\yb628\1280\cigarette\generatedfiles\release\moc_alarmdialog.cpp -d:\aaa\yb628\1280\cigarette\generatedfiles\release\moc_capturethread.cpp -d:\aaa\yb628\1280\cigarette\generatedfiles\release\moc_capturethreadbasler.cpp -d:\aaa\yb628\1280\cigarette\generatedfiles\release\moc_capturethreadhik.cpp -d:\aaa\yb628\1280\cigarette\generatedfiles\release\moc_camera_glue.cpp -d:\aaa\yb628\1280\cigarette\generatedfiles\release\moc_change_shift.cpp -d:\aaa\yb628\1280\cigarette\generatedfiles\release\moc_cleanthread.cpp -d:\aaa\yb628\1280\cigarette\generatedfiles\release\moc_plcsetup.cpp -d:\aaa\yb628\1280\cigarette\generatedfiles\release\moc_db_label.cpp -d:\aaa\yb628\1280\cigarette\generatedfiles\release\moc_debugthread.cpp -d:\aaa\yb628\1280\cigarette\generatedfiles\release\moc_dialogin.cpp -d:\aaa\yb628\1280\cigarette\generatedfiles\release\moc_exportdata.cpp -d:\aaa\yb628\1280\cigarette\generatedfiles\release\moc_output_statistic.cpp -d:\aaa\yb628\1280\cigarette\generatedfiles\release\moc_logthread.cpp -d:\aaa\yb628\1280\cigarette\generatedfiles\release\moc_savethread.cpp -d:\aaa\yb628\1280\cigarette\generatedfiles\release\moc_dialogsetuppasswd.cpp -d:\aaa\yb628\1280\cigarette\generatedfiles\release\moc_dialogsetup.cpp -d:\aaa\yb628\1280\cigarette\x64\release\vc143.pdb -d:\aaa\yb628\1280\cigarette\x64\release\qrc_cigarette.obj -d:\aaa\yb628\1280\cigarette\x64\release\baslercamera.obj -d:\aaa\yb628\1280\cigarette\x64\release\plcsetup.obj -d:\aaa\yb628\1280\cigarette\x64\release\alarminfo.obj -d:\aaa\yb628\1280\cigarette\x64\release\dialogin.obj -d:\aaa\yb628\1280\cigarette\x64\release\hikcamera.obj -d:\aaa\yb628\1280\cigarette\x64\release\threadsendtcp.obj -d:\aaa\yb628\1280\cigarette\x64\release\alarmdialog.obj -d:\aaa\yb628\1280\cigarette\x64\release\dialogsetuppasswd.obj -d:\aaa\yb628\1280\cigarette\x64\release\plc_item.obj -d:\aaa\yb628\1280\cigarette\x64\release\threadreceive.obj -d:\aaa\yb628\1280\cigarette\x64\release\camera_glue.obj -d:\aaa\yb628\1280\cigarette\x64\release\logthread.obj -d:\aaa\yb628\1280\cigarette\x64\release\tinyxml2.obj -d:\aaa\yb628\1280\cigarette\x64\release\workthread.obj -d:\aaa\yb628\1280\cigarette\x64\release\common.obj -d:\aaa\yb628\1280\cigarette\x64\release\syncqueue.obj -d:\aaa\yb628\1280\cigarette\x64\release\threadsend.obj -d:\aaa\yb628\1280\cigarette\x64\release\cleanthread.obj -d:\aaa\yb628\1280\cigarette\x64\release\output_statistic.obj -d:\aaa\yb628\1280\cigarette\x64\release\alg_jd.obj -d:\aaa\yb628\1280\cigarette\x64\release\main.obj -d:\aaa\yb628\1280\cigarette\x64\release\asyncqueue.obj -d:\aaa\yb628\1280\cigarette\x64\release\debugthread.obj -d:\aaa\yb628\1280\cigarette\x64\release\cigarette.obj -d:\aaa\yb628\1280\cigarette\x64\release\db_label.obj -d:\aaa\yb628\1280\cigarette\x64\release\dialogsetup.obj -d:\aaa\yb628\1280\cigarette\x64\release\change_shift.obj -d:\aaa\yb628\1280\cigarette\x64\release\plcdevice.obj -d:\aaa\yb628\1280\cigarette\x64\release\capturethreadhik.obj -d:\aaa\yb628\1280\cigarette\x64\release\capturethread.obj -d:\aaa\yb628\1280\cigarette\x64\release\capturethreadbasler.obj -d:\aaa\yb628\1280\cigarette\x64\release\basecamera.obj -d:\aaa\yb628\1280\cigarette\x64\release\exportdata.obj -d:\aaa\yb628\1280\cigarette\x64\release\balluffcamera.obj -d:\aaa\yb628\1280\cigarette\x64\release\syncworkthread.obj -d:\aaa\yb628\1280\cigarette\x64\release\moc_cigarette.obj -d:\aaa\yb628\1280\cigarette\x64\release\moc_workthread.obj -d:\aaa\yb628\1280\cigarette\x64\release\moc_alarmdialog.obj -d:\aaa\yb628\1280\cigarette\x64\release\moc_dialogsetup.obj -d:\aaa\yb628\1280\cigarette\x64\release\moc_camera_glue.obj -d:\aaa\yb628\1280\cigarette\x64\release\moc_db_label.obj -d:\aaa\yb628\1280\cigarette\x64\release\moc_dialogsetuppasswd.obj -d:\aaa\yb628\1280\cigarette\x64\release\moc_capturethreadhik.obj -d:\aaa\yb628\1280\cigarette\x64\release\moc_exportdata.obj -d:\aaa\yb628\1280\cigarette\x64\release\moc_capturethread.obj -d:\aaa\yb628\1280\cigarette\x64\release\moc_dialogin.obj -d:\aaa\yb628\1280\cigarette\x64\release\moc_savethread.obj -d:\aaa\yb628\1280\cigarette\x64\release\moc_plcsetup.obj -d:\aaa\yb628\1280\cigarette\x64\release\moc_capturethreadbasler.obj -d:\aaa\yb628\1280\cigarette\x64\release\moc_syncworkthread.obj -d:\aaa\yb628\1280\cigarette\x64\release\moc_debugthread.obj -d:\aaa\yb628\1280\cigarette\x64\release\moc_threadreceive.obj -d:\aaa\yb628\1280\cigarette\x64\release\moc_cleanthread.obj -d:\aaa\yb628\1280\cigarette\x64\release\moc_output_statistic.obj -d:\aaa\yb628\1280\cigarette\x64\release\moc_change_shift.obj -d:\aaa\yb628\1280\cigarette\x64\release\moc_logthread.obj -d:\aaa\yb628\1280\x64\release\cigarette.exe -d:\aaa\yb628\1280\cigarette\.\generatedfiles\release\moc_cigarette.cpp -d:\aaa\yb628\1280\cigarette\.\generatedfiles\release\moc_syncworkthread.cpp -d:\aaa\yb628\1280\cigarette\.\generatedfiles\release\moc_threadreceive.cpp -d:\aaa\yb628\1280\cigarette\.\generatedfiles\release\moc_workthread.cpp -d:\aaa\yb628\1280\cigarette\.\generatedfiles\release\moc_alarmdialog.cpp -d:\aaa\yb628\1280\cigarette\.\generatedfiles\release\moc_capturethread.cpp -d:\aaa\yb628\1280\cigarette\.\generatedfiles\release\moc_capturethreadbasler.cpp -d:\aaa\yb628\1280\cigarette\.\generatedfiles\release\moc_capturethreadhik.cpp -d:\aaa\yb628\1280\cigarette\.\generatedfiles\release\moc_camera_glue.cpp -d:\aaa\yb628\1280\cigarette\.\generatedfiles\release\moc_change_shift.cpp -d:\aaa\yb628\1280\cigarette\.\generatedfiles\release\moc_cleanthread.cpp -d:\aaa\yb628\1280\cigarette\.\generatedfiles\release\moc_plcsetup.cpp -d:\aaa\yb628\1280\cigarette\.\generatedfiles\release\moc_db_label.cpp -d:\aaa\yb628\1280\cigarette\.\generatedfiles\release\moc_debugthread.cpp -d:\aaa\yb628\1280\cigarette\.\generatedfiles\release\moc_dialogin.cpp -d:\aaa\yb628\1280\cigarette\.\generatedfiles\release\moc_exportdata.cpp -d:\aaa\yb628\1280\cigarette\.\generatedfiles\release\moc_output_statistic.cpp -d:\aaa\yb628\1280\cigarette\.\generatedfiles\release\moc_logthread.cpp -d:\aaa\yb628\1280\cigarette\.\generatedfiles\release\moc_savethread.cpp -d:\aaa\yb628\1280\cigarette\.\generatedfiles\release\moc_dialogsetuppasswd.cpp -d:\aaa\yb628\1280\cigarette\.\generatedfiles\release\moc_dialogsetup.cpp -d:\aaa\yb628\1280\cigarette\.\generatedfiles\qrc_cigarette.cpp -d:\aaa\yb628\1280\cigarette\.\generatedfiles\ui_cigarette.h -d:\aaa\yb628\1280\cigarette\.\generatedfiles\ui_dialogsetuppasswd.h -d:\aaa\yb628\1280\cigarette\.\generatedfiles\ui_dialogsetup.h -d:\aaa\yb628\1280\cigarette\.\generatedfiles\ui_plcsetup.h -d:\aaa\yb628\1280\cigarette\.\generatedfiles\ui_alarmdialog.h -d:\aaa\yb628\1280\cigarette\.\generatedfiles\ui_dialogin.h -d:\aaa\yb628\1280\cigarette\.\generatedfiles\ui_camera_glue.h -d:\aaa\yb628\1280\cigarette\.\generatedfiles\ui_change_shift.h -d:\aaa\yb628\1280\cigarette\.\generatedfiles\ui_output_statistic.h -d:\aaa\yb628\1280\x64\release\cigarette.lib -d:\aaa\yb628\1280\x64\release\cigarette.exp -d:\aaa\yb628\1280\cigarette\x64\release\cigarette.tlog\cigarette.write.1u.tlog -d:\aaa\yb628\1280\cigarette\x64\release\cigarette.tlog\cl.command.1.tlog -d:\aaa\yb628\1280\cigarette\x64\release\cigarette.tlog\cl.items.tlog -d:\aaa\yb628\1280\cigarette\x64\release\cigarette.tlog\cl.read.1.tlog -d:\aaa\yb628\1280\cigarette\x64\release\cigarette.tlog\cl.write.1.tlog -d:\aaa\yb628\1280\cigarette\x64\release\cigarette.tlog\link.command.1.tlog -d:\aaa\yb628\1280\cigarette\x64\release\cigarette.tlog\link.read.1.tlog -d:\aaa\yb628\1280\cigarette\x64\release\cigarette.tlog\link.secondary.1.tlog -d:\aaa\yb628\1280\cigarette\x64\release\cigarette.tlog\link.write.1.tlog -d:\aaa\yb628\1280\cigarette\x64\release\cigarette.tlog\moc.read.1u.tlog -d:\aaa\yb628\1280\cigarette\x64\release\cigarette.tlog\moc.write.1u.tlog -d:\aaa\yb628\1280\cigarette\x64\release\cigarette.tlog\rcc.read.1u.tlog -d:\aaa\yb628\1280\cigarette\x64\release\cigarette.tlog\rcc.write.1u.tlog -d:\aaa\yb628\1280\cigarette\x64\release\cigarette.tlog\uic.read.1u.tlog -d:\aaa\yb628\1280\cigarette\x64\release\cigarette.tlog\uic.write.1u.tlog diff --git a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/CL.command.1.tlog b/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/CL.command.1.tlog deleted file mode 100644 index 3f5cc771..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/CL.command.1.tlog and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/CL.write.1.tlog b/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/CL.write.1.tlog deleted file mode 100644 index d72aa8de..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/CL.write.1.tlog and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/Cigarette.lastbuildstate b/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/Cigarette.lastbuildstate deleted file mode 100644 index 80a6c6d4..00000000 --- a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/Cigarette.lastbuildstate +++ /dev/null @@ -1,2 +0,0 @@ -PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.41.34120:TargetPlatformVersion=10.0.22621.0: -Release|x64|D:\aaa\YB628\1280\| diff --git a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/Cigarette.write.1u.tlog b/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/Cigarette.write.1u.tlog deleted file mode 100644 index 7840efcd..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/Cigarette.write.1u.tlog and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/Cl.items.tlog b/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/Cl.items.tlog deleted file mode 100644 index d2cf7155..00000000 --- a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/Cl.items.tlog +++ /dev/null @@ -1,57 +0,0 @@ -D:\aaa\YB628\1280\Cigarette\alarmdialog.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\alarmdialog.obj -D:\aaa\YB628\1280\Cigarette\AlarmInfo.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\AlarmInfo.obj -D:\aaa\YB628\1280\Cigarette\alg_jd.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\alg_jd.obj -D:\aaa\YB628\1280\Cigarette\ASyncQueue.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\ASyncQueue.obj -D:\aaa\YB628\1280\Cigarette\balluffcamera.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\balluffcamera.obj -D:\aaa\YB628\1280\Cigarette\basecamera.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\basecamera.obj -D:\aaa\YB628\1280\Cigarette\baslercamera.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\baslercamera.obj -D:\aaa\YB628\1280\Cigarette\camera_glue.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\camera_glue.obj -D:\aaa\YB628\1280\Cigarette\CaptureThread.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\CaptureThread.obj -D:\aaa\YB628\1280\Cigarette\CaptureThreadBasler.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\CaptureThreadBasler.obj -D:\aaa\YB628\1280\Cigarette\CaptureThreadHIK.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\CaptureThreadHIK.obj -D:\aaa\YB628\1280\Cigarette\change_shift.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\change_shift.obj -D:\aaa\YB628\1280\Cigarette\cigarette.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\cigarette.obj -D:\aaa\YB628\1280\Cigarette\Cleanthread.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\Cleanthread.obj -D:\aaa\YB628\1280\Cigarette\common.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\common.obj -D:\aaa\YB628\1280\Cigarette\db_label.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\db_label.obj -D:\aaa\YB628\1280\Cigarette\debugthread.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\debugthread.obj -D:\aaa\YB628\1280\Cigarette\dialogin.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\dialogin.obj -D:\aaa\YB628\1280\Cigarette\dialogsetup.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\dialogsetup.obj -D:\aaa\YB628\1280\Cigarette\dialogsetuppasswd.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\dialogsetuppasswd.obj -D:\aaa\YB628\1280\Cigarette\exportData.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\exportData.obj -D:\aaa\YB628\1280\Cigarette\hikcamera.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\hikcamera.obj -D:\aaa\YB628\1280\Cigarette\Logthread.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\Logthread.obj -D:\aaa\YB628\1280\Cigarette\main.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\main.obj -D:\aaa\YB628\1280\Cigarette\output_statistic.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\output_statistic.obj -D:\aaa\YB628\1280\Cigarette\plcsetup.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\plcsetup.obj -D:\aaa\YB628\1280\Cigarette\PLC\PLCDevice.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\PLCDevice.obj -D:\aaa\YB628\1280\Cigarette\plc_item.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\plc_item.obj -D:\aaa\YB628\1280\Cigarette\SyncQueue.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\SyncQueue.obj -D:\aaa\YB628\1280\Cigarette\SyncWorkThread.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\SyncWorkThread.obj -D:\aaa\YB628\1280\Cigarette\threadReceive.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\threadReceive.obj -D:\aaa\YB628\1280\Cigarette\threadSend.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\threadSend.obj -D:\aaa\YB628\1280\Cigarette\threadSendTCP.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\threadSendTCP.obj -D:\aaa\YB628\1280\Cigarette\tinyxml2.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\tinyxml2.obj -D:\aaa\YB628\1280\Cigarette\workthread.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\workthread.obj -D:\aaa\YB628\1280\Cigarette\GeneratedFiles\qrc_cigarette.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\qrc_cigarette.obj -D:\aaa\YB628\1280\Cigarette\GeneratedFiles\Release\moc_cigarette.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\moc_cigarette.obj -D:\aaa\YB628\1280\Cigarette\GeneratedFiles\Release\moc_SyncWorkThread.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\moc_SyncWorkThread.obj -D:\aaa\YB628\1280\Cigarette\GeneratedFiles\Release\moc_threadReceive.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\moc_threadReceive.obj -D:\aaa\YB628\1280\Cigarette\GeneratedFiles\Release\moc_workthread.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\moc_workthread.obj -D:\aaa\YB628\1280\Cigarette\GeneratedFiles\Release\moc_alarmdialog.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\moc_alarmdialog.obj -D:\aaa\YB628\1280\Cigarette\GeneratedFiles\Release\moc_CaptureThread.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\moc_CaptureThread.obj -D:\aaa\YB628\1280\Cigarette\GeneratedFiles\Release\moc_CaptureThreadBasler.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\moc_CaptureThreadBasler.obj -D:\aaa\YB628\1280\Cigarette\GeneratedFiles\Release\moc_CaptureThreadHIK.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\moc_CaptureThreadHIK.obj -D:\aaa\YB628\1280\Cigarette\GeneratedFiles\Release\moc_camera_glue.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\moc_camera_glue.obj -D:\aaa\YB628\1280\Cigarette\GeneratedFiles\Release\moc_change_shift.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\moc_change_shift.obj -D:\aaa\YB628\1280\Cigarette\GeneratedFiles\Release\moc_Cleanthread.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\moc_Cleanthread.obj -D:\aaa\YB628\1280\Cigarette\GeneratedFiles\Release\moc_plcsetup.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\moc_plcsetup.obj -D:\aaa\YB628\1280\Cigarette\GeneratedFiles\Release\moc_db_label.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\moc_db_label.obj -D:\aaa\YB628\1280\Cigarette\GeneratedFiles\Release\moc_debugthread.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\moc_debugthread.obj -D:\aaa\YB628\1280\Cigarette\GeneratedFiles\Release\moc_dialogin.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\moc_dialogin.obj -D:\aaa\YB628\1280\Cigarette\GeneratedFiles\Release\moc_exportData.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\moc_exportData.obj -D:\aaa\YB628\1280\Cigarette\GeneratedFiles\Release\moc_output_statistic.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\moc_output_statistic.obj -D:\aaa\YB628\1280\Cigarette\GeneratedFiles\Release\moc_Logthread.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\moc_Logthread.obj -D:\aaa\YB628\1280\Cigarette\GeneratedFiles\Release\moc_savethread.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\moc_savethread.obj -D:\aaa\YB628\1280\Cigarette\GeneratedFiles\Release\moc_dialogsetuppasswd.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\moc_dialogsetuppasswd.obj -D:\aaa\YB628\1280\Cigarette\GeneratedFiles\Release\moc_dialogsetup.cpp;D:\aaa\YB628\1280\Cigarette\x64\Release\moc_dialogsetup.obj diff --git a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/link.command.1.tlog b/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/link.command.1.tlog deleted file mode 100644 index 084c9304..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/link.command.1.tlog and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/link.read.1.tlog b/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/link.read.1.tlog deleted file mode 100644 index 2b3f3afd..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/link.read.1.tlog and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/link.secondary.1.tlog b/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/link.secondary.1.tlog deleted file mode 100644 index bdacfaef..00000000 --- a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/link.secondary.1.tlog +++ /dev/null @@ -1,3 +0,0 @@ -^D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\ALARMDIALOG.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\ALARMINFO.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\ALG_JD.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\ASYNCQUEUE.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\BALLUFFCAMERA.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\BASECAMERA.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\BASLERCAMERA.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\CAMERA_GLUE.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\CAPTURETHREAD.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\CAPTURETHREADBASLER.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\CAPTURETHREADHIK.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\CHANGE_SHIFT.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\CIGARETTE.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\CLEANTHREAD.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\COMMON.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\DB_LABEL.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\DEBUGTHREAD.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\DIALOGIN.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\DIALOGSETUP.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\DIALOGSETUPPASSWD.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\EXPORTDATA.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\HIKCAMERA.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\LOGTHREAD.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\MAIN.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\MOC_ALARMDIALOG.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\MOC_CAMERA_GLUE.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\MOC_CAPTURETHREAD.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\MOC_CAPTURETHREADBASLER.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\MOC_CAPTURETHREADHIK.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\MOC_CHANGE_SHIFT.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\MOC_CIGARETTE.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\MOC_CLEANTHREAD.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\MOC_DB_LABEL.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\MOC_DEBUGTHREAD.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\MOC_DIALOGIN.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\MOC_DIALOGSETUP.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\MOC_DIALOGSETUPPASSWD.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\MOC_EXPORTDATA.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\MOC_LOGTHREAD.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\MOC_OUTPUT_STATISTIC.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\MOC_PLCSETUP.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\MOC_SAVETHREAD.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\MOC_SYNCWORKTHREAD.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\MOC_THREADRECEIVE.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\MOC_WORKTHREAD.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\OUTPUT_STATISTIC.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\PLCDEVICE.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\PLCSETUP.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\PLC_ITEM.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\QRC_CIGARETTE.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\SYNCQUEUE.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\SYNCWORKTHREAD.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\THREADRECEIVE.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\THREADSEND.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\THREADSENDTCP.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\TINYXML2.OBJ|D:\AAA\YB628\1280\CIGARETTE\X64\RELEASE\WORKTHREAD.OBJ -D:\aaa\YB628\1280\x64\Release\Cigarette.lib -D:\aaa\YB628\1280\x64\Release\Cigarette.EXP diff --git a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/link.write.1.tlog b/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/link.write.1.tlog deleted file mode 100644 index 6701defd..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/link.write.1.tlog and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/moc.read.1u.tlog b/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/moc.read.1u.tlog deleted file mode 100644 index c6fbfdbb..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/moc.read.1u.tlog and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/moc.write.1u.tlog b/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/moc.write.1u.tlog deleted file mode 100644 index afebf8ae..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/moc.write.1u.tlog and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/rcc.read.1u.tlog b/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/rcc.read.1u.tlog deleted file mode 100644 index f306d5b4..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/rcc.read.1u.tlog and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/rcc.write.1u.tlog b/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/rcc.write.1u.tlog deleted file mode 100644 index 7bdba460..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/rcc.write.1u.tlog and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/uic.read.1u.tlog b/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/uic.read.1u.tlog deleted file mode 100644 index 66cdd7ca..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/uic.read.1u.tlog and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/uic.write.1u.tlog b/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/uic.write.1u.tlog deleted file mode 100644 index 3218c3cf..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/uic.write.1u.tlog and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/Cleanthread.obj b/1280x800 TH/Cigarette/x64/Release/Cleanthread.obj deleted file mode 100644 index 7a08f272..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/Cleanthread.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/Logthread.obj b/1280x800 TH/Cigarette/x64/Release/Logthread.obj deleted file mode 100644 index 6abca944..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/Logthread.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/PLCDevice.obj b/1280x800 TH/Cigarette/x64/Release/PLCDevice.obj deleted file mode 100644 index 39237664..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/PLCDevice.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/SyncQueue.obj b/1280x800 TH/Cigarette/x64/Release/SyncQueue.obj deleted file mode 100644 index 7b2e77d3..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/SyncQueue.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/SyncWorkThread.obj b/1280x800 TH/Cigarette/x64/Release/SyncWorkThread.obj deleted file mode 100644 index 53e9e35e..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/SyncWorkThread.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/alarmdialog.obj b/1280x800 TH/Cigarette/x64/Release/alarmdialog.obj deleted file mode 100644 index d6186f4f..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/alarmdialog.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/alg_jd.obj b/1280x800 TH/Cigarette/x64/Release/alg_jd.obj deleted file mode 100644 index 15a7d81a..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/alg_jd.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/balluffcamera.obj b/1280x800 TH/Cigarette/x64/Release/balluffcamera.obj deleted file mode 100644 index 732d8978..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/balluffcamera.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/basecamera.obj b/1280x800 TH/Cigarette/x64/Release/basecamera.obj deleted file mode 100644 index 860c96e2..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/basecamera.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/baslercamera.obj b/1280x800 TH/Cigarette/x64/Release/baslercamera.obj deleted file mode 100644 index a6cd56e2..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/baslercamera.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/camera_glue.obj b/1280x800 TH/Cigarette/x64/Release/camera_glue.obj deleted file mode 100644 index 41fee94d..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/camera_glue.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/change_shift.obj b/1280x800 TH/Cigarette/x64/Release/change_shift.obj deleted file mode 100644 index 4e45ea69..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/change_shift.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/cigarette.obj b/1280x800 TH/Cigarette/x64/Release/cigarette.obj deleted file mode 100644 index a8900a2c..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/cigarette.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/common.obj b/1280x800 TH/Cigarette/x64/Release/common.obj deleted file mode 100644 index 474c3cf1..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/common.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/db_label.obj b/1280x800 TH/Cigarette/x64/Release/db_label.obj deleted file mode 100644 index dc5c70b6..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/db_label.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/debugthread.obj b/1280x800 TH/Cigarette/x64/Release/debugthread.obj deleted file mode 100644 index be83940f..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/debugthread.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/dialogin.obj b/1280x800 TH/Cigarette/x64/Release/dialogin.obj deleted file mode 100644 index 4b39aacb..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/dialogin.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/dialogsetup.obj b/1280x800 TH/Cigarette/x64/Release/dialogsetup.obj deleted file mode 100644 index dd500881..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/dialogsetup.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/dialogsetuppasswd.obj b/1280x800 TH/Cigarette/x64/Release/dialogsetuppasswd.obj deleted file mode 100644 index 6bac591c..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/dialogsetuppasswd.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/exportData.obj b/1280x800 TH/Cigarette/x64/Release/exportData.obj deleted file mode 100644 index a15a630e..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/exportData.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/hikcamera.obj b/1280x800 TH/Cigarette/x64/Release/hikcamera.obj deleted file mode 100644 index d5ce8b10..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/hikcamera.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/main.obj b/1280x800 TH/Cigarette/x64/Release/main.obj deleted file mode 100644 index 8b4d91d0..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/main.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/moc_CaptureThread.obj b/1280x800 TH/Cigarette/x64/Release/moc_CaptureThread.obj deleted file mode 100644 index a8befe5e..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/moc_CaptureThread.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/moc_CaptureThreadBasler.obj b/1280x800 TH/Cigarette/x64/Release/moc_CaptureThreadBasler.obj deleted file mode 100644 index ffe05eda..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/moc_CaptureThreadBasler.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/moc_CaptureThreadHIK.obj b/1280x800 TH/Cigarette/x64/Release/moc_CaptureThreadHIK.obj deleted file mode 100644 index eb4ee31c..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/moc_CaptureThreadHIK.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/moc_Cleanthread.obj b/1280x800 TH/Cigarette/x64/Release/moc_Cleanthread.obj deleted file mode 100644 index 3a2bfec3..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/moc_Cleanthread.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/moc_Logthread.obj b/1280x800 TH/Cigarette/x64/Release/moc_Logthread.obj deleted file mode 100644 index a293500b..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/moc_Logthread.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/moc_SyncWorkThread.obj b/1280x800 TH/Cigarette/x64/Release/moc_SyncWorkThread.obj deleted file mode 100644 index ecdb0f8c..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/moc_SyncWorkThread.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/moc_alarmdialog.obj b/1280x800 TH/Cigarette/x64/Release/moc_alarmdialog.obj deleted file mode 100644 index 67d08ea3..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/moc_alarmdialog.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/moc_camera_glue.obj b/1280x800 TH/Cigarette/x64/Release/moc_camera_glue.obj deleted file mode 100644 index a61a0edc..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/moc_camera_glue.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/moc_change_shift.obj b/1280x800 TH/Cigarette/x64/Release/moc_change_shift.obj deleted file mode 100644 index 87b2cb83..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/moc_change_shift.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/moc_cigarette.obj b/1280x800 TH/Cigarette/x64/Release/moc_cigarette.obj deleted file mode 100644 index adc9a62b..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/moc_cigarette.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/moc_db_label.obj b/1280x800 TH/Cigarette/x64/Release/moc_db_label.obj deleted file mode 100644 index 22b106a2..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/moc_db_label.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/moc_debugthread.obj b/1280x800 TH/Cigarette/x64/Release/moc_debugthread.obj deleted file mode 100644 index cc89be99..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/moc_debugthread.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/moc_dialogin.obj b/1280x800 TH/Cigarette/x64/Release/moc_dialogin.obj deleted file mode 100644 index 41b27394..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/moc_dialogin.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/moc_dialogsetup.obj b/1280x800 TH/Cigarette/x64/Release/moc_dialogsetup.obj deleted file mode 100644 index a868e76b..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/moc_dialogsetup.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/moc_dialogsetuppasswd.obj b/1280x800 TH/Cigarette/x64/Release/moc_dialogsetuppasswd.obj deleted file mode 100644 index 1e261385..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/moc_dialogsetuppasswd.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/moc_exportData.obj b/1280x800 TH/Cigarette/x64/Release/moc_exportData.obj deleted file mode 100644 index 9705dd12..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/moc_exportData.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/moc_output_statistic.obj b/1280x800 TH/Cigarette/x64/Release/moc_output_statistic.obj deleted file mode 100644 index 8d43ee4c..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/moc_output_statistic.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/moc_plcsetup.obj b/1280x800 TH/Cigarette/x64/Release/moc_plcsetup.obj deleted file mode 100644 index 59351177..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/moc_plcsetup.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/moc_savethread.obj b/1280x800 TH/Cigarette/x64/Release/moc_savethread.obj deleted file mode 100644 index 95c9ebb0..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/moc_savethread.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/moc_threadReceive.obj b/1280x800 TH/Cigarette/x64/Release/moc_threadReceive.obj deleted file mode 100644 index 8d0de213..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/moc_threadReceive.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/moc_workthread.obj b/1280x800 TH/Cigarette/x64/Release/moc_workthread.obj deleted file mode 100644 index 9991d711..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/moc_workthread.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/output_statistic.obj b/1280x800 TH/Cigarette/x64/Release/output_statistic.obj deleted file mode 100644 index aa9608ee..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/output_statistic.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/plc_item.obj b/1280x800 TH/Cigarette/x64/Release/plc_item.obj deleted file mode 100644 index 0aefc2e4..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/plc_item.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/plcsetup.obj b/1280x800 TH/Cigarette/x64/Release/plcsetup.obj deleted file mode 100644 index 192b439c..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/plcsetup.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/qmake/qtvars_x64_Release.props b/1280x800 TH/Cigarette/x64/Release/qmake/qtvars_x64_Release.props deleted file mode 100644 index 0bcc81ea..00000000 --- a/1280x800 TH/Cigarette/x64/Release/qmake/qtvars_x64_Release.props +++ /dev/null @@ -1,60 +0,0 @@ - - -_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;NDEBUG;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB -C:\Users\FD\AppData\Local\Temp\zhxryfs2.eyb;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtWidgets;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtGui;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtANGLE;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtNetwork;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtCore;C:\Users\FD\AppData\Local\Temp\zhxryfs2.eyb;/include;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\mkspecs\win32-msvc - -MultiThreadedDLL --Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\Qt5Widgets.lib;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\Qt5Gui.lib;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\Qt5Network.lib;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\Qt5Core.lib;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\qtmain.lib;shell32.lib -"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" - -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -C:/Qt/Qt5.14.2/Docs/Qt-5.14.2 -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/include -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/lib -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/bin -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/bin -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/tests -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/plugins -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/imports -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/qml -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/translations - -C:/Qt/Qt5.14.2/Examples/Qt-5.14.2 -C:/Qt/Qt5.14.2/Examples/Qt-5.14.2 -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/bin -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/lib -win32-msvc -win32-msvc -3.1 -5.14.2 -$(Qt_INCLUDEPATH_);.\GeneratedFiles\Release;.\GeneratedFiles - 5.14.2_msvc2017_64 - core;network;gui;widgets - bin - bin - - - DEFINES=/Project/ItemDefinitionGroup/ClCompile/PreprocessorDefinitions;INCLUDEPATH=/Project/ItemDefinitionGroup/ClCompile/AdditionalIncludeDirectories;STDCPP=/Project/ItemDefinitionGroup/ClCompile/LanguageStandard;RUNTIME=/Project/ItemDefinitionGroup/ClCompile/RuntimeLibrary;CL_OPTIONS=/Project/ItemDefinitionGroup/ClCompile/AdditionalOptions;LIBS=/Project/ItemDefinitionGroup/Link/AdditionalDependencies;LINK_OPTIONS=/Project/ItemDefinitionGroup/Link/AdditionalOptions - - release - 5.14.2 - 5 - 14 - 2 - - diff --git a/1280x800 TH/Cigarette/x64/Release/qmake/temp/B12702AD-ABFB-343A-A199-8E24837244A3.Cigarette.designtime.idx b/1280x800 TH/Cigarette/x64/Release/qmake/temp/B12702AD-ABFB-343A-A199-8E24837244A3.Cigarette.designtime.idx deleted file mode 100644 index 34a34b9e..00000000 --- a/1280x800 TH/Cigarette/x64/Release/qmake/temp/B12702AD-ABFB-343A-A199-8E24837244A3.Cigarette.designtime.idx +++ /dev/null @@ -1 +0,0 @@ -C:\Users\FD\AppData\Local\Temp\w3evnpgm.sra.designtime.props diff --git a/1280x800 TH/Cigarette/x64/Release/qmake/temp/props.txt b/1280x800 TH/Cigarette/x64/Release/qmake/temp/props.txt deleted file mode 100644 index 62a0538e..00000000 --- a/1280x800 TH/Cigarette/x64/Release/qmake/temp/props.txt +++ /dev/null @@ -1,25 +0,0 @@ -QT_SYSROOT: -QT_INSTALL_PREFIX:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -QT_INSTALL_ARCHDATA:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -QT_INSTALL_DATA:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -QT_INSTALL_DOCS:C:/Qt/Qt5.14.2/Docs/Qt-5.14.2 -QT_INSTALL_HEADERS:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/include -QT_INSTALL_LIBS:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/lib -QT_INSTALL_LIBEXECS:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/bin -QT_INSTALL_BINS:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/bin -QT_INSTALL_TESTS:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/tests -QT_INSTALL_PLUGINS:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/plugins -QT_INSTALL_IMPORTS:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/imports -QT_INSTALL_QML:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/qml -QT_INSTALL_TRANSLATIONS:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/translations -QT_INSTALL_CONFIGURATION: -QT_INSTALL_EXAMPLES:C:/Qt/Qt5.14.2/Examples/Qt-5.14.2 -QT_INSTALL_DEMOS:C:/Qt/Qt5.14.2/Examples/Qt-5.14.2 -QT_HOST_PREFIX:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -QT_HOST_DATA:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -QT_HOST_BINS:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/bin -QT_HOST_LIBS:C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/lib -QMAKE_SPEC:win32-msvc -QMAKE_XSPEC:win32-msvc -QMAKE_VERSION:3.1 -QT_VERSION:5.14.2 diff --git a/1280x800 TH/Cigarette/x64/Release/qmake/temp/qtvars.log b/1280x800 TH/Cigarette/x64/Release/qmake/temp/qtvars.log deleted file mode 100644 index a2b17c87..00000000 --- a/1280x800 TH/Cigarette/x64/Release/qmake/temp/qtvars.log +++ /dev/null @@ -1 +0,0 @@ -Info: creating stash file C:\Users\FD\AppData\Local\Temp\zhxryfs2.eyb\.qmake.stash diff --git a/1280x800 TH/Cigarette/x64/Release/qmake/temp/qtvars_x64_Release.props b/1280x800 TH/Cigarette/x64/Release/qmake/temp/qtvars_x64_Release.props deleted file mode 100644 index 0bcc81ea..00000000 --- a/1280x800 TH/Cigarette/x64/Release/qmake/temp/qtvars_x64_Release.props +++ /dev/null @@ -1,60 +0,0 @@ - - -_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;NDEBUG;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB -C:\Users\FD\AppData\Local\Temp\zhxryfs2.eyb;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtWidgets;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtGui;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtANGLE;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtNetwork;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtCore;C:\Users\FD\AppData\Local\Temp\zhxryfs2.eyb;/include;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\mkspecs\win32-msvc - -MultiThreadedDLL --Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\Qt5Widgets.lib;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\Qt5Gui.lib;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\Qt5Network.lib;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\Qt5Core.lib;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\qtmain.lib;shell32.lib -"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" - -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -C:/Qt/Qt5.14.2/Docs/Qt-5.14.2 -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/include -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/lib -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/bin -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/bin -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/tests -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/plugins -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/imports -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/qml -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/translations - -C:/Qt/Qt5.14.2/Examples/Qt-5.14.2 -C:/Qt/Qt5.14.2/Examples/Qt-5.14.2 -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64 -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/bin -C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/lib -win32-msvc -win32-msvc -3.1 -5.14.2 -$(Qt_INCLUDEPATH_);.\GeneratedFiles\Release;.\GeneratedFiles - 5.14.2_msvc2017_64 - core;network;gui;widgets - bin - bin - - - DEFINES=/Project/ItemDefinitionGroup/ClCompile/PreprocessorDefinitions;INCLUDEPATH=/Project/ItemDefinitionGroup/ClCompile/AdditionalIncludeDirectories;STDCPP=/Project/ItemDefinitionGroup/ClCompile/LanguageStandard;RUNTIME=/Project/ItemDefinitionGroup/ClCompile/RuntimeLibrary;CL_OPTIONS=/Project/ItemDefinitionGroup/ClCompile/AdditionalOptions;LIBS=/Project/ItemDefinitionGroup/Link/AdditionalDependencies;LINK_OPTIONS=/Project/ItemDefinitionGroup/Link/AdditionalOptions - - release - 5.14.2 - 5 - 14 - 2 - - diff --git a/1280x800 TH/Cigarette/x64/Release/qt/qmake/props.txt b/1280x800 TH/Cigarette/x64/Release/qt/qmake/props.txt deleted file mode 100644 index 9f76d83d..00000000 --- a/1280x800 TH/Cigarette/x64/Release/qt/qmake/props.txt +++ /dev/null @@ -1,25 +0,0 @@ -QT_SYSROOT: -QT_INSTALL_PREFIX:C:/Qt5.15.2/5.15.2/msvc2019_64 -QT_INSTALL_ARCHDATA:C:/Qt5.15.2/5.15.2/msvc2019_64 -QT_INSTALL_DATA:C:/Qt5.15.2/5.15.2/msvc2019_64 -QT_INSTALL_DOCS:C:/Qt5.15.2/Docs/Qt-5.15.2 -QT_INSTALL_HEADERS:C:/Qt5.15.2/5.15.2/msvc2019_64/include -QT_INSTALL_LIBS:C:/Qt5.15.2/5.15.2/msvc2019_64/lib -QT_INSTALL_LIBEXECS:C:/Qt5.15.2/5.15.2/msvc2019_64/bin -QT_INSTALL_BINS:C:/Qt5.15.2/5.15.2/msvc2019_64/bin -QT_INSTALL_TESTS:C:/Qt5.15.2/5.15.2/msvc2019_64/tests -QT_INSTALL_PLUGINS:C:/Qt5.15.2/5.15.2/msvc2019_64/plugins -QT_INSTALL_IMPORTS:C:/Qt5.15.2/5.15.2/msvc2019_64/imports -QT_INSTALL_QML:C:/Qt5.15.2/5.15.2/msvc2019_64/qml -QT_INSTALL_TRANSLATIONS:C:/Qt5.15.2/5.15.2/msvc2019_64/translations -QT_INSTALL_CONFIGURATION: -QT_INSTALL_EXAMPLES:C:/Qt5.15.2/Examples/Qt-5.15.2 -QT_INSTALL_DEMOS:C:/Qt5.15.2/Examples/Qt-5.15.2 -QT_HOST_PREFIX:C:/Qt5.15.2/5.15.2/msvc2019_64 -QT_HOST_DATA:C:/Qt5.15.2/5.15.2/msvc2019_64 -QT_HOST_BINS:C:/Qt5.15.2/5.15.2/msvc2019_64/bin -QT_HOST_LIBS:C:/Qt5.15.2/5.15.2/msvc2019_64/lib -QMAKE_SPEC:win32-msvc -QMAKE_XSPEC:win32-msvc -QMAKE_VERSION:3.1 -QT_VERSION:5.15.2 diff --git a/1280x800 TH/Cigarette/x64/Release/qt/qmake/qtvars.log b/1280x800 TH/Cigarette/x64/Release/qt/qmake/qtvars.log deleted file mode 100644 index 7d6566b0..00000000 --- a/1280x800 TH/Cigarette/x64/Release/qt/qmake/qtvars.log +++ /dev/null @@ -1,3 +0,0 @@ -Cannot read D:/mqtt/qtmqtt-5.15.2/build/Desktop_Qt_5_15_2_MSVC2019_64bit-Debug/mkspecs/modules-inst/qt_lib_mqtt.pri: No such file or directory -Cannot read D:/mqtt/qtmqtt-5.15.2/build/Desktop_Qt_5_15_2_MSVC2019_64bit-Debug/mkspecs/modules-inst/qt_lib_mqtt_private.pri: No such file or directory -Info: creating stash file D:\aaa\YB628\1280\Cigarette\x64\Release\qt\qmake\.qmake.stash diff --git a/1280x800 TH/Cigarette/x64/Release/qt/qt_work.log b/1280x800 TH/Cigarette/x64/Release/qt/qt_work.log deleted file mode 100644 index 47616088..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/qt/qt_work.log and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/qt_work.log b/1280x800 TH/Cigarette/x64/Release/qt_work.log deleted file mode 100644 index 3a3f6fb1..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/qt_work.log and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/threadReceive.obj b/1280x800 TH/Cigarette/x64/Release/threadReceive.obj deleted file mode 100644 index 71566528..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/threadReceive.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/threadSend.obj b/1280x800 TH/Cigarette/x64/Release/threadSend.obj deleted file mode 100644 index d81c7610..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/threadSend.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/threadSendTCP.obj b/1280x800 TH/Cigarette/x64/Release/threadSendTCP.obj deleted file mode 100644 index b818dd2b..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/threadSendTCP.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/tinyxml2.obj b/1280x800 TH/Cigarette/x64/Release/tinyxml2.obj deleted file mode 100644 index 790c15c3..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/tinyxml2.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette/x64/Release/workthread.obj b/1280x800 TH/Cigarette/x64/Release/workthread.obj deleted file mode 100644 index 3eddda88..00000000 Binary files a/1280x800 TH/Cigarette/x64/Release/workthread.obj and /dev/null differ diff --git a/1280x800 TH/Cigarette.sln b/1280x800-XH/Cigarette.sln similarity index 97% rename from 1280x800 TH/Cigarette.sln rename to 1280x800-XH/Cigarette.sln index 243d8ea9..dfce70c5 100644 --- a/1280x800 TH/Cigarette.sln +++ b/1280x800-XH/Cigarette.sln @@ -27,6 +27,6 @@ Global EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0AF1A30E-A12C-4014-ACD5-65A1E6D54D46} - Qt5Version = 5.15.2_msvc2019_64 + Qt5Version = 5.15.0_msvc2019_64 EndGlobalSection EndGlobal diff --git a/1280x800 TH/Cigarette/ASyncQueue.cpp b/1280x800-XH/Cigarette/ASyncQueue.cpp similarity index 100% rename from 1280x800 TH/Cigarette/ASyncQueue.cpp rename to 1280x800-XH/Cigarette/ASyncQueue.cpp diff --git a/1280x800 TH/Cigarette/ASyncQueue.h b/1280x800-XH/Cigarette/ASyncQueue.h similarity index 100% rename from 1280x800 TH/Cigarette/ASyncQueue.h rename to 1280x800-XH/Cigarette/ASyncQueue.h diff --git a/1280x800 TH/Cigarette/AlarmInfo.cpp b/1280x800-XH/Cigarette/AlarmInfo.cpp similarity index 100% rename from 1280x800 TH/Cigarette/AlarmInfo.cpp rename to 1280x800-XH/Cigarette/AlarmInfo.cpp diff --git a/1280x800 TH/Cigarette/AlarmInfo.h b/1280x800-XH/Cigarette/AlarmInfo.h similarity index 100% rename from 1280x800 TH/Cigarette/AlarmInfo.h rename to 1280x800-XH/Cigarette/AlarmInfo.h diff --git a/1280x800 TH/Cigarette/CaptureThread.cpp b/1280x800-XH/Cigarette/CaptureThread.cpp similarity index 100% rename from 1280x800 TH/Cigarette/CaptureThread.cpp rename to 1280x800-XH/Cigarette/CaptureThread.cpp diff --git a/1280x800 TH/Cigarette/CaptureThread.h b/1280x800-XH/Cigarette/CaptureThread.h similarity index 100% rename from 1280x800 TH/Cigarette/CaptureThread.h rename to 1280x800-XH/Cigarette/CaptureThread.h diff --git a/1280x800 TH/Cigarette/CaptureThreadBasler.cpp b/1280x800-XH/Cigarette/CaptureThreadBasler.cpp similarity index 100% rename from 1280x800 TH/Cigarette/CaptureThreadBasler.cpp rename to 1280x800-XH/Cigarette/CaptureThreadBasler.cpp diff --git a/1280x800 TH/Cigarette/CaptureThreadBasler.h b/1280x800-XH/Cigarette/CaptureThreadBasler.h similarity index 100% rename from 1280x800 TH/Cigarette/CaptureThreadBasler.h rename to 1280x800-XH/Cigarette/CaptureThreadBasler.h diff --git a/1280x800 TH/Cigarette/CaptureThreadHIK.cpp b/1280x800-XH/Cigarette/CaptureThreadHIK.cpp similarity index 94% rename from 1280x800 TH/Cigarette/CaptureThreadHIK.cpp rename to 1280x800-XH/Cigarette/CaptureThreadHIK.cpp index 3967ade3..5d2d3fa2 100644 --- a/1280x800 TH/Cigarette/CaptureThreadHIK.cpp +++ b/1280x800-XH/Cigarette/CaptureThreadHIK.cpp @@ -13,6 +13,7 @@ extern int work_camera_nums; #ifdef __TCPSend extern SyncQueue<_TCPSendInfo>* TCP_Info_queue; extern threadSendTCP tcpSendThread; +_TCPSendInfo TCPSendInfo;/// #endif inline void LossCallBackfunction(unsigned int pData, void* pUser) { @@ -29,6 +30,7 @@ inline void FallingGpioEventfunction(MV_EVENT_OUT_INFO* pEventInfo, void* pUser) try { CaptureThreadHIK* CaptureThreadHIKptr = (CaptureThreadHIK*)pUser; int unit_count = CaptureThreadHIKptr->p_unit_queue->count(); + //qDebug() << unit_count; if (unit_count > 0) { cv::Mat long_image; @@ -44,6 +46,10 @@ inline void FallingGpioEventfunction(MV_EVENT_OUT_INFO* pEventInfo, void* pUser) cv::Mat roi = long_image(r); image.copyTo(roi); } + if (CaptureThreadHIKptr->Local_Num == 1){ + QDateTime FAll__start = QDateTime::currentDateTime(); + //qDebug() << "FallingGpioEventfunction" << FAll__start; + } #ifdef SYNC_CAMERA {//åˆå¹¶æ‰€æœ‰ç›¸æœºå›¾ç‰‡æ”¾å…¥é˜Ÿåˆ— std::lock_guard locker(CaptureThreadHIKptr->p_image_sync_arr->lock); @@ -60,6 +66,16 @@ inline void FallingGpioEventfunction(MV_EVENT_OUT_INFO* pEventInfo, void* pUser) #endif CaptureThreadHIKptr->p_shooted_queue->put(true); } + else + { +#ifdef __TCPSend /// + QDateTime now_ts = QDateTime::currentDateTime(); + QString sendName = "no_signal_" + now_ts.toString("yyyy-MM-dd_HH-mm-ss.zzz"); + TCPSendInfo.pics_name = sendName.toLocal8Bit().constData(); + TCP_Info_queue->put(TCPSendInfo); +#endif + } + CaptureThreadHIKptr->p_unit_queue->clear(); } catch (...) { @@ -298,9 +314,11 @@ void CaptureThreadHIK::process(void) if (MV_OK == nRet) { m_cntGrabbedImages++; - + cv::Mat openCVImage(stFrameInfo.nHeight, stFrameInfo.nWidth, CV_8UC3, g_pImage_buf); cv::Mat image_clone = openCVImage.clone(); + + QDateTime start = QDateTime::currentDateTime(); if (!g_debug_mode) { #ifdef IMM_PROCESS diff --git a/1280x800 TH/Cigarette/CaptureThreadHIK.h b/1280x800-XH/Cigarette/CaptureThreadHIK.h similarity index 100% rename from 1280x800 TH/Cigarette/CaptureThreadHIK.h rename to 1280x800-XH/Cigarette/CaptureThreadHIK.h diff --git a/1280x800 TH/Cigarette/Cigarette.vcxproj b/1280x800-XH/Cigarette/Cigarette.vcxproj similarity index 97% rename from 1280x800 TH/Cigarette/Cigarette.vcxproj rename to 1280x800-XH/Cigarette/Cigarette.vcxproj index 0f948a44..fc2b01a1 100644 --- a/1280x800 TH/Cigarette/Cigarette.vcxproj +++ b/1280x800-XH/Cigarette/Cigarette.vcxproj @@ -21,7 +21,7 @@ {B12702AD-ABFB-343A-A199-8E24837244A3} QtVS_v304 - 10.0.22621.0 + 10.0 $(MSBuildProjectDirectory)\QtMsBuild @@ -45,14 +45,15 @@ core;network;gui;widgets + 5.15.0_msvc2019_64 - 5.15.2_msvc2019_64 + 5.15.0_msvc2019_64 core;network;gui;widgets - release core;network;gui;widgets + 5.15.0_msvc2019_64 5.15.2_msvc2019_64 @@ -216,7 +217,7 @@ true true stdcpp14 - MaxSpeed + Disabled false 4819;%(DisableSpecificWarnings) @@ -224,10 +225,12 @@ Console $(OutDir)\$(ProjectName).exe $(ProjectDir)OpenCV455Simple\win64\vc15\lib;$(ProjectDir)Pylon6.2\lib\Win64;$(ProjectDir)MvIMPACT\lib\win64;$(ProjectDir)MVS3.2.1\lib\win64;$(ProjectDir)modbus;Ws2_32.lib;%(AdditionalLibraryDirectories) - false + true opencv_world455.lib;modbus.lib;mvDeviceManager.lib;MvCameraControl.lib;%(AdditionalDependencies) + + Moc'ing %(Identity)... @@ -272,12 +275,14 @@ + + @@ -295,6 +300,8 @@ + + diff --git a/1280x800 TH/Cigarette/Cigarette.vcxproj.filters b/1280x800-XH/Cigarette/Cigarette.vcxproj.filters similarity index 96% rename from 1280x800 TH/Cigarette/Cigarette.vcxproj.filters rename to 1280x800-XH/Cigarette/Cigarette.vcxproj.filters index 2eaf0043..6e4b469e 100644 --- a/1280x800 TH/Cigarette/Cigarette.vcxproj.filters +++ b/1280x800-XH/Cigarette/Cigarette.vcxproj.filters @@ -140,6 +140,12 @@ Source Files + + Source Files + + + Source Files + @@ -282,5 +288,11 @@ Header Files + + Header Files + + + Header Files + \ No newline at end of file diff --git a/1280x800 TH/Cigarette/Cigarette.vcxproj.user b/1280x800-XH/Cigarette/Cigarette.vcxproj.user similarity index 83% rename from 1280x800 TH/Cigarette/Cigarette.vcxproj.user rename to 1280x800-XH/Cigarette/Cigarette.vcxproj.user index 382a51ec..0ee9c85e 100644 --- a/1280x800 TH/Cigarette/Cigarette.vcxproj.user +++ b/1280x800-XH/Cigarette/Cigarette.vcxproj.user @@ -10,22 +10,22 @@ PATH=$(QTDIR)\bin%3bD:\Qt\5.15.2\msvc2019_64\bin%3b$(PATH) - 2024-07-25T01:51:24.4267388Z + 2024-10-21T01:19:06.2001128Z - 2024-07-25T01:51:24.4984950Z + 2024-10-21T01:19:06.6843966Z - 2024-07-25T01:51:24.5622820Z + 2024-10-21T01:19:11.6858184Z - 2024-07-25T01:51:24.6749053Z + 2024-10-21T01:19:11.2096987Z diff --git a/1280x800 TH/Cigarette/Cleanthread.cpp b/1280x800-XH/Cigarette/Cleanthread.cpp similarity index 96% rename from 1280x800 TH/Cigarette/Cleanthread.cpp rename to 1280x800-XH/Cigarette/Cleanthread.cpp index dd752878..695ba090 100644 --- a/1280x800 TH/Cigarette/Cleanthread.cpp +++ b/1280x800-XH/Cigarette/Cleanthread.cpp @@ -66,6 +66,7 @@ void CleanWorkThread::doWork() CleanImageFile(dirNg_result, delDays--); //调用函数获å–ç£ç›˜å‚æ•°(å•ä½ä¸ºå­—节Byte),转化为GB，需è¦é™¤ä»¥(1024*1024*1024) GetDiskFreeSpaceEx(strDriver, &freeDiskSpaceAvailable, &totalDiskSpace, &totalFreeDiskSpace); + //GetDiskFreeSpaceEx(TEXT("D:"), &freeDiskSpaceAvailable, &totalDiskSpace, &totalFreeDiskSpace); spaceSize = ((qint64)totalFreeDiskSpace.QuadPart * (100 / freeSize)) / (qint64)totalDiskSpace.QuadPart; dirSize = DirFileSize(dir) / gb; //delDays = g_sys_conf.save_days; @@ -75,6 +76,7 @@ void CleanWorkThread::doWork() CleanImageFile(dirNg, delDays--); CleanImageFile(dirNg_result, delDays--); GetDiskFreeSpaceEx(strDriver, &freeDiskSpaceAvailable, &totalDiskSpace, &totalFreeDiskSpace); + //GetDiskFreeSpaceEx(TEXT("D:"), &freeDiskSpaceAvailable, &totalDiskSpace, &totalFreeDiskSpace); spaceSize = ((qint64)totalFreeDiskSpace.QuadPart * (100 / freeSize)) / (qint64)totalDiskSpace.QuadPart; } } diff --git a/1280x800 TH/Cigarette/Cleanthread.h b/1280x800-XH/Cigarette/Cleanthread.h similarity index 100% rename from 1280x800 TH/Cigarette/Cleanthread.h rename to 1280x800-XH/Cigarette/Cleanthread.h diff --git a/1280x800 TH/Cigarette/Common/CommonGUIFunctions.cpp b/1280x800-XH/Cigarette/Common/CommonGUIFunctions.cpp similarity index 100% rename from 1280x800 TH/Cigarette/Common/CommonGUIFunctions.cpp rename to 1280x800-XH/Cigarette/Common/CommonGUIFunctions.cpp diff --git a/1280x800 TH/Cigarette/Common/CommonGUIFunctions.h b/1280x800-XH/Cigarette/Common/CommonGUIFunctions.h similarity index 100% rename from 1280x800 TH/Cigarette/Common/CommonGUIFunctions.h rename to 1280x800-XH/Cigarette/Common/CommonGUIFunctions.h diff --git a/1280x800 TH/Cigarette/Common/Info.h b/1280x800-XH/Cigarette/Common/Info.h similarity index 100% rename from 1280x800 TH/Cigarette/Common/Info.h rename to 1280x800-XH/Cigarette/Common/Info.h diff --git a/1280x800 TH/Cigarette/Common/ProxyResolverContext.h b/1280x800-XH/Cigarette/Common/ProxyResolverContext.h similarity index 100% rename from 1280x800 TH/Cigarette/Common/ProxyResolverContext.h rename to 1280x800-XH/Cigarette/Common/ProxyResolverContext.h diff --git a/1280x800 TH/Cigarette/Common/aviexception.h b/1280x800-XH/Cigarette/Common/aviexception.h similarity index 100% rename from 1280x800 TH/Cigarette/Common/aviexception.h rename to 1280x800-XH/Cigarette/Common/aviexception.h diff --git a/1280x800 TH/Cigarette/Common/avihelper.cpp b/1280x800-XH/Cigarette/Common/avihelper.cpp similarity index 100% rename from 1280x800 TH/Cigarette/Common/avihelper.cpp rename to 1280x800-XH/Cigarette/Common/avihelper.cpp diff --git a/1280x800 TH/Cigarette/Common/avihelper.h b/1280x800-XH/Cigarette/Common/avihelper.h similarity index 100% rename from 1280x800 TH/Cigarette/Common/avihelper.h rename to 1280x800-XH/Cigarette/Common/avihelper.h diff --git a/1280x800 TH/Cigarette/Common/aviwrapper.cpp b/1280x800-XH/Cigarette/Common/aviwrapper.cpp similarity index 100% rename from 1280x800 TH/Cigarette/Common/aviwrapper.cpp rename to 1280x800-XH/Cigarette/Common/aviwrapper.cpp diff --git a/1280x800 TH/Cigarette/Common/aviwrapper.h b/1280x800-XH/Cigarette/Common/aviwrapper.h similarity index 100% rename from 1280x800 TH/Cigarette/Common/aviwrapper.h rename to 1280x800-XH/Cigarette/Common/aviwrapper.h diff --git a/1280x800 TH/Cigarette/Common/exampleHelper.h b/1280x800-XH/Cigarette/Common/exampleHelper.h similarity index 100% rename from 1280x800 TH/Cigarette/Common/exampleHelper.h rename to 1280x800-XH/Cigarette/Common/exampleHelper.h diff --git a/1280x800 TH/Cigarette/Common/exampleHelper_C.c b/1280x800-XH/Cigarette/Common/exampleHelper_C.c similarity index 100% rename from 1280x800 TH/Cigarette/Common/exampleHelper_C.c rename to 1280x800-XH/Cigarette/Common/exampleHelper_C.c diff --git a/1280x800 TH/Cigarette/Common/exampleHelper_C.h b/1280x800-XH/Cigarette/Common/exampleHelper_C.h similarity index 100% rename from 1280x800 TH/Cigarette/Common/exampleHelper_C.h rename to 1280x800-XH/Cigarette/Common/exampleHelper_C.h diff --git a/1280x800 TH/Cigarette/Common/mv.ico b/1280x800-XH/Cigarette/Common/mv.ico similarity index 100% rename from 1280x800 TH/Cigarette/Common/mv.ico rename to 1280x800-XH/Cigarette/Common/mv.ico diff --git a/1280x800 TH/Cigarette/Common/mvIcon.xpm b/1280x800-XH/Cigarette/Common/mvIcon.xpm similarity index 100% rename from 1280x800 TH/Cigarette/Common/mvIcon.xpm rename to 1280x800-XH/Cigarette/Common/mvIcon.xpm diff --git a/1280x800 TH/Cigarette/Common/qtIncludeEpilogue.h b/1280x800-XH/Cigarette/Common/qtIncludeEpilogue.h similarity index 100% rename from 1280x800 TH/Cigarette/Common/qtIncludeEpilogue.h rename to 1280x800-XH/Cigarette/Common/qtIncludeEpilogue.h diff --git a/1280x800 TH/Cigarette/Common/qtIncludePrologue.h b/1280x800-XH/Cigarette/Common/qtIncludePrologue.h similarity index 100% rename from 1280x800 TH/Cigarette/Common/qtIncludePrologue.h rename to 1280x800-XH/Cigarette/Common/qtIncludePrologue.h diff --git a/1280x800 TH/Cigarette/Common/win32/ProxyResolver.cpp b/1280x800-XH/Cigarette/Common/win32/ProxyResolver.cpp similarity index 100% rename from 1280x800 TH/Cigarette/Common/win32/ProxyResolver.cpp rename to 1280x800-XH/Cigarette/Common/win32/ProxyResolver.cpp diff --git a/1280x800 TH/Cigarette/Common/win32/ProxyResolver.h b/1280x800-XH/Cigarette/Common/win32/ProxyResolver.h similarity index 100% rename from 1280x800 TH/Cigarette/Common/win32/ProxyResolver.h rename to 1280x800-XH/Cigarette/Common/win32/ProxyResolver.h diff --git a/1280x800 TH/Cigarette/Common/win32/ProxyResolverContext.cpp b/1280x800-XH/Cigarette/Common/win32/ProxyResolverContext.cpp similarity index 100% rename from 1280x800 TH/Cigarette/Common/win32/ProxyResolverContext.cpp rename to 1280x800-XH/Cigarette/Common/win32/ProxyResolverContext.cpp diff --git a/1280x800 TH/Cigarette/Common/wxAbstraction.h b/1280x800-XH/Cigarette/Common/wxAbstraction.h similarity index 100% rename from 1280x800 TH/Cigarette/Common/wxAbstraction.h rename to 1280x800-XH/Cigarette/Common/wxAbstraction.h diff --git a/1280x800 TH/Cigarette/Common/wxIncludeEpilogue.h b/1280x800-XH/Cigarette/Common/wxIncludeEpilogue.h similarity index 100% rename from 1280x800 TH/Cigarette/Common/wxIncludeEpilogue.h rename to 1280x800-XH/Cigarette/Common/wxIncludeEpilogue.h diff --git a/1280x800 TH/Cigarette/Common/wxIncludePrologue.h b/1280x800-XH/Cigarette/Common/wxIncludePrologue.h similarity index 100% rename from 1280x800 TH/Cigarette/Common/wxIncludePrologue.h rename to 1280x800-XH/Cigarette/Common/wxIncludePrologue.h diff --git a/1280x800 TH/Cigarette/Common/wxIncluder.h b/1280x800-XH/Cigarette/Common/wxIncluder.h similarity index 100% rename from 1280x800 TH/Cigarette/Common/wxIncluder.h rename to 1280x800-XH/Cigarette/Common/wxIncluder.h diff --git a/1280x800 TH/Cigarette/CryptoToolLib.h b/1280x800-XH/Cigarette/CryptoToolLib.h similarity index 100% rename from 1280x800 TH/Cigarette/CryptoToolLib.h rename to 1280x800-XH/Cigarette/CryptoToolLib.h diff --git a/1280x800 TH/Cigarette/CryptoToolLib.lib b/1280x800-XH/Cigarette/CryptoToolLib.lib similarity index 100% rename from 1280x800 TH/Cigarette/CryptoToolLib.lib rename to 1280x800-XH/Cigarette/CryptoToolLib.lib diff --git a/1280x800-XH/Cigarette/Debug/qmake/qtvars_Win32_Debug.props b/1280x800-XH/Cigarette/Debug/qmake/qtvars_Win32_Debug.props new file mode 100644 index 00000000..63b5d7be --- /dev/null +++ b/1280x800-XH/Cigarette/Debug/qmake/qtvars_Win32_Debug.props @@ -0,0 +1,59 @@ + + +_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_WIDGETS_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB +D:\CigaretteSH\240819-hangzhou-ZB416-2-1024x768-XH\Cigarette\Debug\qmake\temp;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtWidgets;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtGui;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtANGLE;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtNetwork;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtCore;D:\CigaretteSH\240819-hangzhou-ZB416-2-1024x768-XH\Cigarette\Debug\qmake\temp;/include;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\mkspecs\win32-msvc + +-Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus +C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Widgetsd.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Guid.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Networkd.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Cored.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\qtmaind.lib;shell32.lib +"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" + +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/Docs/Qt-5.15.0 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/include +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/lib +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/tests +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/plugins +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/imports +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/qml +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/translations + +C:/Qt/Qt5.15.0/Examples/Qt-5.15.0 +C:/Qt/Qt5.15.0/Examples/Qt-5.15.0 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/lib +win32-msvc +win32-msvc +3.1 +5.15.0 +$(Qt_INCLUDEPATH_);.\GeneratedFiles\Debug;.\GeneratedFiles + 5.15.0_msvc2019_64 + core;network;gui;widgets + bin + bin + + + DEFINES=/Project/ItemDefinitionGroup/ClCompile/PreprocessorDefinitions;INCLUDEPATH=/Project/ItemDefinitionGroup/ClCompile/AdditionalIncludeDirectories;STDCPP=/Project/ItemDefinitionGroup/ClCompile/LanguageStandard;CL_OPTIONS=/Project/ItemDefinitionGroup/ClCompile/AdditionalOptions;LIBS=/Project/ItemDefinitionGroup/Link/AdditionalDependencies;LINK_OPTIONS=/Project/ItemDefinitionGroup/Link/AdditionalOptions + + debug + 5.15.0 + 5 + 15 + 0 + + diff --git a/1280x800 TH/Cigarette/x64/Debug/qt/qmake/.qmake.stash b/1280x800-XH/Cigarette/Debug/qmake/temp/.qmake.stash similarity index 100% rename from 1280x800 TH/Cigarette/x64/Debug/qt/qmake/.qmake.stash rename to 1280x800-XH/Cigarette/Debug/qmake/temp/.qmake.stash diff --git a/1280x800-XH/Cigarette/Debug/qmake/temp/B12702AD-ABFB-343A-A199-8E24837244A3.Cigarette.designtime.idx b/1280x800-XH/Cigarette/Debug/qmake/temp/B12702AD-ABFB-343A-A199-8E24837244A3.Cigarette.designtime.idx new file mode 100644 index 00000000..b605f640 --- /dev/null +++ b/1280x800-XH/Cigarette/Debug/qmake/temp/B12702AD-ABFB-343A-A199-8E24837244A3.Cigarette.designtime.idx @@ -0,0 +1 @@ +C:\Users\Administrator\AppData\Local\Temp\l4o1gj1i.bmd.designtime.props diff --git a/1280x800 TH/Cigarette/Cigarette/Debug/qmake/temp/moc_predefs.h.cbt b/1280x800-XH/Cigarette/Debug/qmake/temp/moc_predefs.h.cbt similarity index 100% rename from 1280x800 TH/Cigarette/Cigarette/Debug/qmake/temp/moc_predefs.h.cbt rename to 1280x800-XH/Cigarette/Debug/qmake/temp/moc_predefs.h.cbt diff --git a/1280x800-XH/Cigarette/Debug/qmake/temp/props.txt b/1280x800-XH/Cigarette/Debug/qmake/temp/props.txt new file mode 100644 index 00000000..21ebcf92 --- /dev/null +++ b/1280x800-XH/Cigarette/Debug/qmake/temp/props.txt @@ -0,0 +1,25 @@ +QT_SYSROOT: +QT_INSTALL_PREFIX:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +QT_INSTALL_ARCHDATA:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +QT_INSTALL_DATA:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +QT_INSTALL_DOCS:C:/Qt/Qt5.15.0/Docs/Qt-5.15.0 +QT_INSTALL_HEADERS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/include +QT_INSTALL_LIBS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/lib +QT_INSTALL_LIBEXECS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +QT_INSTALL_BINS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +QT_INSTALL_TESTS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/tests +QT_INSTALL_PLUGINS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/plugins +QT_INSTALL_IMPORTS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/imports +QT_INSTALL_QML:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/qml +QT_INSTALL_TRANSLATIONS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/translations +QT_INSTALL_CONFIGURATION: +QT_INSTALL_EXAMPLES:C:/Qt/Qt5.15.0/Examples/Qt-5.15.0 +QT_INSTALL_DEMOS:C:/Qt/Qt5.15.0/Examples/Qt-5.15.0 +QT_HOST_PREFIX:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +QT_HOST_DATA:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +QT_HOST_BINS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +QT_HOST_LIBS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/lib +QMAKE_SPEC:win32-msvc +QMAKE_XSPEC:win32-msvc +QMAKE_VERSION:3.1 +QT_VERSION:5.15.0 diff --git a/1280x800-XH/Cigarette/Debug/qmake/temp/qtvars.log b/1280x800-XH/Cigarette/Debug/qmake/temp/qtvars.log new file mode 100644 index 00000000..a3737f66 --- /dev/null +++ b/1280x800-XH/Cigarette/Debug/qmake/temp/qtvars.log @@ -0,0 +1 @@ +Info: creating stash file D:\CigaretteSH\240819-hangzhou-ZB416-2-1024x768-XH\Cigarette\Debug\qmake\temp\.qmake.stash diff --git a/1280x800 TH/Cigarette/Cigarette/Debug/qmake/temp/qtvars.pro b/1280x800-XH/Cigarette/Debug/qmake/temp/qtvars.pro similarity index 100% rename from 1280x800 TH/Cigarette/Cigarette/Debug/qmake/temp/qtvars.pro rename to 1280x800-XH/Cigarette/Debug/qmake/temp/qtvars.pro diff --git a/1280x800 TH/Cigarette/Cigarette/Debug/qmake/temp/qtvars.vcxproj b/1280x800-XH/Cigarette/Debug/qmake/temp/qtvars.vcxproj similarity index 81% rename from 1280x800 TH/Cigarette/Cigarette/Debug/qmake/temp/qtvars.vcxproj rename to 1280x800-XH/Cigarette/Debug/qmake/temp/qtvars.vcxproj index 25f51089..c332dcc5 100644 --- a/1280x800 TH/Cigarette/Cigarette/Debug/qmake/temp/qtvars.vcxproj +++ b/1280x800-XH/Cigarette/Debug/qmake/temp/qtvars.vcxproj @@ -33,7 +33,7 @@ - C:\Users\FD\AppData\Local\Temp\iige4dcj.z1o;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtWidgets;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtGui;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtANGLE;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtNetwork;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtCore;C:\Users\FD\AppData\Local\Temp\iige4dcj.z1o;/include;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\mkspecs\win32-msvc;%(AdditionalIncludeDirectories) + D:\CigaretteSH\240819-hangzhou-ZB416-2-1024x768-XH\Cigarette\Debug\qmake\temp;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtWidgets;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtGui;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtANGLE;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtNetwork;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtCore;D:\CigaretteSH\240819-hangzhou-ZB416-2-1024x768-XH\Cigarette\Debug\qmake\temp;/include;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\mkspecs\win32-msvc;%(AdditionalIncludeDirectories) -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus %(AdditionalOptions) .\ false @@ -49,7 +49,7 @@ TurnOffAllWarnings - C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\Qt5Widgetsd.lib;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\Qt5Guid.lib;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\Qt5Networkd.lib;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\Qt5Cored.lib;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\qtmaind.lib;shell32.lib;%(AdditionalDependencies) + C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Widgetsd.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Guid.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Networkd.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Cored.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\qtmaind.lib;shell32.lib;%(AdditionalDependencies) C:\openssl\lib;C:\Utils\my_sql\mysql-5.7.25-winx64\lib;C:\Utils\postgresql\pgsql\lib;%(AdditionalLibraryDirectories) "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions) true @@ -72,8 +72,8 @@ Document - C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\mkspecs\features\data\dummy.cpp;%(AdditionalInputs) - cl -BxC:\Qt\Qt5.14.2\5.14.2\msvc2017_64\bin\qmake.exe -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -Zi -MDd -W0 -E C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\mkspecs\features\data\dummy.cpp 2>NUL >moc_predefs.h + C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\mkspecs\features\data\dummy.cpp;%(AdditionalInputs) + cl -BxC:\Qt\Qt5.15.0\5.15.0\msvc2019_64\bin\qmake.exe -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -Zi -MDd -W0 -E C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\mkspecs\features\data\dummy.cpp 2>NUL >moc_predefs.h Generate moc_predefs.h moc_predefs.h;%(Outputs) diff --git a/1280x800 TH/Cigarette/Cigarette/Debug/qmake/temp/qtvars.vcxproj.filters b/1280x800-XH/Cigarette/Debug/qmake/temp/qtvars.vcxproj.filters similarity index 100% rename from 1280x800 TH/Cigarette/Cigarette/Debug/qmake/temp/qtvars.vcxproj.filters rename to 1280x800-XH/Cigarette/Debug/qmake/temp/qtvars.vcxproj.filters diff --git a/1280x800-XH/Cigarette/Debug/qmake/temp/qtvars_Win32_Debug.props b/1280x800-XH/Cigarette/Debug/qmake/temp/qtvars_Win32_Debug.props new file mode 100644 index 00000000..63b5d7be --- /dev/null +++ b/1280x800-XH/Cigarette/Debug/qmake/temp/qtvars_Win32_Debug.props @@ -0,0 +1,59 @@ + + +_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_WIDGETS_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB +D:\CigaretteSH\240819-hangzhou-ZB416-2-1024x768-XH\Cigarette\Debug\qmake\temp;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtWidgets;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtGui;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtANGLE;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtNetwork;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtCore;D:\CigaretteSH\240819-hangzhou-ZB416-2-1024x768-XH\Cigarette\Debug\qmake\temp;/include;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\mkspecs\win32-msvc + +-Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus +C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Widgetsd.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Guid.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Networkd.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Cored.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\qtmaind.lib;shell32.lib +"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" + +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/Docs/Qt-5.15.0 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/include +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/lib +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/tests +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/plugins +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/imports +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/qml +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/translations + +C:/Qt/Qt5.15.0/Examples/Qt-5.15.0 +C:/Qt/Qt5.15.0/Examples/Qt-5.15.0 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/lib +win32-msvc +win32-msvc +3.1 +5.15.0 +$(Qt_INCLUDEPATH_);.\GeneratedFiles\Debug;.\GeneratedFiles + 5.15.0_msvc2019_64 + core;network;gui;widgets + bin + bin + + + DEFINES=/Project/ItemDefinitionGroup/ClCompile/PreprocessorDefinitions;INCLUDEPATH=/Project/ItemDefinitionGroup/ClCompile/AdditionalIncludeDirectories;STDCPP=/Project/ItemDefinitionGroup/ClCompile/LanguageStandard;CL_OPTIONS=/Project/ItemDefinitionGroup/ClCompile/AdditionalOptions;LIBS=/Project/ItemDefinitionGroup/Link/AdditionalDependencies;LINK_OPTIONS=/Project/ItemDefinitionGroup/Link/AdditionalOptions + + debug + 5.15.0 + 5 + 15 + 0 + + diff --git a/1280x800-XH/Cigarette/Debug/qt_work.log b/1280x800-XH/Cigarette/Debug/qt_work.log new file mode 100644 index 00000000..3c20cc9e Binary files /dev/null and b/1280x800-XH/Cigarette/Debug/qt_work.log differ diff --git a/1280x800 TH/Cigarette/FtpManager.h b/1280x800-XH/Cigarette/FtpManager.h similarity index 100% rename from 1280x800 TH/Cigarette/FtpManager.h rename to 1280x800-XH/Cigarette/FtpManager.h diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_CaptureThread.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_CaptureThread.cpp similarity index 98% rename from 1280x800 TH/Cigarette/GeneratedFiles/Release/moc_CaptureThread.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_CaptureThread.cpp index 4de0dbea..f71aafdc 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_CaptureThread.cpp +++ b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_CaptureThread.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'CaptureThread.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -13,7 +13,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'CaptureThread.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.15.2. It" +#error "This file was generated using the moc from 5.15.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_CaptureThreadBasler.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_CaptureThreadBasler.cpp similarity index 98% rename from 1280x800 TH/Cigarette/GeneratedFiles/Release/moc_CaptureThreadBasler.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_CaptureThreadBasler.cpp index 404a3452..cd1f4ce2 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_CaptureThreadBasler.cpp +++ b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_CaptureThreadBasler.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'CaptureThreadBasler.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -13,7 +13,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'CaptureThreadBasler.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.15.2. It" +#error "This file was generated using the moc from 5.15.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_CaptureThreadHIK.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_CaptureThreadHIK.cpp similarity index 98% rename from 1280x800 TH/Cigarette/GeneratedFiles/Release/moc_CaptureThreadHIK.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_CaptureThreadHIK.cpp index 0fa7ccf3..f0259370 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_CaptureThreadHIK.cpp +++ b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_CaptureThreadHIK.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'CaptureThreadHIK.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -13,7 +13,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'CaptureThreadHIK.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.15.2. It" +#error "This file was generated using the moc from 5.15.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_Cleanthread.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_Cleanthread.cpp similarity index 97% rename from 1280x800 TH/Cigarette/GeneratedFiles/Release/moc_Cleanthread.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_Cleanthread.cpp index 3661cbd9..260523a2 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_Cleanthread.cpp +++ b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_Cleanthread.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'Cleanthread.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -13,7 +13,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'Cleanthread.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.15.2. It" +#error "This file was generated using the moc from 5.15.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_Logthread.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_Logthread.cpp similarity index 97% rename from 1280x800 TH/Cigarette/GeneratedFiles/Release/moc_Logthread.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_Logthread.cpp index fa3b7b13..60583856 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_Logthread.cpp +++ b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_Logthread.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'Logthread.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -13,7 +13,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'Logthread.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.15.2. It" +#error "This file was generated using the moc from 5.15.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_workthread.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_SyncWorkThread.cpp similarity index 57% rename from 1280x800 TH/Cigarette/GeneratedFiles/Release/moc_workthread.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_SyncWorkThread.cpp index 0d9c55f0..c3748043 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_workthread.cpp +++ b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_SyncWorkThread.cpp @@ -1,19 +1,19 @@ /**************************************************************************** -** Meta object code from reading C++ file 'workthread.h' +** Meta object code from reading C++ file 'SyncWorkThread.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ #include -#include "../../workthread.h" +#include "../../SyncWorkThread.h" #include #include #if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'workthread.h' doesn't include ." +#error "The header file 'SyncWorkThread.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.15.2. It" +#error "This file was generated using the moc from 5.15.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -21,60 +21,65 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED -struct qt_meta_stringdata_WorkThread_t { - QByteArrayData data[14]; - char stringdata0[116]; +struct qt_meta_stringdata_SyncWorkThread_t { + QByteArrayData data[17]; + char stringdata0[151]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ - qptrdiff(offsetof(qt_meta_stringdata_WorkThread_t, stringdata0) + ofs \ + qptrdiff(offsetof(qt_meta_stringdata_SyncWorkThread_t, stringdata0) + ofs \ - idx * sizeof(QByteArrayData)) \ ) -static const qt_meta_stringdata_WorkThread_t qt_meta_stringdata_WorkThread = { +static const qt_meta_stringdata_SyncWorkThread_t qt_meta_stringdata_SyncWorkThread = { { -QT_MOC_LITERAL(0, 0, 10), // "WorkThread" -QT_MOC_LITERAL(1, 11, 6), // "notify" -QT_MOC_LITERAL(2, 18, 0), // "" -QT_MOC_LITERAL(3, 19, 3), // "Num" -QT_MOC_LITERAL(4, 23, 3), // "Cnt" -QT_MOC_LITERAL(5, 27, 7), // "cv::Mat" -QT_MOC_LITERAL(6, 35, 16), // "display_timecost" -QT_MOC_LITERAL(7, 52, 2), // "ms" -QT_MOC_LITERAL(8, 55, 19), // "display_check_total" -QT_MOC_LITERAL(9, 75, 2), // "no" -QT_MOC_LITERAL(10, 78, 13), // "display_jd_no" -QT_MOC_LITERAL(11, 92, 5), // "jd_no" -QT_MOC_LITERAL(12, 98, 8), // "event_ok" -QT_MOC_LITERAL(13, 107, 8) // "event_ng" +QT_MOC_LITERAL(0, 0, 14), // "SyncWorkThread" +QT_MOC_LITERAL(1, 15, 6), // "notify" +QT_MOC_LITERAL(2, 22, 0), // "" +QT_MOC_LITERAL(3, 23, 3), // "Num" +QT_MOC_LITERAL(4, 27, 3), // "Cnt" +QT_MOC_LITERAL(5, 31, 7), // "cv::Mat" +QT_MOC_LITERAL(6, 39, 16), // "display_timecost" +QT_MOC_LITERAL(7, 56, 2), // "ms" +QT_MOC_LITERAL(8, 59, 19), // "display_check_total" +QT_MOC_LITERAL(9, 79, 2), // "no" +QT_MOC_LITERAL(10, 82, 13), // "display_jd_no" +QT_MOC_LITERAL(11, 96, 5), // "jd_no" +QT_MOC_LITERAL(12, 102, 8), // "event_ok" +QT_MOC_LITERAL(13, 111, 8), // "event_ng" +QT_MOC_LITERAL(14, 120, 18), // "sendDataToCompress" +QT_MOC_LITERAL(15, 139, 8), // "filePath" +QT_MOC_LITERAL(16, 148, 2) // "Ng" }, - "WorkThread\0notify\0\0Num\0Cnt\0cv::Mat\0" + "SyncWorkThread\0notify\0\0Num\0Cnt\0cv::Mat\0" "display_timecost\0ms\0display_check_total\0" "no\0display_jd_no\0jd_no\0event_ok\0" - "event_ng" + "event_ng\0sendDataToCompress\0filePath\0" + "Ng" }; #undef QT_MOC_LITERAL -static const uint qt_meta_data_WorkThread[] = { +static const uint qt_meta_data_SyncWorkThread[] = { // content: 8, // revision 0, // classname 0, 0, // classinfo - 6, 14, // methods + 7, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors 0, // flags - 6, // signalCount + 7, // signalCount // signals: name, argc, parameters, tag, flags - 1, 3, 44, 2, 0x06 /* Public */, - 6, 2, 51, 2, 0x06 /* Public */, - 8, 2, 56, 2, 0x06 /* Public */, - 10, 2, 61, 2, 0x06 /* Public */, - 12, 1, 66, 2, 0x06 /* Public */, - 13, 1, 69, 2, 0x06 /* Public */, + 1, 3, 49, 2, 0x06 /* Public */, + 6, 2, 56, 2, 0x06 /* Public */, + 8, 2, 61, 2, 0x06 /* Public */, + 10, 2, 66, 2, 0x06 /* Public */, + 12, 1, 71, 2, 0x06 /* Public */, + 13, 1, 74, 2, 0x06 /* Public */, + 14, 2, 77, 2, 0x06 /* Public */, // signals: parameters QMetaType::Void, QMetaType::Int, QMetaType::Int, 0x80000000 | 5, 3, 4, 2, @@ -83,14 +88,15 @@ static const uint qt_meta_data_WorkThread[] = { QMetaType::Void, QMetaType::Int, QMetaType::QString, 3, 11, QMetaType::Void, QMetaType::Int, 3, QMetaType::Void, QMetaType::Int, 3, + QMetaType::Void, QMetaType::QString, QMetaType::Bool, 15, 16, 0 // eod }; -void WorkThread::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +void SyncWorkThread::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { if (_c == QMetaObject::InvokeMetaMethod) { - auto *_t = static_cast(_o); + auto *_t = static_cast(_o); Q_UNUSED(_t) switch (_id) { case 0: _t->notify((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< cv::Mat(*)>(_a[3]))); break; @@ -99,135 +105,150 @@ void WorkThread::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, case 3: _t->display_jd_no((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< QString(*)>(_a[2]))); break; case 4: _t->event_ok((*reinterpret_cast< int(*)>(_a[1]))); break; case 5: _t->event_ng((*reinterpret_cast< int(*)>(_a[1]))); break; + case 6: _t->sendDataToCompress((*reinterpret_cast< QString(*)>(_a[1])),(*reinterpret_cast< bool(*)>(_a[2]))); break; default: ; } } else if (_c == QMetaObject::IndexOfMethod) { int *result = reinterpret_cast(_a[0]); { - using _t = void (WorkThread::*)(int , int , cv::Mat ); - if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&WorkThread::notify)) { + using _t = void (SyncWorkThread::*)(int , int , cv::Mat ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&SyncWorkThread::notify)) { *result = 0; return; } } { - using _t = void (WorkThread::*)(int , int ); - if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&WorkThread::display_timecost)) { + using _t = void (SyncWorkThread::*)(int , int ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&SyncWorkThread::display_timecost)) { *result = 1; return; } } { - using _t = void (WorkThread::*)(int , long ); - if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&WorkThread::display_check_total)) { + using _t = void (SyncWorkThread::*)(int , long ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&SyncWorkThread::display_check_total)) { *result = 2; return; } } { - using _t = void (WorkThread::*)(int , QString ); - if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&WorkThread::display_jd_no)) { + using _t = void (SyncWorkThread::*)(int , QString ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&SyncWorkThread::display_jd_no)) { *result = 3; return; } } { - using _t = void (WorkThread::*)(int ); - if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&WorkThread::event_ok)) { + using _t = void (SyncWorkThread::*)(int ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&SyncWorkThread::event_ok)) { *result = 4; return; } } { - using _t = void (WorkThread::*)(int ); - if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&WorkThread::event_ng)) { + using _t = void (SyncWorkThread::*)(int ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&SyncWorkThread::event_ng)) { *result = 5; return; } } + { + using _t = void (SyncWorkThread::*)(QString , bool ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&SyncWorkThread::sendDataToCompress)) { + *result = 6; + return; + } + } } } -QT_INIT_METAOBJECT const QMetaObject WorkThread::staticMetaObject = { { +QT_INIT_METAOBJECT const QMetaObject SyncWorkThread::staticMetaObject = { { QMetaObject::SuperData::link(), - qt_meta_stringdata_WorkThread.data, - qt_meta_data_WorkThread, + qt_meta_stringdata_SyncWorkThread.data, + qt_meta_data_SyncWorkThread, qt_static_metacall, nullptr, nullptr } }; -const QMetaObject *WorkThread::metaObject() const +const QMetaObject *SyncWorkThread::metaObject() const { return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject; } -void *WorkThread::qt_metacast(const char *_clname) +void *SyncWorkThread::qt_metacast(const char *_clname) { if (!_clname) return nullptr; - if (!strcmp(_clname, qt_meta_stringdata_WorkThread.stringdata0)) + if (!strcmp(_clname, qt_meta_stringdata_SyncWorkThread.stringdata0)) return static_cast(this); return QThread::qt_metacast(_clname); } -int WorkThread::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +int SyncWorkThread::qt_metacall(QMetaObject::Call _c, int _id, void **_a) { _id = QThread::qt_metacall(_c, _id, _a); if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 6) + if (_id < 7) qt_static_metacall(this, _c, _id, _a); - _id -= 6; + _id -= 7; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 6) + if (_id < 7) *reinterpret_cast(_a[0]) = -1; - _id -= 6; + _id -= 7; } return _id; } // SIGNAL 0 -void WorkThread::notify(int _t1, int _t2, cv::Mat _t3) +void SyncWorkThread::notify(int _t1, int _t2, cv::Mat _t3) { void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))), const_cast(reinterpret_cast(std::addressof(_t2))), const_cast(reinterpret_cast(std::addressof(_t3))) }; QMetaObject::activate(this, &staticMetaObject, 0, _a); } // SIGNAL 1 -void WorkThread::display_timecost(int _t1, int _t2) +void SyncWorkThread::display_timecost(int _t1, int _t2) { void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))), const_cast(reinterpret_cast(std::addressof(_t2))) }; QMetaObject::activate(this, &staticMetaObject, 1, _a); } // SIGNAL 2 -void WorkThread::display_check_total(int _t1, long _t2) +void SyncWorkThread::display_check_total(int _t1, long _t2) { void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))), const_cast(reinterpret_cast(std::addressof(_t2))) }; QMetaObject::activate(this, &staticMetaObject, 2, _a); } // SIGNAL 3 -void WorkThread::display_jd_no(int _t1, QString _t2) +void SyncWorkThread::display_jd_no(int _t1, QString _t2) { void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))), const_cast(reinterpret_cast(std::addressof(_t2))) }; QMetaObject::activate(this, &staticMetaObject, 3, _a); } // SIGNAL 4 -void WorkThread::event_ok(int _t1) +void SyncWorkThread::event_ok(int _t1) { void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; QMetaObject::activate(this, &staticMetaObject, 4, _a); } // SIGNAL 5 -void WorkThread::event_ng(int _t1) +void SyncWorkThread::event_ng(int _t1) { void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; QMetaObject::activate(this, &staticMetaObject, 5, _a); } + +// SIGNAL 6 +void SyncWorkThread::sendDataToCompress(QString _t1, bool _t2) +{ + void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))), const_cast(reinterpret_cast(std::addressof(_t2))) }; + QMetaObject::activate(this, &staticMetaObject, 6, _a); +} QT_WARNING_POP QT_END_MOC_NAMESPACE diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_alarmdialog.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_alarmdialog.cpp similarity index 96% rename from 1280x800 TH/Cigarette/GeneratedFiles/Release/moc_alarmdialog.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_alarmdialog.cpp index 1f5655a3..3407c596 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_alarmdialog.cpp +++ b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_alarmdialog.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'alarmdialog.hpp' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -13,7 +13,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'alarmdialog.hpp' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.15.2. It" +#error "This file was generated using the moc from 5.15.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_camera_glue.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_camera_glue.cpp similarity index 97% rename from 1280x800 TH/Cigarette/GeneratedFiles/Release/moc_camera_glue.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_camera_glue.cpp index c0629afc..e769f685 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_camera_glue.cpp +++ b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_camera_glue.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'camera_glue.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -13,7 +13,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'camera_glue.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.15.2. It" +#error "This file was generated using the moc from 5.15.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_change_shift.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_change_shift.cpp similarity index 97% rename from 1280x800 TH/Cigarette/GeneratedFiles/Release/moc_change_shift.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_change_shift.cpp index 38c608f8..d0065e66 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_change_shift.cpp +++ b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_change_shift.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'change_shift.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -13,7 +13,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'change_shift.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.15.2. It" +#error "This file was generated using the moc from 5.15.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_cigarette.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_cigarette.cpp similarity index 99% rename from 1280x800 TH/Cigarette/GeneratedFiles/Release/moc_cigarette.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_cigarette.cpp index be119ca4..6f4a3d9d 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_cigarette.cpp +++ b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_cigarette.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'cigarette.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -13,7 +13,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'cigarette.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.15.2. It" +#error "This file was generated using the moc from 5.15.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_db_label.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_db_label.cpp similarity index 98% rename from 1280x800 TH/Cigarette/GeneratedFiles/Release/moc_db_label.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_db_label.cpp index c90a779b..262a8f35 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_db_label.cpp +++ b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_db_label.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'db_label.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -13,7 +13,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'db_label.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.15.2. It" +#error "This file was generated using the moc from 5.15.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_debugthread.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_debugthread.cpp similarity index 97% rename from 1280x800 TH/Cigarette/GeneratedFiles/Release/moc_debugthread.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_debugthread.cpp index fa81e2da..c0a12229 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_debugthread.cpp +++ b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_debugthread.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'debugthread.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -13,7 +13,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'debugthread.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.15.2. It" +#error "This file was generated using the moc from 5.15.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_dialogin.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_dialogin.cpp similarity index 98% rename from 1280x800 TH/Cigarette/GeneratedFiles/Release/moc_dialogin.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_dialogin.cpp index b2a37e28..abc59b1d 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_dialogin.cpp +++ b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_dialogin.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'dialogin.hpp' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -13,7 +13,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'dialogin.hpp' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.15.2. It" +#error "This file was generated using the moc from 5.15.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_dialogsetup.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_dialogsetup.cpp similarity index 99% rename from 1280x800 TH/Cigarette/GeneratedFiles/Release/moc_dialogsetup.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_dialogsetup.cpp index be14ca6e..383dcd9b 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_dialogsetup.cpp +++ b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_dialogsetup.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'dialogsetup.hpp' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -13,7 +13,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'dialogsetup.hpp' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.15.2. It" +#error "This file was generated using the moc from 5.15.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_dialogsetuppasswd.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_dialogsetuppasswd.cpp similarity index 98% rename from 1280x800 TH/Cigarette/GeneratedFiles/Release/moc_dialogsetuppasswd.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_dialogsetuppasswd.cpp index eb698011..b6851a40 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_dialogsetuppasswd.cpp +++ b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_dialogsetuppasswd.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'dialogsetuppasswd.hpp' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -13,7 +13,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'dialogsetuppasswd.hpp' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.15.2. It" +#error "This file was generated using the moc from 5.15.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_exportData.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_exportData.cpp similarity index 87% rename from 1280x800 TH/Cigarette/GeneratedFiles/Release/moc_exportData.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_exportData.cpp index 92580f4e..7c4958f1 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_exportData.cpp +++ b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_exportData.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'exportData.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -13,7 +13,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'exportData.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.15.2. It" +#error "This file was generated using the moc from 5.15.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_ExportDataThread_t { - QByteArrayData data[5]; - char stringdata0[71]; + QByteArrayData data[6]; + char stringdata0[74]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -36,11 +36,12 @@ QT_MOC_LITERAL(0, 0, 16), // "ExportDataThread" QT_MOC_LITERAL(1, 17, 21), // "EDrecMsgFromCigarette" QT_MOC_LITERAL(2, 39, 0), // "" QT_MOC_LITERAL(3, 40, 21), // "GetDataFromSaveThread" -QT_MOC_LITERAL(4, 62, 8) // "filePath" +QT_MOC_LITERAL(4, 62, 8), // "filePath" +QT_MOC_LITERAL(5, 71, 2) // "Ng" }, "ExportDataThread\0EDrecMsgFromCigarette\0" - "\0GetDataFromSaveThread\0filePath" + "\0GetDataFromSaveThread\0filePath\0Ng" }; #undef QT_MOC_LITERAL @@ -59,11 +60,11 @@ static const uint qt_meta_data_ExportDataThread[] = { // slots: name, argc, parameters, tag, flags 1, 0, 24, 2, 0x0a /* Public */, - 3, 1, 25, 2, 0x0a /* Public */, + 3, 2, 25, 2, 0x0a /* Public */, // slots: parameters QMetaType::Void, - QMetaType::Void, QMetaType::QString, 4, + QMetaType::Void, QMetaType::QString, QMetaType::Bool, 4, 5, 0 // eod }; @@ -75,7 +76,7 @@ void ExportDataThread::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int Q_UNUSED(_t) switch (_id) { case 0: _t->EDrecMsgFromCigarette(); break; - case 1: _t->GetDataFromSaveThread((*reinterpret_cast< QString(*)>(_a[1]))); break; + case 1: _t->GetDataFromSaveThread((*reinterpret_cast< QString(*)>(_a[1])),(*reinterpret_cast< bool(*)>(_a[2]))); break; default: ; } } diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_output_statistic.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_output_statistic.cpp similarity index 96% rename from 1280x800 TH/Cigarette/GeneratedFiles/Release/moc_output_statistic.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_output_statistic.cpp index 79f91a63..50993acf 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_output_statistic.cpp +++ b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_output_statistic.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'output_statistic.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -13,7 +13,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'output_statistic.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.15.2. It" +#error "This file was generated using the moc from 5.15.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_plcsetup.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_plcsetup.cpp similarity index 97% rename from 1280x800 TH/Cigarette/GeneratedFiles/Release/moc_plcsetup.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_plcsetup.cpp index a9a89b71..a6fd3720 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_plcsetup.cpp +++ b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_plcsetup.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'plcsetup.hpp' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -13,7 +13,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'plcsetup.hpp' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.15.2. It" +#error "This file was generated using the moc from 5.15.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_savethread.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_savethread.cpp similarity index 96% rename from 1280x800 TH/Cigarette/GeneratedFiles/Release/moc_savethread.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_savethread.cpp index c717d6c3..e3d90a5f 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_savethread.cpp +++ b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_savethread.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'savethread.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -13,7 +13,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'savethread.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.15.2. It" +#error "This file was generated using the moc from 5.15.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_threadReceive.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_threadReceive.cpp similarity index 97% rename from 1280x800 TH/Cigarette/GeneratedFiles/Release/moc_threadReceive.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_threadReceive.cpp index 145910d6..719ecfb9 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_threadReceive.cpp +++ b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_threadReceive.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'threadReceive.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -13,7 +13,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'threadReceive.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.15.2. It" +#error "This file was generated using the moc from 5.15.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_SyncWorkThread.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_workthread.cpp similarity index 58% rename from 1280x800 TH/Cigarette/GeneratedFiles/Release/moc_SyncWorkThread.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_workthread.cpp index 303daef4..0163bd54 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/Release/moc_SyncWorkThread.cpp +++ b/1280x800-XH/Cigarette/GeneratedFiles/Debug/moc_workthread.cpp @@ -1,19 +1,19 @@ /**************************************************************************** -** Meta object code from reading C++ file 'SyncWorkThread.h' +** Meta object code from reading C++ file 'workthread.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ #include -#include "../../SyncWorkThread.h" +#include "../../workthread.h" #include #include #if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'SyncWorkThread.h' doesn't include ." +#error "The header file 'workthread.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.15.2. It" +#error "This file was generated using the moc from 5.15.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -21,25 +21,25 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED -struct qt_meta_stringdata_SyncWorkThread_t { +struct qt_meta_stringdata_WorkThread_t { QByteArrayData data[1]; - char stringdata0[15]; + char stringdata0[11]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ - qptrdiff(offsetof(qt_meta_stringdata_SyncWorkThread_t, stringdata0) + ofs \ + qptrdiff(offsetof(qt_meta_stringdata_WorkThread_t, stringdata0) + ofs \ - idx * sizeof(QByteArrayData)) \ ) -static const qt_meta_stringdata_SyncWorkThread_t qt_meta_stringdata_SyncWorkThread = { +static const qt_meta_stringdata_WorkThread_t qt_meta_stringdata_WorkThread = { { -QT_MOC_LITERAL(0, 0, 14) // "SyncWorkThread" +QT_MOC_LITERAL(0, 0, 10) // "WorkThread" }, - "SyncWorkThread" + "WorkThread" }; #undef QT_MOC_LITERAL -static const uint qt_meta_data_SyncWorkThread[] = { +static const uint qt_meta_data_WorkThread[] = { // content: 8, // revision @@ -55,7 +55,7 @@ static const uint qt_meta_data_SyncWorkThread[] = { 0 // eod }; -void SyncWorkThread::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +void WorkThread::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { Q_UNUSED(_o); Q_UNUSED(_id); @@ -63,30 +63,30 @@ void SyncWorkThread::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _ Q_UNUSED(_a); } -QT_INIT_METAOBJECT const QMetaObject SyncWorkThread::staticMetaObject = { { +QT_INIT_METAOBJECT const QMetaObject WorkThread::staticMetaObject = { { QMetaObject::SuperData::link(), - qt_meta_stringdata_SyncWorkThread.data, - qt_meta_data_SyncWorkThread, + qt_meta_stringdata_WorkThread.data, + qt_meta_data_WorkThread, qt_static_metacall, nullptr, nullptr } }; -const QMetaObject *SyncWorkThread::metaObject() const +const QMetaObject *WorkThread::metaObject() const { return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject; } -void *SyncWorkThread::qt_metacast(const char *_clname) +void *WorkThread::qt_metacast(const char *_clname) { if (!_clname) return nullptr; - if (!strcmp(_clname, qt_meta_stringdata_SyncWorkThread.stringdata0)) + if (!strcmp(_clname, qt_meta_stringdata_WorkThread.stringdata0)) return static_cast(this); return QThread::qt_metacast(_clname); } -int SyncWorkThread::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +int WorkThread::qt_metacall(QMetaObject::Call _c, int _id, void **_a) { _id = QThread::qt_metacall(_c, _id, _a); return _id; diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_CaptureThread.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Release/moc_CaptureThread.cpp similarity index 100% rename from 1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_CaptureThread.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Release/moc_CaptureThread.cpp diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_CaptureThreadBasler.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Release/moc_CaptureThreadBasler.cpp similarity index 100% rename from 1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_CaptureThreadBasler.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Release/moc_CaptureThreadBasler.cpp diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_CaptureThreadHIK.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Release/moc_CaptureThreadHIK.cpp similarity index 100% rename from 1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_CaptureThreadHIK.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Release/moc_CaptureThreadHIK.cpp diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_Cleanthread.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Release/moc_Cleanthread.cpp similarity index 100% rename from 1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_Cleanthread.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Release/moc_Cleanthread.cpp diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_Logthread.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Release/moc_Logthread.cpp similarity index 100% rename from 1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_Logthread.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Release/moc_Logthread.cpp diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_SyncWorkThread.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Release/moc_SyncWorkThread.cpp similarity index 100% rename from 1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_SyncWorkThread.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Release/moc_SyncWorkThread.cpp diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_alarmdialog.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Release/moc_alarmdialog.cpp similarity index 100% rename from 1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_alarmdialog.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Release/moc_alarmdialog.cpp diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_camera_glue.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Release/moc_camera_glue.cpp similarity index 100% rename from 1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_camera_glue.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Release/moc_camera_glue.cpp diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_change_shift.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Release/moc_change_shift.cpp similarity index 100% rename from 1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_change_shift.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Release/moc_change_shift.cpp diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_cigarette.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Release/moc_cigarette.cpp similarity index 100% rename from 1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_cigarette.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Release/moc_cigarette.cpp diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_db_label.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Release/moc_db_label.cpp similarity index 100% rename from 1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_db_label.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Release/moc_db_label.cpp diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_debugthread.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Release/moc_debugthread.cpp similarity index 100% rename from 1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_debugthread.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Release/moc_debugthread.cpp diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_dialogin.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Release/moc_dialogin.cpp similarity index 100% rename from 1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_dialogin.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Release/moc_dialogin.cpp diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_dialogsetup.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Release/moc_dialogsetup.cpp similarity index 100% rename from 1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_dialogsetup.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Release/moc_dialogsetup.cpp diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_dialogsetuppasswd.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Release/moc_dialogsetuppasswd.cpp similarity index 100% rename from 1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_dialogsetuppasswd.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Release/moc_dialogsetuppasswd.cpp diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_exportData.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Release/moc_exportData.cpp similarity index 91% rename from 1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_exportData.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Release/moc_exportData.cpp index 92580f4e..b1ba78e8 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_exportData.cpp +++ b/1280x800-XH/Cigarette/GeneratedFiles/Release/moc_exportData.cpp @@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_ExportDataThread_t { - QByteArrayData data[5]; - char stringdata0[71]; + QByteArrayData data[6]; + char stringdata0[74]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -36,11 +36,12 @@ QT_MOC_LITERAL(0, 0, 16), // "ExportDataThread" QT_MOC_LITERAL(1, 17, 21), // "EDrecMsgFromCigarette" QT_MOC_LITERAL(2, 39, 0), // "" QT_MOC_LITERAL(3, 40, 21), // "GetDataFromSaveThread" -QT_MOC_LITERAL(4, 62, 8) // "filePath" +QT_MOC_LITERAL(4, 62, 8), // "filePath" +QT_MOC_LITERAL(5, 71, 2) // "Ng" }, "ExportDataThread\0EDrecMsgFromCigarette\0" - "\0GetDataFromSaveThread\0filePath" + "\0GetDataFromSaveThread\0filePath\0Ng" }; #undef QT_MOC_LITERAL @@ -59,11 +60,11 @@ static const uint qt_meta_data_ExportDataThread[] = { // slots: name, argc, parameters, tag, flags 1, 0, 24, 2, 0x0a /* Public */, - 3, 1, 25, 2, 0x0a /* Public */, + 3, 2, 25, 2, 0x0a /* Public */, // slots: parameters QMetaType::Void, - QMetaType::Void, QMetaType::QString, 4, + QMetaType::Void, QMetaType::QString, QMetaType::Bool, 4, 5, 0 // eod }; @@ -75,7 +76,7 @@ void ExportDataThread::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int Q_UNUSED(_t) switch (_id) { case 0: _t->EDrecMsgFromCigarette(); break; - case 1: _t->GetDataFromSaveThread((*reinterpret_cast< QString(*)>(_a[1]))); break; + case 1: _t->GetDataFromSaveThread((*reinterpret_cast< QString(*)>(_a[1])),(*reinterpret_cast< bool(*)>(_a[2]))); break; default: ; } } diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_output_statistic.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Release/moc_output_statistic.cpp similarity index 100% rename from 1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_output_statistic.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Release/moc_output_statistic.cpp diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_plcsetup.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Release/moc_plcsetup.cpp similarity index 100% rename from 1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_plcsetup.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Release/moc_plcsetup.cpp diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_savethread.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Release/moc_savethread.cpp similarity index 100% rename from 1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_savethread.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Release/moc_savethread.cpp diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_threadReceive.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Release/moc_threadReceive.cpp similarity index 100% rename from 1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_threadReceive.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Release/moc_threadReceive.cpp diff --git a/1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_workthread.cpp b/1280x800-XH/Cigarette/GeneratedFiles/Release/moc_workthread.cpp similarity index 100% rename from 1280x800 TH/Cigarette/GeneratedFiles/Debug/moc_workthread.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/Release/moc_workthread.cpp diff --git a/1280x800 TH/Cigarette/GeneratedFiles/qrc_cigarette.cpp b/1280x800-XH/Cigarette/GeneratedFiles/qrc_cigarette.cpp similarity index 99% rename from 1280x800 TH/Cigarette/GeneratedFiles/qrc_cigarette.cpp rename to 1280x800-XH/Cigarette/GeneratedFiles/qrc_cigarette.cpp index e3ed1aac..a553ecf3 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/qrc_cigarette.cpp +++ b/1280x800-XH/Cigarette/GeneratedFiles/qrc_cigarette.cpp @@ -7,7 +7,7 @@ *****************************************************************************/ static const unsigned char qt_resource_data[] = { - // D:/aaa/YB628/1280/Cigarette/Resources/cam1_yes.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/unlock.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/cam1_no.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/pause.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/cam2_no.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/plc.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/cam8_yes.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/setup.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/start.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/lock.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/cam6_yes.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/exit.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/alarm.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/cam4_yes.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/rotate.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/cam2_yes.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/keyboard.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/cam8_no.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/cam1.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/cam2.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/cam3.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/cam4.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/cam5_no.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/cam5.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/cam6_no.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/cam7_yes.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/cam6.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/cam7_no.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/cam5_yes.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/cam7.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/cam8.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/logo.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/cam3_yes.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/cam3_no.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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:/aaa/YB628/1280/Cigarette/Resources/cam4_no.png + // D:/aaa/diamabeifen/ZB28-2-1280x800/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, @@ -24538,109 +24538,109 @@ static const unsigned char qt_resource_struct[] = { 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, // :/Cigarette/Resources/cam5_yes.png 0x0,0x0,0x3,0x2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4,0xec,0x95, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x47, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd2,0xff, // :/Cigarette/Resources/cam4_yes.png 0x0,0x0,0x1,0x7c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x2,0x60,0xb, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x47, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd2,0xfe, // :/Cigarette/Resources/cam3_yes.png 0x0,0x0,0x3,0x62,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5,0x79,0x7c, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x47, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd2,0xfe, // :/Cigarette/Resources/cam2_yes.png 0x0,0x0,0x1,0xb4,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x2,0xc0,0xe4, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x46, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd2,0xfe, // :/Cigarette/Resources/cam8_yes.png 0x0,0x0,0x0,0xcc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x4,0xa3, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x48, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd3,0x0, // :/Cigarette/Resources/cam7_yes.png 0x0,0x0,0x2,0xb2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4,0x7f,0x96, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x48, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd2,0xff, // :/Cigarette/Resources/cam6_yes.png 0x0,0x0,0x1,0x30,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0xe8,0x12, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x48, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd2,0xff, // :/Cigarette/Resources/cam1_yes.png 0x0,0x0,0x0,0x30,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x46, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd2,0xfd, // :/Cigarette/Resources/unlock.png 0x0,0x0,0x0,0x4e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x24,0xa7, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x4a, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd3,0x1, // :/Cigarette/Resources/lock.png 0x0,0x0,0x1,0x1a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0xc9,0x2c, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x49, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd3,0x0, // :/Cigarette/Resources/logo.png 0x0,0x0,0x3,0x4c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5,0x57,0x5d, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x49, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd3,0x0, // :/Cigarette/Resources/cam4_no.png 0x0,0x0,0x3,0x9c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5,0xc4,0x50, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x47, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd2,0xfe, // :/Cigarette/Resources/cam5_no.png 0x0,0x0,0x2,0x64,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4,0x12,0x5b, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x47, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd2,0xfe, // :/Cigarette/Resources/cam2_no.png 0x0,0x0,0x0,0x9c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0xc1,0x8, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x46, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd2,0xfd, // :/Cigarette/Resources/cam3_no.png 0x0,0x0,0x3,0x80,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5,0x9e,0x8f, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x46, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd2,0xfe, // :/Cigarette/Resources/cam8_no.png 0x0,0x0,0x1,0xf0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x3,0x57,0xe9, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x48, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd3,0x0, // :/Cigarette/Resources/cam6_no.png 0x0,0x0,0x2,0x96,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4,0x5a,0x6b, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x47, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd2,0xff, // :/Cigarette/Resources/cam7_no.png 0x0,0x0,0x2,0xe6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4,0xc7,0x88, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x48, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd2,0xff, // :/Cigarette/Resources/cam1_no.png 0x0,0x0,0x0,0x68,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x44,0x36, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x46, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd2,0xfd, // :/Cigarette/Resources/keyboard.png 0x0,0x0,0x1,0xd2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x2,0xe5,0xce, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x49, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd3,0x0, // :/Cigarette/Resources/plc.png 0x0,0x0,0x0,0xb8,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0xe6,0xc5, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x49, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd3,0x1, // :/Cigarette/Resources/cam1.png 0x0,0x0,0x2,0xc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x3,0x7d,0x2f, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x46, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd2,0xfd, // :/Cigarette/Resources/cam2.png 0x0,0x0,0x2,0x22,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x3,0xa2,0x41, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x46, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd2,0xfd, // :/Cigarette/Resources/cam3.png 0x0,0x0,0x2,0x38,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x3,0xc7,0xa5, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x46, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd2,0xfe, // :/Cigarette/Resources/cam4.png 0x0,0x0,0x2,0x4e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x3,0xed,0x5, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x47, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd2,0xfe, // :/Cigarette/Resources/cam5.png 0x0,0x0,0x2,0x80,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4,0x37,0x92, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x47, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd2,0xfe, // :/Cigarette/Resources/cam6.png 0x0,0x0,0x2,0xd0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4,0xa4,0x7a, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x47, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd2,0xff, // :/Cigarette/Resources/cam7.png 0x0,0x0,0x3,0x20,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5,0x11,0x99, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x48, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd2,0xff, // :/Cigarette/Resources/cam8.png 0x0,0x0,0x3,0x36,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5,0x34,0x52, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x48, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd2,0xff, // :/Cigarette/Resources/alarm.png 0x0,0x0,0x1,0x64,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x2,0x39,0x88, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x45, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd2,0xfd, // :/Cigarette/Resources/start.png 0x0,0x0,0x1,0x2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x80,0x3, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x4a, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd3,0x1, // :/Cigarette/Resources/rotate.png 0x0,0x0,0x1,0x9a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x2,0x84,0xf2, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x4a, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd3,0x1, // :/Cigarette/Resources/setup.png 0x0,0x0,0x0,0xea,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x29,0xcf, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x4a, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd3,0x1, // :/Cigarette/Resources/pause.png 0x0,0x0,0x0,0x84,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x69,0xa8, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x49, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd3,0x1, // :/Cigarette/Resources/exit.png 0x0,0x0,0x1,0x4e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x2,0xd,0x20, -0x0,0x0,0x1,0x8f,0x22,0x77,0x20,0x48, +0x0,0x0,0x1,0x90,0xd8,0x69,0xd3,0x0, }; diff --git a/1280x800 TH/Cigarette/GeneratedFiles/ui_alarmdialog.h b/1280x800-XH/Cigarette/GeneratedFiles/ui_alarmdialog.h similarity index 100% rename from 1280x800 TH/Cigarette/GeneratedFiles/ui_alarmdialog.h rename to 1280x800-XH/Cigarette/GeneratedFiles/ui_alarmdialog.h diff --git a/1280x800 TH/Cigarette/GeneratedFiles/ui_camera_glue.h b/1280x800-XH/Cigarette/GeneratedFiles/ui_camera_glue.h similarity index 84% rename from 1280x800 TH/Cigarette/GeneratedFiles/ui_camera_glue.h rename to 1280x800-XH/Cigarette/GeneratedFiles/ui_camera_glue.h index 99e6c6fc..8eefd7be 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/ui_camera_glue.h +++ b/1280x800-XH/Cigarette/GeneratedFiles/ui_camera_glue.h @@ -63,10 +63,10 @@ public: { if (camera_glue->objectName().isEmpty()) camera_glue->setObjectName(QString::fromUtf8("camera_glue")); - camera_glue->resize(433, 262); + camera_glue->resize(319, 270); spinBox_21 = new QSpinBox(camera_glue); spinBox_21->setObjectName(QString::fromUtf8("spinBox_21")); - spinBox_21->setGeometry(QRect(220, 50, 70, 30)); + spinBox_21->setGeometry(QRect(190, 50, 70, 30)); QFont font; font.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); font.setPointSize(12); @@ -77,194 +77,194 @@ public: spinBox_21->setMaximum(10); spinBox_31 = new QSpinBox(camera_glue); spinBox_31->setObjectName(QString::fromUtf8("spinBox_31")); - spinBox_31->setGeometry(QRect(320, 50, 70, 30)); + spinBox_31->setGeometry(QRect(290, 1810, 70, 30)); spinBox_31->setFont(font); spinBox_31->setWrapping(true); spinBox_31->setMaximum(10); spinBox_41 = new QSpinBox(camera_glue); spinBox_41->setObjectName(QString::fromUtf8("spinBox_41")); - spinBox_41->setGeometry(QRect(390, 1850, 70, 30)); + spinBox_41->setGeometry(QRect(390, 1810, 70, 30)); spinBox_41->setFont(font); spinBox_41->setWrapping(true); spinBox_41->setMaximum(10); spinBox_32 = new QSpinBox(camera_glue); spinBox_32->setObjectName(QString::fromUtf8("spinBox_32")); - spinBox_32->setGeometry(QRect(320, 100, 70, 30)); + spinBox_32->setGeometry(QRect(290, 1860, 70, 30)); spinBox_32->setFont(font); spinBox_32->setWrapping(true); spinBox_32->setMaximum(10); spinBox_22 = new QSpinBox(camera_glue); spinBox_22->setObjectName(QString::fromUtf8("spinBox_22")); - spinBox_22->setGeometry(QRect(220, 100, 70, 30)); + spinBox_22->setGeometry(QRect(190, 100, 70, 30)); spinBox_22->setFont(font); spinBox_22->setWrapping(true); spinBox_22->setMaximum(10); spinBox_42 = new QSpinBox(camera_glue); spinBox_42->setObjectName(QString::fromUtf8("spinBox_42")); - spinBox_42->setGeometry(QRect(390, 1900, 70, 30)); + spinBox_42->setGeometry(QRect(390, 1860, 70, 30)); spinBox_42->setFont(font); spinBox_42->setWrapping(true); spinBox_42->setMaximum(10); spinBox_33 = new QSpinBox(camera_glue); spinBox_33->setObjectName(QString::fromUtf8("spinBox_33")); - spinBox_33->setGeometry(QRect(320, 150, 70, 30)); + spinBox_33->setGeometry(QRect(290, 1910, 70, 30)); spinBox_33->setFont(font); spinBox_33->setWrapping(true); spinBox_33->setMaximum(10); spinBox_23 = new QSpinBox(camera_glue); spinBox_23->setObjectName(QString::fromUtf8("spinBox_23")); - spinBox_23->setGeometry(QRect(220, 150, 70, 30)); + spinBox_23->setGeometry(QRect(190, 150, 70, 30)); spinBox_23->setFont(font); spinBox_23->setWrapping(true); spinBox_23->setMaximum(10); spinBox_43 = new QSpinBox(camera_glue); spinBox_43->setObjectName(QString::fromUtf8("spinBox_43")); - spinBox_43->setGeometry(QRect(390, 1950, 70, 30)); + spinBox_43->setGeometry(QRect(390, 1910, 70, 30)); spinBox_43->setFont(font); spinBox_43->setWrapping(true); spinBox_43->setMaximum(10); spinBox_12 = new QSpinBox(camera_glue); spinBox_12->setObjectName(QString::fromUtf8("spinBox_12")); - spinBox_12->setGeometry(QRect(120, 100, 70, 30)); + spinBox_12->setGeometry(QRect(90, 100, 70, 30)); spinBox_12->setFont(font); spinBox_12->setWrapping(true); spinBox_12->setMaximum(10); spinBox_11 = new QSpinBox(camera_glue); spinBox_11->setObjectName(QString::fromUtf8("spinBox_11")); - spinBox_11->setGeometry(QRect(120, 50, 70, 30)); + spinBox_11->setGeometry(QRect(90, 50, 70, 30)); spinBox_11->setFont(font); spinBox_11->setWrapping(true); spinBox_11->setMaximum(10); spinBox_13 = new QSpinBox(camera_glue); spinBox_13->setObjectName(QString::fromUtf8("spinBox_13")); - spinBox_13->setGeometry(QRect(120, 150, 70, 30)); + spinBox_13->setGeometry(QRect(90, 150, 70, 30)); spinBox_13->setFont(font); spinBox_13->setWrapping(true); spinBox_13->setMaximum(10); label_first = new QLabel(camera_glue); label_first->setObjectName(QString::fromUtf8("label_first")); - label_first->setGeometry(QRect(40, 53, 61, 21)); + label_first->setGeometry(QRect(10, 53, 61, 21)); label_first->setFont(font); label_second = new QLabel(camera_glue); label_second->setObjectName(QString::fromUtf8("label_second")); - label_second->setGeometry(QRect(40, 105, 61, 21)); + label_second->setGeometry(QRect(10, 105, 61, 21)); label_second->setFont(font); label_third = new QLabel(camera_glue); label_third->setObjectName(QString::fromUtf8("label_third")); - label_third->setGeometry(QRect(40, 155, 61, 21)); + label_third->setGeometry(QRect(10, 155, 61, 21)); label_third->setFont(font); label_1 = new QLabel(camera_glue); label_1->setObjectName(QString::fromUtf8("label_1")); - label_1->setGeometry(QRect(120, 20, 70, 20)); + label_1->setGeometry(QRect(90, 20, 70, 20)); label_1->setFont(font); label_2 = new QLabel(camera_glue); label_2->setObjectName(QString::fromUtf8("label_2")); - label_2->setGeometry(QRect(220, 20, 70, 20)); + label_2->setGeometry(QRect(190, 20, 70, 20)); label_2->setFont(font); label_3 = new QLabel(camera_glue); label_3->setObjectName(QString::fromUtf8("label_3")); - label_3->setGeometry(QRect(320, 20, 70, 20)); + label_3->setGeometry(QRect(290, 1780, 70, 20)); label_3->setFont(font); label_4 = new QLabel(camera_glue); label_4->setObjectName(QString::fromUtf8("label_4")); - label_4->setGeometry(QRect(390, 1820, 70, 20)); + label_4->setGeometry(QRect(390, 1780, 70, 20)); label_4->setFont(font); label_hint = new QLabel(camera_glue); label_hint->setObjectName(QString::fromUtf8("label_hint")); - label_hint->setGeometry(QRect(140, 190, 285, 25)); + label_hint->setGeometry(QRect(50, 190, 285, 25)); QFont font1; font1.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); font1.setPointSize(10); label_hint->setFont(font1); pushButton_take = new QPushButton(camera_glue); pushButton_take->setObjectName(QString::fromUtf8("pushButton_take")); - pushButton_take->setGeometry(QRect(140, 220, 141, 31)); + pushButton_take->setGeometry(QRect(80, 220, 141, 31)); pushButton_take->setFont(font); spinBox_53 = new QSpinBox(camera_glue); spinBox_53->setObjectName(QString::fromUtf8("spinBox_53")); - spinBox_53->setGeometry(QRect(490, 1950, 70, 30)); + spinBox_53->setGeometry(QRect(490, 1910, 70, 30)); spinBox_53->setFont(font); spinBox_53->setWrapping(true); spinBox_53->setMaximum(10); label_5 = new QLabel(camera_glue); label_5->setObjectName(QString::fromUtf8("label_5")); - label_5->setGeometry(QRect(490, 1820, 70, 20)); + label_5->setGeometry(QRect(490, 1780, 70, 20)); label_5->setFont(font); spinBox_52 = new QSpinBox(camera_glue); spinBox_52->setObjectName(QString::fromUtf8("spinBox_52")); - spinBox_52->setGeometry(QRect(490, 1900, 70, 30)); + spinBox_52->setGeometry(QRect(490, 1860, 70, 30)); spinBox_52->setFont(font); spinBox_52->setWrapping(true); spinBox_52->setMaximum(10); spinBox_51 = new QSpinBox(camera_glue); spinBox_51->setObjectName(QString::fromUtf8("spinBox_51")); - spinBox_51->setGeometry(QRect(490, 1850, 70, 30)); + spinBox_51->setGeometry(QRect(490, 1810, 70, 30)); spinBox_51->setFont(font); spinBox_51->setWrapping(true); spinBox_51->setMaximum(10); spinBox_63 = new QSpinBox(camera_glue); spinBox_63->setObjectName(QString::fromUtf8("spinBox_63")); - spinBox_63->setGeometry(QRect(590, 1950, 70, 30)); + spinBox_63->setGeometry(QRect(590, 1910, 70, 30)); spinBox_63->setFont(font); spinBox_63->setWrapping(true); spinBox_63->setMaximum(10); label_6 = new QLabel(camera_glue); label_6->setObjectName(QString::fromUtf8("label_6")); - label_6->setGeometry(QRect(590, 1820, 70, 20)); + label_6->setGeometry(QRect(590, 1780, 70, 20)); label_6->setFont(font); spinBox_62 = new QSpinBox(camera_glue); spinBox_62->setObjectName(QString::fromUtf8("spinBox_62")); - spinBox_62->setGeometry(QRect(590, 1900, 70, 30)); + spinBox_62->setGeometry(QRect(590, 1860, 70, 30)); spinBox_62->setFont(font); spinBox_62->setWrapping(true); spinBox_62->setMaximum(10); spinBox_61 = new QSpinBox(camera_glue); spinBox_61->setObjectName(QString::fromUtf8("spinBox_61")); - spinBox_61->setGeometry(QRect(590, 1850, 70, 30)); + spinBox_61->setGeometry(QRect(590, 1810, 70, 30)); spinBox_61->setFont(font); spinBox_61->setWrapping(true); spinBox_61->setMaximum(10); spinBox_73 = new QSpinBox(camera_glue); spinBox_73->setObjectName(QString::fromUtf8("spinBox_73")); - spinBox_73->setGeometry(QRect(690, 1950, 70, 30)); + spinBox_73->setGeometry(QRect(690, 1910, 70, 30)); spinBox_73->setFont(font); spinBox_73->setWrapping(true); spinBox_73->setMaximum(10); label_7 = new QLabel(camera_glue); label_7->setObjectName(QString::fromUtf8("label_7")); - label_7->setGeometry(QRect(690, 1820, 70, 20)); + label_7->setGeometry(QRect(690, 1780, 70, 20)); label_7->setFont(font); spinBox_72 = new QSpinBox(camera_glue); spinBox_72->setObjectName(QString::fromUtf8("spinBox_72")); - spinBox_72->setGeometry(QRect(690, 1900, 70, 30)); + spinBox_72->setGeometry(QRect(690, 1860, 70, 30)); spinBox_72->setFont(font); spinBox_72->setWrapping(true); spinBox_72->setMaximum(10); spinBox_71 = new QSpinBox(camera_glue); spinBox_71->setObjectName(QString::fromUtf8("spinBox_71")); - spinBox_71->setGeometry(QRect(690, 1850, 70, 30)); + spinBox_71->setGeometry(QRect(690, 1810, 70, 30)); spinBox_71->setFont(font); spinBox_71->setWrapping(true); spinBox_71->setMaximum(10); spinBox_83 = new QSpinBox(camera_glue); spinBox_83->setObjectName(QString::fromUtf8("spinBox_83")); - spinBox_83->setGeometry(QRect(790, 1950, 70, 30)); + spinBox_83->setGeometry(QRect(790, 1910, 70, 30)); spinBox_83->setFont(font); spinBox_83->setWrapping(true); spinBox_83->setMaximum(10); label_8 = new QLabel(camera_glue); label_8->setObjectName(QString::fromUtf8("label_8")); - label_8->setGeometry(QRect(790, 1820, 70, 20)); + label_8->setGeometry(QRect(790, 1780, 70, 20)); label_8->setFont(font); spinBox_82 = new QSpinBox(camera_glue); spinBox_82->setObjectName(QString::fromUtf8("spinBox_82")); - spinBox_82->setGeometry(QRect(790, 1900, 70, 30)); + spinBox_82->setGeometry(QRect(790, 1860, 70, 30)); spinBox_82->setFont(font); spinBox_82->setWrapping(true); spinBox_82->setMaximum(10); spinBox_81 = new QSpinBox(camera_glue); spinBox_81->setObjectName(QString::fromUtf8("spinBox_81")); - spinBox_81->setGeometry(QRect(790, 1850, 70, 30)); + spinBox_81->setGeometry(QRect(790, 1810, 70, 30)); spinBox_81->setFont(font); spinBox_81->setWrapping(true); spinBox_81->setMaximum(10); diff --git a/1280x800 TH/Cigarette/GeneratedFiles/ui_change_shift.h b/1280x800-XH/Cigarette/GeneratedFiles/ui_change_shift.h similarity index 100% rename from 1280x800 TH/Cigarette/GeneratedFiles/ui_change_shift.h rename to 1280x800-XH/Cigarette/GeneratedFiles/ui_change_shift.h diff --git a/1280x800 TH/Cigarette/GeneratedFiles/ui_cigarette.h b/1280x800-XH/Cigarette/GeneratedFiles/ui_cigarette.h similarity index 75% rename from 1280x800 TH/Cigarette/GeneratedFiles/ui_cigarette.h rename to 1280x800-XH/Cigarette/GeneratedFiles/ui_cigarette.h index e5ce45e2..5984823c 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/ui_cigarette.h +++ b/1280x800-XH/Cigarette/GeneratedFiles/ui_cigarette.h @@ -29,10 +29,6 @@ class Ui_CigaretteClass public: QWidget *centralWidget; QToolButton *rotate_1; - QLabel *label_17; - QLabel *label_18; - QLabel *label_cur_time; - db_label *image_label_12; db_label *image_label_22; QToolButton *rotate_2; QLCDNumber *lcdNumber_ok_4; @@ -55,8 +51,6 @@ public: QLCDNumber *lcdNumber_kick_4; db_label *label_ng_4; QToolButton *rotate_3; - db_label *image_label_31; - db_label *image_label_32; QLCDNumber *lcdNumber_total_6; QLCDNumber *lcdNumber_ng_5; db_label *image_label_61; @@ -133,33 +127,62 @@ public: QToolButton *rotate_8; QToolButton *rotate_7; db_label *image_label_71; - QLabel *location; - QLabel *label_title; - QLabel *label_title_6; - QToolButton *toolButton_4; - QLabel *label_title_7; + QToolButton *toolButton_cam_7; QLabel *cam_status_7; - QLabel *cam_work_4; - QLabel *cam_work_7; + QToolButton *toolButton_cam_4; + QLabel *cam_status_5; + QLabel *cam_work_5; QToolButton *toolButton_cam_6; + QLabel *cam_status_4; + QLabel *cam_status_8; + QLabel *cam_status_6; QLabel *cam_work_6; + QLabel *cam_work_4; QToolButton *toolButton_cam_5; + QLabel *cam_work_7; QToolButton *toolButton_cam_8; - QLabel *cam_status_4; - QLabel *cam_status_6; - QLabel *cam_work_5; - QToolButton *toolButton_cam_7; - QLabel *cam_status_5; - QLabel *cam_status_8; QLabel *cam_work_8; - QToolButton *toolButton_cam_4; - db_label *image_label_11; - QGroupBox *groupBox_a_2; - QLabel *label_4; - QLabel *label_title_2; + QLCDNumber *lcdNumber_kick_3; + QGroupBox *groupBox_11; + QLabel *label_26; + QLabel *label_cap_speed_3; + QLabel *label_jd_no_3; + QLabel *label_23; + QLabel *label_22; + QLabel *label_timecost_3; + QLabel *label_reslut_3; + QLCDNumber *lcdNumber_ok_3; + QLabel *label_7; + QLabel *label_9; + db_label *label_ng_3; + QToolButton *rotate_11; + QLabel *label_3; QLCDNumber *lcdNumber_total_3; - QLCDNumber *lcdNumber_ok_2; - QLCDNumber *lcdNumber_kick_2; + db_label *image_label_31; + QLCDNumber *lcdNumber_ng_3; + db_label *image_label_32; + db_label *image_label_12; + QLabel *cam_status_3; + QLabel *cam_work_3; + QToolButton *toolButton_cam_3; + QLabel *location; + db_label *image_label_21; + db_label *label_ng_1; + QGroupBox *groupBox_op; + QToolButton *btn_start; + QToolButton *btn_pause; + QToolButton *btn_lock; + QToolButton *btn_setup; + QPushButton *pushButton_wintab; + QLabel *label_4; + QGroupBox *groupBox_b; + QLabel *label_33; + QLabel *label_cap_speed_2; + QLabel *label_jd_no_2; + QLabel *label_reslut_2; + QLabel *label_24; + QLabel *label_25; + QLabel *label_timecost_2; QGroupBox *groupBox_a; QLabel *label_19; QLabel *label_cap_speed_1; @@ -168,7 +191,25 @@ public: QLabel *label_21; QLabel *label_timecost_1; QLabel *label_reslut_1; + QToolButton *toolButton_4; + db_label *label_ng_2; + QLCDNumber *lcdNumber_ok_1; + QLabel *label_title; + QLCDNumber *lcdNumber_ng_1; + QLabel *label_cur_time; + db_label *image_label_11; + QToolButton *rotate_9; + QLabel *label_10; + QLCDNumber *lcdNumber_total_2; + QLCDNumber *lcdNumber_total_1; + QLabel *label_17; QLabel *label_6; + QLCDNumber *lcdNumber_ng_2; + QLabel *label_18; + QLabel *label_11; + QLCDNumber *lcdNumber_ok_2; + QLabel *label; + QLabel *label_title_7; QGroupBox *groupBox_status; db_label *label_alarm; QLabel *label_5; @@ -177,48 +218,15 @@ public: QToolButton *toolButton_alarm; QToolButton *toolButton_plc; QPushButton *pushButton_clear; + QLabel *label_run_stat; QLabel *label_12; QLabel *label_role; QLabel *label_8; QLCDNumber *lcdNumber_total_no_last; - QLabel *label_run_stat; - QLCDNumber *lcdNumber_ng_1; - QLabel *label; - QLCDNumber *lcdNumber_total_2; - QLCDNumber *lcdNumber_ng_2; - QLabel *label_10; - db_label *label_ng_1; - db_label *image_label_21; - QGroupBox *groupBox_op; - QToolButton *btn_start; - QToolButton *btn_pause; - QToolButton *btn_lock; - QToolButton *btn_setup; - QLCDNumber *lcdNumber_ok_3; - QLCDNumber *lcdNumber_kick_3; - db_label *label_ng_3; + QPushButton *pushButton_reset; QLabel *label_2; - QLCDNumber *lcdNumber_kick_1; - db_label *label_ng_2; - QLCDNumber *lcdNumber_ok_1; - QGroupBox *groupBox_b; - QLabel *label_33; - QLabel *label_cap_speed_2; - QLabel *label_jd_no_2; - QLabel *label_reslut_2; - QLabel *label_24; - QLabel *label_25; - QLabel *label_timecost_2; - QGroupBox *groupBox_11; - QLabel *label_26; - QLabel *label_cap_speed_3; - QLabel *label_jd_no_3; - QLabel *label_23; - QLabel *label_22; - QLabel *label_timecost_3; - QLabel *label_reslut_3; + QLabel *label_title_6; QGroupBox *groupBox_dev; - QLabel *cam_status_1; QToolButton *toolButton_cam_1; QToolButton *toolButton_cam_2; QLabel *cam_status_2; @@ -226,24 +234,28 @@ public: QLabel *cam_work_1; QCheckBox *checkBox_debug; QCheckBox *checkBox_unkick; - QLabel *cam_work_3; - QLabel *cam_status_9; - QToolButton *toolButton_cam_3; QLabel *cam_work_9; QToolButton *toolButton_cam_9; - QLabel *cam_status_3; - QLabel *label_7; - QPushButton *pushButton_Clear_Pic; - QToolButton *rotate_9; - QToolButton *rotate_10; - QLCDNumber *lcdNumber_total_1; - QLabel *label_3; - QToolButton *rotate_11; - QLabel *label_11; - QLabel *label_9; - QLCDNumber *lcdNumber_ng_3; - QPushButton *pushButton_wintab; - QPushButton *pushButton_reset; + QToolButton *toolButton_cam_10; + QToolButton *toolButton_cam_11; + QLabel *cam_status_9; + QLabel *cam_work_10; + QToolButton *toolButton_cam_12; + QToolButton *toolButton_cam_13; + QToolButton *toolButton_cam_14; + QLabel *cam_status_10; + QLabel *cam_status_11; + QLabel *cam_status_12; + QLabel *cam_status_13; + QLabel *cam_status_14; + QLabel *cam_work_11; + QLabel *cam_work_12; + QLabel *cam_work_13; + QLabel *cam_work_14; + QLabel *cam_status_1; + QLabel *label_title_2; + QLCDNumber *lcdNumber_kick_1; + QLCDNumber *lcdNumber_kick_2; void setupUi(QMainWindow *CigaretteClass) { @@ -262,34 +274,9 @@ public: icon.addFile(QString::fromUtf8(":/Cigarette/Resources/rotate.png"), QSize(), QIcon::Normal, QIcon::Off); rotate_1->setIcon(icon); rotate_1->setIconSize(QSize(40, 40)); - label_17 = new QLabel(centralWidget); - label_17->setObjectName(QString::fromUtf8("label_17")); - label_17->setGeometry(QRect(1020, 10, 191, 21)); - QFont font; - font.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); - font.setPointSize(12); - font.setBold(false); - font.setWeight(50); - label_17->setFont(font); - label_17->setStyleSheet(QString::fromUtf8("color:white")); - label_18 = new QLabel(centralWidget); - label_18->setObjectName(QString::fromUtf8("label_18")); - label_18->setGeometry(QRect(1170, 10, 81, 21)); - label_18->setFont(font); - label_18->setStyleSheet(QString::fromUtf8("color:white")); - label_cur_time = new QLabel(centralWidget); - label_cur_time->setObjectName(QString::fromUtf8("label_cur_time")); - label_cur_time->setGeometry(QRect(990, 30, 211, 31)); - label_cur_time->setFont(font); - label_cur_time->setStyleSheet(QString::fromUtf8("color:white")); - label_cur_time->setAlignment(Qt::AlignCenter); - image_label_12 = new db_label(centralWidget); - image_label_12->setObjectName(QString::fromUtf8("image_label_12")); - image_label_12->setGeometry(QRect(10, 240, 231, 401)); - image_label_12->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 0, 0);")); image_label_22 = new db_label(centralWidget); image_label_22->setObjectName(QString::fromUtf8("image_label_22")); - image_label_22->setGeometry(QRect(170, 1880, 160, 110)); + image_label_22->setGeometry(QRect(170, 1380, 160, 110)); image_label_22->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 0, 0);")); rotate_2 = new QToolButton(centralWidget); rotate_2->setObjectName(QString::fromUtf8("rotate_2")); @@ -300,21 +287,21 @@ public: rotate_2->setIconSize(QSize(40, 40)); lcdNumber_ok_4 = new QLCDNumber(centralWidget); lcdNumber_ok_4->setObjectName(QString::fromUtf8("lcdNumber_ok_4")); - lcdNumber_ok_4->setGeometry(QRect(610, 1735, 90, 20)); + lcdNumber_ok_4->setGeometry(QRect(610, 2065, 90, 20)); lcdNumber_ok_4->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_ok_4->setDigitCount(10); image_label_42 = new db_label(centralWidget); image_label_42->setObjectName(QString::fromUtf8("image_label_42")); - image_label_42->setGeometry(QRect(490, 1880, 160, 110)); + image_label_42->setGeometry(QRect(490, 1380, 160, 110)); image_label_42->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 0, 0);")); lcdNumber_ng_4 = new QLCDNumber(centralWidget); lcdNumber_ng_4->setObjectName(QString::fromUtf8("lcdNumber_ng_4")); - lcdNumber_ng_4->setGeometry(QRect(610, 1765, 90, 20)); + lcdNumber_ng_4->setGeometry(QRect(610, 2095, 90, 20)); lcdNumber_ng_4->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_ng_4->setDigitCount(10); lcdNumber_total_4 = new QLCDNumber(centralWidget); lcdNumber_total_4->setObjectName(QString::fromUtf8("lcdNumber_total_4")); - lcdNumber_total_4->setGeometry(QRect(610, 1705, 90, 20)); + lcdNumber_total_4->setGeometry(QRect(610, 2035, 90, 20)); lcdNumber_total_4->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_total_4->setDigitCount(10); rotate_4 = new QToolButton(centralWidget); @@ -326,86 +313,86 @@ public: rotate_4->setIconSize(QSize(40, 40)); label_check_4 = new QLabel(centralWidget); label_check_4->setObjectName(QString::fromUtf8("label_check_4")); - label_check_4->setGeometry(QRect(515, 1705, 90, 20)); - QFont font1; - font1.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); - font1.setPointSize(10); - font1.setBold(true); - font1.setWeight(75); - label_check_4->setFont(font1); + label_check_4->setGeometry(QRect(515, 2035, 90, 20)); + QFont font; + font.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); + font.setPointSize(10); + font.setBold(true); + font.setWeight(75); + label_check_4->setFont(font); label_check_4->setStyleSheet(QString::fromUtf8("color:white")); label_ok_4 = new QLabel(centralWidget); label_ok_4->setObjectName(QString::fromUtf8("label_ok_4")); - label_ok_4->setGeometry(QRect(515, 1735, 90, 20)); - label_ok_4->setFont(font1); + label_ok_4->setGeometry(QRect(515, 2065, 90, 20)); + label_ok_4->setFont(font); label_ok_4->setStyleSheet(QString::fromUtf8("color:white")); label_kick_4 = new QLabel(centralWidget); label_kick_4->setObjectName(QString::fromUtf8("label_kick_4")); - label_kick_4->setGeometry(QRect(515, 1795, 90, 20)); - label_kick_4->setFont(font1); + label_kick_4->setGeometry(QRect(515, 2125, 90, 20)); + label_kick_4->setFont(font); label_kick_4->setStyleSheet(QString::fromUtf8("color:white")); groupBox_a_4 = new QGroupBox(centralWidget); groupBox_a_4->setObjectName(QString::fromUtf8("groupBox_a_4")); - groupBox_a_4->setGeometry(QRect(185, 1815, 511, 51)); - QFont font2; - font2.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); - font2.setPointSize(10); - groupBox_a_4->setFont(font2); + groupBox_a_4->setGeometry(QRect(185, 2145, 511, 51)); + QFont font1; + font1.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); + font1.setPointSize(10); + groupBox_a_4->setFont(font1); groupBox_a_4->setStyleSheet(QString::fromUtf8("color:white")); label_speed_4 = new QLabel(groupBox_a_4); label_speed_4->setObjectName(QString::fromUtf8("label_speed_4")); label_speed_4->setGeometry(QRect(10, 20, 70, 20)); - label_speed_4->setFont(font2); + label_speed_4->setFont(font1); label_cap_speed_4 = new QLabel(groupBox_a_4); label_cap_speed_4->setObjectName(QString::fromUtf8("label_cap_speed_4")); - label_cap_speed_4->setGeometry(QRect(80, 20, 50, 20)); - QFont font3; - font3.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); - font3.setPointSize(11); - label_cap_speed_4->setFont(font3); + label_cap_speed_4->setGeometry(QRect(80, 20, 61, 20)); + QFont font2; + font2.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); + font2.setPointSize(11); + label_cap_speed_4->setFont(font2); label_cap_speed_4->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); label_jd_no_4 = new QLabel(groupBox_a_4); label_jd_no_4->setObjectName(QString::fromUtf8("label_jd_no_4")); - label_jd_no_4->setGeometry(QRect(220, 20, 50, 20)); - label_jd_no_4->setFont(font3); + label_jd_no_4->setGeometry(QRect(220, 20, 61, 20)); + label_jd_no_4->setFont(font2); label_jd_no_4->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); label_jdnum_4 = new QLabel(groupBox_a_4); label_jdnum_4->setObjectName(QString::fromUtf8("label_jdnum_4")); label_jdnum_4->setGeometry(QRect(150, 20, 70, 20)); - label_jdnum_4->setFont(font2); + label_jdnum_4->setFont(font1); label_time_4 = new QLabel(groupBox_a_4); label_time_4->setObjectName(QString::fromUtf8("label_time_4")); label_time_4->setGeometry(QRect(290, 20, 70, 20)); - label_time_4->setFont(font2); + label_time_4->setFont(font1); label_timecost_4 = new QLabel(groupBox_a_4); label_timecost_4->setObjectName(QString::fromUtf8("label_timecost_4")); - label_timecost_4->setGeometry(QRect(360, 20, 50, 20)); - label_timecost_4->setFont(font3); + label_timecost_4->setGeometry(QRect(360, 20, 61, 20)); + label_timecost_4->setFont(font2); label_timecost_4->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); label_reslut_4 = new QLabel(groupBox_a_4); label_reslut_4->setObjectName(QString::fromUtf8("label_reslut_4")); label_reslut_4->setGeometry(QRect(430, 20, 60, 25)); - QFont font4; - font4.setFamily(QString::fromUtf8("SimSun")); - font4.setPointSize(18); - font4.setBold(true); - font4.setWeight(75); - label_reslut_4->setFont(font4); + QFont font3; + font3.setFamily(QString::fromUtf8("SimSun")); + font3.setPointSize(18); + font3.setBold(true); + font3.setWeight(75); + label_reslut_4->setFont(font3); label_reslut_4->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 255, 0);")); label_reslut_4->setAlignment(Qt::AlignCenter); image_label_41 = new db_label(centralWidget); image_label_41->setObjectName(QString::fromUtf8("image_label_41")); - image_label_41->setGeometry(QRect(185, 1705, 320, 110)); + image_label_41->setGeometry(QRect(185, 2035, 320, 110)); image_label_41->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 0, 0);")); lcdNumber_kick_4 = new QLCDNumber(centralWidget); lcdNumber_kick_4->setObjectName(QString::fromUtf8("lcdNumber_kick_4")); - lcdNumber_kick_4->setGeometry(QRect(610, 1795, 90, 20)); + lcdNumber_kick_4->setGeometry(QRect(610, 2125, 90, 20)); lcdNumber_kick_4->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_kick_4->setDigitCount(10); label_ng_4 = new db_label(centralWidget); label_ng_4->setObjectName(QString::fromUtf8("label_ng_4")); - label_ng_4->setGeometry(QRect(515, 1765, 90, 20)); - label_ng_4->setFont(font1); + label_ng_4->setGeometry(QRect(515, 2095, 90, 20)); + label_ng_4->setFont(font); label_ng_4->setStyleSheet(QString::fromUtf8("color:white")); rotate_3 = new QToolButton(centralWidget); rotate_3->setObjectName(QString::fromUtf8("rotate_3")); @@ -414,42 +401,34 @@ public: rotate_3->setAutoFillBackground(false); rotate_3->setIcon(icon); rotate_3->setIconSize(QSize(40, 40)); - image_label_31 = new db_label(centralWidget); - image_label_31->setObjectName(QString::fromUtf8("image_label_31")); - image_label_31->setGeometry(QRect(800, 240, 231, 401)); - image_label_31->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 0, 0);")); - image_label_32 = new db_label(centralWidget); - image_label_32->setObjectName(QString::fromUtf8("image_label_32")); - image_label_32->setGeometry(QRect(1040, 240, 231, 401)); - image_label_32->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 0, 0);")); lcdNumber_total_6 = new QLCDNumber(centralWidget); lcdNumber_total_6->setObjectName(QString::fromUtf8("lcdNumber_total_6")); - lcdNumber_total_6->setGeometry(QRect(1175, 1360, 90, 20)); + lcdNumber_total_6->setGeometry(QRect(1175, 1700, 90, 20)); lcdNumber_total_6->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_total_6->setDigitCount(10); lcdNumber_ng_5 = new QLCDNumber(centralWidget); lcdNumber_ng_5->setObjectName(QString::fromUtf8("lcdNumber_ng_5")); - lcdNumber_ng_5->setGeometry(QRect(1175, 1255, 90, 20)); + lcdNumber_ng_5->setGeometry(QRect(1175, 1595, 90, 20)); lcdNumber_ng_5->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_ng_5->setDigitCount(10); image_label_61 = new db_label(centralWidget); image_label_61->setObjectName(QString::fromUtf8("image_label_61")); - image_label_61->setGeometry(QRect(750, 1360, 320, 110)); + image_label_61->setGeometry(QRect(750, 1700, 320, 110)); image_label_61->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 0, 0);")); label_kick_6 = new QLabel(centralWidget); label_kick_6->setObjectName(QString::fromUtf8("label_kick_6")); - label_kick_6->setGeometry(QRect(1080, 1450, 90, 20)); - label_kick_6->setFont(font1); + label_kick_6->setGeometry(QRect(1080, 1790, 90, 20)); + label_kick_6->setFont(font); label_kick_6->setStyleSheet(QString::fromUtf8("color:white")); label_check_5 = new QLabel(centralWidget); label_check_5->setObjectName(QString::fromUtf8("label_check_5")); - label_check_5->setGeometry(QRect(1080, 1195, 90, 20)); - label_check_5->setFont(font1); + label_check_5->setGeometry(QRect(1080, 1535, 90, 20)); + label_check_5->setFont(font); label_check_5->setStyleSheet(QString::fromUtf8("color:white")); label_check_8 = new QLabel(centralWidget); label_check_8->setObjectName(QString::fromUtf8("label_check_8")); - label_check_8->setGeometry(QRect(1080, 1705, 90, 20)); - label_check_8->setFont(font1); + label_check_8->setGeometry(QRect(1080, 2035, 90, 20)); + label_check_8->setFont(font); label_check_8->setStyleSheet(QString::fromUtf8("color:white")); rotate_5 = new QToolButton(centralWidget); rotate_5->setObjectName(QString::fromUtf8("rotate_5")); @@ -460,18 +439,18 @@ public: rotate_5->setIconSize(QSize(40, 40)); label_kick_8 = new QLabel(centralWidget); label_kick_8->setObjectName(QString::fromUtf8("label_kick_8")); - label_kick_8->setGeometry(QRect(1080, 1795, 90, 20)); - label_kick_8->setFont(font1); + label_kick_8->setGeometry(QRect(1080, 2125, 90, 20)); + label_kick_8->setFont(font); label_kick_8->setStyleSheet(QString::fromUtf8("color:white")); label_check_7 = new QLabel(centralWidget); label_check_7->setObjectName(QString::fromUtf8("label_check_7")); - label_check_7->setGeometry(QRect(1080, 1540, 90, 20)); - label_check_7->setFont(font1); + label_check_7->setGeometry(QRect(1080, 1870, 90, 20)); + label_check_7->setFont(font); label_check_7->setStyleSheet(QString::fromUtf8("color:white")); label_ng_6 = new db_label(centralWidget); label_ng_6->setObjectName(QString::fromUtf8("label_ng_6")); - label_ng_6->setGeometry(QRect(1080, 1420, 90, 20)); - label_ng_6->setFont(font1); + label_ng_6->setGeometry(QRect(1080, 1760, 90, 20)); + label_ng_6->setFont(font); label_ng_6->setStyleSheet(QString::fromUtf8("color:white")); rotate_6 = new QToolButton(centralWidget); rotate_6->setObjectName(QString::fromUtf8("rotate_6")); @@ -482,298 +461,298 @@ public: rotate_6->setIconSize(QSize(40, 40)); label_ng_5 = new db_label(centralWidget); label_ng_5->setObjectName(QString::fromUtf8("label_ng_5")); - label_ng_5->setGeometry(QRect(1080, 1255, 90, 20)); - label_ng_5->setFont(font1); + label_ng_5->setGeometry(QRect(1080, 1595, 90, 20)); + label_ng_5->setFont(font); label_ng_5->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_ng_7 = new QLCDNumber(centralWidget); lcdNumber_ng_7->setObjectName(QString::fromUtf8("lcdNumber_ng_7")); - lcdNumber_ng_7->setGeometry(QRect(1175, 1600, 90, 20)); + lcdNumber_ng_7->setGeometry(QRect(1175, 1930, 90, 20)); lcdNumber_ng_7->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_ng_7->setDigitCount(10); label_ok_7 = new QLabel(centralWidget); label_ok_7->setObjectName(QString::fromUtf8("label_ok_7")); - label_ok_7->setGeometry(QRect(1080, 1570, 90, 20)); - label_ok_7->setFont(font1); + label_ok_7->setGeometry(QRect(1080, 1900, 90, 20)); + label_ok_7->setFont(font); label_ok_7->setStyleSheet(QString::fromUtf8("color:white")); image_label_72 = new db_label(centralWidget); image_label_72->setObjectName(QString::fromUtf8("image_label_72")); - image_label_72->setGeometry(QRect(970, 1880, 160, 110)); + image_label_72->setGeometry(QRect(970, 1380, 160, 110)); image_label_72->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 0, 0);")); groupBox_a_6 = new QGroupBox(centralWidget); groupBox_a_6->setObjectName(QString::fromUtf8("groupBox_a_6")); - groupBox_a_6->setGeometry(QRect(750, 1475, 510, 50)); - groupBox_a_6->setFont(font2); + groupBox_a_6->setGeometry(QRect(750, 1815, 510, 50)); + groupBox_a_6->setFont(font1); groupBox_a_6->setStyleSheet(QString::fromUtf8("color:white")); label_speed_6 = new QLabel(groupBox_a_6); label_speed_6->setObjectName(QString::fromUtf8("label_speed_6")); label_speed_6->setGeometry(QRect(10, 20, 70, 20)); - label_speed_6->setFont(font2); + label_speed_6->setFont(font1); label_cap_speed_6 = new QLabel(groupBox_a_6); label_cap_speed_6->setObjectName(QString::fromUtf8("label_cap_speed_6")); - label_cap_speed_6->setGeometry(QRect(80, 20, 50, 20)); - label_cap_speed_6->setFont(font3); + label_cap_speed_6->setGeometry(QRect(80, 20, 61, 20)); + label_cap_speed_6->setFont(font2); label_cap_speed_6->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); label_jd_no_6 = new QLabel(groupBox_a_6); label_jd_no_6->setObjectName(QString::fromUtf8("label_jd_no_6")); - label_jd_no_6->setGeometry(QRect(220, 20, 50, 20)); - label_jd_no_6->setFont(font3); + label_jd_no_6->setGeometry(QRect(220, 20, 61, 20)); + label_jd_no_6->setFont(font2); label_jd_no_6->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); label_jdnum_6 = new QLabel(groupBox_a_6); label_jdnum_6->setObjectName(QString::fromUtf8("label_jdnum_6")); label_jdnum_6->setGeometry(QRect(150, 20, 70, 20)); - label_jdnum_6->setFont(font2); + label_jdnum_6->setFont(font1); label_time_6 = new QLabel(groupBox_a_6); label_time_6->setObjectName(QString::fromUtf8("label_time_6")); label_time_6->setGeometry(QRect(290, 20, 70, 20)); - label_time_6->setFont(font2); + label_time_6->setFont(font1); label_timecost_6 = new QLabel(groupBox_a_6); label_timecost_6->setObjectName(QString::fromUtf8("label_timecost_6")); - label_timecost_6->setGeometry(QRect(360, 20, 50, 20)); - label_timecost_6->setFont(font3); + label_timecost_6->setGeometry(QRect(360, 20, 61, 20)); + label_timecost_6->setFont(font2); label_timecost_6->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); label_reslut_6 = new QLabel(groupBox_a_6); label_reslut_6->setObjectName(QString::fromUtf8("label_reslut_6")); label_reslut_6->setGeometry(QRect(430, 20, 60, 25)); - label_reslut_6->setFont(font4); + label_reslut_6->setFont(font3); label_reslut_6->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 255, 0);")); label_reslut_6->setAlignment(Qt::AlignCenter); lcdNumber_ng_6 = new QLCDNumber(centralWidget); lcdNumber_ng_6->setObjectName(QString::fromUtf8("lcdNumber_ng_6")); - lcdNumber_ng_6->setGeometry(QRect(1175, 1420, 90, 20)); + lcdNumber_ng_6->setGeometry(QRect(1175, 1760, 90, 20)); lcdNumber_ng_6->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_ng_6->setDigitCount(10); image_label_81 = new db_label(centralWidget); image_label_81->setObjectName(QString::fromUtf8("image_label_81")); - image_label_81->setGeometry(QRect(750, 1705, 320, 110)); + image_label_81->setGeometry(QRect(750, 2035, 320, 110)); image_label_81->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 0, 0);")); lcdNumber_total_8 = new QLCDNumber(centralWidget); lcdNumber_total_8->setObjectName(QString::fromUtf8("lcdNumber_total_8")); - lcdNumber_total_8->setGeometry(QRect(1175, 1705, 90, 20)); + lcdNumber_total_8->setGeometry(QRect(1175, 2035, 90, 20)); lcdNumber_total_8->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_total_8->setDigitCount(10); groupBox_a_8 = new QGroupBox(centralWidget); groupBox_a_8->setObjectName(QString::fromUtf8("groupBox_a_8")); - groupBox_a_8->setGeometry(QRect(750, 1815, 511, 51)); - groupBox_a_8->setFont(font2); + groupBox_a_8->setGeometry(QRect(750, 2145, 511, 51)); + groupBox_a_8->setFont(font1); groupBox_a_8->setStyleSheet(QString::fromUtf8("color:white")); label_speed_8 = new QLabel(groupBox_a_8); label_speed_8->setObjectName(QString::fromUtf8("label_speed_8")); label_speed_8->setGeometry(QRect(10, 20, 70, 20)); - label_speed_8->setFont(font2); + label_speed_8->setFont(font1); label_cap_speed_8 = new QLabel(groupBox_a_8); label_cap_speed_8->setObjectName(QString::fromUtf8("label_cap_speed_8")); - label_cap_speed_8->setGeometry(QRect(80, 20, 50, 20)); - label_cap_speed_8->setFont(font3); + label_cap_speed_8->setGeometry(QRect(80, 20, 61, 20)); + label_cap_speed_8->setFont(font2); label_cap_speed_8->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); label_jd_no_8 = new QLabel(groupBox_a_8); label_jd_no_8->setObjectName(QString::fromUtf8("label_jd_no_8")); - label_jd_no_8->setGeometry(QRect(220, 20, 50, 20)); - label_jd_no_8->setFont(font3); + label_jd_no_8->setGeometry(QRect(220, 20, 61, 20)); + label_jd_no_8->setFont(font2); label_jd_no_8->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); label_jdnum_8 = new QLabel(groupBox_a_8); label_jdnum_8->setObjectName(QString::fromUtf8("label_jdnum_8")); label_jdnum_8->setGeometry(QRect(150, 20, 70, 20)); - label_jdnum_8->setFont(font2); + label_jdnum_8->setFont(font1); label_time_8 = new QLabel(groupBox_a_8); label_time_8->setObjectName(QString::fromUtf8("label_time_8")); label_time_8->setGeometry(QRect(290, 20, 70, 20)); - label_time_8->setFont(font2); + label_time_8->setFont(font1); label_timecost_8 = new QLabel(groupBox_a_8); label_timecost_8->setObjectName(QString::fromUtf8("label_timecost_8")); - label_timecost_8->setGeometry(QRect(360, 20, 50, 20)); - label_timecost_8->setFont(font3); + label_timecost_8->setGeometry(QRect(360, 20, 61, 20)); + label_timecost_8->setFont(font2); label_timecost_8->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); label_reslut_8 = new QLabel(groupBox_a_8); label_reslut_8->setObjectName(QString::fromUtf8("label_reslut_8")); label_reslut_8->setGeometry(QRect(430, 20, 60, 25)); - label_reslut_8->setFont(font4); + label_reslut_8->setFont(font3); label_reslut_8->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 255, 0);")); label_reslut_8->setAlignment(Qt::AlignCenter); groupBox_a_7 = new QGroupBox(centralWidget); groupBox_a_7->setObjectName(QString::fromUtf8("groupBox_a_7")); - groupBox_a_7->setGeometry(QRect(750, 1650, 510, 50)); - groupBox_a_7->setFont(font2); + groupBox_a_7->setGeometry(QRect(750, 1980, 510, 50)); + groupBox_a_7->setFont(font1); groupBox_a_7->setStyleSheet(QString::fromUtf8("color:white")); label_speed_7 = new QLabel(groupBox_a_7); label_speed_7->setObjectName(QString::fromUtf8("label_speed_7")); label_speed_7->setGeometry(QRect(10, 20, 70, 20)); - label_speed_7->setFont(font2); + label_speed_7->setFont(font1); label_cap_speed_7 = new QLabel(groupBox_a_7); label_cap_speed_7->setObjectName(QString::fromUtf8("label_cap_speed_7")); - label_cap_speed_7->setGeometry(QRect(80, 20, 50, 20)); - label_cap_speed_7->setFont(font3); + label_cap_speed_7->setGeometry(QRect(80, 20, 61, 20)); + label_cap_speed_7->setFont(font2); label_cap_speed_7->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); label_jd_no_7 = new QLabel(groupBox_a_7); label_jd_no_7->setObjectName(QString::fromUtf8("label_jd_no_7")); - label_jd_no_7->setGeometry(QRect(220, 20, 50, 20)); - label_jd_no_7->setFont(font3); + label_jd_no_7->setGeometry(QRect(220, 20, 61, 20)); + label_jd_no_7->setFont(font2); label_jd_no_7->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); label_jdnum_7 = new QLabel(groupBox_a_7); label_jdnum_7->setObjectName(QString::fromUtf8("label_jdnum_7")); label_jdnum_7->setGeometry(QRect(150, 20, 70, 20)); - label_jdnum_7->setFont(font2); + label_jdnum_7->setFont(font1); label_time_7 = new QLabel(groupBox_a_7); label_time_7->setObjectName(QString::fromUtf8("label_time_7")); label_time_7->setGeometry(QRect(290, 20, 70, 20)); - label_time_7->setFont(font2); + label_time_7->setFont(font1); label_timecost_7 = new QLabel(groupBox_a_7); label_timecost_7->setObjectName(QString::fromUtf8("label_timecost_7")); - label_timecost_7->setGeometry(QRect(360, 20, 50, 20)); - label_timecost_7->setFont(font3); + label_timecost_7->setGeometry(QRect(360, 20, 61, 20)); + label_timecost_7->setFont(font2); label_timecost_7->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); label_reslut_7 = new QLabel(groupBox_a_7); label_reslut_7->setObjectName(QString::fromUtf8("label_reslut_7")); label_reslut_7->setGeometry(QRect(430, 20, 60, 25)); - label_reslut_7->setFont(font4); + label_reslut_7->setFont(font3); label_reslut_7->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 255, 0);")); label_reslut_7->setAlignment(Qt::AlignCenter); label_kick_5 = new QLabel(centralWidget); label_kick_5->setObjectName(QString::fromUtf8("label_kick_5")); - label_kick_5->setGeometry(QRect(1080, 1285, 90, 20)); - label_kick_5->setFont(font1); + label_kick_5->setGeometry(QRect(1080, 1625, 90, 20)); + label_kick_5->setFont(font); label_kick_5->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_ng_8 = new QLCDNumber(centralWidget); lcdNumber_ng_8->setObjectName(QString::fromUtf8("lcdNumber_ng_8")); - lcdNumber_ng_8->setGeometry(QRect(1175, 1765, 90, 20)); + lcdNumber_ng_8->setGeometry(QRect(1175, 2095, 90, 20)); lcdNumber_ng_8->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_ng_8->setDigitCount(10); lcdNumber_kick_5 = new QLCDNumber(centralWidget); lcdNumber_kick_5->setObjectName(QString::fromUtf8("lcdNumber_kick_5")); - lcdNumber_kick_5->setGeometry(QRect(1175, 1285, 90, 20)); + lcdNumber_kick_5->setGeometry(QRect(1175, 1625, 90, 20)); lcdNumber_kick_5->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_kick_5->setDigitCount(10); label_kick_7 = new QLabel(centralWidget); label_kick_7->setObjectName(QString::fromUtf8("label_kick_7")); - label_kick_7->setGeometry(QRect(1080, 1630, 90, 20)); - label_kick_7->setFont(font1); + label_kick_7->setGeometry(QRect(1080, 1960, 90, 20)); + label_kick_7->setFont(font); label_kick_7->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_ok_6 = new QLCDNumber(centralWidget); lcdNumber_ok_6->setObjectName(QString::fromUtf8("lcdNumber_ok_6")); - lcdNumber_ok_6->setGeometry(QRect(1175, 1390, 90, 20)); + lcdNumber_ok_6->setGeometry(QRect(1175, 1730, 90, 20)); lcdNumber_ok_6->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_ok_6->setDigitCount(10); groupBox_a_5 = new QGroupBox(centralWidget); groupBox_a_5->setObjectName(QString::fromUtf8("groupBox_a_5")); - groupBox_a_5->setGeometry(QRect(750, 1305, 510, 50)); - groupBox_a_5->setFont(font2); + groupBox_a_5->setGeometry(QRect(750, 1645, 510, 50)); + groupBox_a_5->setFont(font1); groupBox_a_5->setStyleSheet(QString::fromUtf8("color:white")); label_speed_5 = new QLabel(groupBox_a_5); label_speed_5->setObjectName(QString::fromUtf8("label_speed_5")); label_speed_5->setGeometry(QRect(10, 20, 70, 20)); - label_speed_5->setFont(font2); + label_speed_5->setFont(font1); label_cap_speed_5 = new QLabel(groupBox_a_5); label_cap_speed_5->setObjectName(QString::fromUtf8("label_cap_speed_5")); - label_cap_speed_5->setGeometry(QRect(80, 20, 50, 20)); - label_cap_speed_5->setFont(font3); + label_cap_speed_5->setGeometry(QRect(80, 20, 61, 20)); + label_cap_speed_5->setFont(font2); label_cap_speed_5->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); label_jd_no_5 = new QLabel(groupBox_a_5); label_jd_no_5->setObjectName(QString::fromUtf8("label_jd_no_5")); - label_jd_no_5->setGeometry(QRect(220, 20, 50, 20)); - label_jd_no_5->setFont(font3); + label_jd_no_5->setGeometry(QRect(220, 20, 61, 20)); + label_jd_no_5->setFont(font2); label_jd_no_5->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); label_jdnum_5 = new QLabel(groupBox_a_5); label_jdnum_5->setObjectName(QString::fromUtf8("label_jdnum_5")); label_jdnum_5->setGeometry(QRect(150, 20, 70, 20)); - label_jdnum_5->setFont(font2); + label_jdnum_5->setFont(font1); label_time_5 = new QLabel(groupBox_a_5); label_time_5->setObjectName(QString::fromUtf8("label_time_5")); label_time_5->setGeometry(QRect(290, 20, 70, 20)); - label_time_5->setFont(font2); + label_time_5->setFont(font1); label_timecost_5 = new QLabel(groupBox_a_5); label_timecost_5->setObjectName(QString::fromUtf8("label_timecost_5")); - label_timecost_5->setGeometry(QRect(360, 20, 50, 20)); - label_timecost_5->setFont(font3); + label_timecost_5->setGeometry(QRect(360, 20, 61, 20)); + label_timecost_5->setFont(font2); label_timecost_5->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); label_reslut_5 = new QLabel(groupBox_a_5); label_reslut_5->setObjectName(QString::fromUtf8("label_reslut_5")); label_reslut_5->setGeometry(QRect(430, 20, 60, 25)); - label_reslut_5->setFont(font4); + label_reslut_5->setFont(font3); label_reslut_5->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 255, 0);")); label_reslut_5->setAlignment(Qt::AlignCenter); lcdNumber_kick_7 = new QLCDNumber(centralWidget); lcdNumber_kick_7->setObjectName(QString::fromUtf8("lcdNumber_kick_7")); - lcdNumber_kick_7->setGeometry(QRect(1175, 1630, 90, 20)); + lcdNumber_kick_7->setGeometry(QRect(1175, 1960, 90, 20)); lcdNumber_kick_7->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_kick_7->setDigitCount(10); image_label_51 = new db_label(centralWidget); image_label_51->setObjectName(QString::fromUtf8("image_label_51")); - image_label_51->setGeometry(QRect(750, 1195, 320, 110)); + image_label_51->setGeometry(QRect(750, 1535, 320, 110)); image_label_51->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 0, 0);")); label_ok_5 = new QLabel(centralWidget); label_ok_5->setObjectName(QString::fromUtf8("label_ok_5")); - label_ok_5->setGeometry(QRect(1080, 1225, 90, 20)); - label_ok_5->setFont(font1); + label_ok_5->setGeometry(QRect(1080, 1565, 90, 20)); + label_ok_5->setFont(font); label_ok_5->setStyleSheet(QString::fromUtf8("color:white")); label_check_6 = new QLabel(centralWidget); label_check_6->setObjectName(QString::fromUtf8("label_check_6")); - label_check_6->setGeometry(QRect(1080, 1360, 90, 20)); - label_check_6->setFont(font1); + label_check_6->setGeometry(QRect(1080, 1700, 90, 20)); + label_check_6->setFont(font); label_check_6->setStyleSheet(QString::fromUtf8("color:white")); label_ok_8 = new QLabel(centralWidget); label_ok_8->setObjectName(QString::fromUtf8("label_ok_8")); - label_ok_8->setGeometry(QRect(1080, 1735, 90, 20)); - label_ok_8->setFont(font1); + label_ok_8->setGeometry(QRect(1080, 2065, 90, 20)); + label_ok_8->setFont(font); label_ok_8->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_ok_8 = new QLCDNumber(centralWidget); lcdNumber_ok_8->setObjectName(QString::fromUtf8("lcdNumber_ok_8")); - lcdNumber_ok_8->setGeometry(QRect(1175, 1735, 90, 20)); + lcdNumber_ok_8->setGeometry(QRect(1175, 2065, 90, 20)); lcdNumber_ok_8->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_ok_8->setDigitCount(10); lcdNumber_ok_5 = new QLCDNumber(centralWidget); lcdNumber_ok_5->setObjectName(QString::fromUtf8("lcdNumber_ok_5")); - lcdNumber_ok_5->setGeometry(QRect(1175, 1225, 90, 20)); + lcdNumber_ok_5->setGeometry(QRect(1175, 1565, 90, 20)); lcdNumber_ok_5->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_ok_5->setDigitCount(10); label_ng_8 = new db_label(centralWidget); label_ng_8->setObjectName(QString::fromUtf8("label_ng_8")); - label_ng_8->setGeometry(QRect(1080, 1765, 90, 20)); - label_ng_8->setFont(font1); + label_ng_8->setGeometry(QRect(1080, 2095, 90, 20)); + label_ng_8->setFont(font); label_ng_8->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_total_7 = new QLCDNumber(centralWidget); lcdNumber_total_7->setObjectName(QString::fromUtf8("lcdNumber_total_7")); - lcdNumber_total_7->setGeometry(QRect(1175, 1540, 90, 20)); + lcdNumber_total_7->setGeometry(QRect(1175, 1870, 90, 20)); lcdNumber_total_7->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_total_7->setDigitCount(10); lcdNumber_kick_6 = new QLCDNumber(centralWidget); lcdNumber_kick_6->setObjectName(QString::fromUtf8("lcdNumber_kick_6")); - lcdNumber_kick_6->setGeometry(QRect(1175, 1450, 90, 20)); + lcdNumber_kick_6->setGeometry(QRect(1175, 1790, 90, 20)); lcdNumber_kick_6->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_kick_6->setDigitCount(10); label_ng_7 = new db_label(centralWidget); label_ng_7->setObjectName(QString::fromUtf8("label_ng_7")); - label_ng_7->setGeometry(QRect(1080, 1600, 90, 20)); - label_ng_7->setFont(font1); + label_ng_7->setGeometry(QRect(1080, 1930, 90, 20)); + label_ng_7->setFont(font); label_ng_7->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_total_5 = new QLCDNumber(centralWidget); lcdNumber_total_5->setObjectName(QString::fromUtf8("lcdNumber_total_5")); - lcdNumber_total_5->setGeometry(QRect(1175, 1195, 90, 20)); + lcdNumber_total_5->setGeometry(QRect(1175, 1535, 90, 20)); lcdNumber_total_5->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_total_5->setDigitCount(10); image_label_52 = new db_label(centralWidget); image_label_52->setObjectName(QString::fromUtf8("image_label_52")); - image_label_52->setGeometry(QRect(650, 1880, 160, 110)); + image_label_52->setGeometry(QRect(650, 1380, 160, 110)); image_label_52->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 0, 0);")); image_label_82 = new db_label(centralWidget); image_label_82->setObjectName(QString::fromUtf8("image_label_82")); - image_label_82->setGeometry(QRect(1130, 1880, 160, 110)); + image_label_82->setGeometry(QRect(1130, 1380, 160, 110)); image_label_82->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 0, 0);")); lcdNumber_ok_7 = new QLCDNumber(centralWidget); lcdNumber_ok_7->setObjectName(QString::fromUtf8("lcdNumber_ok_7")); - lcdNumber_ok_7->setGeometry(QRect(1175, 1570, 90, 20)); + lcdNumber_ok_7->setGeometry(QRect(1175, 1900, 90, 20)); lcdNumber_ok_7->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_ok_7->setDigitCount(10); label_ok_6 = new QLabel(centralWidget); label_ok_6->setObjectName(QString::fromUtf8("label_ok_6")); - label_ok_6->setGeometry(QRect(1080, 1390, 90, 20)); - label_ok_6->setFont(font1); + label_ok_6->setGeometry(QRect(1080, 1730, 90, 20)); + label_ok_6->setFont(font); label_ok_6->setStyleSheet(QString::fromUtf8("color:white")); image_label_62 = new db_label(centralWidget); image_label_62->setObjectName(QString::fromUtf8("image_label_62")); - image_label_62->setGeometry(QRect(810, 1880, 160, 110)); + image_label_62->setGeometry(QRect(810, 1380, 160, 110)); image_label_62->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 0, 0);")); lcdNumber_kick_8 = new QLCDNumber(centralWidget); lcdNumber_kick_8->setObjectName(QString::fromUtf8("lcdNumber_kick_8")); - lcdNumber_kick_8->setGeometry(QRect(1175, 1795, 90, 20)); + lcdNumber_kick_8->setGeometry(QRect(1175, 2125, 90, 20)); lcdNumber_kick_8->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_kick_8->setDigitCount(10); rotate_8 = new QToolButton(centralWidget); @@ -792,238 +771,508 @@ public: rotate_7->setIconSize(QSize(40, 40)); image_label_71 = new db_label(centralWidget); image_label_71->setObjectName(QString::fromUtf8("image_label_71")); - image_label_71->setGeometry(QRect(750, 1540, 320, 110)); + image_label_71->setGeometry(QRect(750, 1870, 320, 110)); image_label_71->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 0, 0);")); - location = new QLabel(centralWidget); - location->setObjectName(QString::fromUtf8("location")); - location->setGeometry(QRect(1180, 35, 121, 21)); - location->setFont(font); - location->setStyleSheet(QString::fromUtf8("color:white")); - label_title = new QLabel(centralWidget); - label_title->setObjectName(QString::fromUtf8("label_title")); - label_title->setGeometry(QRect(430, 0, 441, 51)); - QFont font5; - font5.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); - font5.setPointSize(24); - label_title->setFont(font5); - label_title->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); - label_title->setAlignment(Qt::AlignCenter); - label_title_6 = new QLabel(centralWidget); - label_title_6->setObjectName(QString::fromUtf8("label_title_6")); - label_title_6->setGeometry(QRect(80, 7, 271, 31)); - QFont font6; - font6.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); - font6.setPointSize(13); - label_title_6->setFont(font6); - label_title_6->setStyleSheet(QString::fromUtf8("color:white")); - label_title_6->setAlignment(Qt::AlignCenter); - toolButton_4 = new QToolButton(centralWidget); - toolButton_4->setObjectName(QString::fromUtf8("toolButton_4")); - toolButton_4->setGeometry(QRect(10, 5, 70, 61)); - toolButton_4->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/logo.png);\n" -"")); - label_title_7 = new QLabel(centralWidget); - label_title_7->setObjectName(QString::fromUtf8("label_title_7")); - label_title_7->setGeometry(QRect(80, 40, 341, 16)); - label_title_7->setFont(font2); - label_title_7->setStyleSheet(QString::fromUtf8("color:white")); - label_title_7->setAlignment(Qt::AlignCenter); + toolButton_cam_7 = new QToolButton(centralWidget); + toolButton_cam_7->setObjectName(QString::fromUtf8("toolButton_cam_7")); + toolButton_cam_7->setGeometry(QRect(110, 1790, 41, 41)); + toolButton_cam_7->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/cam7_no.png);")); cam_status_7 = new QLabel(centralWidget); cam_status_7->setObjectName(QString::fromUtf8("cam_status_7")); - cam_status_7->setGeometry(QRect(90, 1740, 61, 16)); - cam_status_7->setFont(font1); + cam_status_7->setGeometry(QRect(100, 1840, 61, 16)); + cam_status_7->setFont(font); cam_status_7->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); cam_status_7->setAlignment(Qt::AlignCenter); - cam_work_4 = new QLabel(centralWidget); - cam_work_4->setObjectName(QString::fromUtf8("cam_work_4")); - cam_work_4->setGeometry(QRect(10, 1850, 61, 16)); - cam_work_4->setFont(font1); - cam_work_4->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); - cam_work_4->setAlignment(Qt::AlignCenter); - cam_work_7 = new QLabel(centralWidget); - cam_work_7->setObjectName(QString::fromUtf8("cam_work_7")); - cam_work_7->setGeometry(QRect(90, 1760, 61, 16)); - cam_work_7->setFont(font1); - cam_work_7->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); - cam_work_7->setAlignment(Qt::AlignCenter); + toolButton_cam_4 = new QToolButton(centralWidget); + toolButton_cam_4->setObjectName(QString::fromUtf8("toolButton_cam_4")); + toolButton_cam_4->setGeometry(QRect(30, 1880, 41, 41)); + toolButton_cam_4->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/cam4_no.png);")); + cam_status_5 = new QLabel(centralWidget); + cam_status_5->setObjectName(QString::fromUtf8("cam_status_5")); + cam_status_5->setGeometry(QRect(100, 1660, 61, 16)); + cam_status_5->setFont(font); + cam_status_5->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + cam_status_5->setAlignment(Qt::AlignCenter); + cam_work_5 = new QLabel(centralWidget); + cam_work_5->setObjectName(QString::fromUtf8("cam_work_5")); + cam_work_5->setGeometry(QRect(100, 1680, 61, 16)); + cam_work_5->setFont(font); + cam_work_5->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + cam_work_5->setAlignment(Qt::AlignCenter); toolButton_cam_6 = new QToolButton(centralWidget); toolButton_cam_6->setObjectName(QString::fromUtf8("toolButton_cam_6")); - toolButton_cam_6->setGeometry(QRect(100, 1600, 41, 41)); + toolButton_cam_6->setGeometry(QRect(110, 1700, 41, 41)); toolButton_cam_6->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/cam6_no.png);")); + cam_status_4 = new QLabel(centralWidget); + cam_status_4->setObjectName(QString::fromUtf8("cam_status_4")); + cam_status_4->setGeometry(QRect(20, 1930, 61, 16)); + cam_status_4->setFont(font); + cam_status_4->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + cam_status_4->setAlignment(Qt::AlignCenter); + cam_status_8 = new QLabel(centralWidget); + cam_status_8->setObjectName(QString::fromUtf8("cam_status_8")); + cam_status_8->setGeometry(QRect(100, 1930, 61, 16)); + cam_status_8->setFont(font); + cam_status_8->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + cam_status_8->setAlignment(Qt::AlignCenter); + cam_status_6 = new QLabel(centralWidget); + cam_status_6->setObjectName(QString::fromUtf8("cam_status_6")); + cam_status_6->setGeometry(QRect(100, 1750, 61, 16)); + cam_status_6->setFont(font); + cam_status_6->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + cam_status_6->setAlignment(Qt::AlignCenter); cam_work_6 = new QLabel(centralWidget); cam_work_6->setObjectName(QString::fromUtf8("cam_work_6")); - cam_work_6->setGeometry(QRect(90, 1670, 61, 16)); - cam_work_6->setFont(font1); + cam_work_6->setGeometry(QRect(100, 1770, 61, 16)); + cam_work_6->setFont(font); cam_work_6->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); cam_work_6->setAlignment(Qt::AlignCenter); + cam_work_4 = new QLabel(centralWidget); + cam_work_4->setObjectName(QString::fromUtf8("cam_work_4")); + cam_work_4->setGeometry(QRect(20, 1950, 61, 16)); + cam_work_4->setFont(font); + cam_work_4->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + cam_work_4->setAlignment(Qt::AlignCenter); toolButton_cam_5 = new QToolButton(centralWidget); toolButton_cam_5->setObjectName(QString::fromUtf8("toolButton_cam_5")); - toolButton_cam_5->setGeometry(QRect(100, 1510, 41, 41)); + toolButton_cam_5->setGeometry(QRect(110, 1610, 41, 41)); toolButton_cam_5->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/cam5_no.png);")); + cam_work_7 = new QLabel(centralWidget); + cam_work_7->setObjectName(QString::fromUtf8("cam_work_7")); + cam_work_7->setGeometry(QRect(100, 1860, 61, 16)); + cam_work_7->setFont(font); + cam_work_7->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + cam_work_7->setAlignment(Qt::AlignCenter); toolButton_cam_8 = new QToolButton(centralWidget); toolButton_cam_8->setObjectName(QString::fromUtf8("toolButton_cam_8")); - toolButton_cam_8->setGeometry(QRect(100, 1780, 41, 41)); + toolButton_cam_8->setGeometry(QRect(110, 1880, 41, 41)); toolButton_cam_8->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/cam8_no.png);")); - cam_status_4 = new QLabel(centralWidget); - cam_status_4->setObjectName(QString::fromUtf8("cam_status_4")); - cam_status_4->setGeometry(QRect(10, 1830, 61, 16)); - cam_status_4->setFont(font1); - cam_status_4->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); - cam_status_4->setAlignment(Qt::AlignCenter); - cam_status_6 = new QLabel(centralWidget); - cam_status_6->setObjectName(QString::fromUtf8("cam_status_6")); - cam_status_6->setGeometry(QRect(90, 1650, 61, 16)); - cam_status_6->setFont(font1); - cam_status_6->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); - cam_status_6->setAlignment(Qt::AlignCenter); - cam_work_5 = new QLabel(centralWidget); - cam_work_5->setObjectName(QString::fromUtf8("cam_work_5")); - cam_work_5->setGeometry(QRect(90, 1580, 61, 16)); - cam_work_5->setFont(font1); - cam_work_5->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); - cam_work_5->setAlignment(Qt::AlignCenter); - toolButton_cam_7 = new QToolButton(centralWidget); - toolButton_cam_7->setObjectName(QString::fromUtf8("toolButton_cam_7")); - toolButton_cam_7->setGeometry(QRect(100, 1690, 41, 41)); - toolButton_cam_7->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/cam7_no.png);")); - cam_status_5 = new QLabel(centralWidget); - cam_status_5->setObjectName(QString::fromUtf8("cam_status_5")); - cam_status_5->setGeometry(QRect(90, 1560, 61, 16)); - cam_status_5->setFont(font1); - cam_status_5->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); - cam_status_5->setAlignment(Qt::AlignCenter); - cam_status_8 = new QLabel(centralWidget); - cam_status_8->setObjectName(QString::fromUtf8("cam_status_8")); - cam_status_8->setGeometry(QRect(90, 1830, 61, 16)); - cam_status_8->setFont(font1); - cam_status_8->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); - cam_status_8->setAlignment(Qt::AlignCenter); cam_work_8 = new QLabel(centralWidget); cam_work_8->setObjectName(QString::fromUtf8("cam_work_8")); - cam_work_8->setGeometry(QRect(90, 1850, 61, 16)); - cam_work_8->setFont(font1); + cam_work_8->setGeometry(QRect(100, 1950, 61, 16)); + cam_work_8->setFont(font); cam_work_8->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); cam_work_8->setAlignment(Qt::AlignCenter); - toolButton_cam_4 = new QToolButton(centralWidget); - toolButton_cam_4->setObjectName(QString::fromUtf8("toolButton_cam_4")); - toolButton_cam_4->setGeometry(QRect(20, 1780, 41, 41)); - toolButton_cam_4->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/cam4_no.png);")); - image_label_11 = new db_label(centralWidget); - image_label_11->setObjectName(QString::fromUtf8("image_label_11")); - image_label_11->setGeometry(QRect(250, 240, 231, 401)); - image_label_11->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 0, 0);")); - groupBox_a_2 = new QGroupBox(centralWidget); - groupBox_a_2->setObjectName(QString::fromUtf8("groupBox_a_2")); - groupBox_a_2->setGeometry(QRect(580, 60, 691, 171)); + lcdNumber_kick_3 = new QLCDNumber(centralWidget); + lcdNumber_kick_3->setObjectName(QString::fromUtf8("lcdNumber_kick_3")); + lcdNumber_kick_3->setGeometry(QRect(620, 1880, 111, 31)); + lcdNumber_kick_3->setStyleSheet(QString::fromUtf8("color:white")); + lcdNumber_kick_3->setDigitCount(10); + groupBox_11 = new QGroupBox(centralWidget); + groupBox_11->setObjectName(QString::fromUtf8("groupBox_11")); + groupBox_11->setGeometry(QRect(510, 1630, 201, 101)); + QFont font4; + font4.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); + font4.setPointSize(12); + groupBox_11->setFont(font4); + groupBox_11->setStyleSheet(QString::fromUtf8("color:white")); + label_26 = new QLabel(groupBox_11); + label_26->setObjectName(QString::fromUtf8("label_26")); + label_26->setGeometry(QRect(10, 30, 71, 21)); + label_26->setFont(font2); + label_cap_speed_3 = new QLabel(groupBox_11); + label_cap_speed_3->setObjectName(QString::fromUtf8("label_cap_speed_3")); + label_cap_speed_3->setGeometry(QRect(75, 30, 65, 21)); + label_cap_speed_3->setFont(font2); + label_cap_speed_3->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); + label_jd_no_3 = new QLabel(groupBox_11); + label_jd_no_3->setObjectName(QString::fromUtf8("label_jd_no_3")); + label_jd_no_3->setGeometry(QRect(80, 70, 60, 21)); + label_jd_no_3->setFont(font2); + label_jd_no_3->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); + label_23 = new QLabel(groupBox_11); + label_23->setObjectName(QString::fromUtf8("label_23")); + label_23->setGeometry(QRect(10, 70, 71, 21)); + label_23->setFont(font2); + label_22 = new QLabel(groupBox_11); + label_22->setObjectName(QString::fromUtf8("label_22")); + label_22->setGeometry(QRect(230, 30, 71, 21)); + label_22->setFont(font2); + label_timecost_3 = new QLabel(groupBox_11); + label_timecost_3->setObjectName(QString::fromUtf8("label_timecost_3")); + label_timecost_3->setGeometry(QRect(300, 30, 50, 20)); + label_timecost_3->setFont(font2); + label_timecost_3->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); + label_reslut_3 = new QLabel(groupBox_11); + label_reslut_3->setObjectName(QString::fromUtf8("label_reslut_3")); + label_reslut_3->setGeometry(QRect(230, 60, 111, 31)); + label_reslut_3->setFont(font3); + label_reslut_3->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 255, 0);")); + label_reslut_3->setAlignment(Qt::AlignCenter); + lcdNumber_ok_3 = new QLCDNumber(centralWidget); + lcdNumber_ok_3->setObjectName(QString::fromUtf8("lcdNumber_ok_3")); + lcdNumber_ok_3->setGeometry(QRect(620, 1820, 111, 31)); + lcdNumber_ok_3->setStyleSheet(QString::fromUtf8("color:white")); + lcdNumber_ok_3->setDigitCount(10); + label_7 = new QLabel(centralWidget); + label_7->setObjectName(QString::fromUtf8("label_7")); + label_7->setGeometry(QRect(530, 1790, 71, 31)); + label_7->setFont(font); + label_7->setStyleSheet(QString::fromUtf8("color:white")); + label_9 = new QLabel(centralWidget); + label_9->setObjectName(QString::fromUtf8("label_9")); + label_9->setGeometry(QRect(530, 1880, 71, 31)); + label_9->setFont(font); + label_9->setStyleSheet(QString::fromUtf8("color:white")); + label_ng_3 = new db_label(centralWidget); + label_ng_3->setObjectName(QString::fromUtf8("label_ng_3")); + label_ng_3->setGeometry(QRect(530, 1850, 71, 31)); + label_ng_3->setFont(font); + label_ng_3->setStyleSheet(QString::fromUtf8("color:white")); + rotate_11 = new QToolButton(centralWidget); + rotate_11->setObjectName(QString::fromUtf8("rotate_11")); + rotate_11->setGeometry(QRect(1240, 1500, 20, 20)); + rotate_11->setFocusPolicy(Qt::ClickFocus); + rotate_11->setAutoFillBackground(false); + rotate_11->setStyleSheet(QString::fromUtf8("border-image:url(:/Cigarette/Resources/rotate.png)")); + QIcon icon1; + icon1.addFile(QString::fromUtf8("../../../\350\265\204\346\226\231/\347\203\237\345\216\202\350\275\257\344\273\266\344\273\243\347\240\201/230720-\351\203\221\345\267\236\345\206\267\350\203\266ZB416\346\235\241\347\233\222-3\347\233\270\346\234\272-1280x800/Cigarette/Resources/rotate.png"), QSize(), QIcon::Normal, QIcon::Off); + rotate_11->setIcon(icon1); + rotate_11->setIconSize(QSize(40, 40)); + label_3 = new QLabel(centralWidget); + label_3->setObjectName(QString::fromUtf8("label_3")); + label_3->setGeometry(QRect(530, 1820, 71, 31)); + label_3->setFont(font); + label_3->setStyleSheet(QString::fromUtf8("color:white")); + lcdNumber_total_3 = new QLCDNumber(centralWidget); + lcdNumber_total_3->setObjectName(QString::fromUtf8("lcdNumber_total_3")); + lcdNumber_total_3->setGeometry(QRect(620, 1790, 111, 31)); + lcdNumber_total_3->setStyleSheet(QString::fromUtf8("color:white")); + lcdNumber_total_3->setDigitCount(10); + image_label_31 = new db_label(centralWidget); + image_label_31->setObjectName(QString::fromUtf8("image_label_31")); + image_label_31->setGeometry(QRect(190, 1500, 191, 121)); + image_label_31->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 0, 0);")); + lcdNumber_ng_3 = new QLCDNumber(centralWidget); + lcdNumber_ng_3->setObjectName(QString::fromUtf8("lcdNumber_ng_3")); + lcdNumber_ng_3->setGeometry(QRect(620, 1850, 111, 31)); + lcdNumber_ng_3->setStyleSheet(QString::fromUtf8("color:white")); + lcdNumber_ng_3->setDigitCount(10); + image_label_32 = new db_label(centralWidget); + image_label_32->setObjectName(QString::fromUtf8("image_label_32")); + image_label_32->setGeometry(QRect(440, 1500, 231, 121)); + image_label_32->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 0, 0);")); + image_label_12 = new db_label(centralWidget); + image_label_12->setObjectName(QString::fromUtf8("image_label_12")); + image_label_12->setGeometry(QRect(0, 1370, 161, 131)); + image_label_12->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 0, 0);")); + cam_status_3 = new QLabel(centralWidget); + cam_status_3->setObjectName(QString::fromUtf8("cam_status_3")); + cam_status_3->setGeometry(QRect(20, 1790, 45, 30)); + QFont font5; + font5.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); + font5.setPointSize(16); + font5.setBold(false); + font5.setWeight(50); + cam_status_3->setFont(font5); + cam_status_3->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + cam_status_3->setAlignment(Qt::AlignCenter); + cam_work_3 = new QLabel(centralWidget); + cam_work_3->setObjectName(QString::fromUtf8("cam_work_3")); + cam_work_3->setGeometry(QRect(20, 1830, 45, 30)); + cam_work_3->setFont(font5); + cam_work_3->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + cam_work_3->setAlignment(Qt::AlignCenter); + toolButton_cam_3 = new QToolButton(centralWidget); + toolButton_cam_3->setObjectName(QString::fromUtf8("toolButton_cam_3")); + toolButton_cam_3->setGeometry(QRect(20, 1740, 50, 50)); + toolButton_cam_3->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/cam3_no.png);")); + location = new QLabel(centralWidget); + location->setObjectName(QString::fromUtf8("location")); + location->setGeometry(QRect(1180, 35, 131, 30)); + QFont font6; + font6.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); + font6.setPointSize(12); + font6.setBold(false); + font6.setWeight(50); + location->setFont(font6); + location->setLayoutDirection(Qt::LeftToRight); + location->setStyleSheet(QString::fromUtf8("color:white")); + location->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter); + image_label_21 = new db_label(centralWidget); + image_label_21->setObjectName(QString::fromUtf8("image_label_21")); + image_label_21->setGeometry(QRect(730, 85, 531, 481)); + image_label_21->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 0, 0);")); + label_ng_1 = new db_label(centralWidget); + label_ng_1->setObjectName(QString::fromUtf8("label_ng_1")); + label_ng_1->setGeometry(QRect(480, 625, 81, 31)); + label_ng_1->setFont(font); + label_ng_1->setStyleSheet(QString::fromUtf8("color:white")); + groupBox_op = new QGroupBox(centralWidget); + groupBox_op->setObjectName(QString::fromUtf8("groupBox_op")); + groupBox_op->setGeometry(QRect(10, 75, 171, 291)); QFont font7; - font7.setFamily(QString::fromUtf8("\345\256\213\344\275\223")); + font7.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); font7.setPointSize(14); - groupBox_a_2->setFont(font7); - groupBox_a_2->setStyleSheet(QString::fromUtf8("color:white")); + font7.setBold(true); + font7.setWeight(75); + groupBox_op->setFont(font7); + groupBox_op->setStyleSheet(QString::fromUtf8("color:white")); + btn_start = new QToolButton(groupBox_op); + btn_start->setObjectName(QString::fromUtf8("btn_start")); + btn_start->setGeometry(QRect(10, 24, 72, 96)); + QFont font8; + font8.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); + btn_start->setFont(font8); + btn_start->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/start.png);")); + btn_start->setAutoRaise(false); + btn_pause = new QToolButton(groupBox_op); + btn_pause->setObjectName(QString::fromUtf8("btn_pause")); + btn_pause->setGeometry(QRect(95, 24, 72, 96)); + btn_pause->setFont(font8); + btn_pause->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/pause.png);\n" +"")); + btn_pause->setAutoRaise(false); + btn_lock = new QToolButton(groupBox_op); + btn_lock->setObjectName(QString::fromUtf8("btn_lock")); + btn_lock->setGeometry(QRect(10, 120, 72, 96)); + btn_lock->setFont(font8); + btn_lock->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/unlock.png);")); + btn_lock->setAutoRaise(false); + btn_setup = new QToolButton(groupBox_op); + btn_setup->setObjectName(QString::fromUtf8("btn_setup")); + btn_setup->setGeometry(QRect(90, 120, 72, 96)); + btn_setup->setFont(font8); + btn_setup->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/setup.png);\n" +"")); + btn_setup->setAutoRaise(false); + pushButton_wintab = new QPushButton(groupBox_op); + pushButton_wintab->setObjectName(QString::fromUtf8("pushButton_wintab")); + pushButton_wintab->setGeometry(QRect(10, 230, 151, 51)); + QFont font9; + font9.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); + font9.setPointSize(16); + pushButton_wintab->setFont(font9); + pushButton_wintab->setStyleSheet(QString::fromUtf8("color:white")); label_4 = new QLabel(centralWidget); label_4->setObjectName(QString::fromUtf8("label_4")); - label_4->setGeometry(QRect(600, 180, 71, 31)); - label_4->setFont(font1); + label_4->setGeometry(QRect(200, 625, 91, 31)); + label_4->setFont(font); label_4->setStyleSheet(QString::fromUtf8("color:white")); - label_title_2 = new QLabel(centralWidget); - label_title_2->setObjectName(QString::fromUtf8("label_title_2")); - label_title_2->setGeometry(QRect(170, 180, 151, 51)); - QFont font8; - font8.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); - font8.setPointSize(18); - label_title_2->setFont(font8); - label_title_2->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); - label_title_2->setAlignment(Qt::AlignCenter); - lcdNumber_total_3 = new QLCDNumber(centralWidget); - lcdNumber_total_3->setObjectName(QString::fromUtf8("lcdNumber_total_3")); - lcdNumber_total_3->setGeometry(QRect(1150, 90, 111, 31)); - lcdNumber_total_3->setStyleSheet(QString::fromUtf8("color:white")); - lcdNumber_total_3->setDigitCount(10); - lcdNumber_ok_2 = new QLCDNumber(centralWidget); - lcdNumber_ok_2->setObjectName(QString::fromUtf8("lcdNumber_ok_2")); - lcdNumber_ok_2->setGeometry(QRect(920, 120, 111, 31)); - lcdNumber_ok_2->setStyleSheet(QString::fromUtf8("color:white")); - lcdNumber_ok_2->setDigitCount(10); - lcdNumber_kick_2 = new QLCDNumber(centralWidget); - lcdNumber_kick_2->setObjectName(QString::fromUtf8("lcdNumber_kick_2")); - lcdNumber_kick_2->setGeometry(QRect(920, 180, 111, 31)); - lcdNumber_kick_2->setStyleSheet(QString::fromUtf8("color:white")); - lcdNumber_kick_2->setDigitCount(10); + groupBox_b = new QGroupBox(centralWidget); + groupBox_b->setObjectName(QString::fromUtf8("groupBox_b")); + groupBox_b->setGeometry(QRect(732, 675, 541, 61)); + QFont font10; + font10.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); + font10.setPointSize(14); + groupBox_b->setFont(font10); + groupBox_b->setStyleSheet(QString::fromUtf8("color:white")); + label_33 = new QLabel(groupBox_b); + label_33->setObjectName(QString::fromUtf8("label_33")); + label_33->setGeometry(QRect(10, 30, 71, 21)); + label_33->setFont(font2); + label_cap_speed_2 = new QLabel(groupBox_b); + label_cap_speed_2->setObjectName(QString::fromUtf8("label_cap_speed_2")); + label_cap_speed_2->setGeometry(QRect(80, 30, 71, 21)); + label_cap_speed_2->setFont(font2); + label_cap_speed_2->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); + label_jd_no_2 = new QLabel(groupBox_b); + label_jd_no_2->setObjectName(QString::fromUtf8("label_jd_no_2")); + label_jd_no_2->setGeometry(QRect(230, 30, 60, 21)); + QFont font11; + font11.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); + font11.setPointSize(11); + font11.setKerning(true); + label_jd_no_2->setFont(font11); + label_jd_no_2->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter); + label_reslut_2 = new QLabel(groupBox_b); + label_reslut_2->setObjectName(QString::fromUtf8("label_reslut_2")); + label_reslut_2->setGeometry(QRect(450, 20, 81, 31)); + label_reslut_2->setFont(font3); + label_reslut_2->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 255, 0);")); + label_reslut_2->setAlignment(Qt::AlignCenter); + label_24 = new QLabel(groupBox_b); + label_24->setObjectName(QString::fromUtf8("label_24")); + label_24->setGeometry(QRect(300, 30, 71, 21)); + label_24->setFont(font2); + label_25 = new QLabel(groupBox_b); + label_25->setObjectName(QString::fromUtf8("label_25")); + label_25->setGeometry(QRect(160, 30, 71, 21)); + label_25->setFont(font2); + label_timecost_2 = new QLabel(groupBox_b); + label_timecost_2->setObjectName(QString::fromUtf8("label_timecost_2")); + label_timecost_2->setGeometry(QRect(370, 30, 50, 20)); + label_timecost_2->setFont(font2); + label_timecost_2->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); + label_33->raise(); + label_cap_speed_2->raise(); + label_jd_no_2->raise(); + label_24->raise(); + label_25->raise(); + label_timecost_2->raise(); + label_reslut_2->raise(); groupBox_a = new QGroupBox(centralWidget); groupBox_a->setObjectName(QString::fromUtf8("groupBox_a")); - groupBox_a->setGeometry(QRect(10, 640, 471, 101)); - QFont font9; - font9.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); - font9.setPointSize(12); - groupBox_a->setFont(font9); + groupBox_a->setGeometry(QRect(190, 675, 540, 61)); + groupBox_a->setFont(font10); groupBox_a->setStyleSheet(QString::fromUtf8("color:white")); label_19 = new QLabel(groupBox_a); label_19->setObjectName(QString::fromUtf8("label_19")); label_19->setGeometry(QRect(10, 30, 71, 21)); - label_19->setFont(font3); + label_19->setFont(font2); label_cap_speed_1 = new QLabel(groupBox_a); label_cap_speed_1->setObjectName(QString::fromUtf8("label_cap_speed_1")); - label_cap_speed_1->setGeometry(QRect(75, 30, 65, 21)); - label_cap_speed_1->setFont(font3); + label_cap_speed_1->setGeometry(QRect(80, 30, 71, 21)); + label_cap_speed_1->setFont(font2); label_cap_speed_1->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); label_jd_no_1 = new QLabel(groupBox_a); label_jd_no_1->setObjectName(QString::fromUtf8("label_jd_no_1")); - label_jd_no_1->setGeometry(QRect(80, 70, 60, 21)); - label_jd_no_1->setFont(font3); - label_jd_no_1->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); + label_jd_no_1->setGeometry(QRect(230, 30, 60, 21)); + label_jd_no_1->setFont(font2); + label_jd_no_1->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter); label_20 = new QLabel(groupBox_a); label_20->setObjectName(QString::fromUtf8("label_20")); - label_20->setGeometry(QRect(10, 70, 71, 21)); - label_20->setFont(font3); + label_20->setGeometry(QRect(160, 30, 71, 21)); + label_20->setFont(font2); label_21 = new QLabel(groupBox_a); label_21->setObjectName(QString::fromUtf8("label_21")); - label_21->setGeometry(QRect(230, 30, 71, 21)); - label_21->setFont(font3); + label_21->setGeometry(QRect(300, 30, 71, 21)); + label_21->setFont(font2); label_timecost_1 = new QLabel(groupBox_a); label_timecost_1->setObjectName(QString::fromUtf8("label_timecost_1")); - label_timecost_1->setGeometry(QRect(300, 30, 50, 20)); - label_timecost_1->setFont(font3); + label_timecost_1->setGeometry(QRect(370, 30, 50, 20)); + label_timecost_1->setFont(font2); label_timecost_1->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); label_reslut_1 = new QLabel(groupBox_a); label_reslut_1->setObjectName(QString::fromUtf8("label_reslut_1")); - label_reslut_1->setGeometry(QRect(230, 60, 111, 31)); - label_reslut_1->setFont(font4); + label_reslut_1->setGeometry(QRect(450, 20, 81, 31)); + label_reslut_1->setFont(font3); label_reslut_1->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 255, 0);")); label_reslut_1->setAlignment(Qt::AlignCenter); + toolButton_4 = new QToolButton(centralWidget); + toolButton_4->setObjectName(QString::fromUtf8("toolButton_4")); + toolButton_4->setGeometry(QRect(10, 0, 70, 61)); + toolButton_4->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/logo.png);\n" +"")); + label_ng_2 = new db_label(centralWidget); + label_ng_2->setObjectName(QString::fromUtf8("label_ng_2")); + label_ng_2->setGeometry(QRect(1030, 625, 81, 31)); + label_ng_2->setFont(font); + label_ng_2->setStyleSheet(QString::fromUtf8("color:white")); + lcdNumber_ok_1 = new QLCDNumber(centralWidget); + lcdNumber_ok_1->setObjectName(QString::fromUtf8("lcdNumber_ok_1")); + lcdNumber_ok_1->setGeometry(QRect(580, 575, 131, 41)); + lcdNumber_ok_1->setStyleSheet(QString::fromUtf8("color:white")); + lcdNumber_ok_1->setDigitCount(10); + label_title = new QLabel(centralWidget); + label_title->setObjectName(QString::fromUtf8("label_title")); + label_title->setGeometry(QRect(430, 5, 441, 61)); + QFont font12; + font12.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); + font12.setPointSize(24); + label_title->setFont(font12); + label_title->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + label_title->setAlignment(Qt::AlignCenter); + lcdNumber_ng_1 = new QLCDNumber(centralWidget); + lcdNumber_ng_1->setObjectName(QString::fromUtf8("lcdNumber_ng_1")); + lcdNumber_ng_1->setGeometry(QRect(580, 625, 131, 41)); + lcdNumber_ng_1->setStyleSheet(QString::fromUtf8("color:white")); + lcdNumber_ng_1->setDigitCount(10); + label_cur_time = new QLabel(centralWidget); + label_cur_time->setObjectName(QString::fromUtf8("label_cur_time")); + label_cur_time->setGeometry(QRect(960, 35, 221, 31)); + label_cur_time->setFont(font6); + label_cur_time->setStyleSheet(QString::fromUtf8("color:white")); + label_cur_time->setAlignment(Qt::AlignCenter); + image_label_11 = new db_label(centralWidget); + image_label_11->setObjectName(QString::fromUtf8("image_label_11")); + image_label_11->setGeometry(QRect(190, 85, 531, 481)); + image_label_11->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 0, 0);")); + rotate_9 = new QToolButton(centralWidget); + rotate_9->setObjectName(QString::fromUtf8("rotate_9")); + rotate_9->setGeometry(QRect(690, 95, 20, 20)); + rotate_9->setFocusPolicy(Qt::ClickFocus); + rotate_9->setAutoFillBackground(false); + rotate_9->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/rotate.png)")); + QIcon icon2; + icon2.addFile(QString::fromUtf8("../../../\350\265\204\346\226\231/\347\203\237\345\216\202/0-\350\275\257\344\273\266\344\273\243\347\240\201/221209-\344\270\212\346\265\267FX2\346\235\241\347\233\222\344\270\244\347\233\270\346\234\272 -GPU-\345\273\266\345\220\216\344\270\200\344\270\252/Cigarette/Resources/rotate.png"), QSize(), QIcon::Normal, QIcon::Off); + rotate_9->setIcon(icon2); + rotate_9->setIconSize(QSize(40, 40)); + label_10 = new QLabel(centralWidget); + label_10->setObjectName(QString::fromUtf8("label_10")); + label_10->setGeometry(QRect(1030, 575, 81, 31)); + label_10->setFont(font); + label_10->setStyleSheet(QString::fromUtf8("color:white")); + lcdNumber_total_2 = new QLCDNumber(centralWidget); + lcdNumber_total_2->setObjectName(QString::fromUtf8("lcdNumber_total_2")); + lcdNumber_total_2->setGeometry(QRect(870, 570, 131, 41)); + lcdNumber_total_2->setStyleSheet(QString::fromUtf8("color:white")); + lcdNumber_total_2->setDigitCount(10); + lcdNumber_total_1 = new QLCDNumber(centralWidget); + lcdNumber_total_1->setObjectName(QString::fromUtf8("lcdNumber_total_1")); + lcdNumber_total_1->setGeometry(QRect(320, 575, 131, 41)); + lcdNumber_total_1->setStyleSheet(QString::fromUtf8("color:white")); + lcdNumber_total_1->setDigitCount(10); + label_17 = new QLabel(centralWidget); + label_17->setObjectName(QString::fromUtf8("label_17")); + label_17->setGeometry(QRect(990, 15, 191, 21)); + label_17->setFont(font6); + label_17->setStyleSheet(QString::fromUtf8("color:white")); label_6 = new QLabel(centralWidget); label_6->setObjectName(QString::fromUtf8("label_6")); - label_6->setGeometry(QRect(830, 90, 71, 31)); - label_6->setFont(font1); + label_6->setGeometry(QRect(750, 575, 91, 31)); + label_6->setFont(font); label_6->setStyleSheet(QString::fromUtf8("color:white")); + lcdNumber_ng_2 = new QLCDNumber(centralWidget); + lcdNumber_ng_2->setObjectName(QString::fromUtf8("lcdNumber_ng_2")); + lcdNumber_ng_2->setGeometry(QRect(1130, 625, 131, 41)); + lcdNumber_ng_2->setStyleSheet(QString::fromUtf8("color:white")); + lcdNumber_ng_2->setDigitCount(10); + label_18 = new QLabel(centralWidget); + label_18->setObjectName(QString::fromUtf8("label_18")); + label_18->setGeometry(QRect(1180, 15, 81, 21)); + label_18->setFont(font6); + label_18->setStyleSheet(QString::fromUtf8("color:white")); + label_11 = new QLabel(centralWidget); + label_11->setObjectName(QString::fromUtf8("label_11")); + label_11->setGeometry(QRect(750, 625, 91, 31)); + label_11->setFont(font); + label_11->setStyleSheet(QString::fromUtf8("color:white")); + lcdNumber_ok_2 = new QLCDNumber(centralWidget); + lcdNumber_ok_2->setObjectName(QString::fromUtf8("lcdNumber_ok_2")); + lcdNumber_ok_2->setGeometry(QRect(1130, 575, 131, 41)); + lcdNumber_ok_2->setStyleSheet(QString::fromUtf8("color:white")); + lcdNumber_ok_2->setDigitCount(10); + label = new QLabel(centralWidget); + label->setObjectName(QString::fromUtf8("label")); + label->setGeometry(QRect(200, 580, 91, 31)); + label->setFont(font); + label->setStyleSheet(QString::fromUtf8("color:white")); + label_title_7 = new QLabel(centralWidget); + label_title_7->setObjectName(QString::fromUtf8("label_title_7")); + label_title_7->setGeometry(QRect(80, 45, 341, 16)); + label_title_7->setFont(font1); + label_title_7->setStyleSheet(QString::fromUtf8("color:white")); + label_title_7->setAlignment(Qt::AlignCenter); groupBox_status = new QGroupBox(centralWidget); groupBox_status->setObjectName(QString::fromUtf8("groupBox_status")); - groupBox_status->setGeometry(QRect(0, 750, 1281, 53)); - QFont font10; - font10.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); - font10.setPointSize(12); - font10.setBold(true); - font10.setWeight(75); - groupBox_status->setFont(font10); + groupBox_status->setGeometry(QRect(10, 740, 1264, 53)); + QFont font13; + font13.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); + font13.setPointSize(12); + font13.setBold(true); + font13.setWeight(75); + groupBox_status->setFont(font13); label_alarm = new db_label(groupBox_status); label_alarm->setObjectName(QString::fromUtf8("label_alarm")); - label_alarm->setGeometry(QRect(940, 10, 81, 31)); - label_alarm->setFont(font10); + label_alarm->setGeometry(QRect(919, 10, 71, 31)); + label_alarm->setFont(font13); label_alarm->setStyleSheet(QString::fromUtf8("color:white")); label_alarm->setAlignment(Qt::AlignCenter); label_5 = new QLabel(groupBox_status); label_5->setObjectName(QString::fromUtf8("label_5")); - label_5->setGeometry(QRect(380, 10, 41, 31)); - label_5->setFont(font10); + label_5->setGeometry(QRect(410, 10, 41, 31)); + label_5->setFont(font13); label_5->setStyleSheet(QString::fromUtf8("color:white")); label_plc = new QLabel(groupBox_status); label_plc->setObjectName(QString::fromUtf8("label_plc")); - label_plc->setGeometry(QRect(770, 10, 81, 31)); - label_plc->setFont(font10); + label_plc->setGeometry(QRect(740, 10, 81, 31)); + label_plc->setFont(font13); label_plc->setStyleSheet(QString::fromUtf8("color:white")); label_plc->setAlignment(Qt::AlignCenter); lcdNumber_total_no = new QLCDNumber(groupBox_status); lcdNumber_total_no->setObjectName(QString::fromUtf8("lcdNumber_total_no")); - lcdNumber_total_no->setGeometry(QRect(430, 5, 161, 41)); + lcdNumber_total_no->setGeometry(QRect(450, 5, 171, 41)); lcdNumber_total_no->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_total_no->setDigitCount(8); toolButton_alarm = new QToolButton(groupBox_status); @@ -1036,457 +1285,225 @@ public: toolButton_plc->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/plc.png);")); pushButton_clear = new QPushButton(groupBox_status); pushButton_clear->setObjectName(QString::fromUtf8("pushButton_clear")); - pushButton_clear->setGeometry(QRect(610, 5, 51, 41)); - pushButton_clear->setFont(font9); + pushButton_clear->setGeometry(QRect(630, 5, 51, 41)); + pushButton_clear->setFont(font4); pushButton_clear->setStyleSheet(QString::fromUtf8("color:white")); + label_run_stat = new QLabel(groupBox_status); + label_run_stat->setObjectName(QString::fromUtf8("label_run_stat")); + label_run_stat->setGeometry(QRect(1000, 16, 250, 20)); + label_run_stat->setFont(font13); + label_run_stat->setStyleSheet(QString::fromUtf8("color:white")); + label_run_stat->setAlignment(Qt::AlignCenter); label_12 = new QLabel(groupBox_status); label_12->setObjectName(QString::fromUtf8("label_12")); - label_12->setGeometry(QRect(10, 10, 81, 31)); - label_12->setFont(font10); + label_12->setGeometry(QRect(10, 10, 101, 31)); + label_12->setFont(font13); label_12->setStyleSheet(QString::fromUtf8("color:white")); label_12->setAlignment(Qt::AlignCenter); label_role = new QLabel(groupBox_status); label_role->setObjectName(QString::fromUtf8("label_role")); - label_role->setGeometry(QRect(100, 10, 71, 31)); - label_role->setFont(font); + label_role->setGeometry(QRect(110, 10, 71, 31)); + label_role->setFont(font6); label_role->setStyleSheet(QString::fromUtf8("color:white")); label_8 = new QLabel(groupBox_status); label_8->setObjectName(QString::fromUtf8("label_8")); - label_8->setGeometry(QRect(160, 10, 41, 31)); - label_8->setFont(font10); + label_8->setGeometry(QRect(190, 10, 41, 31)); + label_8->setFont(font13); label_8->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_total_no_last = new QLCDNumber(groupBox_status); lcdNumber_total_no_last->setObjectName(QString::fromUtf8("lcdNumber_total_no_last")); - lcdNumber_total_no_last->setGeometry(QRect(210, 5, 161, 41)); + lcdNumber_total_no_last->setGeometry(QRect(230, 5, 171, 41)); lcdNumber_total_no_last->setStyleSheet(QString::fromUtf8("color:white")); lcdNumber_total_no_last->setDigitCount(8); - label_run_stat = new QLabel(groupBox_status); - label_run_stat->setObjectName(QString::fromUtf8("label_run_stat")); - label_run_stat->setGeometry(QRect(1050, 10, 221, 31)); - label_run_stat->setFont(font3); - label_run_stat->setStyleSheet(QString::fromUtf8("color:white")); - label_run_stat->setAlignment(Qt::AlignCenter); - lcdNumber_ng_1 = new QLCDNumber(centralWidget); - lcdNumber_ng_1->setObjectName(QString::fromUtf8("lcdNumber_ng_1")); - lcdNumber_ng_1->setGeometry(QRect(690, 150, 111, 31)); - lcdNumber_ng_1->setStyleSheet(QString::fromUtf8("color:white")); - lcdNumber_ng_1->setDigitCount(10); - label = new QLabel(centralWidget); - label->setObjectName(QString::fromUtf8("label")); - label->setGeometry(QRect(600, 90, 71, 31)); - label->setFont(font1); - label->setStyleSheet(QString::fromUtf8("color:white")); - lcdNumber_total_2 = new QLCDNumber(centralWidget); - lcdNumber_total_2->setObjectName(QString::fromUtf8("lcdNumber_total_2")); - lcdNumber_total_2->setGeometry(QRect(920, 90, 111, 31)); - lcdNumber_total_2->setStyleSheet(QString::fromUtf8("color:white")); - lcdNumber_total_2->setDigitCount(10); - lcdNumber_ng_2 = new QLCDNumber(centralWidget); - lcdNumber_ng_2->setObjectName(QString::fromUtf8("lcdNumber_ng_2")); - lcdNumber_ng_2->setGeometry(QRect(920, 150, 111, 31)); - lcdNumber_ng_2->setStyleSheet(QString::fromUtf8("color:white")); - lcdNumber_ng_2->setDigitCount(10); - label_10 = new QLabel(centralWidget); - label_10->setObjectName(QString::fromUtf8("label_10")); - label_10->setGeometry(QRect(830, 120, 71, 31)); - label_10->setFont(font1); - label_10->setStyleSheet(QString::fromUtf8("color:white")); - label_ng_1 = new db_label(centralWidget); - label_ng_1->setObjectName(QString::fromUtf8("label_ng_1")); - label_ng_1->setGeometry(QRect(600, 150, 71, 31)); - label_ng_1->setFont(font1); - label_ng_1->setStyleSheet(QString::fromUtf8("color:white")); - image_label_21 = new db_label(centralWidget); - image_label_21->setObjectName(QString::fromUtf8("image_label_21")); - image_label_21->setGeometry(QRect(490, 240, 301, 401)); - image_label_21->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 0, 0);")); - groupBox_op = new QGroupBox(centralWidget); - groupBox_op->setObjectName(QString::fromUtf8("groupBox_op")); - groupBox_op->setGeometry(QRect(10, 60, 311, 111)); - QFont font11; - font11.setFamily(QString::fromUtf8("\345\256\213\344\275\223")); - font11.setPointSize(14); - font11.setBold(false); - font11.setWeight(50); - groupBox_op->setFont(font11); - groupBox_op->setStyleSheet(QString::fromUtf8("color:white")); - btn_start = new QToolButton(groupBox_op); - btn_start->setObjectName(QString::fromUtf8("btn_start")); - btn_start->setGeometry(QRect(20, 20, 53, 70)); - btn_start->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/start.png);")); - btn_start->setAutoRaise(false); - btn_pause = new QToolButton(groupBox_op); - btn_pause->setObjectName(QString::fromUtf8("btn_pause")); - btn_pause->setGeometry(QRect(90, 20, 53, 70)); - btn_pause->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/pause.png);\n" -"")); - btn_pause->setAutoRaise(false); - btn_lock = new QToolButton(groupBox_op); - btn_lock->setObjectName(QString::fromUtf8("btn_lock")); - btn_lock->setGeometry(QRect(170, 20, 53, 70)); - btn_lock->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/unlock.png);")); - btn_lock->setAutoRaise(false); - btn_setup = new QToolButton(groupBox_op); - btn_setup->setObjectName(QString::fromUtf8("btn_setup")); - btn_setup->setGeometry(QRect(250, 20, 53, 70)); - btn_setup->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/setup.png);\n" -"")); - btn_setup->setAutoRaise(false); - lcdNumber_ok_3 = new QLCDNumber(centralWidget); - lcdNumber_ok_3->setObjectName(QString::fromUtf8("lcdNumber_ok_3")); - lcdNumber_ok_3->setGeometry(QRect(1150, 120, 111, 31)); - lcdNumber_ok_3->setStyleSheet(QString::fromUtf8("color:white")); - lcdNumber_ok_3->setDigitCount(10); - lcdNumber_kick_3 = new QLCDNumber(centralWidget); - lcdNumber_kick_3->setObjectName(QString::fromUtf8("lcdNumber_kick_3")); - lcdNumber_kick_3->setGeometry(QRect(1150, 180, 111, 31)); - lcdNumber_kick_3->setStyleSheet(QString::fromUtf8("color:white")); - lcdNumber_kick_3->setDigitCount(10); - label_ng_3 = new db_label(centralWidget); - label_ng_3->setObjectName(QString::fromUtf8("label_ng_3")); - label_ng_3->setGeometry(QRect(1060, 150, 71, 31)); - label_ng_3->setFont(font1); - label_ng_3->setStyleSheet(QString::fromUtf8("color:white")); + pushButton_reset = new QPushButton(groupBox_status); + pushButton_reset->setObjectName(QString::fromUtf8("pushButton_reset")); + pushButton_reset->setGeometry(QRect(825, 5, 51, 41)); + pushButton_reset->setFont(font4); + pushButton_reset->setStyleSheet(QString::fromUtf8("color:white")); label_2 = new QLabel(centralWidget); label_2->setObjectName(QString::fromUtf8("label_2")); - label_2->setGeometry(QRect(600, 120, 71, 31)); - label_2->setFont(font1); + label_2->setGeometry(QRect(480, 575, 81, 31)); + label_2->setFont(font); label_2->setStyleSheet(QString::fromUtf8("color:white")); - lcdNumber_kick_1 = new QLCDNumber(centralWidget); - lcdNumber_kick_1->setObjectName(QString::fromUtf8("lcdNumber_kick_1")); - lcdNumber_kick_1->setGeometry(QRect(690, 180, 111, 31)); - lcdNumber_kick_1->setStyleSheet(QString::fromUtf8("color:white")); - lcdNumber_kick_1->setDigitCount(10); - label_ng_2 = new db_label(centralWidget); - label_ng_2->setObjectName(QString::fromUtf8("label_ng_2")); - label_ng_2->setGeometry(QRect(830, 150, 71, 31)); - label_ng_2->setFont(font1); - label_ng_2->setStyleSheet(QString::fromUtf8("color:white")); - lcdNumber_ok_1 = new QLCDNumber(centralWidget); - lcdNumber_ok_1->setObjectName(QString::fromUtf8("lcdNumber_ok_1")); - lcdNumber_ok_1->setGeometry(QRect(690, 120, 111, 31)); - lcdNumber_ok_1->setStyleSheet(QString::fromUtf8("color:white")); - lcdNumber_ok_1->setDigitCount(10); - groupBox_b = new QGroupBox(centralWidget); - groupBox_b->setObjectName(QString::fromUtf8("groupBox_b")); - groupBox_b->setGeometry(QRect(490, 640, 301, 101)); - groupBox_b->setFont(font9); - groupBox_b->setStyleSheet(QString::fromUtf8("color:white")); - label_33 = new QLabel(groupBox_b); - label_33->setObjectName(QString::fromUtf8("label_33")); - label_33->setGeometry(QRect(10, 30, 71, 21)); - label_33->setFont(font3); - label_cap_speed_2 = new QLabel(groupBox_b); - label_cap_speed_2->setObjectName(QString::fromUtf8("label_cap_speed_2")); - label_cap_speed_2->setGeometry(QRect(75, 30, 65, 21)); - label_cap_speed_2->setFont(font3); - label_cap_speed_2->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); - label_jd_no_2 = new QLabel(groupBox_b); - label_jd_no_2->setObjectName(QString::fromUtf8("label_jd_no_2")); - label_jd_no_2->setGeometry(QRect(80, 70, 60, 21)); - label_jd_no_2->setFont(font3); - label_jd_no_2->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); - label_reslut_2 = new QLabel(groupBox_b); - label_reslut_2->setObjectName(QString::fromUtf8("label_reslut_2")); - label_reslut_2->setGeometry(QRect(170, 60, 111, 31)); - label_reslut_2->setFont(font4); - label_reslut_2->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 255, 0);")); - label_reslut_2->setAlignment(Qt::AlignCenter); - label_24 = new QLabel(groupBox_b); - label_24->setObjectName(QString::fromUtf8("label_24")); - label_24->setGeometry(QRect(160, 30, 71, 21)); - label_24->setFont(font3); - label_25 = new QLabel(groupBox_b); - label_25->setObjectName(QString::fromUtf8("label_25")); - label_25->setGeometry(QRect(10, 70, 71, 21)); - label_25->setFont(font3); - label_timecost_2 = new QLabel(groupBox_b); - label_timecost_2->setObjectName(QString::fromUtf8("label_timecost_2")); - label_timecost_2->setGeometry(QRect(230, 30, 50, 20)); - label_timecost_2->setFont(font3); - label_timecost_2->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); - label_33->raise(); - label_cap_speed_2->raise(); - label_jd_no_2->raise(); - label_24->raise(); - label_25->raise(); - label_timecost_2->raise(); - label_reslut_2->raise(); - groupBox_11 = new QGroupBox(centralWidget); - groupBox_11->setObjectName(QString::fromUtf8("groupBox_11")); - groupBox_11->setGeometry(QRect(800, 640, 471, 101)); - groupBox_11->setFont(font9); - groupBox_11->setStyleSheet(QString::fromUtf8("color:white")); - label_26 = new QLabel(groupBox_11); - label_26->setObjectName(QString::fromUtf8("label_26")); - label_26->setGeometry(QRect(10, 30, 71, 21)); - label_26->setFont(font3); - label_cap_speed_3 = new QLabel(groupBox_11); - label_cap_speed_3->setObjectName(QString::fromUtf8("label_cap_speed_3")); - label_cap_speed_3->setGeometry(QRect(75, 30, 65, 21)); - label_cap_speed_3->setFont(font3); - label_cap_speed_3->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); - label_jd_no_3 = new QLabel(groupBox_11); - label_jd_no_3->setObjectName(QString::fromUtf8("label_jd_no_3")); - label_jd_no_3->setGeometry(QRect(80, 70, 60, 21)); - label_jd_no_3->setFont(font3); - label_jd_no_3->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); - label_23 = new QLabel(groupBox_11); - label_23->setObjectName(QString::fromUtf8("label_23")); - label_23->setGeometry(QRect(10, 70, 71, 21)); - label_23->setFont(font3); - label_22 = new QLabel(groupBox_11); - label_22->setObjectName(QString::fromUtf8("label_22")); - label_22->setGeometry(QRect(230, 30, 71, 21)); - label_22->setFont(font3); - label_timecost_3 = new QLabel(groupBox_11); - label_timecost_3->setObjectName(QString::fromUtf8("label_timecost_3")); - label_timecost_3->setGeometry(QRect(300, 30, 50, 20)); - label_timecost_3->setFont(font3); - label_timecost_3->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); - label_reslut_3 = new QLabel(groupBox_11); - label_reslut_3->setObjectName(QString::fromUtf8("label_reslut_3")); - label_reslut_3->setGeometry(QRect(230, 60, 111, 31)); - label_reslut_3->setFont(font4); - label_reslut_3->setStyleSheet(QString::fromUtf8("background-color: rgb(0, 255, 0);")); - label_reslut_3->setAlignment(Qt::AlignCenter); + label_title_6 = new QLabel(centralWidget); + label_title_6->setObjectName(QString::fromUtf8("label_title_6")); + label_title_6->setGeometry(QRect(80, 2, 271, 31)); + QFont font14; + font14.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); + font14.setPointSize(13); + label_title_6->setFont(font14); + label_title_6->setStyleSheet(QString::fromUtf8("color:white")); + label_title_6->setAlignment(Qt::AlignCenter); groupBox_dev = new QGroupBox(centralWidget); groupBox_dev->setObjectName(QString::fromUtf8("groupBox_dev")); - groupBox_dev->setGeometry(QRect(330, 60, 241, 171)); - groupBox_dev->setFont(font11); + groupBox_dev->setGeometry(QRect(10, 365, 171, 371)); + groupBox_dev->setFont(font7); groupBox_dev->setStyleSheet(QString::fromUtf8("color:white")); - cam_status_1 = new QLabel(groupBox_dev); - cam_status_1->setObjectName(QString::fromUtf8("cam_status_1")); - cam_status_1->setGeometry(QRect(20, 70, 45, 30)); - QFont font12; - font12.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); - font12.setPointSize(16); - font12.setBold(false); - font12.setWeight(50); - cam_status_1->setFont(font12); - cam_status_1->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); - cam_status_1->setAlignment(Qt::AlignCenter); - toolButton_cam_1 = new QToolButton(groupBox_dev); - toolButton_cam_1->setObjectName(QString::fromUtf8("toolButton_cam_1")); - toolButton_cam_1->setGeometry(QRect(20, 20, 51, 50)); - toolButton_cam_1->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/cam1_no.png);")); - toolButton_cam_2 = new QToolButton(groupBox_dev); - toolButton_cam_2->setObjectName(QString::fromUtf8("toolButton_cam_2")); - toolButton_cam_2->setGeometry(QRect(100, 20, 50, 50)); - toolButton_cam_2->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/cam2_no.png);")); - cam_status_2 = new QLabel(groupBox_dev); - cam_status_2->setObjectName(QString::fromUtf8("cam_status_2")); - cam_status_2->setGeometry(QRect(100, 70, 45, 30)); - cam_status_2->setFont(font12); - cam_status_2->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); - cam_status_2->setAlignment(Qt::AlignCenter); - cam_work_2 = new QLabel(groupBox_dev); - cam_work_2->setObjectName(QString::fromUtf8("cam_work_2")); - cam_work_2->setGeometry(QRect(100, 110, 45, 30)); - cam_work_2->setFont(font12); - cam_work_2->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); - cam_work_2->setAlignment(Qt::AlignCenter); - cam_work_1 = new QLabel(groupBox_dev); - cam_work_1->setObjectName(QString::fromUtf8("cam_work_1")); - cam_work_1->setGeometry(QRect(20, 110, 45, 30)); - cam_work_1->setFont(font12); - cam_work_1->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); - cam_work_1->setAlignment(Qt::AlignCenter); - checkBox_debug = new QCheckBox(groupBox_dev); - checkBox_debug->setObjectName(QString::fromUtf8("checkBox_debug")); - checkBox_debug->setGeometry(QRect(10, 140, 91, 21)); - QFont font13; - font13.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); - font13.setPointSize(10); - font13.setBold(false); - font13.setWeight(50); - checkBox_debug->setFont(font13); - checkBox_debug->setStyleSheet(QString::fromUtf8("color:white")); - checkBox_unkick = new QCheckBox(groupBox_dev); - checkBox_unkick->setObjectName(QString::fromUtf8("checkBox_unkick")); - checkBox_unkick->setGeometry(QRect(140, 140, 71, 21)); - checkBox_unkick->setFont(font13); - checkBox_unkick->setStyleSheet(QString::fromUtf8("color:white")); - cam_work_3 = new QLabel(groupBox_dev); - cam_work_3->setObjectName(QString::fromUtf8("cam_work_3")); - cam_work_3->setGeometry(QRect(180, 110, 45, 30)); - cam_work_3->setFont(font12); - cam_work_3->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); - cam_work_3->setAlignment(Qt::AlignCenter); - cam_status_9 = new QLabel(groupBox_dev); - cam_status_9->setObjectName(QString::fromUtf8("cam_status_9")); - cam_status_9->setGeometry(QRect(90, 675, 71, 31)); - QFont font14; - font14.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); - font14.setPointSize(18); - font14.setBold(true); - font14.setWeight(75); - cam_status_9->setFont(font14); - cam_status_9->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); - cam_status_9->setAlignment(Qt::AlignCenter); - toolButton_cam_3 = new QToolButton(groupBox_dev); - toolButton_cam_3->setObjectName(QString::fromUtf8("toolButton_cam_3")); - toolButton_cam_3->setGeometry(QRect(180, 20, 50, 50)); - toolButton_cam_3->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/cam3_no.png);")); - cam_work_9 = new QLabel(groupBox_dev); - cam_work_9->setObjectName(QString::fromUtf8("cam_work_9")); - cam_work_9->setGeometry(QRect(90, 710, 71, 31)); - cam_work_9->setFont(font14); - cam_work_9->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); - cam_work_9->setAlignment(Qt::AlignCenter); - toolButton_cam_9 = new QToolButton(groupBox_dev); - toolButton_cam_9->setObjectName(QString::fromUtf8("toolButton_cam_9")); - toolButton_cam_9->setGeometry(QRect(90, 585, 72, 72)); - toolButton_cam_9->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/cam4_no.png);")); - cam_status_3 = new QLabel(groupBox_dev); - cam_status_3->setObjectName(QString::fromUtf8("cam_status_3")); - cam_status_3->setGeometry(QRect(180, 70, 45, 30)); - cam_status_3->setFont(font12); - cam_status_3->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); - cam_status_3->setAlignment(Qt::AlignCenter); - label_7 = new QLabel(centralWidget); - label_7->setObjectName(QString::fromUtf8("label_7")); - label_7->setGeometry(QRect(1060, 90, 71, 31)); - label_7->setFont(font1); - label_7->setStyleSheet(QString::fromUtf8("color:white")); - pushButton_Clear_Pic = new QPushButton(centralWidget); - pushButton_Clear_Pic->setObjectName(QString::fromUtf8("pushButton_Clear_Pic")); - pushButton_Clear_Pic->setGeometry(QRect(10, 1070, 67, 51)); - QPalette palette; - QBrush brush(QColor(255, 255, 255, 255)); - brush.setStyle(Qt::SolidPattern); - palette.setBrush(QPalette::Active, QPalette::WindowText, brush); - QBrush brush1(QColor(55, 55, 55, 255)); - brush1.setStyle(Qt::SolidPattern); - palette.setBrush(QPalette::Active, QPalette::Button, brush1); - palette.setBrush(QPalette::Active, QPalette::Text, brush); - palette.setBrush(QPalette::Active, QPalette::ButtonText, brush); - palette.setBrush(QPalette::Active, QPalette::Base, brush1); - palette.setBrush(QPalette::Active, QPalette::Window, brush1); - QBrush brush2(QColor(255, 255, 255, 128)); - brush2.setStyle(Qt::SolidPattern); -#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) - palette.setBrush(QPalette::Active, QPalette::PlaceholderText, brush2); -#endif - palette.setBrush(QPalette::Inactive, QPalette::WindowText, brush); - palette.setBrush(QPalette::Inactive, QPalette::Button, brush1); - palette.setBrush(QPalette::Inactive, QPalette::Text, brush); - palette.setBrush(QPalette::Inactive, QPalette::ButtonText, brush); - palette.setBrush(QPalette::Inactive, QPalette::Base, brush1); - palette.setBrush(QPalette::Inactive, QPalette::Window, brush1); -#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) - palette.setBrush(QPalette::Inactive, QPalette::PlaceholderText, brush2); -#endif - QBrush brush3(QColor(120, 120, 120, 255)); - brush3.setStyle(Qt::SolidPattern); - palette.setBrush(QPalette::Disabled, QPalette::WindowText, brush3); - palette.setBrush(QPalette::Disabled, QPalette::Button, brush1); - palette.setBrush(QPalette::Disabled, QPalette::Text, brush3); - palette.setBrush(QPalette::Disabled, QPalette::ButtonText, brush3); - palette.setBrush(QPalette::Disabled, QPalette::Base, brush1); - palette.setBrush(QPalette::Disabled, QPalette::Window, brush1); - QBrush brush4(QColor(0, 0, 0, 128)); - brush4.setStyle(Qt::SolidPattern); -#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) - palette.setBrush(QPalette::Disabled, QPalette::PlaceholderText, brush4); -#endif - pushButton_Clear_Pic->setPalette(palette); - pushButton_Clear_Pic->setFont(font2); - rotate_9 = new QToolButton(centralWidget); - rotate_9->setObjectName(QString::fromUtf8("rotate_9")); - rotate_9->setGeometry(QRect(460, 240, 20, 20)); - rotate_9->setFocusPolicy(Qt::ClickFocus); - rotate_9->setAutoFillBackground(false); - rotate_9->setStyleSheet(QString::fromUtf8("border-image:url(:/Cigarette/Resources/rotate.png)")); - QIcon icon1; - icon1.addFile(QString::fromUtf8("../../../\347\203\237\345\216\202\350\275\257\344\273\266\344\273\243\347\240\201/230720-\351\203\221\345\267\236\345\206\267\350\203\266ZB416\346\235\241\347\233\222-3\347\233\270\346\234\272-1280x800/Cigarette/Resources/rotate.png"), QSize(), QIcon::Normal, QIcon::Off); - rotate_9->setIcon(icon1); - rotate_9->setIconSize(QSize(40, 40)); - rotate_10 = new QToolButton(centralWidget); - rotate_10->setObjectName(QString::fromUtf8("rotate_10")); - rotate_10->setGeometry(QRect(770, 240, 20, 20)); - rotate_10->setStyleSheet(QString::fromUtf8("border-image:url(:/Cigarette/Resources/rotate.png)")); - rotate_10->setIcon(icon1); - rotate_10->setIconSize(QSize(40, 40)); - lcdNumber_total_1 = new QLCDNumber(centralWidget); - lcdNumber_total_1->setObjectName(QString::fromUtf8("lcdNumber_total_1")); - lcdNumber_total_1->setGeometry(QRect(690, 90, 111, 31)); - lcdNumber_total_1->setStyleSheet(QString::fromUtf8("color:white")); - lcdNumber_total_1->setDigitCount(10); - label_3 = new QLabel(centralWidget); - label_3->setObjectName(QString::fromUtf8("label_3")); - label_3->setGeometry(QRect(1060, 120, 71, 31)); - label_3->setFont(font1); - label_3->setStyleSheet(QString::fromUtf8("color:white")); - rotate_11 = new QToolButton(centralWidget); - rotate_11->setObjectName(QString::fromUtf8("rotate_11")); - rotate_11->setGeometry(QRect(1250, 240, 20, 20)); - rotate_11->setFocusPolicy(Qt::ClickFocus); - rotate_11->setAutoFillBackground(false); - rotate_11->setStyleSheet(QString::fromUtf8("border-image:url(:/Cigarette/Resources/rotate.png)")); - rotate_11->setIcon(icon1); - rotate_11->setIconSize(QSize(40, 40)); - label_11 = new QLabel(centralWidget); - label_11->setObjectName(QString::fromUtf8("label_11")); - label_11->setGeometry(QRect(830, 180, 71, 31)); - label_11->setFont(font1); - label_11->setStyleSheet(QString::fromUtf8("color:white")); - label_9 = new QLabel(centralWidget); - label_9->setObjectName(QString::fromUtf8("label_9")); - label_9->setGeometry(QRect(1060, 180, 71, 31)); - label_9->setFont(font1); - label_9->setStyleSheet(QString::fromUtf8("color:white")); - lcdNumber_ng_3 = new QLCDNumber(centralWidget); - lcdNumber_ng_3->setObjectName(QString::fromUtf8("lcdNumber_ng_3")); - lcdNumber_ng_3->setGeometry(QRect(1150, 150, 111, 31)); - lcdNumber_ng_3->setStyleSheet(QString::fromUtf8("color:white")); - lcdNumber_ng_3->setDigitCount(10); - pushButton_wintab = new QPushButton(centralWidget); - pushButton_wintab->setObjectName(QString::fromUtf8("pushButton_wintab")); - pushButton_wintab->setGeometry(QRect(20, 2300, 131, 51)); - pushButton_wintab->setFont(font9); - pushButton_wintab->setStyleSheet(QString::fromUtf8("color:white")); - pushButton_reset = new QPushButton(centralWidget); - pushButton_reset->setObjectName(QString::fromUtf8("pushButton_reset")); - pushButton_reset->setGeometry(QRect(20, 180, 141, 51)); - QPalette palette1; - palette1.setBrush(QPalette::Active, QPalette::WindowText, brush); - palette1.setBrush(QPalette::Active, QPalette::Button, brush1); - palette1.setBrush(QPalette::Active, QPalette::Text, brush); - palette1.setBrush(QPalette::Active, QPalette::ButtonText, brush); - palette1.setBrush(QPalette::Active, QPalette::Base, brush1); - palette1.setBrush(QPalette::Active, QPalette::Window, brush1); -#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) - palette1.setBrush(QPalette::Active, QPalette::PlaceholderText, brush2); -#endif - palette1.setBrush(QPalette::Inactive, QPalette::WindowText, brush); - palette1.setBrush(QPalette::Inactive, QPalette::Button, brush1); - palette1.setBrush(QPalette::Inactive, QPalette::Text, brush); - palette1.setBrush(QPalette::Inactive, QPalette::ButtonText, brush); - palette1.setBrush(QPalette::Inactive, QPalette::Base, brush1); - palette1.setBrush(QPalette::Inactive, QPalette::Window, brush1); -#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) - palette1.setBrush(QPalette::Inactive, QPalette::PlaceholderText, brush2); -#endif - palette1.setBrush(QPalette::Disabled, QPalette::WindowText, brush3); - palette1.setBrush(QPalette::Disabled, QPalette::Button, brush1); - palette1.setBrush(QPalette::Disabled, QPalette::Text, brush3); - palette1.setBrush(QPalette::Disabled, QPalette::ButtonText, brush3); - palette1.setBrush(QPalette::Disabled, QPalette::Base, brush1); - palette1.setBrush(QPalette::Disabled, QPalette::Window, brush1); -#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) - palette1.setBrush(QPalette::Disabled, QPalette::PlaceholderText, brush4); -#endif - pushButton_reset->setPalette(palette1); - pushButton_reset->setFont(font8); + toolButton_cam_1 = new QToolButton(groupBox_dev); + toolButton_cam_1->setObjectName(QString::fromUtf8("toolButton_cam_1")); + toolButton_cam_1->setGeometry(QRect(10, 30, 71, 71)); + toolButton_cam_1->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/cam1_no.png);")); + toolButton_cam_2 = new QToolButton(groupBox_dev); + toolButton_cam_2->setObjectName(QString::fromUtf8("toolButton_cam_2")); + toolButton_cam_2->setGeometry(QRect(95, 30, 71, 71)); + toolButton_cam_2->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/cam2_no.png);")); + cam_status_2 = new QLabel(groupBox_dev); + cam_status_2->setObjectName(QString::fromUtf8("cam_status_2")); + cam_status_2->setGeometry(QRect(95, 120, 71, 31)); + QFont font15; + font15.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); + font15.setPointSize(18); + font15.setBold(true); + font15.setWeight(75); + cam_status_2->setFont(font15); + cam_status_2->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + cam_status_2->setAlignment(Qt::AlignCenter); + cam_work_2 = new QLabel(groupBox_dev); + cam_work_2->setObjectName(QString::fromUtf8("cam_work_2")); + cam_work_2->setGeometry(QRect(95, 155, 71, 31)); + cam_work_2->setFont(font15); + cam_work_2->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + cam_work_2->setAlignment(Qt::AlignCenter); + cam_work_1 = new QLabel(groupBox_dev); + cam_work_1->setObjectName(QString::fromUtf8("cam_work_1")); + cam_work_1->setGeometry(QRect(10, 155, 71, 31)); + cam_work_1->setFont(font15); + cam_work_1->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + cam_work_1->setAlignment(Qt::AlignCenter); + checkBox_debug = new QCheckBox(groupBox_dev); + checkBox_debug->setObjectName(QString::fromUtf8("checkBox_debug")); + checkBox_debug->setGeometry(QRect(10, 320, 91, 21)); + checkBox_debug->setFont(font13); + checkBox_debug->setStyleSheet(QString::fromUtf8("color:white")); + checkBox_unkick = new QCheckBox(groupBox_dev); + checkBox_unkick->setObjectName(QString::fromUtf8("checkBox_unkick")); + checkBox_unkick->setGeometry(QRect(10, 340, 81, 21)); + checkBox_unkick->setFont(font13); + checkBox_unkick->setStyleSheet(QString::fromUtf8("color:white")); + cam_work_9 = new QLabel(groupBox_dev); + cam_work_9->setObjectName(QString::fromUtf8("cam_work_9")); + cam_work_9->setGeometry(QRect(10, 1560, 61, 16)); + cam_work_9->setFont(font); + cam_work_9->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + cam_work_9->setAlignment(Qt::AlignCenter); + toolButton_cam_9 = new QToolButton(groupBox_dev); + toolButton_cam_9->setObjectName(QString::fromUtf8("toolButton_cam_9")); + toolButton_cam_9->setGeometry(QRect(20, 1490, 41, 41)); + toolButton_cam_9->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/cam4_no.png);")); + toolButton_cam_10 = new QToolButton(groupBox_dev); + toolButton_cam_10->setObjectName(QString::fromUtf8("toolButton_cam_10")); + toolButton_cam_10->setGeometry(QRect(100, 1310, 41, 41)); + toolButton_cam_10->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/cam6_no.png);")); + toolButton_cam_11 = new QToolButton(groupBox_dev); + toolButton_cam_11->setObjectName(QString::fromUtf8("toolButton_cam_11")); + toolButton_cam_11->setGeometry(QRect(100, 1490, 41, 41)); + toolButton_cam_11->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/cam8_no.png);")); + cam_status_9 = new QLabel(groupBox_dev); + cam_status_9->setObjectName(QString::fromUtf8("cam_status_9")); + cam_status_9->setGeometry(QRect(90, 1540, 61, 16)); + cam_status_9->setFont(font); + cam_status_9->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + cam_status_9->setAlignment(Qt::AlignCenter); + cam_work_10 = new QLabel(groupBox_dev); + cam_work_10->setObjectName(QString::fromUtf8("cam_work_10")); + cam_work_10->setGeometry(QRect(90, 1560, 61, 16)); + cam_work_10->setFont(font); + cam_work_10->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + cam_work_10->setAlignment(Qt::AlignCenter); + toolButton_cam_12 = new QToolButton(groupBox_dev); + toolButton_cam_12->setObjectName(QString::fromUtf8("toolButton_cam_12")); + toolButton_cam_12->setGeometry(QRect(20, 1400, 41, 41)); + toolButton_cam_12->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/cam3_no.png);")); + toolButton_cam_13 = new QToolButton(groupBox_dev); + toolButton_cam_13->setObjectName(QString::fromUtf8("toolButton_cam_13")); + toolButton_cam_13->setGeometry(QRect(100, 1220, 41, 41)); + toolButton_cam_13->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/cam5_no.png);")); + toolButton_cam_14 = new QToolButton(groupBox_dev); + toolButton_cam_14->setObjectName(QString::fromUtf8("toolButton_cam_14")); + toolButton_cam_14->setGeometry(QRect(100, 1400, 41, 41)); + toolButton_cam_14->setStyleSheet(QString::fromUtf8("border-image: url(:/Cigarette/Resources/cam7_no.png);")); + cam_status_10 = new QLabel(groupBox_dev); + cam_status_10->setObjectName(QString::fromUtf8("cam_status_10")); + cam_status_10->setGeometry(QRect(90, 1270, 61, 16)); + cam_status_10->setFont(font); + cam_status_10->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + cam_status_10->setAlignment(Qt::AlignCenter); + cam_status_11 = new QLabel(groupBox_dev); + cam_status_11->setObjectName(QString::fromUtf8("cam_status_11")); + cam_status_11->setGeometry(QRect(10, 1450, 61, 16)); + cam_status_11->setFont(font); + cam_status_11->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + cam_status_11->setAlignment(Qt::AlignCenter); + cam_status_12 = new QLabel(groupBox_dev); + cam_status_12->setObjectName(QString::fromUtf8("cam_status_12")); + cam_status_12->setGeometry(QRect(90, 1450, 61, 16)); + cam_status_12->setFont(font); + cam_status_12->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + cam_status_12->setAlignment(Qt::AlignCenter); + cam_status_13 = new QLabel(groupBox_dev); + cam_status_13->setObjectName(QString::fromUtf8("cam_status_13")); + cam_status_13->setGeometry(QRect(90, 1360, 61, 16)); + cam_status_13->setFont(font); + cam_status_13->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + cam_status_13->setAlignment(Qt::AlignCenter); + cam_status_14 = new QLabel(groupBox_dev); + cam_status_14->setObjectName(QString::fromUtf8("cam_status_14")); + cam_status_14->setGeometry(QRect(10, 1540, 61, 16)); + cam_status_14->setFont(font); + cam_status_14->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + cam_status_14->setAlignment(Qt::AlignCenter); + cam_work_11 = new QLabel(groupBox_dev); + cam_work_11->setObjectName(QString::fromUtf8("cam_work_11")); + cam_work_11->setGeometry(QRect(10, 1470, 61, 16)); + cam_work_11->setFont(font); + cam_work_11->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + cam_work_11->setAlignment(Qt::AlignCenter); + cam_work_12 = new QLabel(groupBox_dev); + cam_work_12->setObjectName(QString::fromUtf8("cam_work_12")); + cam_work_12->setGeometry(QRect(90, 1290, 61, 16)); + cam_work_12->setFont(font); + cam_work_12->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + cam_work_12->setAlignment(Qt::AlignCenter); + cam_work_13 = new QLabel(groupBox_dev); + cam_work_13->setObjectName(QString::fromUtf8("cam_work_13")); + cam_work_13->setGeometry(QRect(90, 1380, 61, 16)); + cam_work_13->setFont(font); + cam_work_13->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + cam_work_13->setAlignment(Qt::AlignCenter); + cam_work_14 = new QLabel(groupBox_dev); + cam_work_14->setObjectName(QString::fromUtf8("cam_work_14")); + cam_work_14->setGeometry(QRect(90, 1470, 61, 16)); + cam_work_14->setFont(font); + cam_work_14->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + cam_work_14->setAlignment(Qt::AlignCenter); + cam_status_1 = new QLabel(groupBox_dev); + cam_status_1->setObjectName(QString::fromUtf8("cam_status_1")); + cam_status_1->setGeometry(QRect(10, 120, 71, 31)); + cam_status_1->setFont(font15); + cam_status_1->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + cam_status_1->setAlignment(Qt::AlignCenter); + label_title_2 = new QLabel(groupBox_dev); + label_title_2->setObjectName(QString::fromUtf8("label_title_2")); + label_title_2->setGeometry(QRect(10, 200, 151, 111)); + QFont font16; + font16.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); + font16.setPointSize(30); + label_title_2->setFont(font16); + label_title_2->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 0);")); + label_title_2->setAlignment(Qt::AlignCenter); + lcdNumber_kick_1 = new QLCDNumber(centralWidget); + lcdNumber_kick_1->setObjectName(QString::fromUtf8("lcdNumber_kick_1")); + lcdNumber_kick_1->setGeometry(QRect(320, 625, 131, 41)); + lcdNumber_kick_1->setStyleSheet(QString::fromUtf8("color:white")); + lcdNumber_kick_1->setDigitCount(10); + lcdNumber_kick_2 = new QLCDNumber(centralWidget); + lcdNumber_kick_2->setObjectName(QString::fromUtf8("lcdNumber_kick_2")); + lcdNumber_kick_2->setGeometry(QRect(870, 625, 131, 41)); + lcdNumber_kick_2->setStyleSheet(QString::fromUtf8("color:white")); + lcdNumber_kick_2->setDigitCount(10); CigaretteClass->setCentralWidget(centralWidget); - rotate_11->raise(); - rotate_10->raise(); rotate_9->raise(); rotate_1->raise(); - label_17->raise(); - label_18->raise(); - label_cur_time->raise(); rotate_2->raise(); lcdNumber_ok_4->raise(); lcdNumber_ng_4->raise(); @@ -1499,7 +1516,6 @@ public: image_label_41->raise(); lcdNumber_kick_4->raise(); label_ng_4->raise(); - image_label_31->raise(); rotate_3->raise(); lcdNumber_total_6->raise(); lcdNumber_ng_5->raise(); @@ -1546,70 +1562,73 @@ public: rotate_7->raise(); image_label_71->raise(); image_label_22->raise(); - image_label_32->raise(); image_label_42->raise(); image_label_52->raise(); image_label_62->raise(); image_label_72->raise(); image_label_82->raise(); - image_label_12->raise(); - location->raise(); - label_title->raise(); - label_title_6->raise(); - toolButton_4->raise(); - label_title_7->raise(); + toolButton_cam_7->raise(); cam_status_7->raise(); - cam_work_4->raise(); - cam_work_7->raise(); + toolButton_cam_4->raise(); + cam_status_5->raise(); + cam_work_5->raise(); toolButton_cam_6->raise(); + cam_status_4->raise(); + cam_status_8->raise(); + cam_status_6->raise(); cam_work_6->raise(); + cam_work_4->raise(); toolButton_cam_5->raise(); + cam_work_7->raise(); toolButton_cam_8->raise(); - cam_status_4->raise(); - cam_status_6->raise(); - cam_work_5->raise(); - toolButton_cam_7->raise(); - cam_status_5->raise(); - cam_status_8->raise(); cam_work_8->raise(); - toolButton_cam_4->raise(); - image_label_11->raise(); - groupBox_a_2->raise(); - label_4->raise(); - label_title_2->raise(); + lcdNumber_kick_3->raise(); + groupBox_11->raise(); + lcdNumber_ok_3->raise(); + label_7->raise(); + label_9->raise(); + label_ng_3->raise(); + rotate_11->raise(); + label_3->raise(); lcdNumber_total_3->raise(); - lcdNumber_ok_2->raise(); - lcdNumber_kick_2->raise(); - groupBox_a->raise(); - label_6->raise(); - groupBox_status->raise(); - lcdNumber_ng_1->raise(); - label->raise(); - lcdNumber_total_2->raise(); - lcdNumber_ng_2->raise(); - label_10->raise(); - label_ng_1->raise(); + image_label_31->raise(); + lcdNumber_ng_3->raise(); + image_label_32->raise(); + image_label_12->raise(); + cam_status_3->raise(); + cam_work_3->raise(); + toolButton_cam_3->raise(); + location->raise(); image_label_21->raise(); + label_ng_1->raise(); groupBox_op->raise(); - lcdNumber_ok_3->raise(); - lcdNumber_kick_3->raise(); - label_ng_3->raise(); - label_2->raise(); - lcdNumber_kick_1->raise(); + label_4->raise(); + groupBox_b->raise(); + groupBox_a->raise(); + toolButton_4->raise(); label_ng_2->raise(); lcdNumber_ok_1->raise(); - groupBox_b->raise(); - groupBox_11->raise(); - groupBox_dev->raise(); - label_7->raise(); - pushButton_Clear_Pic->raise(); + label_title->raise(); + lcdNumber_ng_1->raise(); + label_cur_time->raise(); + image_label_11->raise(); + label_10->raise(); + lcdNumber_total_2->raise(); lcdNumber_total_1->raise(); - label_3->raise(); + label_17->raise(); + label_6->raise(); + lcdNumber_ng_2->raise(); + label_18->raise(); label_11->raise(); - label_9->raise(); - lcdNumber_ng_3->raise(); - pushButton_wintab->raise(); - pushButton_reset->raise(); + lcdNumber_ok_2->raise(); + label->raise(); + label_title_7->raise(); + groupBox_status->raise(); + label_2->raise(); + label_title_6->raise(); + groupBox_dev->raise(); + lcdNumber_kick_1->raise(); + lcdNumber_kick_2->raise(); retranslateUi(CigaretteClass); @@ -1620,10 +1639,6 @@ public: { CigaretteClass->setWindowTitle(QCoreApplication::translate("CigaretteClass", "Cigarette", nullptr)); rotate_1->setText(QCoreApplication::translate("CigaretteClass", "...", nullptr)); - label_17->setText(QCoreApplication::translate("CigaretteClass", "Tel:87907256(0532)", nullptr)); - label_18->setText(QCoreApplication::translate("CigaretteClass", "\351\235\222\345\262\233\347\273\264\345\205\213", nullptr)); - label_cur_time->setText(QCoreApplication::translate("CigaretteClass", "2020-10-10 13:15:39", nullptr)); - image_label_12->setText(QString()); image_label_22->setText(QString()); rotate_2->setText(QCoreApplication::translate("CigaretteClass", "...", nullptr)); image_label_42->setText(QString()); @@ -1642,8 +1657,6 @@ public: image_label_41->setText(QString()); label_ng_4->setText(QCoreApplication::translate("CigaretteClass", "4#NG\346\254\241\346\225\260", nullptr)); rotate_3->setText(QCoreApplication::translate("CigaretteClass", "...", nullptr)); - image_label_31->setText(QString()); - image_label_32->setText(QString()); image_label_61->setText(QString()); label_kick_6->setText(QCoreApplication::translate("CigaretteClass", "6#\345\211\224\351\231\244\346\254\241\346\225\260", nullptr)); label_check_5->setText(QCoreApplication::translate("CigaretteClass", "5#\346\243\200\346\265\213\344\270\252\346\225\260", nullptr)); @@ -1704,30 +1717,58 @@ public: rotate_8->setText(QCoreApplication::translate("CigaretteClass", "...", nullptr)); rotate_7->setText(QCoreApplication::translate("CigaretteClass", "...", nullptr)); image_label_71->setText(QString()); - location->setText(QCoreApplication::translate("CigaretteClass", "CDTH", nullptr)); - label_title->setText(QCoreApplication::translate("CigaretteClass", "\346\235\241\347\233\222\350\203\266\347\202\271\346\243\200\346\265\213\347\263\273\347\273\237", nullptr)); - label_title_6->setText(QCoreApplication::translate("CigaretteClass", "\344\270\212\346\265\267\347\203\237\350\215\211\346\234\272\346\242\260\346\234\211\351\231\220\350\264\243\344\273\273\345\205\254\345\217\270", nullptr)); - toolButton_4->setText(QString()); - label_title_7->setText(QCoreApplication::translate("CigaretteClass", "SHANGHAI TOBACCO MACHINERY CO.,LTD", nullptr)); + toolButton_cam_7->setText(QString()); cam_status_7->setText(QCoreApplication::translate("CigaretteClass", "\350\201\224\346\234\272", nullptr)); - cam_work_4->setText(QCoreApplication::translate("CigaretteClass", "\345\267\245\344\275\234", nullptr)); - cam_work_7->setText(QCoreApplication::translate("CigaretteClass", "\345\267\245\344\275\234", nullptr)); + toolButton_cam_4->setText(QString()); + cam_status_5->setText(QCoreApplication::translate("CigaretteClass", "\350\201\224\346\234\272", nullptr)); + cam_work_5->setText(QCoreApplication::translate("CigaretteClass", "\345\267\245\344\275\234", nullptr)); toolButton_cam_6->setText(QString()); + cam_status_4->setText(QCoreApplication::translate("CigaretteClass", "\350\201\224\346\234\272", nullptr)); + cam_status_8->setText(QCoreApplication::translate("CigaretteClass", "\350\201\224\346\234\272", nullptr)); + cam_status_6->setText(QCoreApplication::translate("CigaretteClass", "\350\201\224\346\234\272", nullptr)); cam_work_6->setText(QCoreApplication::translate("CigaretteClass", "\345\267\245\344\275\234", nullptr)); + cam_work_4->setText(QCoreApplication::translate("CigaretteClass", "\345\267\245\344\275\234", nullptr)); toolButton_cam_5->setText(QString()); + cam_work_7->setText(QCoreApplication::translate("CigaretteClass", "\345\267\245\344\275\234", nullptr)); toolButton_cam_8->setText(QString()); - cam_status_4->setText(QCoreApplication::translate("CigaretteClass", "\350\201\224\346\234\272", nullptr)); - cam_status_6->setText(QCoreApplication::translate("CigaretteClass", "\350\201\224\346\234\272", nullptr)); - cam_work_5->setText(QCoreApplication::translate("CigaretteClass", "\345\267\245\344\275\234", nullptr)); - toolButton_cam_7->setText(QString()); - cam_status_5->setText(QCoreApplication::translate("CigaretteClass", "\350\201\224\346\234\272", nullptr)); - cam_status_8->setText(QCoreApplication::translate("CigaretteClass", "\350\201\224\346\234\272", nullptr)); cam_work_8->setText(QCoreApplication::translate("CigaretteClass", "\345\267\245\344\275\234", nullptr)); - toolButton_cam_4->setText(QString()); - image_label_11->setText(QString()); - groupBox_a_2->setTitle(QCoreApplication::translate("CigaretteClass", "\347\212\266\346\200\201\345\214\272", nullptr)); - label_4->setText(QCoreApplication::translate("CigaretteClass", "1#\345\211\224\351\231\244\346\225\260", nullptr)); - label_title_2->setText(QCoreApplication::translate("CigaretteClass", "\346\234\252\350\277\220\350\241\214", nullptr)); + groupBox_11->setTitle(QCoreApplication::translate("CigaretteClass", "3#\347\233\270\346\234\272\345\210\206\346\236\220\347\273\223\346\236\234", nullptr)); + label_26->setText(QCoreApplication::translate("CigaretteClass", "\351\207\207\351\233\206\351\200\237\345\272\246\357\274\232", nullptr)); + label_cap_speed_3->setText(QString()); + label_jd_no_3->setText(QString()); + label_23->setText(QCoreApplication::translate("CigaretteClass", "\350\203\266\347\202\271\344\270\252\346\225\260\357\274\232", nullptr)); + label_22->setText(QCoreApplication::translate("CigaretteClass", "\350\257\206\345\210\253\346\227\266\351\227\264\357\274\232", nullptr)); + label_timecost_3->setText(QString()); + label_reslut_3->setText(QCoreApplication::translate("CigaretteClass", "OK", nullptr)); + label_7->setText(QCoreApplication::translate("CigaretteClass", "3#\346\200\273\344\270\252\346\225\260", nullptr)); + label_9->setText(QCoreApplication::translate("CigaretteClass", "3#\345\211\224\351\231\244\346\225\260", nullptr)); + label_ng_3->setText(QCoreApplication::translate("CigaretteClass", "3#NG\346\225\260", nullptr)); + rotate_11->setText(QCoreApplication::translate("CigaretteClass", "...", nullptr)); + label_3->setText(QCoreApplication::translate("CigaretteClass", "3#OK\346\225\260", nullptr)); + image_label_31->setText(QString()); + image_label_32->setText(QString()); + image_label_12->setText(QString()); + cam_status_3->setText(QCoreApplication::translate("CigaretteClass", "\350\201\224\346\234\272", nullptr)); + cam_work_3->setText(QCoreApplication::translate("CigaretteClass", "\345\267\245\344\275\234", nullptr)); + toolButton_cam_3->setText(QString()); + location->setText(QCoreApplication::translate("CigaretteClass", "CDTH", nullptr)); + image_label_21->setText(QString()); + label_ng_1->setText(QCoreApplication::translate("CigaretteClass", "1#NG\346\254\241\346\225\260", nullptr)); + groupBox_op->setTitle(QCoreApplication::translate("CigaretteClass", "\346\223\215\344\275\234\345\214\272", nullptr)); + btn_start->setText(QString()); + btn_pause->setText(QString()); + btn_lock->setText(QString()); + btn_setup->setText(QString()); + pushButton_wintab->setText(QCoreApplication::translate("CigaretteClass", "\345\210\207\346\215\242\347\252\227\345\217\243", nullptr)); + label_4->setText(QCoreApplication::translate("CigaretteClass", "1#\345\211\224\351\231\244\346\254\241\346\225\260", nullptr)); + groupBox_b->setTitle(QCoreApplication::translate("CigaretteClass", "2#\347\233\270\346\234\272\345\210\206\346\236\220\347\273\223\346\236\234", nullptr)); + label_33->setText(QCoreApplication::translate("CigaretteClass", "\351\207\207\351\233\206\351\200\237\345\272\246\357\274\232", nullptr)); + label_cap_speed_2->setText(QString()); + label_jd_no_2->setText(QString()); + label_reslut_2->setText(QCoreApplication::translate("CigaretteClass", "OK", nullptr)); + label_24->setText(QCoreApplication::translate("CigaretteClass", "\350\257\206\345\210\253\346\227\266\351\227\264\357\274\232", nullptr)); + label_25->setText(QCoreApplication::translate("CigaretteClass", "\350\203\266\347\202\271\344\270\252\346\225\260\357\274\232", nullptr)); + label_timecost_2->setText(QString()); groupBox_a->setTitle(QCoreApplication::translate("CigaretteClass", "1#\347\233\270\346\234\272\345\210\206\346\236\220\347\273\223\346\236\234", nullptr)); label_19->setText(QCoreApplication::translate("CigaretteClass", "\351\207\207\351\233\206\351\200\237\345\272\246\357\274\232", nullptr)); label_cap_speed_1->setText(QString()); @@ -1736,7 +1777,19 @@ public: label_21->setText(QCoreApplication::translate("CigaretteClass", "\350\257\206\345\210\253\346\227\266\351\227\264\357\274\232", nullptr)); label_timecost_1->setText(QString()); label_reslut_1->setText(QCoreApplication::translate("CigaretteClass", "OK", nullptr)); - label_6->setText(QCoreApplication::translate("CigaretteClass", "2#\346\200\273\344\270\252\346\225\260", nullptr)); + toolButton_4->setText(QString()); + label_ng_2->setText(QCoreApplication::translate("CigaretteClass", "2#NG\346\254\241\346\225\260", nullptr)); + label_title->setText(QCoreApplication::translate("CigaretteClass", "\345\260\217\347\233\222\345\260\201\347\255\276\347\272\270\347\272\270\350\203\266\347\202\271\346\243\200\346\265\213\347\263\273\347\273\237", nullptr)); + label_cur_time->setText(QCoreApplication::translate("CigaretteClass", "2020-10-10 13:15:39", nullptr)); + image_label_11->setText(QString()); + rotate_9->setText(QCoreApplication::translate("CigaretteClass", "...", nullptr)); + label_10->setText(QCoreApplication::translate("CigaretteClass", "2#OK\346\254\241\346\225\260", nullptr)); + label_17->setText(QCoreApplication::translate("CigaretteClass", "Tel:87907256(0532)", nullptr)); + label_6->setText(QCoreApplication::translate("CigaretteClass", "2#\346\243\200\346\265\213\344\270\252\346\225\260", nullptr)); + label_18->setText(QCoreApplication::translate("CigaretteClass", "\351\235\222\345\262\233\347\273\264\345\205\213", nullptr)); + label_11->setText(QCoreApplication::translate("CigaretteClass", "2#\345\211\224\351\231\244\346\254\241\346\225\260", nullptr)); + label->setText(QCoreApplication::translate("CigaretteClass", "1#\346\243\200\346\265\213\344\270\252\346\225\260", nullptr)); + label_title_7->setText(QCoreApplication::translate("CigaretteClass", "SHANGHAI TOBACCO MACHINERY CO.,LTD", nullptr)); groupBox_status->setTitle(QString()); label_alarm->setText(QCoreApplication::translate("CigaretteClass", "\346\227\240\346\212\245\350\255\246", nullptr)); label_5->setText(QCoreApplication::translate("CigaretteClass", "\345\275\223\347\217\255", nullptr)); @@ -1744,40 +1797,14 @@ public: toolButton_alarm->setText(QString()); toolButton_plc->setText(QString()); pushButton_clear->setText(QCoreApplication::translate("CigaretteClass", "\346\215\242\347\217\255", nullptr)); + label_run_stat->setText(QCoreApplication::translate("CigaretteClass", "\350\277\220\350\241\2141\345\271\26410\346\234\21025\345\244\2519\346\227\26615\345\210\206", nullptr)); label_12->setText(QCoreApplication::translate("CigaretteClass", "\347\231\273\351\231\206\347\224\250\346\210\267\357\274\232", nullptr)); label_role->setText(QCoreApplication::translate("CigaretteClass", "\346\223\215\344\275\234\345\221\230", nullptr)); label_8->setText(QCoreApplication::translate("CigaretteClass", "\344\270\212\347\217\255", nullptr)); - label_run_stat->setText(QCoreApplication::translate("CigaretteClass", "\350\277\220\350\241\2141\345\271\26410\346\234\21025\345\244\2519\346\227\26615\345\210\206", nullptr)); - label->setText(QCoreApplication::translate("CigaretteClass", "1#\346\200\273\344\270\252\346\225\260", nullptr)); - label_10->setText(QCoreApplication::translate("CigaretteClass", "2#OK\346\225\260", nullptr)); - label_ng_1->setText(QCoreApplication::translate("CigaretteClass", "1#NG\346\225\260", nullptr)); - image_label_21->setText(QString()); - groupBox_op->setTitle(QCoreApplication::translate("CigaretteClass", "\346\223\215\344\275\234\345\214\272", nullptr)); - btn_start->setText(QString()); - btn_pause->setText(QString()); - btn_lock->setText(QString()); - btn_setup->setText(QString()); - label_ng_3->setText(QCoreApplication::translate("CigaretteClass", "3#NG\346\225\260", nullptr)); - label_2->setText(QCoreApplication::translate("CigaretteClass", "1#OK\346\225\260", nullptr)); - label_ng_2->setText(QCoreApplication::translate("CigaretteClass", "2#NG\346\225\260", nullptr)); - groupBox_b->setTitle(QCoreApplication::translate("CigaretteClass", "2#\347\233\270\346\234\272\345\210\206\346\236\220\347\273\223\346\236\234", nullptr)); - label_33->setText(QCoreApplication::translate("CigaretteClass", "\351\207\207\351\233\206\351\200\237\345\272\246\357\274\232", nullptr)); - label_cap_speed_2->setText(QString()); - label_jd_no_2->setText(QString()); - label_reslut_2->setText(QCoreApplication::translate("CigaretteClass", "OK", nullptr)); - label_24->setText(QCoreApplication::translate("CigaretteClass", "\350\257\206\345\210\253\346\227\266\351\227\264\357\274\232", nullptr)); - label_25->setText(QCoreApplication::translate("CigaretteClass", "\350\203\266\347\202\271\344\270\252\346\225\260\357\274\232", nullptr)); - label_timecost_2->setText(QString()); - groupBox_11->setTitle(QCoreApplication::translate("CigaretteClass", "3#\347\233\270\346\234\272\345\210\206\346\236\220\347\273\223\346\236\234", nullptr)); - label_26->setText(QCoreApplication::translate("CigaretteClass", "\351\207\207\351\233\206\351\200\237\345\272\246\357\274\232", nullptr)); - label_cap_speed_3->setText(QString()); - label_jd_no_3->setText(QString()); - label_23->setText(QCoreApplication::translate("CigaretteClass", "\350\203\266\347\202\271\344\270\252\346\225\260\357\274\232", nullptr)); - label_22->setText(QCoreApplication::translate("CigaretteClass", "\350\257\206\345\210\253\346\227\266\351\227\264\357\274\232", nullptr)); - label_timecost_3->setText(QString()); - label_reslut_3->setText(QCoreApplication::translate("CigaretteClass", "OK", nullptr)); + pushButton_reset->setText(QCoreApplication::translate("CigaretteClass", "\345\244\215\344\275\215", nullptr)); + label_2->setText(QCoreApplication::translate("CigaretteClass", "1#OK\346\254\241\346\225\260", nullptr)); + label_title_6->setText(QCoreApplication::translate("CigaretteClass", "\344\270\212\346\265\267\347\203\237\350\215\211\346\234\272\346\242\260\346\234\211\351\231\220\350\264\243\344\273\273\345\205\254\345\217\270", nullptr)); groupBox_dev->setTitle(QCoreApplication::translate("CigaretteClass", "\350\256\276\345\244\207\345\214\272", nullptr)); - cam_status_1->setText(QCoreApplication::translate("CigaretteClass", "\350\201\224\346\234\272", nullptr)); toolButton_cam_1->setText(QString()); toolButton_cam_2->setText(QString()); cam_status_2->setText(QCoreApplication::translate("CigaretteClass", "\350\201\224\346\234\272", nullptr)); @@ -1785,22 +1812,26 @@ public: cam_work_1->setText(QCoreApplication::translate("CigaretteClass", "\345\267\245\344\275\234", nullptr)); checkBox_debug->setText(QCoreApplication::translate("CigaretteClass", "\350\260\203\350\257\225\346\250\241\345\274\217", nullptr)); checkBox_unkick->setText(QCoreApplication::translate("CigaretteClass", "\344\270\215\345\211\224\351\231\244", nullptr)); - cam_work_3->setText(QCoreApplication::translate("CigaretteClass", "\345\267\245\344\275\234", nullptr)); - cam_status_9->setText(QCoreApplication::translate("CigaretteClass", "\350\201\224\346\234\272", nullptr)); - toolButton_cam_3->setText(QString()); cam_work_9->setText(QCoreApplication::translate("CigaretteClass", "\345\267\245\344\275\234", nullptr)); toolButton_cam_9->setText(QString()); - cam_status_3->setText(QCoreApplication::translate("CigaretteClass", "\350\201\224\346\234\272", nullptr)); - label_7->setText(QCoreApplication::translate("CigaretteClass", "3#\346\200\273\344\270\252\346\225\260", nullptr)); - pushButton_Clear_Pic->setText(QCoreApplication::translate("CigaretteClass", "\346\270\205\347\220\206\345\233\276\347\211\207", nullptr)); - rotate_9->setText(QCoreApplication::translate("CigaretteClass", "...", nullptr)); - rotate_10->setText(QCoreApplication::translate("CigaretteClass", "...", nullptr)); - label_3->setText(QCoreApplication::translate("CigaretteClass", "3#OK\346\225\260", nullptr)); - rotate_11->setText(QCoreApplication::translate("CigaretteClass", "...", nullptr)); - label_11->setText(QCoreApplication::translate("CigaretteClass", "2#\345\211\224\351\231\244\346\225\260", nullptr)); - label_9->setText(QCoreApplication::translate("CigaretteClass", "3#\345\211\224\351\231\244\346\225\260", nullptr)); - pushButton_wintab->setText(QCoreApplication::translate("CigaretteClass", "\345\210\207\346\215\242\347\252\227\345\217\243", nullptr)); - pushButton_reset->setText(QCoreApplication::translate("CigaretteClass", "\345\244\215\344\275\215", nullptr)); + toolButton_cam_10->setText(QString()); + toolButton_cam_11->setText(QString()); + cam_status_9->setText(QCoreApplication::translate("CigaretteClass", "\350\201\224\346\234\272", nullptr)); + cam_work_10->setText(QCoreApplication::translate("CigaretteClass", "\345\267\245\344\275\234", nullptr)); + toolButton_cam_12->setText(QString()); + toolButton_cam_13->setText(QString()); + toolButton_cam_14->setText(QString()); + cam_status_10->setText(QCoreApplication::translate("CigaretteClass", "\350\201\224\346\234\272", nullptr)); + cam_status_11->setText(QCoreApplication::translate("CigaretteClass", "\350\201\224\346\234\272", nullptr)); + cam_status_12->setText(QCoreApplication::translate("CigaretteClass", "\350\201\224\346\234\272", nullptr)); + cam_status_13->setText(QCoreApplication::translate("CigaretteClass", "\350\201\224\346\234\272", nullptr)); + cam_status_14->setText(QCoreApplication::translate("CigaretteClass", "\350\201\224\346\234\272", nullptr)); + cam_work_11->setText(QCoreApplication::translate("CigaretteClass", "\345\267\245\344\275\234", nullptr)); + cam_work_12->setText(QCoreApplication::translate("CigaretteClass", "\345\267\245\344\275\234", nullptr)); + cam_work_13->setText(QCoreApplication::translate("CigaretteClass", "\345\267\245\344\275\234", nullptr)); + cam_work_14->setText(QCoreApplication::translate("CigaretteClass", "\345\267\245\344\275\234", nullptr)); + cam_status_1->setText(QCoreApplication::translate("CigaretteClass", "\350\201\224\346\234\272", nullptr)); + label_title_2->setText(QCoreApplication::translate("CigaretteClass", "\350\277\220\350\241\214\344\270\255", nullptr)); } // retranslateUi }; diff --git a/1280x800 TH/Cigarette/GeneratedFiles/ui_dialogin.h b/1280x800-XH/Cigarette/GeneratedFiles/ui_dialogin.h similarity index 100% rename from 1280x800 TH/Cigarette/GeneratedFiles/ui_dialogin.h rename to 1280x800-XH/Cigarette/GeneratedFiles/ui_dialogin.h diff --git a/1280x800 TH/Cigarette/GeneratedFiles/ui_dialogsetup.h b/1280x800-XH/Cigarette/GeneratedFiles/ui_dialogsetup.h similarity index 90% rename from 1280x800 TH/Cigarette/GeneratedFiles/ui_dialogsetup.h rename to 1280x800-XH/Cigarette/GeneratedFiles/ui_dialogsetup.h index f5402d57..e90c5404 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/ui_dialogsetup.h +++ b/1280x800-XH/Cigarette/GeneratedFiles/ui_dialogsetup.h @@ -28,6 +28,7 @@ QT_BEGIN_NAMESPACE class Ui_DialogSetup { public: + QWidget *widget; QScrollArea *scrollArea; QWidget *scrollAreaWidgetContents; QGroupBox *groupBox_startSets; @@ -135,7 +136,7 @@ public: { if (DialogSetup->objectName().isEmpty()) DialogSetup->setObjectName(QString::fromUtf8("DialogSetup")); - DialogSetup->resize(661, 818); + DialogSetup->resize(663, 750); QFont font; font.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); font.setPointSize(14); @@ -143,10 +144,13 @@ public: font.setWeight(75); DialogSetup->setFont(font); DialogSetup->setStyleSheet(QString::fromUtf8("background-color: rgb(240, 240, 240);")); - scrollArea = new QScrollArea(DialogSetup); + widget = new QWidget(DialogSetup); + widget->setObjectName(QString::fromUtf8("widget")); + widget->setGeometry(QRect(0, 0, 851, 1121)); + scrollArea = new QScrollArea(widget); scrollArea->setObjectName(QString::fromUtf8("scrollArea")); - scrollArea->setGeometry(QRect(0, 0, 731, 1091)); - QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); + scrollArea->setGeometry(QRect(0, 0, 781, 1011)); + QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); sizePolicy.setHorizontalStretch(0); sizePolicy.setVerticalStretch(0); sizePolicy.setHeightForWidth(scrollArea->sizePolicy().hasHeightForWidth()); @@ -155,13 +159,10 @@ public: scrollArea->setWidgetResizable(true); scrollAreaWidgetContents = new QWidget(); scrollAreaWidgetContents->setObjectName(QString::fromUtf8("scrollAreaWidgetContents")); - scrollAreaWidgetContents->setGeometry(QRect(0, 0, 729, 1089)); - QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Expanding); - sizePolicy1.setHorizontalStretch(0); - sizePolicy1.setVerticalStretch(0); - sizePolicy1.setHeightForWidth(scrollAreaWidgetContents->sizePolicy().hasHeightForWidth()); - scrollAreaWidgetContents->setSizePolicy(sizePolicy1); - scrollAreaWidgetContents->setMinimumSize(QSize(670, 900)); + scrollAreaWidgetContents->setGeometry(QRect(0, 0, 779, 1009)); + sizePolicy.setHeightForWidth(scrollAreaWidgetContents->sizePolicy().hasHeightForWidth()); + scrollAreaWidgetContents->setSizePolicy(sizePolicy); + scrollAreaWidgetContents->setMinimumSize(QSize(670, 1000)); groupBox_startSets = new QGroupBox(scrollAreaWidgetContents); groupBox_startSets->setObjectName(QString::fromUtf8("groupBox_startSets")); groupBox_startSets->setGeometry(QRect(10, 60, 641, 61)); @@ -181,7 +182,7 @@ public: checkBox_auto_work->setFont(font1); groupBox_adminUpdate = new QGroupBox(scrollAreaWidgetContents); groupBox_adminUpdate->setObjectName(QString::fromUtf8("groupBox_adminUpdate")); - groupBox_adminUpdate->setGeometry(QRect(10, 470, 641, 81)); + groupBox_adminUpdate->setGeometry(QRect(10, 450, 641, 81)); groupBox_adminUpdate->setFont(font1); pushButton_pswd = new QPushButton(groupBox_adminUpdate); pushButton_pswd->setObjectName(QString::fromUtf8("pushButton_pswd")); @@ -193,7 +194,7 @@ public: label_newPwd->setFont(font1); lineEdit_confirm = new QLineEdit(groupBox_adminUpdate); lineEdit_confirm->setObjectName(QString::fromUtf8("lineEdit_confirm")); - lineEdit_confirm->setGeometry(QRect(440, 32, 91, 31)); + lineEdit_confirm->setGeometry(QRect(445, 32, 91, 31)); lineEdit_confirm->setFont(font1); lineEdit_confirm->setEchoMode(QLineEdit::Password); lineEdit_new = new QLineEdit(groupBox_adminUpdate); @@ -216,7 +217,7 @@ public: label_oldPwd->setFont(font1); groupBox_camerasParams = new QGroupBox(scrollAreaWidgetContents); groupBox_camerasParams->setObjectName(QString::fromUtf8("groupBox_camerasParams")); - groupBox_camerasParams->setGeometry(QRect(10, 180, 640, 131)); + groupBox_camerasParams->setGeometry(QRect(10, 180, 640, 111)); groupBox_camerasParams->setFont(font1); label_11 = new QLabel(groupBox_camerasParams); label_11->setObjectName(QString::fromUtf8("label_11")); @@ -257,35 +258,35 @@ public: lineEdit_gain_1->setFont(font2); lineEdit_expo_3 = new QLineEdit(groupBox_camerasParams); lineEdit_expo_3->setObjectName(QString::fromUtf8("lineEdit_expo_3")); - lineEdit_expo_3->setGeometry(QRect(210, 100, 90, 20)); + lineEdit_expo_3->setGeometry(QRect(210, 1780, 90, 20)); lineEdit_expo_3->setFont(font2); label_41 = new QLabel(groupBox_camerasParams); label_41->setObjectName(QString::fromUtf8("label_41")); - label_41->setGeometry(QRect(20, 1680, 180, 20)); + label_41->setGeometry(QRect(20, 1810, 180, 20)); label_41->setFont(font2); lineEdit_expo_4 = new QLineEdit(groupBox_camerasParams); lineEdit_expo_4->setObjectName(QString::fromUtf8("lineEdit_expo_4")); - lineEdit_expo_4->setGeometry(QRect(210, 1680, 90, 20)); + lineEdit_expo_4->setGeometry(QRect(210, 1810, 90, 20)); lineEdit_expo_4->setFont(font2); label_31 = new QLabel(groupBox_camerasParams); label_31->setObjectName(QString::fromUtf8("label_31")); - label_31->setGeometry(QRect(20, 100, 180, 20)); + label_31->setGeometry(QRect(20, 1780, 180, 20)); label_31->setFont(font2); lineEdit_gain_4 = new QLineEdit(groupBox_camerasParams); lineEdit_gain_4->setObjectName(QString::fromUtf8("lineEdit_gain_4")); - lineEdit_gain_4->setGeometry(QRect(510, 1680, 90, 20)); + lineEdit_gain_4->setGeometry(QRect(510, 1810, 90, 20)); lineEdit_gain_4->setFont(font2); label_32 = new QLabel(groupBox_camerasParams); label_32->setObjectName(QString::fromUtf8("label_32")); - label_32->setGeometry(QRect(320, 100, 180, 20)); + label_32->setGeometry(QRect(320, 1780, 180, 20)); label_32->setFont(font2); label_42 = new QLabel(groupBox_camerasParams); label_42->setObjectName(QString::fromUtf8("label_42")); - label_42->setGeometry(QRect(320, 1680, 180, 20)); + label_42->setGeometry(QRect(320, 1810, 180, 20)); label_42->setFont(font2); lineEdit_gain_3 = new QLineEdit(groupBox_camerasParams); lineEdit_gain_3->setObjectName(QString::fromUtf8("lineEdit_gain_3")); - lineEdit_gain_3->setGeometry(QRect(510, 100, 90, 20)); + lineEdit_gain_3->setGeometry(QRect(510, 1780, 90, 20)); lineEdit_gain_3->setFont(font2); pushButton_expo = new QPushButton(groupBox_camerasParams); pushButton_expo->setObjectName(QString::fromUtf8("pushButton_expo")); @@ -293,71 +294,71 @@ public: pushButton_expo->setFont(font1); label_51 = new QLabel(groupBox_camerasParams); label_51->setObjectName(QString::fromUtf8("label_51")); - label_51->setGeometry(QRect(20, 1220, 180, 20)); + label_51->setGeometry(QRect(20, 1840, 180, 20)); label_51->setFont(font2); label_61 = new QLabel(groupBox_camerasParams); label_61->setObjectName(QString::fromUtf8("label_61")); - label_61->setGeometry(QRect(20, 1250, 180, 20)); + label_61->setGeometry(QRect(20, 1870, 180, 20)); label_61->setFont(font2); label_71 = new QLabel(groupBox_camerasParams); label_71->setObjectName(QString::fromUtf8("label_71")); - label_71->setGeometry(QRect(20, 1280, 180, 20)); + label_71->setGeometry(QRect(20, 1900, 180, 20)); label_71->setFont(font2); lineEdit_expo_5 = new QLineEdit(groupBox_camerasParams); lineEdit_expo_5->setObjectName(QString::fromUtf8("lineEdit_expo_5")); - lineEdit_expo_5->setGeometry(QRect(210, 1220, 90, 20)); + lineEdit_expo_5->setGeometry(QRect(210, 1840, 90, 20)); lineEdit_expo_5->setFont(font2); lineEdit_expo_6 = new QLineEdit(groupBox_camerasParams); lineEdit_expo_6->setObjectName(QString::fromUtf8("lineEdit_expo_6")); - lineEdit_expo_6->setGeometry(QRect(210, 1250, 90, 20)); + lineEdit_expo_6->setGeometry(QRect(210, 1870, 90, 20)); lineEdit_expo_6->setFont(font2); lineEdit_expo_7 = new QLineEdit(groupBox_camerasParams); lineEdit_expo_7->setObjectName(QString::fromUtf8("lineEdit_expo_7")); - lineEdit_expo_7->setGeometry(QRect(210, 1280, 90, 20)); + lineEdit_expo_7->setGeometry(QRect(210, 1900, 90, 20)); lineEdit_expo_7->setFont(font2); label_52 = new QLabel(groupBox_camerasParams); label_52->setObjectName(QString::fromUtf8("label_52")); - label_52->setGeometry(QRect(320, 1220, 180, 20)); + label_52->setGeometry(QRect(320, 1840, 180, 20)); label_52->setFont(font2); label_62 = new QLabel(groupBox_camerasParams); label_62->setObjectName(QString::fromUtf8("label_62")); - label_62->setGeometry(QRect(320, 1250, 180, 20)); + label_62->setGeometry(QRect(320, 1870, 180, 20)); label_62->setFont(font2); label_72 = new QLabel(groupBox_camerasParams); label_72->setObjectName(QString::fromUtf8("label_72")); - label_72->setGeometry(QRect(320, 1280, 180, 20)); + label_72->setGeometry(QRect(320, 1900, 180, 20)); label_72->setFont(font2); lineEdit_gain_5 = new QLineEdit(groupBox_camerasParams); lineEdit_gain_5->setObjectName(QString::fromUtf8("lineEdit_gain_5")); - lineEdit_gain_5->setGeometry(QRect(510, 1220, 90, 20)); + lineEdit_gain_5->setGeometry(QRect(510, 1840, 90, 20)); lineEdit_gain_5->setFont(font2); lineEdit_gain_6 = new QLineEdit(groupBox_camerasParams); lineEdit_gain_6->setObjectName(QString::fromUtf8("lineEdit_gain_6")); - lineEdit_gain_6->setGeometry(QRect(510, 1250, 90, 20)); + lineEdit_gain_6->setGeometry(QRect(510, 1870, 90, 20)); lineEdit_gain_6->setFont(font2); lineEdit_gain_7 = new QLineEdit(groupBox_camerasParams); lineEdit_gain_7->setObjectName(QString::fromUtf8("lineEdit_gain_7")); - lineEdit_gain_7->setGeometry(QRect(510, 1280, 90, 20)); + lineEdit_gain_7->setGeometry(QRect(510, 1900, 90, 20)); lineEdit_gain_7->setFont(font2); label_81 = new QLabel(groupBox_camerasParams); label_81->setObjectName(QString::fromUtf8("label_81")); - label_81->setGeometry(QRect(20, 1310, 180, 20)); + label_81->setGeometry(QRect(20, 1930, 180, 20)); label_81->setFont(font2); lineEdit_expo_8 = new QLineEdit(groupBox_camerasParams); lineEdit_expo_8->setObjectName(QString::fromUtf8("lineEdit_expo_8")); - lineEdit_expo_8->setGeometry(QRect(210, 1310, 90, 20)); + lineEdit_expo_8->setGeometry(QRect(210, 1930, 90, 20)); lineEdit_expo_8->setFont(font2); label_82 = new QLabel(groupBox_camerasParams); label_82->setObjectName(QString::fromUtf8("label_82")); - label_82->setGeometry(QRect(320, 1310, 180, 20)); + label_82->setGeometry(QRect(320, 1930, 180, 20)); label_82->setFont(font2); lineEdit_gain_8 = new QLineEdit(groupBox_camerasParams); lineEdit_gain_8->setObjectName(QString::fromUtf8("lineEdit_gain_8")); - lineEdit_gain_8->setGeometry(QRect(510, 1310, 90, 20)); + lineEdit_gain_8->setGeometry(QRect(510, 1930, 90, 20)); lineEdit_gain_8->setFont(font2); groupBox_filterSet = new QGroupBox(scrollAreaWidgetContents); groupBox_filterSet->setObjectName(QString::fromUtf8("groupBox_filterSet")); - groupBox_filterSet->setGeometry(QRect(10, 630, 641, 101)); + groupBox_filterSet->setGeometry(QRect(10, 610, 641, 61)); groupBox_filterSet->setFont(font1); label_1 = new QLabel(groupBox_filterSet); label_1->setObjectName(QString::fromUtf8("label_1")); @@ -377,19 +378,19 @@ public: label_2->setFont(font2); lineEdit_filter_4 = new QLineEdit(groupBox_filterSet); lineEdit_filter_4->setObjectName(QString::fromUtf8("lineEdit_filter_4")); - lineEdit_filter_4->setGeometry(QRect(510, 1610, 90, 20)); + lineEdit_filter_4->setGeometry(QRect(510, 1040, 90, 20)); lineEdit_filter_4->setFont(font2); label_3 = new QLabel(groupBox_filterSet); label_3->setObjectName(QString::fromUtf8("label_3")); - label_3->setGeometry(QRect(20, 60, 180, 20)); + label_3->setGeometry(QRect(20, 1040, 180, 20)); label_3->setFont(font2); lineEdit_filter_3 = new QLineEdit(groupBox_filterSet); lineEdit_filter_3->setObjectName(QString::fromUtf8("lineEdit_filter_3")); - lineEdit_filter_3->setGeometry(QRect(210, 60, 90, 20)); + lineEdit_filter_3->setGeometry(QRect(210, 1040, 90, 20)); lineEdit_filter_3->setFont(font2); label_4 = new QLabel(groupBox_filterSet); label_4->setObjectName(QString::fromUtf8("label_4")); - label_4->setGeometry(QRect(320, 1610, 180, 20)); + label_4->setGeometry(QRect(320, 1040, 180, 20)); label_4->setFont(font2); pushButton_filter = new QPushButton(groupBox_filterSet); pushButton_filter->setObjectName(QString::fromUtf8("pushButton_filter")); @@ -397,35 +398,35 @@ public: pushButton_filter->setFont(font1); label_5 = new QLabel(groupBox_filterSet); label_5->setObjectName(QString::fromUtf8("label_5")); - label_5->setGeometry(QRect(20, 1150, 180, 20)); + label_5->setGeometry(QRect(20, 1070, 180, 20)); label_5->setFont(font2); label_6 = new QLabel(groupBox_filterSet); label_6->setObjectName(QString::fromUtf8("label_6")); - label_6->setGeometry(QRect(320, 1150, 180, 20)); + label_6->setGeometry(QRect(320, 1070, 180, 20)); label_6->setFont(font2); label_7 = new QLabel(groupBox_filterSet); label_7->setObjectName(QString::fromUtf8("label_7")); - label_7->setGeometry(QRect(20, 1180, 180, 20)); + label_7->setGeometry(QRect(20, 1100, 180, 20)); label_7->setFont(font2); label_8 = new QLabel(groupBox_filterSet); label_8->setObjectName(QString::fromUtf8("label_8")); - label_8->setGeometry(QRect(320, 1180, 180, 20)); + label_8->setGeometry(QRect(320, 1100, 180, 20)); label_8->setFont(font2); lineEdit_filter_5 = new QLineEdit(groupBox_filterSet); lineEdit_filter_5->setObjectName(QString::fromUtf8("lineEdit_filter_5")); - lineEdit_filter_5->setGeometry(QRect(210, 1150, 90, 20)); + lineEdit_filter_5->setGeometry(QRect(210, 1070, 90, 20)); lineEdit_filter_5->setFont(font2); lineEdit_filter_7 = new QLineEdit(groupBox_filterSet); lineEdit_filter_7->setObjectName(QString::fromUtf8("lineEdit_filter_7")); - lineEdit_filter_7->setGeometry(QRect(210, 1180, 90, 20)); + lineEdit_filter_7->setGeometry(QRect(210, 1100, 90, 20)); lineEdit_filter_7->setFont(font2); lineEdit_filter_6 = new QLineEdit(groupBox_filterSet); lineEdit_filter_6->setObjectName(QString::fromUtf8("lineEdit_filter_6")); - lineEdit_filter_6->setGeometry(QRect(510, 1150, 90, 20)); + lineEdit_filter_6->setGeometry(QRect(510, 1070, 90, 20)); lineEdit_filter_6->setFont(font2); lineEdit_filter_8 = new QLineEdit(groupBox_filterSet); lineEdit_filter_8->setObjectName(QString::fromUtf8("lineEdit_filter_8")); - lineEdit_filter_8->setGeometry(QRect(510, 1180, 90, 20)); + lineEdit_filter_8->setGeometry(QRect(510, 1100, 90, 20)); lineEdit_filter_8->setFont(font2); groupBox_saveSets = new QGroupBox(scrollAreaWidgetContents); groupBox_saveSets->setObjectName(QString::fromUtf8("groupBox_saveSets")); @@ -449,7 +450,7 @@ public: pushButton_image->setFont(font1); pushButton_save = new QPushButton(scrollAreaWidgetContents); pushButton_save->setObjectName(QString::fromUtf8("pushButton_save")); - pushButton_save->setGeometry(QRect(110, 750, 131, 51)); + pushButton_save->setGeometry(QRect(110, 690, 131, 51)); pushButton_save->setFont(font1); pushButton_exit = new QPushButton(scrollAreaWidgetContents); pushButton_exit->setObjectName(QString::fromUtf8("pushButton_exit")); @@ -457,7 +458,7 @@ public: pushButton_exit->setFont(font1); groupBox_userUpdate = new QGroupBox(scrollAreaWidgetContents); groupBox_userUpdate->setObjectName(QString::fromUtf8("groupBox_userUpdate")); - groupBox_userUpdate->setGeometry(QRect(10, 550, 641, 81)); + groupBox_userUpdate->setGeometry(QRect(10, 530, 641, 81)); groupBox_userUpdate->setFont(font1); label_admin_newPwd = new QLabel(groupBox_userUpdate); label_admin_newPwd->setObjectName(QString::fromUtf8("label_admin_newPwd")); @@ -465,7 +466,7 @@ public: label_admin_newPwd->setFont(font1); lineEdit_confirm_op = new QLineEdit(groupBox_userUpdate); lineEdit_confirm_op->setObjectName(QString::fromUtf8("lineEdit_confirm_op")); - lineEdit_confirm_op->setGeometry(QRect(440, 32, 91, 31)); + lineEdit_confirm_op->setGeometry(QRect(445, 32, 91, 31)); lineEdit_confirm_op->setFont(font1); lineEdit_confirm_op->setEchoMode(QLineEdit::Password); lineEdit_new_op = new QLineEdit(groupBox_userUpdate); @@ -492,7 +493,7 @@ public: pushButton_pswd_op->setFont(font1); pushButton_close = new QPushButton(scrollAreaWidgetContents); pushButton_close->setObjectName(QString::fromUtf8("pushButton_close")); - pushButton_close->setGeometry(QRect(370, 750, 131, 51)); + pushButton_close->setGeometry(QRect(370, 690, 131, 51)); pushButton_close->setFont(font1); pushButton_desktop = new QPushButton(scrollAreaWidgetContents); pushButton_desktop->setObjectName(QString::fromUtf8("pushButton_desktop")); @@ -509,30 +510,30 @@ public: label->setFont(font1); pushButton_config = new QPushButton(scrollAreaWidgetContents); pushButton_config->setObjectName(QString::fromUtf8("pushButton_config")); - pushButton_config->setGeometry(QRect(40, 320, 101, 41)); + pushButton_config->setGeometry(QRect(40, 300, 101, 41)); pushButton_config->setFont(font1); pushButton_change = new QPushButton(scrollAreaWidgetContents); pushButton_change->setObjectName(QString::fromUtf8("pushButton_change")); - pushButton_change->setGeometry(QRect(40, 420, 101, 41)); + pushButton_change->setGeometry(QRect(40, 400, 101, 41)); pushButton_change->setFont(font1); pushButton_statistic = new QPushButton(scrollAreaWidgetContents); pushButton_statistic->setObjectName(QString::fromUtf8("pushButton_statistic")); - pushButton_statistic->setGeometry(QRect(40, 370, 101, 41)); + pushButton_statistic->setGeometry(QRect(40, 350, 101, 41)); pushButton_statistic->setFont(font1); toolButton_choose_model_path = new QToolButton(scrollAreaWidgetContents); toolButton_choose_model_path->setObjectName(QString::fromUtf8("toolButton_choose_model_path")); - toolButton_choose_model_path->setGeometry(QRect(620, 1610, 27, 25)); + toolButton_choose_model_path->setGeometry(QRect(620, 1380, 27, 25)); QFont font3; font3.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); toolButton_choose_model_path->setFont(font3); label_model_path = new QLabel(scrollAreaWidgetContents); label_model_path->setObjectName(QString::fromUtf8("label_model_path")); - label_model_path->setGeometry(QRect(190, 1610, 171, 30)); + label_model_path->setGeometry(QRect(190, 1380, 171, 30)); label_model_path->setFont(font1); label_model_path->setAlignment(Qt::AlignCenter); comboBox_model_path = new QComboBox(scrollAreaWidgetContents); comboBox_model_path->setObjectName(QString::fromUtf8("comboBox_model_path")); - comboBox_model_path->setGeometry(QRect(370, 1610, 241, 30)); + comboBox_model_path->setGeometry(QRect(370, 1380, 241, 30)); QFont font4; font4.setFamily(QString::fromUtf8("\345\276\256\350\275\257\351\233\205\351\273\221")); font4.setPointSize(10); @@ -559,37 +560,37 @@ public: pushButton_clear_pic->setFont(font1); pushButton_testimg = new QPushButton(scrollAreaWidgetContents); pushButton_testimg->setObjectName(QString::fromUtf8("pushButton_testimg")); - pushButton_testimg->setGeometry(QRect(520, 750, 131, 21)); + pushButton_testimg->setGeometry(QRect(520, 690, 131, 21)); pushButton_testimg->setFont(font5); pushButton_testimgs = new QPushButton(scrollAreaWidgetContents); pushButton_testimgs->setObjectName(QString::fromUtf8("pushButton_testimgs")); - pushButton_testimgs->setGeometry(QRect(520, 780, 131, 21)); + pushButton_testimgs->setGeometry(QRect(520, 720, 131, 21)); pushButton_testimgs->setFont(font5); label_conf_path = new QLabel(scrollAreaWidgetContents); label_conf_path->setObjectName(QString::fromUtf8("label_conf_path")); - label_conf_path->setGeometry(QRect(190, 340, 171, 30)); + label_conf_path->setGeometry(QRect(190, 330, 171, 30)); label_conf_path->setFont(font1); label_conf_path->setAlignment(Qt::AlignCenter); comboBox_config_path = new QComboBox(scrollAreaWidgetContents); comboBox_config_path->setObjectName(QString::fromUtf8("comboBox_config_path")); - comboBox_config_path->setGeometry(QRect(370, 340, 241, 30)); + comboBox_config_path->setGeometry(QRect(370, 330, 241, 30)); comboBox_config_path->setFont(font4); toolButton_choose_config_path = new QToolButton(scrollAreaWidgetContents); toolButton_choose_config_path->setObjectName(QString::fromUtf8("toolButton_choose_config_path")); - toolButton_choose_config_path->setGeometry(QRect(620, 340, 27, 25)); + toolButton_choose_config_path->setGeometry(QRect(620, 330, 27, 25)); toolButton_choose_config_path->setFont(font3); label_save_pics_path = new QLabel(scrollAreaWidgetContents); label_save_pics_path->setObjectName(QString::fromUtf8("label_save_pics_path")); - label_save_pics_path->setGeometry(QRect(190, 410, 171, 30)); + label_save_pics_path->setGeometry(QRect(190, 390, 171, 30)); label_save_pics_path->setFont(font1); label_save_pics_path->setAlignment(Qt::AlignCenter); comboBox_save_pics_path = new QComboBox(scrollAreaWidgetContents); comboBox_save_pics_path->setObjectName(QString::fromUtf8("comboBox_save_pics_path")); - comboBox_save_pics_path->setGeometry(QRect(370, 410, 241, 30)); + comboBox_save_pics_path->setGeometry(QRect(370, 390, 241, 30)); comboBox_save_pics_path->setFont(font4); toolButton_choose_save_pics_path = new QToolButton(scrollAreaWidgetContents); toolButton_choose_save_pics_path->setObjectName(QString::fromUtf8("toolButton_choose_save_pics_path")); - toolButton_choose_save_pics_path->setGeometry(QRect(620, 410, 27, 25)); + toolButton_choose_save_pics_path->setGeometry(QRect(620, 390, 27, 25)); toolButton_choose_save_pics_path->setFont(font3); scrollArea->setWidget(scrollAreaWidgetContents); diff --git a/1280x800 TH/Cigarette/GeneratedFiles/ui_dialogsetuppasswd.h b/1280x800-XH/Cigarette/GeneratedFiles/ui_dialogsetuppasswd.h similarity index 100% rename from 1280x800 TH/Cigarette/GeneratedFiles/ui_dialogsetuppasswd.h rename to 1280x800-XH/Cigarette/GeneratedFiles/ui_dialogsetuppasswd.h diff --git a/1280x800 TH/Cigarette/GeneratedFiles/ui_output_statistic.h b/1280x800-XH/Cigarette/GeneratedFiles/ui_output_statistic.h similarity index 75% rename from 1280x800 TH/Cigarette/GeneratedFiles/ui_output_statistic.h rename to 1280x800-XH/Cigarette/GeneratedFiles/ui_output_statistic.h index 57587a16..cdcdcf72 100644 --- a/1280x800 TH/Cigarette/GeneratedFiles/ui_output_statistic.h +++ b/1280x800-XH/Cigarette/GeneratedFiles/ui_output_statistic.h @@ -23,9 +23,9 @@ QT_BEGIN_NAMESPACE class Ui_output_statistic { public: - QGridLayout *gridLayout_3; + QGridLayout *gridLayout; QFrame *frame; - QGridLayout *gridLayout_4; + QGridLayout *gridLayout_0; QTabWidget *tabWidget; QWidget *Camera1; QGridLayout *gridLayout_1; @@ -33,27 +33,24 @@ public: QWidget *Camera2; QGridLayout *gridLayout_2; QTextBrowser *textBrowser_2; - QWidget *Camera3; - QGridLayout *gridLayout; - QTextBrowser *textBrowser_3; void setupUi(QDialog *output_statistic) { if (output_statistic->objectName().isEmpty()) output_statistic->setObjectName(QString::fromUtf8("output_statistic")); output_statistic->resize(810, 390); - gridLayout_3 = new QGridLayout(output_statistic); - gridLayout_3->setSpacing(6); - gridLayout_3->setContentsMargins(11, 11, 11, 11); - gridLayout_3->setObjectName(QString::fromUtf8("gridLayout_3")); + gridLayout = new QGridLayout(output_statistic); + gridLayout->setSpacing(6); + gridLayout->setContentsMargins(11, 11, 11, 11); + gridLayout->setObjectName(QString::fromUtf8("gridLayout")); frame = new QFrame(output_statistic); frame->setObjectName(QString::fromUtf8("frame")); frame->setFrameShape(QFrame::StyledPanel); frame->setFrameShadow(QFrame::Raised); - gridLayout_4 = new QGridLayout(frame); - gridLayout_4->setSpacing(6); - gridLayout_4->setContentsMargins(11, 11, 11, 11); - gridLayout_4->setObjectName(QString::fromUtf8("gridLayout_4")); + gridLayout_0 = new QGridLayout(frame); + gridLayout_0->setSpacing(6); + gridLayout_0->setContentsMargins(11, 11, 11, 11); + gridLayout_0->setObjectName(QString::fromUtf8("gridLayout_0")); tabWidget = new QTabWidget(frame); tabWidget->setObjectName(QString::fromUtf8("tabWidget")); QFont font; @@ -83,28 +80,16 @@ public: gridLayout_2->addWidget(textBrowser_2, 0, 0, 1, 1); tabWidget->addTab(Camera2, QString()); - Camera3 = new QWidget(); - Camera3->setObjectName(QString::fromUtf8("Camera3")); - gridLayout = new QGridLayout(Camera3); - gridLayout->setSpacing(6); - gridLayout->setContentsMargins(11, 11, 11, 11); - gridLayout->setObjectName(QString::fromUtf8("gridLayout")); - textBrowser_3 = new QTextBrowser(Camera3); - textBrowser_3->setObjectName(QString::fromUtf8("textBrowser_3")); - - gridLayout->addWidget(textBrowser_3, 0, 0, 1, 1); - - tabWidget->addTab(Camera3, QString()); - gridLayout_4->addWidget(tabWidget, 0, 0, 1, 1); + gridLayout_0->addWidget(tabWidget, 0, 0, 1, 1); - gridLayout_3->addWidget(frame, 0, 0, 1, 1); + gridLayout->addWidget(frame, 0, 0, 1, 1); retranslateUi(output_statistic); - tabWidget->setCurrentIndex(2); + tabWidget->setCurrentIndex(1); QMetaObject::connectSlotsByName(output_statistic); @@ -115,7 +100,6 @@ public: output_statistic->setWindowTitle(QCoreApplication::translate("output_statistic", "\344\272\247\351\207\217\347\273\237\350\256\241", nullptr)); tabWidget->setTabText(tabWidget->indexOf(Camera1), QCoreApplication::translate("output_statistic", "Camera1", nullptr)); tabWidget->setTabText(tabWidget->indexOf(Camera2), QCoreApplication::translate("output_statistic", "Camera2", nullptr)); - tabWidget->setTabText(tabWidget->indexOf(Camera3), QCoreApplication::translate("output_statistic", "Camera3", nullptr)); } // retranslateUi }; diff --git a/1280x800 TH/Cigarette/GeneratedFiles/ui_plcsetup.h b/1280x800-XH/Cigarette/GeneratedFiles/ui_plcsetup.h similarity index 100% rename from 1280x800 TH/Cigarette/GeneratedFiles/ui_plcsetup.h rename to 1280x800-XH/Cigarette/GeneratedFiles/ui_plcsetup.h diff --git a/1280x800 TH/Cigarette/License.dat b/1280x800-XH/Cigarette/License.dat similarity index 100% rename from 1280x800 TH/Cigarette/License.dat rename to 1280x800-XH/Cigarette/License.dat diff --git a/1280x800 TH/Cigarette/Logthread.cpp b/1280x800-XH/Cigarette/Logthread.cpp similarity index 100% rename from 1280x800 TH/Cigarette/Logthread.cpp rename to 1280x800-XH/Cigarette/Logthread.cpp diff --git a/1280x800 TH/Cigarette/Logthread.h b/1280x800-XH/Cigarette/Logthread.h similarity index 100% rename from 1280x800 TH/Cigarette/Logthread.h rename to 1280x800-XH/Cigarette/Logthread.h diff --git a/1280x800 TH/Cigarette/MVS3.2.1/Include/CameraParams.h b/1280x800-XH/Cigarette/MVS3.2.1/Include/CameraParams.h similarity index 100% rename from 1280x800 TH/Cigarette/MVS3.2.1/Include/CameraParams.h rename to 1280x800-XH/Cigarette/MVS3.2.1/Include/CameraParams.h diff --git a/1280x800 TH/Cigarette/MVS3.2.1/Include/MvCameraControl.h b/1280x800-XH/Cigarette/MVS3.2.1/Include/MvCameraControl.h similarity index 100% rename from 1280x800 TH/Cigarette/MVS3.2.1/Include/MvCameraControl.h rename to 1280x800-XH/Cigarette/MVS3.2.1/Include/MvCameraControl.h diff --git a/1280x800 TH/Cigarette/MVS3.2.1/Include/MvErrorDefine.h b/1280x800-XH/Cigarette/MVS3.2.1/Include/MvErrorDefine.h similarity index 100% rename from 1280x800 TH/Cigarette/MVS3.2.1/Include/MvErrorDefine.h rename to 1280x800-XH/Cigarette/MVS3.2.1/Include/MvErrorDefine.h diff --git a/1280x800 TH/Cigarette/MVS3.2.1/Include/MvObsoleteInterfaces.h b/1280x800-XH/Cigarette/MVS3.2.1/Include/MvObsoleteInterfaces.h similarity index 100% rename from 1280x800 TH/Cigarette/MVS3.2.1/Include/MvObsoleteInterfaces.h rename to 1280x800-XH/Cigarette/MVS3.2.1/Include/MvObsoleteInterfaces.h diff --git a/1280x800 TH/Cigarette/MVS3.2.1/Include/MvSdkExport.h b/1280x800-XH/Cigarette/MVS3.2.1/Include/MvSdkExport.h similarity index 100% rename from 1280x800 TH/Cigarette/MVS3.2.1/Include/MvSdkExport.h rename to 1280x800-XH/Cigarette/MVS3.2.1/Include/MvSdkExport.h diff --git a/1280x800 TH/Cigarette/MVS3.2.1/Include/ObsoleteCamParams.h b/1280x800-XH/Cigarette/MVS3.2.1/Include/ObsoleteCamParams.h similarity index 100% rename from 1280x800 TH/Cigarette/MVS3.2.1/Include/ObsoleteCamParams.h rename to 1280x800-XH/Cigarette/MVS3.2.1/Include/ObsoleteCamParams.h diff --git a/1280x800 TH/Cigarette/MVS3.2.1/Include/PixelType.h b/1280x800-XH/Cigarette/MVS3.2.1/Include/PixelType.h similarity index 100% rename from 1280x800 TH/Cigarette/MVS3.2.1/Include/PixelType.h rename to 1280x800-XH/Cigarette/MVS3.2.1/Include/PixelType.h diff --git a/1280x800 TH/Cigarette/MVS3.2.1/lib/win32/C++ Builder/MvCameraControlBC.lib b/1280x800-XH/Cigarette/MVS3.2.1/lib/win32/C++ Builder/MvCameraControlBC.lib similarity index 100% rename from 1280x800 TH/Cigarette/MVS3.2.1/lib/win32/C++ Builder/MvCameraControlBC.lib rename to 1280x800-XH/Cigarette/MVS3.2.1/lib/win32/C++ Builder/MvCameraControlBC.lib diff --git a/1280x800 TH/Cigarette/MVS3.2.1/lib/win32/MvCameraControl.lib b/1280x800-XH/Cigarette/MVS3.2.1/lib/win32/MvCameraControl.lib similarity index 100% rename from 1280x800 TH/Cigarette/MVS3.2.1/lib/win32/MvCameraControl.lib rename to 1280x800-XH/Cigarette/MVS3.2.1/lib/win32/MvCameraControl.lib diff --git a/1280x800 TH/Cigarette/MVS3.2.1/lib/win32/VC6/MvSdkExport.lib b/1280x800-XH/Cigarette/MVS3.2.1/lib/win32/VC6/MvSdkExport.lib similarity index 100% rename from 1280x800 TH/Cigarette/MVS3.2.1/lib/win32/VC6/MvSdkExport.lib rename to 1280x800-XH/Cigarette/MVS3.2.1/lib/win32/VC6/MvSdkExport.lib diff --git a/1280x800 TH/Cigarette/MVS3.2.1/lib/win64/C++ Builder/MvCameraControlBC.a b/1280x800-XH/Cigarette/MVS3.2.1/lib/win64/C++ Builder/MvCameraControlBC.a similarity index 100% rename from 1280x800 TH/Cigarette/MVS3.2.1/lib/win64/C++ Builder/MvCameraControlBC.a rename to 1280x800-XH/Cigarette/MVS3.2.1/lib/win64/C++ Builder/MvCameraControlBC.a diff --git a/1280x800 TH/Cigarette/MVS3.2.1/lib/win64/MvCameraControl.lib b/1280x800-XH/Cigarette/MVS3.2.1/lib/win64/MvCameraControl.lib similarity index 100% rename from 1280x800 TH/Cigarette/MVS3.2.1/lib/win64/MvCameraControl.lib rename to 1280x800-XH/Cigarette/MVS3.2.1/lib/win64/MvCameraControl.lib diff --git a/1280x800 TH/Cigarette/MvIMPACT/DriverBase/Include/mvCustomCommandDataTypes.h b/1280x800-XH/Cigarette/MvIMPACT/DriverBase/Include/mvCustomCommandDataTypes.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/DriverBase/Include/mvCustomCommandDataTypes.h rename to 1280x800-XH/Cigarette/MvIMPACT/DriverBase/Include/mvCustomCommandDataTypes.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/DriverBase/Include/mvDriverBaseEnums.h b/1280x800-XH/Cigarette/MvIMPACT/DriverBase/Include/mvDriverBaseEnums.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/DriverBase/Include/mvDriverBaseEnums.h rename to 1280x800-XH/Cigarette/MvIMPACT/DriverBase/Include/mvDriverBaseEnums.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/DriverBase/Include/mvVersionInfo.h b/1280x800-XH/Cigarette/MvIMPACT/DriverBase/Include/mvVersionInfo.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/DriverBase/Include/mvVersionInfo.h rename to 1280x800-XH/Cigarette/MvIMPACT/DriverBase/Include/mvVersionInfo.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/apps/Common/CommonGUIFunctions.cpp b/1280x800-XH/Cigarette/MvIMPACT/apps/Common/CommonGUIFunctions.cpp similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/apps/Common/CommonGUIFunctions.cpp rename to 1280x800-XH/Cigarette/MvIMPACT/apps/Common/CommonGUIFunctions.cpp diff --git a/1280x800 TH/Cigarette/MvIMPACT/apps/Common/CommonGUIFunctions.h b/1280x800-XH/Cigarette/MvIMPACT/apps/Common/CommonGUIFunctions.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/apps/Common/CommonGUIFunctions.h rename to 1280x800-XH/Cigarette/MvIMPACT/apps/Common/CommonGUIFunctions.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/apps/Common/Info.h b/1280x800-XH/Cigarette/MvIMPACT/apps/Common/Info.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/apps/Common/Info.h rename to 1280x800-XH/Cigarette/MvIMPACT/apps/Common/Info.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/apps/Common/ProxyResolverContext.h b/1280x800-XH/Cigarette/MvIMPACT/apps/Common/ProxyResolverContext.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/apps/Common/ProxyResolverContext.h rename to 1280x800-XH/Cigarette/MvIMPACT/apps/Common/ProxyResolverContext.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/apps/Common/aviexception.h b/1280x800-XH/Cigarette/MvIMPACT/apps/Common/aviexception.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/apps/Common/aviexception.h rename to 1280x800-XH/Cigarette/MvIMPACT/apps/Common/aviexception.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/apps/Common/avihelper.cpp b/1280x800-XH/Cigarette/MvIMPACT/apps/Common/avihelper.cpp similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/apps/Common/avihelper.cpp rename to 1280x800-XH/Cigarette/MvIMPACT/apps/Common/avihelper.cpp diff --git a/1280x800 TH/Cigarette/MvIMPACT/apps/Common/avihelper.h b/1280x800-XH/Cigarette/MvIMPACT/apps/Common/avihelper.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/apps/Common/avihelper.h rename to 1280x800-XH/Cigarette/MvIMPACT/apps/Common/avihelper.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/apps/Common/aviwrapper.cpp b/1280x800-XH/Cigarette/MvIMPACT/apps/Common/aviwrapper.cpp similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/apps/Common/aviwrapper.cpp rename to 1280x800-XH/Cigarette/MvIMPACT/apps/Common/aviwrapper.cpp diff --git a/1280x800 TH/Cigarette/MvIMPACT/apps/Common/aviwrapper.h b/1280x800-XH/Cigarette/MvIMPACT/apps/Common/aviwrapper.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/apps/Common/aviwrapper.h rename to 1280x800-XH/Cigarette/MvIMPACT/apps/Common/aviwrapper.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/apps/Common/exampleHelper.h b/1280x800-XH/Cigarette/MvIMPACT/apps/Common/exampleHelper.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/apps/Common/exampleHelper.h rename to 1280x800-XH/Cigarette/MvIMPACT/apps/Common/exampleHelper.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/apps/Common/exampleHelper_C.c b/1280x800-XH/Cigarette/MvIMPACT/apps/Common/exampleHelper_C.c similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/apps/Common/exampleHelper_C.c rename to 1280x800-XH/Cigarette/MvIMPACT/apps/Common/exampleHelper_C.c diff --git a/1280x800 TH/Cigarette/MvIMPACT/apps/Common/exampleHelper_C.h b/1280x800-XH/Cigarette/MvIMPACT/apps/Common/exampleHelper_C.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/apps/Common/exampleHelper_C.h rename to 1280x800-XH/Cigarette/MvIMPACT/apps/Common/exampleHelper_C.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/apps/Common/mv.ico b/1280x800-XH/Cigarette/MvIMPACT/apps/Common/mv.ico similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/apps/Common/mv.ico rename to 1280x800-XH/Cigarette/MvIMPACT/apps/Common/mv.ico diff --git a/1280x800 TH/Cigarette/MvIMPACT/apps/Common/qtIncludeEpilogue.h b/1280x800-XH/Cigarette/MvIMPACT/apps/Common/qtIncludeEpilogue.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/apps/Common/qtIncludeEpilogue.h rename to 1280x800-XH/Cigarette/MvIMPACT/apps/Common/qtIncludeEpilogue.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/apps/Common/qtIncludePrologue.h b/1280x800-XH/Cigarette/MvIMPACT/apps/Common/qtIncludePrologue.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/apps/Common/qtIncludePrologue.h rename to 1280x800-XH/Cigarette/MvIMPACT/apps/Common/qtIncludePrologue.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/apps/Common/win32/ProxyResolver.cpp b/1280x800-XH/Cigarette/MvIMPACT/apps/Common/win32/ProxyResolver.cpp similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/apps/Common/win32/ProxyResolver.cpp rename to 1280x800-XH/Cigarette/MvIMPACT/apps/Common/win32/ProxyResolver.cpp diff --git a/1280x800 TH/Cigarette/MvIMPACT/apps/Common/win32/ProxyResolver.h b/1280x800-XH/Cigarette/MvIMPACT/apps/Common/win32/ProxyResolver.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/apps/Common/win32/ProxyResolver.h rename to 1280x800-XH/Cigarette/MvIMPACT/apps/Common/win32/ProxyResolver.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/apps/Common/win32/ProxyResolverContext.cpp b/1280x800-XH/Cigarette/MvIMPACT/apps/Common/win32/ProxyResolverContext.cpp similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/apps/Common/win32/ProxyResolverContext.cpp rename to 1280x800-XH/Cigarette/MvIMPACT/apps/Common/win32/ProxyResolverContext.cpp diff --git a/1280x800 TH/Cigarette/MvIMPACT/apps/Common/wxAbstraction.h b/1280x800-XH/Cigarette/MvIMPACT/apps/Common/wxAbstraction.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/apps/Common/wxAbstraction.h rename to 1280x800-XH/Cigarette/MvIMPACT/apps/Common/wxAbstraction.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/apps/Common/wxIncludeEpilogue.h b/1280x800-XH/Cigarette/MvIMPACT/apps/Common/wxIncludeEpilogue.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/apps/Common/wxIncludeEpilogue.h rename to 1280x800-XH/Cigarette/MvIMPACT/apps/Common/wxIncludeEpilogue.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/apps/Common/wxIncludePrologue.h b/1280x800-XH/Cigarette/MvIMPACT/apps/Common/wxIncludePrologue.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/apps/Common/wxIncludePrologue.h rename to 1280x800-XH/Cigarette/MvIMPACT/apps/Common/wxIncludePrologue.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/apps/Common/wxIncluder.h b/1280x800-XH/Cigarette/MvIMPACT/apps/Common/wxIncluder.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/apps/Common/wxIncluder.h rename to 1280x800-XH/Cigarette/MvIMPACT/apps/Common/wxIncluder.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/common/STLHelper.h b/1280x800-XH/Cigarette/MvIMPACT/common/STLHelper.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/common/STLHelper.h rename to 1280x800-XH/Cigarette/MvIMPACT/common/STLHelper.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/common/System/win32/common.rc2 b/1280x800-XH/Cigarette/MvIMPACT/common/System/win32/common.rc2 similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/common/System/win32/common.rc2 rename to 1280x800-XH/Cigarette/MvIMPACT/common/System/win32/common.rc2 diff --git a/1280x800 TH/Cigarette/MvIMPACT/common/auto_array_ptr.h b/1280x800-XH/Cigarette/MvIMPACT/common/auto_array_ptr.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/common/auto_array_ptr.h rename to 1280x800-XH/Cigarette/MvIMPACT/common/auto_array_ptr.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/common/crt/mvstdio.h b/1280x800-XH/Cigarette/MvIMPACT/common/crt/mvstdio.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/common/crt/mvstdio.h rename to 1280x800-XH/Cigarette/MvIMPACT/common/crt/mvstdio.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/common/crt/mvstring.h b/1280x800-XH/Cigarette/MvIMPACT/common/crt/mvstring.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/common/crt/mvstring.h rename to 1280x800-XH/Cigarette/MvIMPACT/common/crt/mvstring.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/common/function_cast.h b/1280x800-XH/Cigarette/MvIMPACT/common/function_cast.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/common/function_cast.h rename to 1280x800-XH/Cigarette/MvIMPACT/common/function_cast.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/common/minmax.h b/1280x800-XH/Cigarette/MvIMPACT/common/minmax.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/common/minmax.h rename to 1280x800-XH/Cigarette/MvIMPACT/common/minmax.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/lib/win32/mvDeviceManager.lib b/1280x800-XH/Cigarette/MvIMPACT/lib/win32/mvDeviceManager.lib similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/lib/win32/mvDeviceManager.lib rename to 1280x800-XH/Cigarette/MvIMPACT/lib/win32/mvDeviceManager.lib diff --git a/1280x800 TH/Cigarette/MvIMPACT/lib/win32/mvDeviceManagerb.lib b/1280x800-XH/Cigarette/MvIMPACT/lib/win32/mvDeviceManagerb.lib similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/lib/win32/mvDeviceManagerb.lib rename to 1280x800-XH/Cigarette/MvIMPACT/lib/win32/mvDeviceManagerb.lib diff --git a/1280x800 TH/Cigarette/MvIMPACT/lib/win32/mvDisplay.lib b/1280x800-XH/Cigarette/MvIMPACT/lib/win32/mvDisplay.lib similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/lib/win32/mvDisplay.lib rename to 1280x800-XH/Cigarette/MvIMPACT/lib/win32/mvDisplay.lib diff --git a/1280x800 TH/Cigarette/MvIMPACT/lib/win32/mvDisplayb.lib b/1280x800-XH/Cigarette/MvIMPACT/lib/win32/mvDisplayb.lib similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/lib/win32/mvDisplayb.lib rename to 1280x800-XH/Cigarette/MvIMPACT/lib/win32/mvDisplayb.lib diff --git a/1280x800 TH/Cigarette/MvIMPACT/lib/win64/mvDeviceManager.lib b/1280x800-XH/Cigarette/MvIMPACT/lib/win64/mvDeviceManager.lib similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/lib/win64/mvDeviceManager.lib rename to 1280x800-XH/Cigarette/MvIMPACT/lib/win64/mvDeviceManager.lib diff --git a/1280x800 TH/Cigarette/MvIMPACT/lib/win64/mvDeviceManagerb.lib b/1280x800-XH/Cigarette/MvIMPACT/lib/win64/mvDeviceManagerb.lib similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/lib/win64/mvDeviceManagerb.lib rename to 1280x800-XH/Cigarette/MvIMPACT/lib/win64/mvDeviceManagerb.lib diff --git a/1280x800 TH/Cigarette/MvIMPACT/lib/win64/mvDisplay.lib b/1280x800-XH/Cigarette/MvIMPACT/lib/win64/mvDisplay.lib similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/lib/win64/mvDisplay.lib rename to 1280x800-XH/Cigarette/MvIMPACT/lib/win64/mvDisplay.lib diff --git a/1280x800 TH/Cigarette/MvIMPACT/lib/win64/mvDisplayb.lib b/1280x800-XH/Cigarette/MvIMPACT/lib/win64/mvDisplayb.lib similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/lib/win64/mvDisplayb.lib rename to 1280x800-XH/Cigarette/MvIMPACT/lib/win64/mvDisplayb.lib diff --git a/1280x800 TH/Cigarette/MvIMPACT/mvDeviceManager/Include/mvDeviceManager.h b/1280x800-XH/Cigarette/MvIMPACT/mvDeviceManager/Include/mvDeviceManager.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/mvDeviceManager/Include/mvDeviceManager.h rename to 1280x800-XH/Cigarette/MvIMPACT/mvDeviceManager/Include/mvDeviceManager.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/mvDisplay/Include/mvDisplay.h b/1280x800-XH/Cigarette/MvIMPACT/mvDisplay/Include/mvDisplay.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/mvDisplay/Include/mvDisplay.h rename to 1280x800-XH/Cigarette/MvIMPACT/mvDisplay/Include/mvDisplay.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/mvDisplay/Include/mvDisplayDatatypes.h b/1280x800-XH/Cigarette/MvIMPACT/mvDisplay/Include/mvDisplayDatatypes.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/mvDisplay/Include/mvDisplayDatatypes.h rename to 1280x800-XH/Cigarette/MvIMPACT/mvDisplay/Include/mvDisplayDatatypes.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/mvDisplay/Include/mvDisplayExtensions.h b/1280x800-XH/Cigarette/MvIMPACT/mvDisplay/Include/mvDisplayExtensions.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/mvDisplay/Include/mvDisplayExtensions.h rename to 1280x800-XH/Cigarette/MvIMPACT/mvDisplay/Include/mvDisplayExtensions.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/mvDisplay/Include/mvDisplayWindow.h b/1280x800-XH/Cigarette/MvIMPACT/mvDisplay/Include/mvDisplayWindow.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/mvDisplay/Include/mvDisplayWindow.h rename to 1280x800-XH/Cigarette/MvIMPACT/mvDisplay/Include/mvDisplayWindow.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/mvDisplay/Include/mvIMPACT_acquire_display.h b/1280x800-XH/Cigarette/MvIMPACT/mvDisplay/Include/mvIMPACT_acquire_display.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/mvDisplay/Include/mvIMPACT_acquire_display.h rename to 1280x800-XH/Cigarette/MvIMPACT/mvDisplay/Include/mvIMPACT_acquire_display.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/mvIMPACT_CPP/mvIMPACT_acquire.h b/1280x800-XH/Cigarette/MvIMPACT/mvIMPACT_CPP/mvIMPACT_acquire.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/mvIMPACT_CPP/mvIMPACT_acquire.h rename to 1280x800-XH/Cigarette/MvIMPACT/mvIMPACT_CPP/mvIMPACT_acquire.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/mvIMPACT_CPP/mvIMPACT_acquire_GenICam.h b/1280x800-XH/Cigarette/MvIMPACT/mvIMPACT_CPP/mvIMPACT_acquire_GenICam.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/mvIMPACT_CPP/mvIMPACT_acquire_GenICam.h rename to 1280x800-XH/Cigarette/MvIMPACT/mvIMPACT_CPP/mvIMPACT_acquire_GenICam.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/mvIMPACT_CPP/mvIMPACT_acquire_GenICam_CustomCommands.h b/1280x800-XH/Cigarette/MvIMPACT/mvIMPACT_CPP/mvIMPACT_acquire_GenICam_CustomCommands.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/mvIMPACT_CPP/mvIMPACT_acquire_GenICam_CustomCommands.h rename to 1280x800-XH/Cigarette/MvIMPACT/mvIMPACT_CPP/mvIMPACT_acquire_GenICam_CustomCommands.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/mvIMPACT_CPP/mvIMPACT_acquire_GenICam_FileStream.h b/1280x800-XH/Cigarette/MvIMPACT/mvIMPACT_CPP/mvIMPACT_acquire_GenICam_FileStream.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/mvIMPACT_CPP/mvIMPACT_acquire_GenICam_FileStream.h rename to 1280x800-XH/Cigarette/MvIMPACT/mvIMPACT_CPP/mvIMPACT_acquire_GenICam_FileStream.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/mvIMPACT_CPP/mvIMPACT_acquire_GenICam_LensControl.h b/1280x800-XH/Cigarette/MvIMPACT/mvIMPACT_CPP/mvIMPACT_acquire_GenICam_LensControl.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/mvIMPACT_CPP/mvIMPACT_acquire_GenICam_LensControl.h rename to 1280x800-XH/Cigarette/MvIMPACT/mvIMPACT_CPP/mvIMPACT_acquire_GenICam_LensControl.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/mvIMPACT_CPP/mvIMPACT_acquire_helper.h b/1280x800-XH/Cigarette/MvIMPACT/mvIMPACT_CPP/mvIMPACT_acquire_helper.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/mvIMPACT_CPP/mvIMPACT_acquire_helper.h rename to 1280x800-XH/Cigarette/MvIMPACT/mvIMPACT_CPP/mvIMPACT_acquire_helper.h diff --git a/1280x800 TH/Cigarette/MvIMPACT/mvIMPACT_CPP/versionInfo.txt b/1280x800-XH/Cigarette/MvIMPACT/mvIMPACT_CPP/versionInfo.txt similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/mvIMPACT_CPP/versionInfo.txt rename to 1280x800-XH/Cigarette/MvIMPACT/mvIMPACT_CPP/versionInfo.txt diff --git a/1280x800 TH/Cigarette/MvIMPACT/mvPropHandling/Include/mvPropHandlingDatatypes.h b/1280x800-XH/Cigarette/MvIMPACT/mvPropHandling/Include/mvPropHandlingDatatypes.h similarity index 100% rename from 1280x800 TH/Cigarette/MvIMPACT/mvPropHandling/Include/mvPropHandlingDatatypes.h rename to 1280x800-XH/Cigarette/MvIMPACT/mvPropHandling/Include/mvPropHandlingDatatypes.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/calib3d.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/calib3d.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/calib3d.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/calib3d.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/calib3d/calib3d.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/calib3d/calib3d.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/calib3d/calib3d.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/calib3d/calib3d.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/calib3d/calib3d_c.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/calib3d/calib3d_c.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/calib3d/calib3d_c.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/calib3d/calib3d_c.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/affine.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/affine.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/affine.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/affine.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/async.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/async.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/async.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/async.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/base.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/base.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/base.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/base.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/bindings_utils.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/bindings_utils.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/bindings_utils.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/bindings_utils.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/bufferpool.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/bufferpool.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/bufferpool.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/bufferpool.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/check.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/check.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/check.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/check.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/core.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/core.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/core.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/core.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/core_c.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/core_c.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/core_c.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/core_c.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda.inl.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda.inl.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda.inl.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda.inl.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/block.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/block.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/block.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/block.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/border_interpolate.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/border_interpolate.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/border_interpolate.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/border_interpolate.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/color.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/color.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/color.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/color.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/common.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/common.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/common.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/common.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/datamov_utils.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/datamov_utils.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/datamov_utils.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/datamov_utils.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/detail/color_detail.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/detail/color_detail.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/detail/color_detail.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/detail/color_detail.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/detail/reduce.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/detail/reduce.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/detail/reduce.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/detail/reduce.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/detail/reduce_key_val.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/detail/reduce_key_val.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/detail/reduce_key_val.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/detail/reduce_key_val.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/detail/transform_detail.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/detail/transform_detail.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/detail/transform_detail.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/detail/transform_detail.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/detail/type_traits_detail.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/detail/type_traits_detail.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/detail/type_traits_detail.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/detail/type_traits_detail.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/detail/vec_distance_detail.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/detail/vec_distance_detail.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/detail/vec_distance_detail.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/detail/vec_distance_detail.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/dynamic_smem.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/dynamic_smem.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/dynamic_smem.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/dynamic_smem.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/emulation.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/emulation.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/emulation.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/emulation.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/filters.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/filters.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/filters.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/filters.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/funcattrib.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/funcattrib.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/funcattrib.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/funcattrib.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/functional.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/functional.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/functional.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/functional.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/limits.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/limits.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/limits.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/limits.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/reduce.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/reduce.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/reduce.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/reduce.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/saturate_cast.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/saturate_cast.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/saturate_cast.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/saturate_cast.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/scan.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/scan.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/scan.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/scan.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/simd_functions.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/simd_functions.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/simd_functions.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/simd_functions.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/transform.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/transform.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/transform.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/transform.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/type_traits.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/type_traits.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/type_traits.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/type_traits.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/utility.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/utility.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/utility.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/utility.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/vec_distance.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/vec_distance.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/vec_distance.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/vec_distance.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/vec_math.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/vec_math.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/vec_math.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/vec_math.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/vec_traits.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/vec_traits.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/vec_traits.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/vec_traits.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/warp.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/warp.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/warp.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/warp.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/warp_reduce.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/warp_reduce.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/warp_reduce.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/warp_reduce.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/warp_shuffle.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/warp_shuffle.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/warp_shuffle.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda/warp_shuffle.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda_stream_accessor.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda_stream_accessor.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda_stream_accessor.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda_stream_accessor.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda_types.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda_types.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda_types.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cuda_types.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cv_cpu_dispatch.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cv_cpu_dispatch.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cv_cpu_dispatch.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cv_cpu_dispatch.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cv_cpu_helper.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cv_cpu_helper.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cv_cpu_helper.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cv_cpu_helper.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cvdef.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cvdef.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cvdef.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cvdef.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cvstd.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cvstd.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cvstd.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cvstd.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cvstd.inl.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cvstd.inl.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cvstd.inl.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cvstd.inl.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cvstd_wrapper.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cvstd_wrapper.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/cvstd_wrapper.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/cvstd_wrapper.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/detail/async_promise.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/detail/async_promise.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/detail/async_promise.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/detail/async_promise.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/detail/dispatch_helper.impl.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/detail/dispatch_helper.impl.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/detail/dispatch_helper.impl.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/detail/dispatch_helper.impl.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/detail/exception_ptr.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/detail/exception_ptr.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/detail/exception_ptr.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/detail/exception_ptr.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/directx.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/directx.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/directx.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/directx.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/dualquaternion.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/dualquaternion.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/dualquaternion.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/dualquaternion.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/dualquaternion.inl.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/dualquaternion.inl.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/dualquaternion.inl.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/dualquaternion.inl.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/eigen.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/eigen.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/eigen.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/eigen.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/fast_math.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/fast_math.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/fast_math.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/fast_math.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/hal.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/hal.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/hal.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/hal.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/interface.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/interface.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/interface.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/interface.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_avx.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_avx.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_avx.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_avx.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_avx512.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_avx512.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_avx512.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_avx512.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_cpp.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_cpp.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_cpp.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_cpp.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_forward.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_forward.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_forward.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_forward.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_msa.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_msa.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_msa.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_msa.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_neon.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_neon.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_neon.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_neon.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_rvv.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_rvv.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_rvv.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_rvv.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_rvv071.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_rvv071.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_rvv071.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_rvv071.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_sse.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_sse.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_sse.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_sse.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_sse_em.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_sse_em.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_sse_em.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_sse_em.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_vsx.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_vsx.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_vsx.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_vsx.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_wasm.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_wasm.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_wasm.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/intrin_wasm.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/msa_macros.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/msa_macros.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/msa_macros.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/msa_macros.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/simd_utils.impl.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/simd_utils.impl.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/simd_utils.impl.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/hal/simd_utils.impl.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/mat.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/mat.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/mat.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/mat.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/mat.inl.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/mat.inl.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/mat.inl.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/mat.inl.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/matx.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/matx.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/matx.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/matx.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/neon_utils.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/neon_utils.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/neon_utils.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/neon_utils.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/ocl.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/ocl.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/ocl.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/ocl.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/ocl_genbase.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/ocl_genbase.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/ocl_genbase.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/ocl_genbase.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/ocl_defs.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/ocl_defs.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/ocl_defs.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/ocl_defs.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/opencl_info.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/opencl_info.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/opencl_info.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/opencl_info.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/opencl_svm.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/opencl_svm.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/opencl_svm.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/opencl_svm.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/autogenerated/opencl_clblas.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/autogenerated/opencl_clblas.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/autogenerated/opencl_clblas.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/autogenerated/opencl_clblas.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/autogenerated/opencl_clfft.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/autogenerated/opencl_clfft.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/autogenerated/opencl_clfft.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/autogenerated/opencl_clfft.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/autogenerated/opencl_core_wrappers.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/autogenerated/opencl_core_wrappers.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/autogenerated/opencl_core_wrappers.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/autogenerated/opencl_core_wrappers.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_clblas.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_clblas.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_clblas.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_clblas.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_clfft.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_clfft.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_clfft.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_clfft.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_core.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_core.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_core.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_core.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_core_wrappers.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_core_wrappers.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_core_wrappers.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_core_wrappers.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_gl.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_gl.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_gl.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_gl.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_gl_wrappers.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_gl_wrappers.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_gl_wrappers.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_gl_wrappers.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_svm_20.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_svm_20.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_svm_20.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_svm_20.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_svm_definitions.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_svm_definitions.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_svm_definitions.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_svm_definitions.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_svm_hsa_extension.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_svm_hsa_extension.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_svm_hsa_extension.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opencl/runtime/opencl_svm_hsa_extension.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opengl.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opengl.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/opengl.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/opengl.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/operations.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/operations.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/operations.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/operations.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/optim.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/optim.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/optim.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/optim.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/ovx.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/ovx.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/ovx.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/ovx.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/parallel/backend/parallel_for.openmp.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/parallel/backend/parallel_for.openmp.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/parallel/backend/parallel_for.openmp.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/parallel/backend/parallel_for.openmp.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/parallel/backend/parallel_for.tbb.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/parallel/backend/parallel_for.tbb.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/parallel/backend/parallel_for.tbb.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/parallel/backend/parallel_for.tbb.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/parallel/parallel_backend.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/parallel/parallel_backend.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/parallel/parallel_backend.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/parallel/parallel_backend.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/persistence.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/persistence.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/persistence.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/persistence.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/quaternion.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/quaternion.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/quaternion.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/quaternion.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/quaternion.inl.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/quaternion.inl.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/quaternion.inl.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/quaternion.inl.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/saturate.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/saturate.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/saturate.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/saturate.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/simd_intrinsics.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/simd_intrinsics.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/simd_intrinsics.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/simd_intrinsics.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/softfloat.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/softfloat.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/softfloat.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/softfloat.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/sse_utils.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/sse_utils.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/sse_utils.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/sse_utils.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/traits.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/traits.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/traits.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/traits.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/types.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/types.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/types.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/types.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/types_c.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/types_c.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/types_c.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/types_c.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/utility.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/utility.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/utility.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/utility.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/allocator_stats.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/allocator_stats.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/allocator_stats.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/allocator_stats.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/allocator_stats.impl.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/allocator_stats.impl.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/allocator_stats.impl.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/allocator_stats.impl.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/filesystem.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/filesystem.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/filesystem.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/filesystem.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/instrumentation.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/instrumentation.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/instrumentation.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/instrumentation.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/logger.defines.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/logger.defines.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/logger.defines.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/logger.defines.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/logger.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/logger.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/logger.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/logger.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/logtag.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/logtag.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/logtag.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/logtag.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/tls.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/tls.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/tls.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/tls.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/trace.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/trace.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/trace.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/utils/trace.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/va_intel.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/va_intel.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/va_intel.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/va_intel.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/version.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/version.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/version.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/version.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/vsx_utils.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/vsx_utils.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/core/vsx_utils.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/core/vsx_utils.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/cvconfig.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/cvconfig.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/cvconfig.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/cvconfig.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/dnn.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/dnn.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/dnn.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/dnn.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/dnn/all_layers.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/dnn/all_layers.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/dnn/all_layers.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/dnn/all_layers.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/dnn/dict.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/dnn/dict.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/dnn/dict.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/dnn/dict.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/dnn/dnn.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/dnn/dnn.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/dnn/dnn.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/dnn/dnn.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/dnn/dnn.inl.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/dnn/dnn.inl.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/dnn/dnn.inl.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/dnn/dnn.inl.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/dnn/layer.details.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/dnn/layer.details.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/dnn/layer.details.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/dnn/layer.details.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/dnn/layer.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/dnn/layer.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/dnn/layer.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/dnn/layer.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/dnn/shape_utils.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/dnn/shape_utils.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/dnn/shape_utils.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/dnn/shape_utils.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/dnn/utils/debug_utils.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/dnn/utils/debug_utils.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/dnn/utils/debug_utils.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/dnn/utils/debug_utils.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/dnn/utils/inference_engine.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/dnn/utils/inference_engine.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/dnn/utils/inference_engine.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/dnn/utils/inference_engine.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/dnn/version.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/dnn/version.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/dnn/version.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/dnn/version.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/features2d.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/features2d.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/features2d.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/features2d.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/features2d/features2d.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/features2d/features2d.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/features2d/features2d.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/features2d/features2d.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/features2d/hal/interface.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/features2d/hal/interface.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/features2d/hal/interface.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/features2d/hal/interface.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/all_indices.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/all_indices.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/all_indices.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/all_indices.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/allocator.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/allocator.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/allocator.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/allocator.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/any.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/any.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/any.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/any.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/autotuned_index.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/autotuned_index.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/autotuned_index.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/autotuned_index.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/composite_index.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/composite_index.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/composite_index.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/composite_index.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/config.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/config.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/config.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/config.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/defines.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/defines.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/defines.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/defines.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/dist.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/dist.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/dist.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/dist.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/dummy.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/dummy.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/dummy.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/dummy.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/dynamic_bitset.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/dynamic_bitset.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/dynamic_bitset.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/dynamic_bitset.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/flann.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/flann.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/flann.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/flann.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/flann_base.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/flann_base.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/flann_base.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/flann_base.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/general.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/general.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/general.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/general.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/ground_truth.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/ground_truth.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/ground_truth.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/ground_truth.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/hdf5.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/hdf5.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/hdf5.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/hdf5.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/heap.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/heap.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/heap.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/heap.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/hierarchical_clustering_index.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/hierarchical_clustering_index.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/hierarchical_clustering_index.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/hierarchical_clustering_index.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/index_testing.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/index_testing.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/index_testing.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/index_testing.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/kdtree_index.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/kdtree_index.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/kdtree_index.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/kdtree_index.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/kdtree_single_index.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/kdtree_single_index.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/kdtree_single_index.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/kdtree_single_index.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/kmeans_index.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/kmeans_index.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/kmeans_index.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/kmeans_index.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/linear_index.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/linear_index.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/linear_index.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/linear_index.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/logger.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/logger.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/logger.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/logger.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/lsh_index.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/lsh_index.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/lsh_index.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/lsh_index.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/lsh_table.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/lsh_table.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/lsh_table.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/lsh_table.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/matrix.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/matrix.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/matrix.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/matrix.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/miniflann.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/miniflann.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/miniflann.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/miniflann.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/nn_index.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/nn_index.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/nn_index.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/nn_index.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/object_factory.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/object_factory.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/object_factory.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/object_factory.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/params.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/params.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/params.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/params.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/random.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/random.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/random.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/random.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/result_set.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/result_set.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/result_set.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/result_set.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/sampling.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/sampling.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/sampling.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/sampling.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/saving.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/saving.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/saving.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/saving.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/simplex_downhill.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/simplex_downhill.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/simplex_downhill.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/simplex_downhill.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/timer.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/timer.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/flann/timer.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/flann/timer.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/core.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/core.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/core.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/core.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/cpu/core.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/cpu/core.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/cpu/core.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/cpu/core.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/cpu/gcpukernel.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/cpu/gcpukernel.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/cpu/gcpukernel.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/cpu/gcpukernel.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/cpu/imgproc.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/cpu/imgproc.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/cpu/imgproc.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/cpu/imgproc.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/cpu/stereo.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/cpu/stereo.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/cpu/stereo.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/cpu/stereo.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/cpu/video.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/cpu/video.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/cpu/video.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/cpu/video.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/fluid/core.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/fluid/core.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/fluid/core.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/fluid/core.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/fluid/gfluidbuffer.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/fluid/gfluidbuffer.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/fluid/gfluidbuffer.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/fluid/gfluidbuffer.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/fluid/gfluidkernel.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/fluid/gfluidkernel.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/fluid/gfluidkernel.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/fluid/gfluidkernel.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/fluid/imgproc.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/fluid/imgproc.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/fluid/imgproc.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/fluid/imgproc.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/garg.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/garg.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/garg.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/garg.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/garray.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/garray.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/garray.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/garray.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gasync_context.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gasync_context.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gasync_context.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gasync_context.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcall.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcall.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcall.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcall.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcommon.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcommon.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcommon.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcommon.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcompiled.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcompiled.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcompiled.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcompiled.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcompiled_async.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcompiled_async.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcompiled_async.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcompiled_async.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcompoundkernel.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcompoundkernel.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcompoundkernel.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcompoundkernel.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcomputation.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcomputation.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcomputation.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcomputation.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcomputation_async.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcomputation_async.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcomputation_async.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gcomputation_async.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gframe.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gframe.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gframe.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gframe.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gkernel.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gkernel.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gkernel.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gkernel.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gmat.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gmat.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gmat.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gmat.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gmetaarg.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gmetaarg.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gmetaarg.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gmetaarg.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gopaque.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gopaque.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gopaque.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gopaque.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gproto.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gproto.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gproto.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gproto.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gpu/core.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gpu/core.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gpu/core.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gpu/core.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gpu/ggpukernel.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gpu/ggpukernel.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gpu/ggpukernel.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gpu/ggpukernel.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gpu/imgproc.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gpu/imgproc.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gpu/imgproc.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gpu/imgproc.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gscalar.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gscalar.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gscalar.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gscalar.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gstreaming.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gstreaming.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gstreaming.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gstreaming.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gtransform.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gtransform.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gtransform.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gtransform.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gtype_traits.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gtype_traits.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gtype_traits.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gtype_traits.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gtyped.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gtyped.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gtyped.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/gtyped.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/imgproc.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/imgproc.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/imgproc.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/imgproc.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/infer.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/infer.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/infer.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/infer.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/infer/bindings_ie.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/infer/bindings_ie.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/infer/bindings_ie.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/infer/bindings_ie.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/infer/ie.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/infer/ie.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/infer/ie.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/infer/ie.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/infer/onnx.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/infer/onnx.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/infer/onnx.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/infer/onnx.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/infer/parsers.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/infer/parsers.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/infer/parsers.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/infer/parsers.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/media.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/media.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/media.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/media.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/ocl/core.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/ocl/core.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/ocl/core.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/ocl/core.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/ocl/goclkernel.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/ocl/goclkernel.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/ocl/goclkernel.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/ocl/goclkernel.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/ocl/imgproc.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/ocl/imgproc.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/ocl/imgproc.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/ocl/imgproc.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/opencv_includes.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/opencv_includes.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/opencv_includes.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/opencv_includes.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/operators.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/operators.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/operators.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/operators.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/assert.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/assert.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/assert.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/assert.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/convert.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/convert.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/convert.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/convert.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/cvdefs.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/cvdefs.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/cvdefs.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/cvdefs.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/exports.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/exports.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/exports.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/exports.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/mat.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/mat.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/mat.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/mat.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/saturate.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/saturate.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/saturate.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/saturate.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/scalar.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/scalar.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/scalar.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/scalar.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/types.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/types.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/types.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/own/types.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/plaidml/core.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/plaidml/core.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/plaidml/core.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/plaidml/core.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/plaidml/gplaidmlkernel.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/plaidml/gplaidmlkernel.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/plaidml/gplaidmlkernel.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/plaidml/gplaidmlkernel.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/plaidml/plaidml.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/plaidml/plaidml.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/plaidml/plaidml.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/plaidml/plaidml.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/python/python.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/python/python.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/python/python.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/python/python.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/render.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/render.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/render.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/render.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/render/render.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/render/render.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/render/render.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/render/render.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/render/render_types.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/render/render_types.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/render/render_types.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/render/render_types.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/rmat.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/rmat.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/rmat.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/rmat.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/s11n.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/s11n.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/s11n.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/s11n.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/s11n/base.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/s11n/base.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/s11n/base.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/s11n/base.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/stereo.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/stereo.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/stereo.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/stereo.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/cap.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/cap.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/cap.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/cap.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/desync.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/desync.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/desync.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/desync.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/format.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/format.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/format.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/format.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/gstreamer/gstreamerpipeline.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/gstreamer/gstreamerpipeline.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/gstreamer/gstreamerpipeline.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/gstreamer/gstreamerpipeline.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/gstreamer/gstreamersource.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/gstreamer/gstreamersource.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/gstreamer/gstreamersource.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/gstreamer/gstreamersource.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/meta.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/meta.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/meta.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/meta.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/onevpl/cfg_params.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/onevpl/cfg_params.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/onevpl/cfg_params.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/onevpl/cfg_params.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/onevpl/data_provider_interface.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/onevpl/data_provider_interface.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/onevpl/data_provider_interface.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/onevpl/data_provider_interface.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/onevpl/device_selector_interface.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/onevpl/device_selector_interface.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/onevpl/device_selector_interface.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/onevpl/device_selector_interface.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/onevpl/source.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/onevpl/source.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/onevpl/source.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/onevpl/source.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/source.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/source.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/source.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/source.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/sync.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/sync.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/sync.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/streaming/sync.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/any.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/any.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/any.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/any.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/compiler_hints.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/compiler_hints.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/compiler_hints.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/compiler_hints.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/copy_through_move.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/copy_through_move.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/copy_through_move.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/copy_through_move.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/optional.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/optional.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/optional.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/optional.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/throw.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/throw.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/throw.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/throw.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/type_traits.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/type_traits.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/type_traits.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/type_traits.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/util.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/util.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/util.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/util.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/variant.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/variant.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/variant.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/util/variant.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/video.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/video.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/gapi/video.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/gapi/video.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/highgui.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/highgui.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/highgui.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/highgui.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/highgui/highgui.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/highgui/highgui.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/highgui/highgui.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/highgui/highgui.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/highgui/highgui_c.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/highgui/highgui_c.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/highgui/highgui_c.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/highgui/highgui_c.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgcodecs.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgcodecs.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgcodecs.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgcodecs.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgcodecs/imgcodecs.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgcodecs/imgcodecs.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgcodecs/imgcodecs.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgcodecs/imgcodecs.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgcodecs/imgcodecs_c.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgcodecs/imgcodecs_c.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgcodecs/imgcodecs_c.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgcodecs/imgcodecs_c.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgcodecs/ios.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgcodecs/ios.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgcodecs/ios.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgcodecs/ios.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgcodecs/legacy/constants_c.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgcodecs/legacy/constants_c.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgcodecs/legacy/constants_c.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgcodecs/legacy/constants_c.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgcodecs/macosx.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgcodecs/macosx.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgcodecs/macosx.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgcodecs/macosx.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgproc.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgproc.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgproc.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgproc.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/bindings.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/bindings.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/bindings.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/bindings.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/detail/gcgraph.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/detail/gcgraph.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/detail/gcgraph.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/detail/gcgraph.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/hal/hal.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/hal/hal.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/hal/hal.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/hal/hal.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/hal/interface.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/hal/interface.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/hal/interface.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/hal/interface.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/imgproc.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/imgproc.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/imgproc.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/imgproc.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/imgproc_c.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/imgproc_c.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/imgproc_c.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/imgproc_c.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/segmentation.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/segmentation.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/segmentation.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/segmentation.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/types_c.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/types_c.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/types_c.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/imgproc/types_c.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/ml.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/ml.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/ml.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/ml.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/ml/ml.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/ml/ml.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/ml/ml.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/ml/ml.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/ml/ml.inl.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/ml/ml.inl.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/ml/ml.inl.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/ml/ml.inl.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/objdetect.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/objdetect.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/objdetect.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/objdetect.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/objdetect/detection_based_tracker.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/objdetect/detection_based_tracker.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/objdetect/detection_based_tracker.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/objdetect/detection_based_tracker.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/objdetect/face.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/objdetect/face.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/objdetect/face.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/objdetect/face.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/objdetect/objdetect.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/objdetect/objdetect.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/objdetect/objdetect.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/objdetect/objdetect.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/opencv.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/opencv.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/opencv.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/opencv.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/opencv_modules.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/opencv_modules.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/opencv_modules.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/opencv_modules.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/photo.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/photo.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/photo.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/photo.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/photo/cuda.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/photo/cuda.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/photo/cuda.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/photo/cuda.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/photo/legacy/constants_c.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/photo/legacy/constants_c.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/photo/legacy/constants_c.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/photo/legacy/constants_c.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/photo/photo.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/photo/photo.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/photo/photo.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/photo/photo.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/autocalib.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/autocalib.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/autocalib.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/autocalib.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/blenders.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/blenders.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/blenders.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/blenders.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/camera.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/camera.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/camera.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/camera.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/exposure_compensate.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/exposure_compensate.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/exposure_compensate.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/exposure_compensate.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/matchers.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/matchers.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/matchers.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/matchers.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/motion_estimators.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/motion_estimators.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/motion_estimators.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/motion_estimators.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/seam_finders.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/seam_finders.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/seam_finders.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/seam_finders.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/timelapsers.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/timelapsers.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/timelapsers.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/timelapsers.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/util.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/util.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/util.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/util.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/util_inl.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/util_inl.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/util_inl.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/util_inl.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/warpers.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/warpers.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/warpers.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/warpers.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/warpers_inl.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/warpers_inl.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/warpers_inl.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching/detail/warpers_inl.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching/warpers.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching/warpers.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/stitching/warpers.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/stitching/warpers.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/video.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/video.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/video.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/video.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/video/background_segm.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/video/background_segm.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/video/background_segm.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/video/background_segm.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/video/detail/tracking.detail.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/video/detail/tracking.detail.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/video/detail/tracking.detail.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/video/detail/tracking.detail.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/video/legacy/constants_c.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/video/legacy/constants_c.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/video/legacy/constants_c.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/video/legacy/constants_c.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/video/tracking.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/video/tracking.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/video/tracking.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/video/tracking.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/video/video.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/video/video.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/video/video.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/video/video.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/videoio.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/videoio.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/videoio.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/videoio.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/videoio/cap_ios.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/videoio/cap_ios.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/videoio/cap_ios.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/videoio/cap_ios.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/videoio/legacy/constants_c.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/videoio/legacy/constants_c.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/videoio/legacy/constants_c.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/videoio/legacy/constants_c.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/videoio/registry.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/videoio/registry.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/videoio/registry.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/videoio/registry.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/videoio/videoio.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/videoio/videoio.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/videoio/videoio.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/videoio/videoio.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/videoio/videoio_c.h b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/videoio/videoio_c.h similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/videoio/videoio_c.h rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/videoio/videoio_c.h diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/world.hpp b/1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/world.hpp similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/include/opencv2/world.hpp rename to 1280x800-XH/Cigarette/OpenCV455Simple/include/opencv2/world.hpp diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/win64/vc14/lib/OpenCVConfig-version.cmake b/1280x800-XH/Cigarette/OpenCV455Simple/win64/vc14/lib/OpenCVConfig-version.cmake similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/win64/vc14/lib/OpenCVConfig-version.cmake rename to 1280x800-XH/Cigarette/OpenCV455Simple/win64/vc14/lib/OpenCVConfig-version.cmake diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/win64/vc14/lib/OpenCVConfig.cmake b/1280x800-XH/Cigarette/OpenCV455Simple/win64/vc14/lib/OpenCVConfig.cmake similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/win64/vc14/lib/OpenCVConfig.cmake rename to 1280x800-XH/Cigarette/OpenCV455Simple/win64/vc14/lib/OpenCVConfig.cmake diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/win64/vc14/lib/OpenCVModules-debug.cmake b/1280x800-XH/Cigarette/OpenCV455Simple/win64/vc14/lib/OpenCVModules-debug.cmake similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/win64/vc14/lib/OpenCVModules-debug.cmake rename to 1280x800-XH/Cigarette/OpenCV455Simple/win64/vc14/lib/OpenCVModules-debug.cmake diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/win64/vc14/lib/OpenCVModules-release.cmake b/1280x800-XH/Cigarette/OpenCV455Simple/win64/vc14/lib/OpenCVModules-release.cmake similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/win64/vc14/lib/OpenCVModules-release.cmake rename to 1280x800-XH/Cigarette/OpenCV455Simple/win64/vc14/lib/OpenCVModules-release.cmake diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/win64/vc14/lib/OpenCVModules.cmake b/1280x800-XH/Cigarette/OpenCV455Simple/win64/vc14/lib/OpenCVModules.cmake similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/win64/vc14/lib/OpenCVModules.cmake rename to 1280x800-XH/Cigarette/OpenCV455Simple/win64/vc14/lib/OpenCVModules.cmake diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/win64/vc14/lib/opencv_world455.lib b/1280x800-XH/Cigarette/OpenCV455Simple/win64/vc14/lib/opencv_world455.lib similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/win64/vc14/lib/opencv_world455.lib rename to 1280x800-XH/Cigarette/OpenCV455Simple/win64/vc14/lib/opencv_world455.lib diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/win64/vc14/lib/opencv_world455d.lib b/1280x800-XH/Cigarette/OpenCV455Simple/win64/vc14/lib/opencv_world455d.lib similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/win64/vc14/lib/opencv_world455d.lib rename to 1280x800-XH/Cigarette/OpenCV455Simple/win64/vc14/lib/opencv_world455d.lib diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/win64/vc15/lib/OpenCVConfig-version.cmake b/1280x800-XH/Cigarette/OpenCV455Simple/win64/vc15/lib/OpenCVConfig-version.cmake similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/win64/vc15/lib/OpenCVConfig-version.cmake rename to 1280x800-XH/Cigarette/OpenCV455Simple/win64/vc15/lib/OpenCVConfig-version.cmake diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/win64/vc15/lib/OpenCVConfig.cmake b/1280x800-XH/Cigarette/OpenCV455Simple/win64/vc15/lib/OpenCVConfig.cmake similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/win64/vc15/lib/OpenCVConfig.cmake rename to 1280x800-XH/Cigarette/OpenCV455Simple/win64/vc15/lib/OpenCVConfig.cmake diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/win64/vc15/lib/OpenCVModules-debug.cmake b/1280x800-XH/Cigarette/OpenCV455Simple/win64/vc15/lib/OpenCVModules-debug.cmake similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/win64/vc15/lib/OpenCVModules-debug.cmake rename to 1280x800-XH/Cigarette/OpenCV455Simple/win64/vc15/lib/OpenCVModules-debug.cmake diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/win64/vc15/lib/OpenCVModules-release.cmake b/1280x800-XH/Cigarette/OpenCV455Simple/win64/vc15/lib/OpenCVModules-release.cmake similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/win64/vc15/lib/OpenCVModules-release.cmake rename to 1280x800-XH/Cigarette/OpenCV455Simple/win64/vc15/lib/OpenCVModules-release.cmake diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/win64/vc15/lib/OpenCVModules.cmake b/1280x800-XH/Cigarette/OpenCV455Simple/win64/vc15/lib/OpenCVModules.cmake similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/win64/vc15/lib/OpenCVModules.cmake rename to 1280x800-XH/Cigarette/OpenCV455Simple/win64/vc15/lib/OpenCVModules.cmake diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/win64/vc15/lib/opencv_world455.lib b/1280x800-XH/Cigarette/OpenCV455Simple/win64/vc15/lib/opencv_world455.lib similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/win64/vc15/lib/opencv_world455.lib rename to 1280x800-XH/Cigarette/OpenCV455Simple/win64/vc15/lib/opencv_world455.lib diff --git a/1280x800 TH/Cigarette/OpenCV455Simple/win64/vc15/lib/opencv_world455d.lib b/1280x800-XH/Cigarette/OpenCV455Simple/win64/vc15/lib/opencv_world455d.lib similarity index 100% rename from 1280x800 TH/Cigarette/OpenCV455Simple/win64/vc15/lib/opencv_world455d.lib rename to 1280x800-XH/Cigarette/OpenCV455Simple/win64/vc15/lib/opencv_world455d.lib diff --git a/1280x800 TH/Cigarette/PLC/PLCDevice.cpp b/1280x800-XH/Cigarette/PLC/PLCDevice.cpp similarity index 100% rename from 1280x800 TH/Cigarette/PLC/PLCDevice.cpp rename to 1280x800-XH/Cigarette/PLC/PLCDevice.cpp diff --git a/1280x800 TH/Cigarette/PLC/PLCDevice.h b/1280x800-XH/Cigarette/PLC/PLCDevice.h similarity index 100% rename from 1280x800 TH/Cigarette/PLC/PLCDevice.h rename to 1280x800-XH/Cigarette/PLC/PLCDevice.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/Base/GCArray.h b/1280x800-XH/Cigarette/Pylon6.2/include/Base/GCArray.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/Base/GCArray.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/Base/GCArray.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/Base/GCBase.h b/1280x800-XH/Cigarette/Pylon6.2/include/Base/GCBase.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/Base/GCBase.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/Base/GCBase.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/Base/GCError.h b/1280x800-XH/Cigarette/Pylon6.2/include/Base/GCError.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/Base/GCError.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/Base/GCError.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/Base/GCException.h b/1280x800-XH/Cigarette/Pylon6.2/include/Base/GCException.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/Base/GCException.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/Base/GCException.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/Base/GCLinkage.h b/1280x800-XH/Cigarette/Pylon6.2/include/Base/GCLinkage.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/Base/GCLinkage.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/Base/GCLinkage.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/Base/GCNamespace.h b/1280x800-XH/Cigarette/Pylon6.2/include/Base/GCNamespace.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/Base/GCNamespace.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/Base/GCNamespace.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/Base/GCRTSSUtilities.h b/1280x800-XH/Cigarette/Pylon6.2/include/Base/GCRTSSUtilities.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/Base/GCRTSSUtilities.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/Base/GCRTSSUtilities.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/Base/GCString.h b/1280x800-XH/Cigarette/Pylon6.2/include/Base/GCString.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/Base/GCString.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/Base/GCString.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/Base/GCStringVector.h b/1280x800-XH/Cigarette/Pylon6.2/include/Base/GCStringVector.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/Base/GCStringVector.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/Base/GCStringVector.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/Base/GCSynch.h b/1280x800-XH/Cigarette/Pylon6.2/include/Base/GCSynch.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/Base/GCSynch.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/Base/GCSynch.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/Base/GCTypes.h b/1280x800-XH/Cigarette/Pylon6.2/include/Base/GCTypes.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/Base/GCTypes.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/Base/GCTypes.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/Base/GCUtilities.h b/1280x800-XH/Cigarette/Pylon6.2/include/Base/GCUtilities.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/Base/GCUtilities.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/Base/GCUtilities.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/Autovector.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/Autovector.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/Autovector.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/Autovector.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/ChunkAdapter.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/ChunkAdapter.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/ChunkAdapter.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/ChunkAdapter.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/ChunkAdapterDcam.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/ChunkAdapterDcam.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/ChunkAdapterDcam.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/ChunkAdapterDcam.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/ChunkAdapterGEV.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/ChunkAdapterGEV.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/ChunkAdapterGEV.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/ChunkAdapterGEV.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/ChunkAdapterGeneric.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/ChunkAdapterGeneric.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/ChunkAdapterGeneric.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/ChunkAdapterGeneric.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/ChunkAdapterU3V.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/ChunkAdapterU3V.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/ChunkAdapterU3V.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/ChunkAdapterU3V.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/ChunkPort.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/ChunkPort.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/ChunkPort.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/ChunkPort.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/Compatibility.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/Compatibility.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/Compatibility.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/Compatibility.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/Container.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/Container.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/Container.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/Container.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/Counter.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/Counter.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/Counter.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/Counter.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/DLLLoad.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/DLLLoad.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/DLLLoad.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/DLLLoad.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/EnumClasses.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/EnumClasses.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/EnumClasses.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/EnumClasses.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/EventAdapter.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/EventAdapter.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/EventAdapter.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/EventAdapter.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/EventAdapter1394.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/EventAdapter1394.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/EventAdapter1394.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/EventAdapter1394.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/EventAdapterCL.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/EventAdapterCL.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/EventAdapterCL.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/EventAdapterCL.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/EventAdapterGEV.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/EventAdapterGEV.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/EventAdapterGEV.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/EventAdapterGEV.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/EventAdapterGeneric.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/EventAdapterGeneric.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/EventAdapterGeneric.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/EventAdapterGeneric.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/EventAdapterU3V.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/EventAdapterU3V.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/EventAdapterU3V.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/EventAdapterU3V.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/EventPort.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/EventPort.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/EventPort.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/EventPort.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/Filestream.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/Filestream.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/Filestream.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/Filestream.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/GenApi.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/GenApi.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/GenApi.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/GenApi.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/GenApiDll.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/GenApiDll.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/GenApiDll.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/GenApiDll.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/GenApiLinkage.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/GenApiLinkage.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/GenApiLinkage.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/GenApiLinkage.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/GenApiNamespace.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/GenApiNamespace.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/GenApiNamespace.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/GenApiNamespace.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/GenApiVersion.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/GenApiVersion.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/GenApiVersion.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/GenApiVersion.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IBase.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IBase.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IBase.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IBase.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IBoolean.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IBoolean.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IBoolean.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IBoolean.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/ICategory.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/ICategory.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/ICategory.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/ICategory.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IChunkPort.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IChunkPort.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IChunkPort.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IChunkPort.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/ICommand.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/ICommand.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/ICommand.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/ICommand.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IDestroy.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IDestroy.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IDestroy.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IDestroy.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IDeviceInfo.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IDeviceInfo.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IDeviceInfo.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IDeviceInfo.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IEnumEntry.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IEnumEntry.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IEnumEntry.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IEnumEntry.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IEnumeration.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IEnumeration.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IEnumeration.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IEnumeration.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IEnumerationT.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IEnumerationT.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IEnumerationT.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IEnumerationT.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IFloat.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IFloat.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IFloat.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IFloat.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IInteger.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IInteger.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IInteger.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IInteger.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/INode.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/INode.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/INode.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/INode.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/INodeMap.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/INodeMap.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/INodeMap.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/INodeMap.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/INodeMapDyn.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/INodeMapDyn.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/INodeMapDyn.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/INodeMapDyn.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IPort.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IPort.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IPort.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IPort.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IPortConstruct.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IPortConstruct.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IPortConstruct.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IPortConstruct.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IPortRecorder.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IPortRecorder.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IPortRecorder.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IPortRecorder.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IRegister.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IRegister.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IRegister.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IRegister.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/ISelector.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/ISelector.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/ISelector.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/ISelector.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/ISelectorDigit.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/ISelectorDigit.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/ISelectorDigit.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/ISelectorDigit.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IString.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IString.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IString.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IString.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IUserData.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IUserData.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IUserData.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IUserData.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IValue.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IValue.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/IValue.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/IValue.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/NodeCallback.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/NodeCallback.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/NodeCallback.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/NodeCallback.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/NodeMapFactory.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/NodeMapFactory.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/NodeMapFactory.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/NodeMapFactory.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/NodeMapRef.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/NodeMapRef.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/NodeMapRef.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/NodeMapRef.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/Persistence.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/Persistence.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/Persistence.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/Persistence.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/Pointer.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/Pointer.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/Pointer.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/Pointer.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/PortImpl.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/PortImpl.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/PortImpl.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/PortImpl.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/PortWriteList.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/PortWriteList.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/PortWriteList.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/PortWriteList.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/Reference.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/Reference.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/Reference.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/Reference.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/RegisterSetHelper.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/RegisterSetHelper.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/RegisterSetHelper.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/RegisterSetHelper.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/SelectorSet.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/SelectorSet.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/SelectorSet.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/SelectorSet.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/StructPort.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/StructPort.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/StructPort.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/StructPort.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/Synch.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/Synch.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/Synch.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/Synch.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenApi/Types.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenApi/Types.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenApi/Types.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenApi/Types.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenICam.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenICam.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenICam.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenICam.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenICamFwd.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenICamFwd.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenICamFwd.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenICamFwd.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/GenICamVersion.h b/1280x800-XH/Cigarette/Pylon6.2/include/GenICamVersion.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/GenICamVersion.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/GenICamVersion.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/_GenICamVersion.h b/1280x800-XH/Cigarette/Pylon6.2/include/_GenICamVersion.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/_GenICamVersion.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/_GenICamVersion.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/genapic/GenApiC.h b/1280x800-XH/Cigarette/Pylon6.2/include/genapic/GenApiC.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/genapic/GenApiC.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/genapic/GenApiC.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/genapic/GenApiC32BitMethods.h b/1280x800-XH/Cigarette/Pylon6.2/include/genapic/GenApiC32BitMethods.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/genapic/GenApiC32BitMethods.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/genapic/GenApiC32BitMethods.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/genapic/GenApiCDefines.h b/1280x800-XH/Cigarette/Pylon6.2/include/genapic/GenApiCDefines.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/genapic/GenApiCDefines.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/genapic/GenApiCDefines.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/genapic/GenApiCEnums.h b/1280x800-XH/Cigarette/Pylon6.2/include/genapic/GenApiCEnums.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/genapic/GenApiCEnums.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/genapic/GenApiCEnums.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/genapic/GenApiCError.h b/1280x800-XH/Cigarette/Pylon6.2/include/genapic/GenApiCError.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/genapic/GenApiCError.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/genapic/GenApiCError.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/genapic/GenApiCTypes.h b/1280x800-XH/Cigarette/Pylon6.2/include/genapic/GenApiCTypes.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/genapic/GenApiCTypes.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/genapic/GenApiCTypes.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/AcquireContinuousConfiguration.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/AcquireContinuousConfiguration.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/AcquireContinuousConfiguration.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/AcquireContinuousConfiguration.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/AcquireSingleFrameConfiguration.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/AcquireSingleFrameConfiguration.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/AcquireSingleFrameConfiguration.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/AcquireSingleFrameConfiguration.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/ArrayParameter.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/ArrayParameter.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/ArrayParameter.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/ArrayParameter.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/AviCompressionOptions.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/AviCompressionOptions.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/AviCompressionOptions.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/AviCompressionOptions.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/AviWriter.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/AviWriter.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/AviWriter.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/AviWriter.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalCameraEventHandler.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalCameraEventHandler.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalCameraEventHandler.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalCameraEventHandler.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalConfigurationEventHandler.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalConfigurationEventHandler.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalConfigurationEventHandler.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalConfigurationEventHandler.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalGrabResultData.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalGrabResultData.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalGrabResultData.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalGrabResultData.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalGrabResultPtr.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalGrabResultPtr.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalGrabResultPtr.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalGrabResultPtr.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalImageEventHandler.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalImageEventHandler.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalImageEventHandler.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalImageEventHandler.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalInstantCamera.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalInstantCamera.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalInstantCamera.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalInstantCamera.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalInstantCameraArray.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalInstantCameraArray.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalInstantCameraArray.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/BaslerUniversalInstantCameraArray.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/BooleanParameter.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/BooleanParameter.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/BooleanParameter.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/BooleanParameter.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/BufferFactory.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/BufferFactory.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/BufferFactory.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/BufferFactory.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/Callback.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/Callback.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/Callback.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/Callback.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/CameraEventHandler.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/CameraEventHandler.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/CameraEventHandler.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/CameraEventHandler.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/ChunkParser.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/ChunkParser.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/ChunkParser.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/ChunkParser.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/CommandParameter.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/CommandParameter.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/CommandParameter.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/CommandParameter.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/ConfigurationEventHandler.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/ConfigurationEventHandler.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/ConfigurationEventHandler.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/ConfigurationEventHandler.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/ConfigurationHelper.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/ConfigurationHelper.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/ConfigurationHelper.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/ConfigurationHelper.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/Container.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/Container.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/Container.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/Container.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/Device.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/Device.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/Device.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/Device.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/DeviceAccessMode.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/DeviceAccessMode.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/DeviceAccessMode.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/DeviceAccessMode.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/DeviceClass.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/DeviceClass.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/DeviceClass.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/DeviceClass.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/DeviceFactory.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/DeviceFactory.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/DeviceFactory.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/DeviceFactory.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/DeviceInfo.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/DeviceInfo.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/DeviceInfo.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/DeviceInfo.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/EnumParameter.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/EnumParameter.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/EnumParameter.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/EnumParameter.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/EnumParameterT.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/EnumParameterT.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/EnumParameterT.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/EnumParameterT.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/EventAdapter.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/EventAdapter.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/EventAdapter.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/EventAdapter.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/EventGrabber.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/EventGrabber.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/EventGrabber.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/EventGrabber.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/EventGrabberProxy.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/EventGrabberProxy.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/EventGrabberProxy.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/EventGrabberProxy.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/FeaturePersistence.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/FeaturePersistence.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/FeaturePersistence.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/FeaturePersistence.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/FloatParameter.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/FloatParameter.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/FloatParameter.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/FloatParameter.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/GrabResultData.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/GrabResultData.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/GrabResultData.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/GrabResultData.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/GrabResultPtr.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/GrabResultPtr.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/GrabResultPtr.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/GrabResultPtr.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/Image.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/Image.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/Image.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/Image.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/ImageDecompressor.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/ImageDecompressor.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/ImageDecompressor.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/ImageDecompressor.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/ImageEventHandler.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/ImageEventHandler.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/ImageEventHandler.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/ImageEventHandler.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/ImageFormatConverter.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/ImageFormatConverter.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/ImageFormatConverter.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/ImageFormatConverter.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/ImagePersistence.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/ImagePersistence.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/ImagePersistence.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/ImagePersistence.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/Info.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/Info.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/Info.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/Info.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/InstantCamera.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/InstantCamera.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/InstantCamera.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/InstantCamera.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/InstantCameraArray.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/InstantCameraArray.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/InstantCameraArray.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/InstantCameraArray.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/InstantInterface.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/InstantInterface.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/InstantInterface.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/InstantInterface.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/IntegerParameter.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/IntegerParameter.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/IntegerParameter.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/IntegerParameter.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/Interface.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/Interface.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/Interface.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/Interface.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/InterfaceInfo.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/InterfaceInfo.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/InterfaceInfo.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/InterfaceInfo.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/NodeMapProxy.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/NodeMapProxy.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/NodeMapProxy.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/NodeMapProxy.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/Parameter.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/Parameter.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/Parameter.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/Parameter.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/ParameterIncludes.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/ParameterIncludes.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/ParameterIncludes.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/ParameterIncludes.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/PayloadType.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/PayloadType.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/PayloadType.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/PayloadType.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/Pixel.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/Pixel.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/Pixel.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/Pixel.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/PixelData.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/PixelData.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/PixelData.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/PixelData.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/PixelType.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/PixelType.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/PixelType.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/PixelType.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/PixelTypeMapper.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/PixelTypeMapper.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/PixelTypeMapper.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/PixelTypeMapper.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/Platform.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/Platform.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/Platform.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/Platform.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonBase.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonBase.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonBase.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonBase.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonBitmapImage.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonBitmapImage.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonBitmapImage.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonBitmapImage.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonDataComponent.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonDataComponent.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonDataComponent.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonDataComponent.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonDataContainer.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonDataContainer.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonDataContainer.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonDataContainer.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonDeviceProxy.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonDeviceProxy.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonDeviceProxy.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonDeviceProxy.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonGUI.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonGUI.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonGUI.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonGUI.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonGUIIncludes.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonGUIIncludes.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonGUIIncludes.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonGUIIncludes.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonImage.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonImage.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonImage.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonImage.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonImageBase.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonImageBase.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonImageBase.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonImageBase.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonImageUserBufferEventHandler.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonImageUserBufferEventHandler.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonImageUserBufferEventHandler.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonImageUserBufferEventHandler.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonIncludes.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonIncludes.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonIncludes.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonIncludes.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonLinkage.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonLinkage.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonLinkage.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonLinkage.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonUtility.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonUtility.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonUtility.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonUtility.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonUtilityIncludes.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonUtilityIncludes.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonUtilityIncludes.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonUtilityIncludes.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonVersion.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonVersion.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonVersion.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonVersion.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonVersionInfo.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonVersionInfo.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonVersionInfo.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonVersionInfo.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonVersionNumber.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonVersionNumber.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/PylonVersionNumber.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/PylonVersionNumber.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/Result.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/Result.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/Result.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/Result.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/ResultImage.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/ResultImage.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/ResultImage.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/ResultImage.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/ReusableImage.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/ReusableImage.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/ReusableImage.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/ReusableImage.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/SfncVersion.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/SfncVersion.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/SfncVersion.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/SfncVersion.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/SoftwareTriggerConfiguration.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/SoftwareTriggerConfiguration.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/SoftwareTriggerConfiguration.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/SoftwareTriggerConfiguration.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/StreamGrabber.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/StreamGrabber.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/StreamGrabber.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/StreamGrabber.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/StreamGrabberProxy.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/StreamGrabberProxy.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/StreamGrabberProxy.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/StreamGrabberProxy.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/StringParameter.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/StringParameter.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/StringParameter.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/StringParameter.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/ThreadPriority.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/ThreadPriority.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/ThreadPriority.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/ThreadPriority.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/TlFactory.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/TlFactory.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/TlFactory.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/TlFactory.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/TlInfo.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/TlInfo.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/TlInfo.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/TlInfo.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/TransportLayer.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/TransportLayer.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/TransportLayer.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/TransportLayer.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/TypeMappings.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/TypeMappings.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/TypeMappings.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/TypeMappings.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/VideoWriter.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/VideoWriter.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/VideoWriter.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/VideoWriter.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/WaitObject.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/WaitObject.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/WaitObject.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/WaitObject.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/WaitObjects.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/WaitObjects.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/WaitObjects.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/WaitObjects.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/XmlFileProvider.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/XmlFileProvider.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/XmlFileProvider.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/XmlFileProvider.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/_BaslerUniversalCameraParams.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/_BaslerUniversalCameraParams.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/_BaslerUniversalCameraParams.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/_BaslerUniversalCameraParams.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/_BaslerUniversalChunkDataParams.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/_BaslerUniversalChunkDataParams.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/_BaslerUniversalChunkDataParams.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/_BaslerUniversalChunkDataParams.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/_BaslerUniversalEventParams.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/_BaslerUniversalEventParams.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/_BaslerUniversalEventParams.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/_BaslerUniversalEventParams.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/_BaslerUniversalInterfaceParams.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/_BaslerUniversalInterfaceParams.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/_BaslerUniversalInterfaceParams.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/_BaslerUniversalInterfaceParams.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/_BaslerUniversalStreamParams.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/_BaslerUniversalStreamParams.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/_BaslerUniversalStreamParams.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/_BaslerUniversalStreamParams.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/_BaslerUniversalTLParams.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/_BaslerUniversalTLParams.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/_BaslerUniversalTLParams.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/_BaslerUniversalTLParams.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/_ImageFormatConverterParams.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/_ImageFormatConverterParams.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/_ImageFormatConverterParams.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/_ImageFormatConverterParams.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/_InstantCameraParams.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/_InstantCameraParams.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/_InstantCameraParams.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/_InstantCameraParams.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/_VideoWriterParams.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/_VideoWriterParams.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/_VideoWriterParams.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/_VideoWriterParams.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkCamera.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkCamera.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkCamera.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkCamera.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkCameraEventHandler.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkCameraEventHandler.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkCameraEventHandler.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkCameraEventHandler.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkConfigurationEventHandler.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkConfigurationEventHandler.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkConfigurationEventHandler.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkConfigurationEventHandler.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkDeviceInfo.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkDeviceInfo.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkDeviceInfo.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkDeviceInfo.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkGrabResultData.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkGrabResultData.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkGrabResultData.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkGrabResultData.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkGrabResultPtr.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkGrabResultPtr.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkGrabResultPtr.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkGrabResultPtr.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkImageEventHandler.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkImageEventHandler.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkImageEventHandler.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkImageEventHandler.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkInstantCamera.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkInstantCamera.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkInstantCamera.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkInstantCamera.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkInstantCameraArray.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkInstantCameraArray.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkInstantCameraArray.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/BaslerCameraLinkInstantCameraArray.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/PylonCLSerDefs.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/PylonCLSerDefs.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/PylonCLSerDefs.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/PylonCLSerDefs.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/PylonCLSerDeviceInfo.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/PylonCLSerDeviceInfo.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/PylonCLSerDeviceInfo.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/PylonCLSerDeviceInfo.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/PylonCLSerIncludes.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/PylonCLSerIncludes.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/PylonCLSerIncludes.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/PylonCLSerIncludes.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/PylonCameraLinkCamera.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/PylonCameraLinkCamera.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/PylonCameraLinkCamera.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/PylonCameraLinkCamera.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/PylonCameraLinkIncludes.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/PylonCameraLinkIncludes.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/PylonCameraLinkIncludes.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/PylonCameraLinkIncludes.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/_BaslerCameraLinkCameraParams.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/_BaslerCameraLinkCameraParams.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/cameralink/_BaslerCameraLinkCameraParams.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/cameralink/_BaslerCameraLinkCameraParams.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/ActionTriggerConfiguration.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/ActionTriggerConfiguration.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/ActionTriggerConfiguration.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/ActionTriggerConfiguration.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigECamera.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigECamera.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigECamera.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigECamera.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigECameraEventHandler.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigECameraEventHandler.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigECameraEventHandler.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigECameraEventHandler.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEConfigurationEventHandler.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEConfigurationEventHandler.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEConfigurationEventHandler.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEConfigurationEventHandler.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEDeviceInfo.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEDeviceInfo.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEDeviceInfo.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEDeviceInfo.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEGrabResultData.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEGrabResultData.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEGrabResultData.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEGrabResultData.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEGrabResultPtr.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEGrabResultPtr.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEGrabResultPtr.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEGrabResultPtr.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEImageEventHandler.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEImageEventHandler.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEImageEventHandler.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEImageEventHandler.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEInstantCamera.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEInstantCamera.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEInstantCamera.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEInstantCamera.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEInstantCameraArray.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEInstantCameraArray.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEInstantCameraArray.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/BaslerGigEInstantCameraArray.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/GigETransportLayer.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/GigETransportLayer.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/GigETransportLayer.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/GigETransportLayer.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/PylonGigE.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/PylonGigE.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/PylonGigE.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/PylonGigE.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/PylonGigECamera.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/PylonGigECamera.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/PylonGigECamera.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/PylonGigECamera.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/PylonGigEDevice.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/PylonGigEDevice.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/PylonGigEDevice.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/PylonGigEDevice.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/PylonGigEDeviceProxy.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/PylonGigEDeviceProxy.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/PylonGigEDeviceProxy.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/PylonGigEDeviceProxy.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/PylonGigEIncludes.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/PylonGigEIncludes.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/PylonGigEIncludes.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/PylonGigEIncludes.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/_BaslerGigECameraParams.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/_BaslerGigECameraParams.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/_BaslerGigECameraParams.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/_BaslerGigECameraParams.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/_GigEChunkData.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/_GigEChunkData.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/_GigEChunkData.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/_GigEChunkData.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/_GigEEventParams.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/_GigEEventParams.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/_GigEEventParams.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/_GigEEventParams.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/_GigEStreamParams.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/_GigEStreamParams.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/_GigEStreamParams.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/_GigEStreamParams.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/_GigETLParams.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/_GigETLParams.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/gige/_GigETLParams.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/gige/_GigETLParams.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/private/DeviceSpecificCameraEventHandlerTie.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/private/DeviceSpecificCameraEventHandlerTie.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/private/DeviceSpecificCameraEventHandlerTie.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/private/DeviceSpecificCameraEventHandlerTie.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/private/DeviceSpecificConfigurationEventHandlerTie.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/private/DeviceSpecificConfigurationEventHandlerTie.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/private/DeviceSpecificConfigurationEventHandlerTie.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/private/DeviceSpecificConfigurationEventHandlerTie.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/private/DeviceSpecificGrabResultPtr.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/private/DeviceSpecificGrabResultPtr.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/private/DeviceSpecificGrabResultPtr.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/private/DeviceSpecificGrabResultPtr.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/private/DeviceSpecificImageEventHandlerTie.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/private/DeviceSpecificImageEventHandlerTie.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/private/DeviceSpecificImageEventHandlerTie.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/private/DeviceSpecificImageEventHandlerTie.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/private/DeviceSpecificInstantCamera.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/private/DeviceSpecificInstantCamera.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/private/DeviceSpecificInstantCamera.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/private/DeviceSpecificInstantCamera.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/private/DeviceSpecificInstantCameraArray.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/private/DeviceSpecificInstantCameraArray.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/private/DeviceSpecificInstantCameraArray.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/private/DeviceSpecificInstantCameraArray.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/stdinclude.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/stdinclude.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/stdinclude.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/stdinclude.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbCamera.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbCamera.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbCamera.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbCamera.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbCameraEventHandler.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbCameraEventHandler.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbCameraEventHandler.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbCameraEventHandler.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbConfigurationEventHandler.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbConfigurationEventHandler.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbConfigurationEventHandler.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbConfigurationEventHandler.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbDeviceInfo.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbDeviceInfo.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbDeviceInfo.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbDeviceInfo.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbGrabResultData.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbGrabResultData.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbGrabResultData.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbGrabResultData.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbGrabResultPtr.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbGrabResultPtr.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbGrabResultPtr.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbGrabResultPtr.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbImageEventHandler.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbImageEventHandler.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbImageEventHandler.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbImageEventHandler.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbInstantCamera.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbInstantCamera.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbInstantCamera.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbInstantCamera.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbInstantCameraArray.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbInstantCameraArray.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbInstantCameraArray.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/BaslerUsbInstantCameraArray.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/PylonUsbCamera.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/PylonUsbCamera.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/PylonUsbCamera.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/PylonUsbCamera.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/PylonUsbDefs.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/PylonUsbDefs.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/PylonUsbDefs.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/PylonUsbDefs.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/PylonUsbIncludes.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/PylonUsbIncludes.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/PylonUsbIncludes.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/PylonUsbIncludes.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/_BaslerUsbCameraParams.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/_BaslerUsbCameraParams.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/_BaslerUsbCameraParams.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/_BaslerUsbCameraParams.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/_UsbChunkData.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/_UsbChunkData.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/_UsbChunkData.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/_UsbChunkData.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/_UsbEventParams.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/_UsbEventParams.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/_UsbEventParams.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/_UsbEventParams.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/_UsbStreamParams.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/_UsbStreamParams.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/_UsbStreamParams.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/_UsbStreamParams.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/_UsbTLParams.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/_UsbTLParams.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylon/usb/_UsbTLParams.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylon/usb/_UsbTLParams.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylonc/GenDC.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylonc/GenDC.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylonc/GenDC.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylonc/GenDC.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylonc/PFNC.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylonc/PFNC.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylonc/PFNC.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylonc/PFNC.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylonc/PylonAviCompressionOptions.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylonc/PylonAviCompressionOptions.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylonc/PylonAviCompressionOptions.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylonc/PylonAviCompressionOptions.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylonc/PylonC.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylonc/PylonC.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylonc/PylonC.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylonc/PylonC.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylonc/PylonC32BitMethods.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylonc/PylonC32BitMethods.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylonc/PylonC32BitMethods.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylonc/PylonC32BitMethods.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylonc/PylonCDefines.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylonc/PylonCDefines.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylonc/PylonCDefines.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylonc/PylonCDefines.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylonc/PylonCEnums.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylonc/PylonCEnums.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylonc/PylonCEnums.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylonc/PylonCEnums.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/include/pylonc/PylonCError.h b/1280x800-XH/Cigarette/Pylon6.2/include/pylonc/PylonCError.h similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/include/pylonc/PylonCError.h rename to 1280x800-XH/Cigarette/Pylon6.2/include/pylonc/PylonCError.h diff --git a/1280x800 TH/Cigarette/Pylon6.2/lib/Win32/GCBase_MD_VC141_v3_1_Basler_pylon.lib b/1280x800-XH/Cigarette/Pylon6.2/lib/Win32/GCBase_MD_VC141_v3_1_Basler_pylon.lib similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/lib/Win32/GCBase_MD_VC141_v3_1_Basler_pylon.lib rename to 1280x800-XH/Cigarette/Pylon6.2/lib/Win32/GCBase_MD_VC141_v3_1_Basler_pylon.lib diff --git a/1280x800 TH/Cigarette/Pylon6.2/lib/Win32/GenApi_MD_VC141_v3_1_Basler_pylon.lib b/1280x800-XH/Cigarette/Pylon6.2/lib/Win32/GenApi_MD_VC141_v3_1_Basler_pylon.lib similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/lib/Win32/GenApi_MD_VC141_v3_1_Basler_pylon.lib rename to 1280x800-XH/Cigarette/Pylon6.2/lib/Win32/GenApi_MD_VC141_v3_1_Basler_pylon.lib diff --git a/1280x800 TH/Cigarette/Pylon6.2/lib/Win32/PylonBase_v6_2.lib b/1280x800-XH/Cigarette/Pylon6.2/lib/Win32/PylonBase_v6_2.lib similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/lib/Win32/PylonBase_v6_2.lib rename to 1280x800-XH/Cigarette/Pylon6.2/lib/Win32/PylonBase_v6_2.lib diff --git a/1280x800 TH/Cigarette/Pylon6.2/lib/Win32/PylonC.lib b/1280x800-XH/Cigarette/Pylon6.2/lib/Win32/PylonC.lib similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/lib/Win32/PylonC.lib rename to 1280x800-XH/Cigarette/Pylon6.2/lib/Win32/PylonC.lib diff --git a/1280x800 TH/Cigarette/Pylon6.2/lib/Win32/PylonC_BCC55.lib b/1280x800-XH/Cigarette/Pylon6.2/lib/Win32/PylonC_BCC55.lib similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/lib/Win32/PylonC_BCC55.lib rename to 1280x800-XH/Cigarette/Pylon6.2/lib/Win32/PylonC_BCC55.lib diff --git a/1280x800 TH/Cigarette/Pylon6.2/lib/Win32/PylonGUI_v6_2.lib b/1280x800-XH/Cigarette/Pylon6.2/lib/Win32/PylonGUI_v6_2.lib similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/lib/Win32/PylonGUI_v6_2.lib rename to 1280x800-XH/Cigarette/Pylon6.2/lib/Win32/PylonGUI_v6_2.lib diff --git a/1280x800 TH/Cigarette/Pylon6.2/lib/Win32/PylonUtility_v6_2.lib b/1280x800-XH/Cigarette/Pylon6.2/lib/Win32/PylonUtility_v6_2.lib similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/lib/Win32/PylonUtility_v6_2.lib rename to 1280x800-XH/Cigarette/Pylon6.2/lib/Win32/PylonUtility_v6_2.lib diff --git a/1280x800 TH/Cigarette/Pylon6.2/lib/Win64/GCBase_MD_VC141_v3_1_Basler_pylon.lib b/1280x800-XH/Cigarette/Pylon6.2/lib/Win64/GCBase_MD_VC141_v3_1_Basler_pylon.lib similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/lib/Win64/GCBase_MD_VC141_v3_1_Basler_pylon.lib rename to 1280x800-XH/Cigarette/Pylon6.2/lib/Win64/GCBase_MD_VC141_v3_1_Basler_pylon.lib diff --git a/1280x800 TH/Cigarette/Pylon6.2/lib/Win64/GenApi_MD_VC141_v3_1_Basler_pylon.lib b/1280x800-XH/Cigarette/Pylon6.2/lib/Win64/GenApi_MD_VC141_v3_1_Basler_pylon.lib similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/lib/Win64/GenApi_MD_VC141_v3_1_Basler_pylon.lib rename to 1280x800-XH/Cigarette/Pylon6.2/lib/Win64/GenApi_MD_VC141_v3_1_Basler_pylon.lib diff --git a/1280x800 TH/Cigarette/Pylon6.2/lib/Win64/PylonBase_v6_2.lib b/1280x800-XH/Cigarette/Pylon6.2/lib/Win64/PylonBase_v6_2.lib similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/lib/Win64/PylonBase_v6_2.lib rename to 1280x800-XH/Cigarette/Pylon6.2/lib/Win64/PylonBase_v6_2.lib diff --git a/1280x800 TH/Cigarette/Pylon6.2/lib/Win64/PylonC.lib b/1280x800-XH/Cigarette/Pylon6.2/lib/Win64/PylonC.lib similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/lib/Win64/PylonC.lib rename to 1280x800-XH/Cigarette/Pylon6.2/lib/Win64/PylonC.lib diff --git a/1280x800 TH/Cigarette/Pylon6.2/lib/Win64/PylonGUI_v6_2.lib b/1280x800-XH/Cigarette/Pylon6.2/lib/Win64/PylonGUI_v6_2.lib similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/lib/Win64/PylonGUI_v6_2.lib rename to 1280x800-XH/Cigarette/Pylon6.2/lib/Win64/PylonGUI_v6_2.lib diff --git a/1280x800 TH/Cigarette/Pylon6.2/lib/Win64/PylonUtility_v6_2.lib b/1280x800-XH/Cigarette/Pylon6.2/lib/Win64/PylonUtility_v6_2.lib similarity index 100% rename from 1280x800 TH/Cigarette/Pylon6.2/lib/Win64/PylonUtility_v6_2.lib rename to 1280x800-XH/Cigarette/Pylon6.2/lib/Win64/PylonUtility_v6_2.lib diff --git a/1280x800-XH/Cigarette/Release/qmake/qtvars_Win32_Release.props b/1280x800-XH/Cigarette/Release/qmake/qtvars_Win32_Release.props new file mode 100644 index 00000000..9c10e3e5 --- /dev/null +++ b/1280x800-XH/Cigarette/Release/qmake/qtvars_Win32_Release.props @@ -0,0 +1,59 @@ + + +_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;NDEBUG;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB +D:\CigaretteSH\240819-hangzhou-ZB416-2-1024x768-XH\Cigarette\Release\qmake\temp;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtWidgets;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtGui;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtANGLE;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtNetwork;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtCore;D:\CigaretteSH\240819-hangzhou-ZB416-2-1024x768-XH\Cigarette\Release\qmake\temp;/include;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\mkspecs\win32-msvc + +-Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus +C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Widgets.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Gui.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Network.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Core.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\qtmain.lib;shell32.lib +"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" + +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/Docs/Qt-5.15.0 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/include +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/lib +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/tests +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/plugins +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/imports +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/qml +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/translations + +C:/Qt/Qt5.15.0/Examples/Qt-5.15.0 +C:/Qt/Qt5.15.0/Examples/Qt-5.15.0 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/lib +win32-msvc +win32-msvc +3.1 +5.15.0 +$(Qt_INCLUDEPATH_);.\GeneratedFiles\Release;.\GeneratedFiles + 5.15.0_msvc2019_64 + core;network;gui;widgets + bin + bin + + + DEFINES=/Project/ItemDefinitionGroup/ClCompile/PreprocessorDefinitions;INCLUDEPATH=/Project/ItemDefinitionGroup/ClCompile/AdditionalIncludeDirectories;STDCPP=/Project/ItemDefinitionGroup/ClCompile/LanguageStandard;CL_OPTIONS=/Project/ItemDefinitionGroup/ClCompile/AdditionalOptions;LIBS=/Project/ItemDefinitionGroup/Link/AdditionalDependencies;LINK_OPTIONS=/Project/ItemDefinitionGroup/Link/AdditionalOptions + + release + 5.15.0 + 5 + 15 + 0 + + diff --git a/1280x800 TH/Cigarette/x64/Release/qmake/temp/.qmake.stash b/1280x800-XH/Cigarette/Release/qmake/temp/.qmake.stash similarity index 65% rename from 1280x800 TH/Cigarette/x64/Release/qmake/temp/.qmake.stash rename to 1280x800-XH/Cigarette/Release/qmake/temp/.qmake.stash index d5712c4a..4c71fd23 100644 --- a/1280x800 TH/Cigarette/x64/Release/qmake/temp/.qmake.stash +++ b/1280x800-XH/Cigarette/Release/qmake/temp/.qmake.stash @@ -1,6 +1,6 @@ QMAKE_CXX.QT_COMPILER_STDCXX = 199711L -QMAKE_CXX.QMAKE_MSC_VER = 1939 -QMAKE_CXX.QMAKE_MSC_FULL_VER = 193933523 +QMAKE_CXX.QMAKE_MSC_VER = 1941 +QMAKE_CXX.QMAKE_MSC_FULL_VER = 194134120 QMAKE_CXX.COMPILER_MACROS = \ QT_COMPILER_STDCXX \ QMAKE_MSC_VER \ diff --git a/1280x800-XH/Cigarette/Release/qmake/temp/B12702AD-ABFB-343A-A199-8E24837244A3.Cigarette.designtime.idx b/1280x800-XH/Cigarette/Release/qmake/temp/B12702AD-ABFB-343A-A199-8E24837244A3.Cigarette.designtime.idx new file mode 100644 index 00000000..6e7c2ef6 --- /dev/null +++ b/1280x800-XH/Cigarette/Release/qmake/temp/B12702AD-ABFB-343A-A199-8E24837244A3.Cigarette.designtime.idx @@ -0,0 +1 @@ +C:\Users\Administrator\AppData\Local\Temp\3atfjtfn.sxd.designtime.props diff --git a/1280x800 TH/Cigarette/x64/Debug/qt/qmake/moc_predefs.h.cbt b/1280x800-XH/Cigarette/Release/qmake/temp/moc_predefs.h.cbt similarity index 100% rename from 1280x800 TH/Cigarette/x64/Debug/qt/qmake/moc_predefs.h.cbt rename to 1280x800-XH/Cigarette/Release/qmake/temp/moc_predefs.h.cbt diff --git a/1280x800-XH/Cigarette/Release/qmake/temp/props.txt b/1280x800-XH/Cigarette/Release/qmake/temp/props.txt new file mode 100644 index 00000000..21ebcf92 --- /dev/null +++ b/1280x800-XH/Cigarette/Release/qmake/temp/props.txt @@ -0,0 +1,25 @@ +QT_SYSROOT: +QT_INSTALL_PREFIX:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +QT_INSTALL_ARCHDATA:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +QT_INSTALL_DATA:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +QT_INSTALL_DOCS:C:/Qt/Qt5.15.0/Docs/Qt-5.15.0 +QT_INSTALL_HEADERS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/include +QT_INSTALL_LIBS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/lib +QT_INSTALL_LIBEXECS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +QT_INSTALL_BINS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +QT_INSTALL_TESTS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/tests +QT_INSTALL_PLUGINS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/plugins +QT_INSTALL_IMPORTS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/imports +QT_INSTALL_QML:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/qml +QT_INSTALL_TRANSLATIONS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/translations +QT_INSTALL_CONFIGURATION: +QT_INSTALL_EXAMPLES:C:/Qt/Qt5.15.0/Examples/Qt-5.15.0 +QT_INSTALL_DEMOS:C:/Qt/Qt5.15.0/Examples/Qt-5.15.0 +QT_HOST_PREFIX:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +QT_HOST_DATA:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +QT_HOST_BINS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +QT_HOST_LIBS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/lib +QMAKE_SPEC:win32-msvc +QMAKE_XSPEC:win32-msvc +QMAKE_VERSION:3.1 +QT_VERSION:5.15.0 diff --git a/1280x800-XH/Cigarette/Release/qmake/temp/qtvars.log b/1280x800-XH/Cigarette/Release/qmake/temp/qtvars.log new file mode 100644 index 00000000..2007f1df --- /dev/null +++ b/1280x800-XH/Cigarette/Release/qmake/temp/qtvars.log @@ -0,0 +1 @@ +Info: creating stash file D:\CigaretteSH\240819-hangzhou-ZB416-2-1024x768-XH\Cigarette\Release\qmake\temp\.qmake.stash diff --git a/1280x800 TH/Cigarette/x64/Release/qmake/temp/qtvars.pro b/1280x800-XH/Cigarette/Release/qmake/temp/qtvars.pro similarity index 100% rename from 1280x800 TH/Cigarette/x64/Release/qmake/temp/qtvars.pro rename to 1280x800-XH/Cigarette/Release/qmake/temp/qtvars.pro diff --git a/1280x800 TH/Cigarette/x64/Release/qmake/temp/qtvars.vcxproj b/1280x800-XH/Cigarette/Release/qmake/temp/qtvars.vcxproj similarity index 80% rename from 1280x800 TH/Cigarette/x64/Release/qmake/temp/qtvars.vcxproj rename to 1280x800-XH/Cigarette/Release/qmake/temp/qtvars.vcxproj index 6069155c..a935f0c1 100644 --- a/1280x800 TH/Cigarette/x64/Release/qmake/temp/qtvars.vcxproj +++ b/1280x800-XH/Cigarette/Release/qmake/temp/qtvars.vcxproj @@ -34,7 +34,7 @@ - C:\Users\FD\AppData\Local\Temp\zhxryfs2.eyb;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtWidgets;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtGui;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtANGLE;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtNetwork;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\include\QtCore;C:\Users\FD\AppData\Local\Temp\zhxryfs2.eyb;/include;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\mkspecs\win32-msvc;%(AdditionalIncludeDirectories) + D:\CigaretteSH\240819-hangzhou-ZB416-2-1024x768-XH\Cigarette\Release\qmake\temp;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtWidgets;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtGui;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtANGLE;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtNetwork;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtCore;D:\CigaretteSH\240819-hangzhou-ZB416-2-1024x768-XH\Cigarette\Release\qmake\temp;/include;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\mkspecs\win32-msvc;%(AdditionalIncludeDirectories) -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus %(AdditionalOptions) .\ false @@ -51,7 +51,7 @@ TurnOffAllWarnings - C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\Qt5Widgets.lib;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\Qt5Gui.lib;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\Qt5Network.lib;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\Qt5Core.lib;C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\lib\qtmain.lib;shell32.lib;%(AdditionalDependencies) + C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Widgets.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Gui.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Network.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Core.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\qtmain.lib;shell32.lib;%(AdditionalDependencies) C:\openssl\lib;C:\Utils\my_sql\mysql-5.7.25-winx64\lib;C:\Utils\postgresql\pgsql\lib;%(AdditionalLibraryDirectories) "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions) true @@ -76,8 +76,8 @@ Document - C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\mkspecs\features\data\dummy.cpp;%(AdditionalInputs) - cl -BxC:\Qt\Qt5.14.2\5.14.2\msvc2017_64\bin\qmake.exe -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -O2 -MD -W0 -E C:\Qt\Qt5.14.2\5.14.2\msvc2017_64\mkspecs\features\data\dummy.cpp 2>NUL >moc_predefs.h + C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\mkspecs\features\data\dummy.cpp;%(AdditionalInputs) + cl -BxC:\Qt\Qt5.15.0\5.15.0\msvc2019_64\bin\qmake.exe -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -O2 -MD -W0 -E C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\mkspecs\features\data\dummy.cpp 2>NUL >moc_predefs.h Generate moc_predefs.h moc_predefs.h;%(Outputs) diff --git a/1280x800 TH/Cigarette/x64/Debug/qt/qmake/qtvars.vcxproj.filters b/1280x800-XH/Cigarette/Release/qmake/temp/qtvars.vcxproj.filters similarity index 100% rename from 1280x800 TH/Cigarette/x64/Debug/qt/qmake/qtvars.vcxproj.filters rename to 1280x800-XH/Cigarette/Release/qmake/temp/qtvars.vcxproj.filters diff --git a/1280x800-XH/Cigarette/Release/qmake/temp/qtvars_Win32_Release.props b/1280x800-XH/Cigarette/Release/qmake/temp/qtvars_Win32_Release.props new file mode 100644 index 00000000..9c10e3e5 --- /dev/null +++ b/1280x800-XH/Cigarette/Release/qmake/temp/qtvars_Win32_Release.props @@ -0,0 +1,59 @@ + + +_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;NDEBUG;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB +D:\CigaretteSH\240819-hangzhou-ZB416-2-1024x768-XH\Cigarette\Release\qmake\temp;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtWidgets;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtGui;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtANGLE;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtNetwork;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtCore;D:\CigaretteSH\240819-hangzhou-ZB416-2-1024x768-XH\Cigarette\Release\qmake\temp;/include;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\mkspecs\win32-msvc + +-Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus +C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Widgets.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Gui.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Network.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Core.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\qtmain.lib;shell32.lib +"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" + +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/Docs/Qt-5.15.0 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/include +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/lib +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/tests +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/plugins +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/imports +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/qml +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/translations + +C:/Qt/Qt5.15.0/Examples/Qt-5.15.0 +C:/Qt/Qt5.15.0/Examples/Qt-5.15.0 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/lib +win32-msvc +win32-msvc +3.1 +5.15.0 +$(Qt_INCLUDEPATH_);.\GeneratedFiles\Release;.\GeneratedFiles + 5.15.0_msvc2019_64 + core;network;gui;widgets + bin + bin + + + DEFINES=/Project/ItemDefinitionGroup/ClCompile/PreprocessorDefinitions;INCLUDEPATH=/Project/ItemDefinitionGroup/ClCompile/AdditionalIncludeDirectories;STDCPP=/Project/ItemDefinitionGroup/ClCompile/LanguageStandard;CL_OPTIONS=/Project/ItemDefinitionGroup/ClCompile/AdditionalOptions;LIBS=/Project/ItemDefinitionGroup/Link/AdditionalDependencies;LINK_OPTIONS=/Project/ItemDefinitionGroup/Link/AdditionalOptions + + release + 5.15.0 + 5 + 15 + 0 + + diff --git a/1280x800 TH/Cigarette/Resources/alarm.png b/1280x800-XH/Cigarette/Resources/alarm.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/alarm.png rename to 1280x800-XH/Cigarette/Resources/alarm.png diff --git a/1280x800 TH/Cigarette/Resources/cam1.png b/1280x800-XH/Cigarette/Resources/cam1.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/cam1.png rename to 1280x800-XH/Cigarette/Resources/cam1.png diff --git a/1280x800 TH/Cigarette/Resources/cam1_no.png b/1280x800-XH/Cigarette/Resources/cam1_no.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/cam1_no.png rename to 1280x800-XH/Cigarette/Resources/cam1_no.png diff --git a/1280x800 TH/Cigarette/Resources/cam1_yes.png b/1280x800-XH/Cigarette/Resources/cam1_yes.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/cam1_yes.png rename to 1280x800-XH/Cigarette/Resources/cam1_yes.png diff --git a/1280x800 TH/Cigarette/Resources/cam2.png b/1280x800-XH/Cigarette/Resources/cam2.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/cam2.png rename to 1280x800-XH/Cigarette/Resources/cam2.png diff --git a/1280x800 TH/Cigarette/Resources/cam2_no.png b/1280x800-XH/Cigarette/Resources/cam2_no.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/cam2_no.png rename to 1280x800-XH/Cigarette/Resources/cam2_no.png diff --git a/1280x800 TH/Cigarette/Resources/cam2_yes.png b/1280x800-XH/Cigarette/Resources/cam2_yes.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/cam2_yes.png rename to 1280x800-XH/Cigarette/Resources/cam2_yes.png diff --git a/1280x800 TH/Cigarette/Resources/cam3.png b/1280x800-XH/Cigarette/Resources/cam3.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/cam3.png rename to 1280x800-XH/Cigarette/Resources/cam3.png diff --git a/1280x800 TH/Cigarette/Resources/cam3_no.png b/1280x800-XH/Cigarette/Resources/cam3_no.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/cam3_no.png rename to 1280x800-XH/Cigarette/Resources/cam3_no.png diff --git a/1280x800 TH/Cigarette/Resources/cam3_yes.png b/1280x800-XH/Cigarette/Resources/cam3_yes.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/cam3_yes.png rename to 1280x800-XH/Cigarette/Resources/cam3_yes.png diff --git a/1280x800 TH/Cigarette/Resources/cam4.png b/1280x800-XH/Cigarette/Resources/cam4.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/cam4.png rename to 1280x800-XH/Cigarette/Resources/cam4.png diff --git a/1280x800 TH/Cigarette/Resources/cam4_no.png b/1280x800-XH/Cigarette/Resources/cam4_no.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/cam4_no.png rename to 1280x800-XH/Cigarette/Resources/cam4_no.png diff --git a/1280x800 TH/Cigarette/Resources/cam4_yes.png b/1280x800-XH/Cigarette/Resources/cam4_yes.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/cam4_yes.png rename to 1280x800-XH/Cigarette/Resources/cam4_yes.png diff --git a/1280x800 TH/Cigarette/Resources/cam5.png b/1280x800-XH/Cigarette/Resources/cam5.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/cam5.png rename to 1280x800-XH/Cigarette/Resources/cam5.png diff --git a/1280x800 TH/Cigarette/Resources/cam5_no.png b/1280x800-XH/Cigarette/Resources/cam5_no.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/cam5_no.png rename to 1280x800-XH/Cigarette/Resources/cam5_no.png diff --git a/1280x800 TH/Cigarette/Resources/cam5_yes.png b/1280x800-XH/Cigarette/Resources/cam5_yes.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/cam5_yes.png rename to 1280x800-XH/Cigarette/Resources/cam5_yes.png diff --git a/1280x800 TH/Cigarette/Resources/cam6.png b/1280x800-XH/Cigarette/Resources/cam6.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/cam6.png rename to 1280x800-XH/Cigarette/Resources/cam6.png diff --git a/1280x800 TH/Cigarette/Resources/cam6_no.png b/1280x800-XH/Cigarette/Resources/cam6_no.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/cam6_no.png rename to 1280x800-XH/Cigarette/Resources/cam6_no.png diff --git a/1280x800 TH/Cigarette/Resources/cam6_yes.png b/1280x800-XH/Cigarette/Resources/cam6_yes.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/cam6_yes.png rename to 1280x800-XH/Cigarette/Resources/cam6_yes.png diff --git a/1280x800 TH/Cigarette/Resources/cam7.png b/1280x800-XH/Cigarette/Resources/cam7.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/cam7.png rename to 1280x800-XH/Cigarette/Resources/cam7.png diff --git a/1280x800 TH/Cigarette/Resources/cam7_no.png b/1280x800-XH/Cigarette/Resources/cam7_no.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/cam7_no.png rename to 1280x800-XH/Cigarette/Resources/cam7_no.png diff --git a/1280x800 TH/Cigarette/Resources/cam7_yes.png b/1280x800-XH/Cigarette/Resources/cam7_yes.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/cam7_yes.png rename to 1280x800-XH/Cigarette/Resources/cam7_yes.png diff --git a/1280x800 TH/Cigarette/Resources/cam8.png b/1280x800-XH/Cigarette/Resources/cam8.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/cam8.png rename to 1280x800-XH/Cigarette/Resources/cam8.png diff --git a/1280x800 TH/Cigarette/Resources/cam8_no.png b/1280x800-XH/Cigarette/Resources/cam8_no.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/cam8_no.png rename to 1280x800-XH/Cigarette/Resources/cam8_no.png diff --git a/1280x800 TH/Cigarette/Resources/cam8_yes.png b/1280x800-XH/Cigarette/Resources/cam8_yes.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/cam8_yes.png rename to 1280x800-XH/Cigarette/Resources/cam8_yes.png diff --git a/1280x800 TH/Cigarette/Resources/exit.png b/1280x800-XH/Cigarette/Resources/exit.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/exit.png rename to 1280x800-XH/Cigarette/Resources/exit.png diff --git a/1280x800 TH/Cigarette/Resources/keyboard.png b/1280x800-XH/Cigarette/Resources/keyboard.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/keyboard.png rename to 1280x800-XH/Cigarette/Resources/keyboard.png diff --git a/1280x800 TH/Cigarette/Resources/lock.png b/1280x800-XH/Cigarette/Resources/lock.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/lock.png rename to 1280x800-XH/Cigarette/Resources/lock.png diff --git a/1280x800 TH/Cigarette/Resources/logo.png b/1280x800-XH/Cigarette/Resources/logo.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/logo.png rename to 1280x800-XH/Cigarette/Resources/logo.png diff --git a/1280x800 TH/Cigarette/Resources/pause.png b/1280x800-XH/Cigarette/Resources/pause.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/pause.png rename to 1280x800-XH/Cigarette/Resources/pause.png diff --git a/1280x800 TH/Cigarette/Resources/plc.png b/1280x800-XH/Cigarette/Resources/plc.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/plc.png rename to 1280x800-XH/Cigarette/Resources/plc.png diff --git a/1280x800 TH/Cigarette/Resources/rotate.png b/1280x800-XH/Cigarette/Resources/rotate.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/rotate.png rename to 1280x800-XH/Cigarette/Resources/rotate.png diff --git a/1280x800 TH/Cigarette/Resources/setup.png b/1280x800-XH/Cigarette/Resources/setup.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/setup.png rename to 1280x800-XH/Cigarette/Resources/setup.png diff --git a/1280x800 TH/Cigarette/Resources/start.png b/1280x800-XH/Cigarette/Resources/start.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/start.png rename to 1280x800-XH/Cigarette/Resources/start.png diff --git a/1280x800 TH/Cigarette/Resources/unlock.png b/1280x800-XH/Cigarette/Resources/unlock.png similarity index 100% rename from 1280x800 TH/Cigarette/Resources/unlock.png rename to 1280x800-XH/Cigarette/Resources/unlock.png diff --git a/1280x800 TH/Cigarette/SyncQueue.cpp b/1280x800-XH/Cigarette/SyncQueue.cpp similarity index 100% rename from 1280x800 TH/Cigarette/SyncQueue.cpp rename to 1280x800-XH/Cigarette/SyncQueue.cpp diff --git a/1280x800 TH/Cigarette/SyncQueue.h b/1280x800-XH/Cigarette/SyncQueue.h similarity index 99% rename from 1280x800 TH/Cigarette/SyncQueue.h rename to 1280x800-XH/Cigarette/SyncQueue.h index 32af85a3..8445f164 100644 --- a/1280x800 TH/Cigarette/SyncQueue.h +++ b/1280x800-XH/Cigarette/SyncQueue.h @@ -57,6 +57,7 @@ template void SyncQueue::take(T& val) { lock_guard locker(lock); + while (isEmpty()) { //cout << "\nQueue "<< name << " is empty now, wait a minute!" << endl; diff --git a/1280x800 TH/Cigarette/alarmdialog.cpp b/1280x800-XH/Cigarette/alarmdialog.cpp similarity index 100% rename from 1280x800 TH/Cigarette/alarmdialog.cpp rename to 1280x800-XH/Cigarette/alarmdialog.cpp diff --git a/1280x800 TH/Cigarette/alarmdialog.hpp b/1280x800-XH/Cigarette/alarmdialog.hpp similarity index 100% rename from 1280x800 TH/Cigarette/alarmdialog.hpp rename to 1280x800-XH/Cigarette/alarmdialog.hpp diff --git a/1280x800 TH/Cigarette/alarmdialog.ui b/1280x800-XH/Cigarette/alarmdialog.ui similarity index 100% rename from 1280x800 TH/Cigarette/alarmdialog.ui rename to 1280x800-XH/Cigarette/alarmdialog.ui diff --git a/1280x800 TH/Cigarette/alg_jd.bak.jpg b/1280x800-XH/Cigarette/alg_jd.bak.jpg similarity index 100% rename from 1280x800 TH/Cigarette/alg_jd.bak.jpg rename to 1280x800-XH/Cigarette/alg_jd.bak.jpg diff --git a/1280x800 TH/Cigarette/alg_jd.cpp b/1280x800-XH/Cigarette/alg_jd.cpp similarity index 64% rename from 1280x800 TH/Cigarette/alg_jd.cpp rename to 1280x800-XH/Cigarette/alg_jd.cpp index 14956364..533d8456 100644 --- a/1280x800 TH/Cigarette/alg_jd.cpp +++ b/1280x800-XH/Cigarette/alg_jd.cpp @@ -1,6 +1,9 @@ #include "alg_jd.h" + #include //所需的库文件 +#include "common.h" +#include "innerRect.h" extern SysConf g_sys_conf; // Initialize the parameters @@ -50,8 +53,7 @@ bool AlgJd::init(QString model_path, QString model_name) net.setPreferableBackend(cv::dnn::DNN_BACKEND_CUDA); net.setPreferableTarget(cv::dnn::DNN_TARGET_CUDA); - - //cv::Mat image = cv::imread("alg_jd.bmp"); + cv::Mat image = cv::imread(image_path.toStdString()); //识别一张图，测试模型是å¦æ­£ç¡®ï¼Œå¹¶ä¸”完æˆGPUæ•°æ®åŠ è½½ @@ -353,15 +355,163 @@ void AlgJd::post_process_batch(std::vector& vec_frame, std::vector g_sys_conf.ConfThreshold * 0.01)///识别度低于阈值NGå¤„ç† { - if (box.width > 15) - {//识别框宽度大于15显示识别，å°äºŽè®¤ä¸ºæ— èƒ¶ç‚¹ï¼ŒNGå¤„ç† + //if (box.width > 15) + //{//识别框宽度大于15显示识别，å°äºŽè®¤ä¸ºæ— èƒ¶ç‚¹ï¼ŒNGå¤„ç† drawPred(classIds[i][idx], confidences[i][idx], box.x, box.y, box.x + box.width, box.y + box.height, vec_frame[k]); results.push_back(std::make_pair(classIds[i][idx], box)); - } + //} } } } vec_results.push_back(results); + } +} + +void AlgJd::detect_Rect(cv::Mat& in, cv::Mat &out, std::vector &Rect_points, bool &isok) +{ + cv::Mat image = in.clone(); + out = in.clone(); + double meanIntensity = cv::mean(image)[0]; + if (meanIntensity > 1.0) { + cv::cvtColor(image, image, cv::COLOR_BGR2GRAY); //ç°åº¦å›¾åƒè½¬ä¸ºå½©è‰²å›¾åƒ + threshold(image, image, 20, 255, CV_THRESH_OTSU); // 大津法自动阈值 + + std::vector> contours; + std::vector hierarcy; + findContours(image, contours, hierarcy, CV_RETR_EXTERNAL, CV_CHAIN_APPROX_NONE); // 检测物体轮廓 + if ((contours.empty()) || (meanIntensity < 5.0)) { + isok = false; + return; + } + drawContours(image, contours, -1, cv::Scalar(255), -1);// 轮廓填充 + + std::vectorboundRect(contours.size()); //å®šä¹‰å†…æŽ¥çŸ©å½¢é›†åˆ + std::vector box(contours.size()); + cv::Point2f rect[4]; + + int index = 0; + double largestArea = 0.0; + + InnerRect test; + test.getInnerRect(image, Rect_points, 4); + + //if (Rect_points.size() < 4) + //{ + // std::cout << " get InnerRect failed.." << std::endl; + // return ; + //} + + //cv::line(out, Rect_points[0], Rect_points[1], cv::Scalar(127)); + //cv::line(out, Rect_points[1], Rect_points[2], cv::Scalar(127)); + //cv::line(out, Rect_points[2], Rect_points[3], cv::Scalar(127)); + //cv::line(out, Rect_points[3], Rect_points[0], cv::Scalar(127)); + + for (int i = 0; i < (int)contours.size(); i++) { + double a = cv::contourArea(contours[i], false); + if (a > largestArea && a) { + largestArea = a; + index = i; + } + } + box[index] = minAreaRect(cv::Mat(contours[index])); + box[index].points(rect); + + float infactAngle = box[index].angle; + // std::cout << infactAngle << std::endl; + + for (int j = 0; j < 4; j++) { + //putText(out, std::to_string(infactAngle).substr(0, 2), cv::Point(Rect_points[2].x+50, Rect_points[2].y+50), CV_FONT_HERSHEY_COMPLEX_SMALL, 0.85, cv::Scalar(255)); + if (box[index].angle > g_sys_conf.angle) { + cv::line(out, Rect_points[0], Rect_points[1], cv::Scalar(0, 0, 255), 2, 8); + cv::line(out, Rect_points[1], Rect_points[2], cv::Scalar(0, 0, 255), 2, 8); + cv::line(out, Rect_points[2], Rect_points[3], cv::Scalar(0, 0, 255), 2, 8); + cv::line(out, Rect_points[3], Rect_points[0], cv::Scalar(0, 0, 255), 2, 8); + putText(out, "NG", cv::Point(Rect_points[2].x + 30, Rect_points[2].y + 30), CV_FONT_HERSHEY_COMPLEX_SMALL, 0.85, cv::Scalar(0, 0, 255)); + isok = false; + putText(out, (std::to_string(infactAngle).substr(0, 2)), cv::Point(Rect_points[2].x + 30, Rect_points[2].y + 50), CV_FONT_HERSHEY_COMPLEX_SMALL, 0.85, cv::Scalar(0, 0, 255)); + } + else { + cv::line(out, Rect_points[0], Rect_points[1], cv::Scalar(0, 255, 0), 2, 8); + cv::line(out, Rect_points[1], Rect_points[2], cv::Scalar(0, 255, 0), 2, 8); + cv::line(out, Rect_points[2], Rect_points[3], cv::Scalar(0, 255, 0), 2, 8); + cv::line(out, Rect_points[3], Rect_points[0], cv::Scalar(0, 255, 0), 2, 8); + putText(out, "OK", cv::Point(Rect_points[2].x + 30, Rect_points[2].y + 30), CV_FONT_HERSHEY_COMPLEX_SMALL, 0.85, cv::Scalar(0, 255, 0)); + isok = true; + putText(out, std::to_string(infactAngle).substr(0, 2), cv::Point(Rect_points[2].x + 30, Rect_points[2].y + 50), CV_FONT_HERSHEY_COMPLEX_SMALL, 0.85, cv::Scalar(0, 255, 0)); + } + } + } + else { + isok = false; } } +//void AlgJd::detect_Rect(cv::Mat& in, cv::Mat& out, std::vector& Rect_points, bool& isok) +//{ +// cv::Mat image = in.clone(); +// out = in.clone(); +// +// cv::cvtColor(image, image, cv::COLOR_BGR2GRAY); //ç°åº¦å›¾åƒè½¬ä¸ºå½©è‰²å›¾åƒ +// threshold(image, image, 20, 255, CV_THRESH_OTSU); // 大津法自动阈值 +// +// std::vector> contours; +// std::vector hierarcy; +// findContours(image, contours, hierarcy, CV_RETR_EXTERNAL, CV_CHAIN_APPROX_NONE); // 检测物体轮廓 +// drawContours(image, contours, -1, cv::Scalar(255), -1);// 轮廓填充 +// +// std::vectorboundRect(contours.size()); //å®šä¹‰å†…æŽ¥çŸ©å½¢é›†åˆ +// std::vector box(contours.size()); +// cv::Point2f rect[4]; +// +// int index = 0; +// double largestArea = 0.0; +// +// InnerRect test; +// test.getInnerRect(image, Rect_points, 4); +// +// if (Rect_points.size() < 4) +// { +// std::cout << " get InnerRect failed.." << std::endl; +// return; +// } +// +// //cv::line(out, Rect_points[0], Rect_points[1], cv::Scalar(127)); +// //cv::line(out, Rect_points[1], Rect_points[2], cv::Scalar(127)); +// //cv::line(out, Rect_points[2], Rect_points[3], cv::Scalar(127)); +// //cv::line(out, Rect_points[3], Rect_points[0], cv::Scalar(127)); +// +// for (int i = 0; i < (int)contours.size(); i++) { +// double a = cv::contourArea(contours[i], false); +// if (a > largestArea) { +// largestArea = a; +// index = i; +// } +// } +// box[index] = minAreaRect(cv::Mat(contours[index])); +// box[index].points(rect); +// +// float infactAngle = box[index].angle; +// // std::cout << infactAngle << std::endl; +// +// for (int j = 0; j < 4; j++) { +// //putText(out, std::to_string(infactAngle).substr(0, 2), cv::Point(Rect_points[2].x+50, Rect_points[2].y+50), CV_FONT_HERSHEY_COMPLEX_SMALL, 0.85, cv::Scalar(255)); +// if (box[index].angle > g_sys_conf.angle) { +// cv::line(out, Rect_points[0], Rect_points[1], cv::Scalar(0, 0, 255), 2, 8); +// cv::line(out, Rect_points[1], Rect_points[2], cv::Scalar(0, 0, 255), 2, 8); +// cv::line(out, Rect_points[2], Rect_points[3], cv::Scalar(0, 0, 255), 2, 8); +// cv::line(out, Rect_points[3], Rect_points[0], cv::Scalar(0, 0, 255), 2, 8); +// putText(out, "NG", cv::Point(Rect_points[2].x + 30, Rect_points[2].y + 30), CV_FONT_HERSHEY_COMPLEX_SMALL, 0.85, cv::Scalar(0, 0, 255)); +// isok = false; +// putText(out, (std::to_string(infactAngle).substr(0, 2)), cv::Point(Rect_points[2].x + 30, Rect_points[2].y + 50), CV_FONT_HERSHEY_COMPLEX_SMALL, 0.85, cv::Scalar(0, 0, 255)); +// } +// else { +// cv::line(out, Rect_points[0], Rect_points[1], cv::Scalar(0, 255, 0), 2, 8); +// cv::line(out, Rect_points[1], Rect_points[2], cv::Scalar(0, 255, 0), 2, 8); +// cv::line(out, Rect_points[2], Rect_points[3], cv::Scalar(0, 255, 0), 2, 8); +// cv::line(out, Rect_points[3], Rect_points[0], cv::Scalar(0, 255, 0), 2, 8); +// putText(out, "OK", cv::Point(Rect_points[2].x + 30, Rect_points[2].y + 30), CV_FONT_HERSHEY_COMPLEX_SMALL, 0.85, cv::Scalar(0, 255, 0)); +// isok = true; +// putText(out, std::to_string(infactAngle).substr(0, 2), cv::Point(Rect_points[2].x + 30, Rect_points[2].y + 50), CV_FONT_HERSHEY_COMPLEX_SMALL, 0.85, cv::Scalar(0, 255, 0)); +// } +// } +//} \ No newline at end of file diff --git a/1280x800 TH/Cigarette/alg_jd.h b/1280x800-XH/Cigarette/alg_jd.h similarity index 92% rename from 1280x800 TH/Cigarette/alg_jd.h rename to 1280x800-XH/Cigarette/alg_jd.h index e3aa2ab2..fa2f4f1c 100644 --- a/1280x800 TH/Cigarette/alg_jd.h +++ b/1280x800-XH/Cigarette/alg_jd.h @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include "common.h" @@ -27,6 +28,8 @@ public: std::vector getOutputsNames(const cv::dnn::Net& net); // Draw the predicted bounding box void drawPred(int classId, float conf, int left, int top, int right, int bottom, cv::Mat& frame); + void detect_Rect(cv::Mat& in, cv::Mat &out, std::vector &Rect_points, bool &isok); + private: cv::dnn::Net net; std::vector classes; diff --git a/1280x800 TH/Cigarette/alg_jd.jpg b/1280x800-XH/Cigarette/alg_jd.jpg similarity index 100% rename from 1280x800 TH/Cigarette/alg_jd.jpg rename to 1280x800-XH/Cigarette/alg_jd.jpg diff --git a/1280x800 TH/Cigarette/alg_jd_ng.cpp b/1280x800-XH/Cigarette/alg_jd_ng.cpp similarity index 100% rename from 1280x800 TH/Cigarette/alg_jd_ng.cpp rename to 1280x800-XH/Cigarette/alg_jd_ng.cpp diff --git a/1280x800 TH/Cigarette/alg_jd_ng.h b/1280x800-XH/Cigarette/alg_jd_ng.h similarity index 100% rename from 1280x800 TH/Cigarette/alg_jd_ng.h rename to 1280x800-XH/Cigarette/alg_jd_ng.h diff --git a/1280x800 TH/Cigarette/balluffcamera.cpp b/1280x800-XH/Cigarette/balluffcamera.cpp similarity index 100% rename from 1280x800 TH/Cigarette/balluffcamera.cpp rename to 1280x800-XH/Cigarette/balluffcamera.cpp diff --git a/1280x800 TH/Cigarette/balluffcamera.h b/1280x800-XH/Cigarette/balluffcamera.h similarity index 100% rename from 1280x800 TH/Cigarette/balluffcamera.h rename to 1280x800-XH/Cigarette/balluffcamera.h diff --git a/1280x800 TH/Cigarette/basecamera.cpp b/1280x800-XH/Cigarette/basecamera.cpp similarity index 100% rename from 1280x800 TH/Cigarette/basecamera.cpp rename to 1280x800-XH/Cigarette/basecamera.cpp diff --git a/1280x800 TH/Cigarette/basecamera.h b/1280x800-XH/Cigarette/basecamera.h similarity index 91% rename from 1280x800 TH/Cigarette/basecamera.h rename to 1280x800-XH/Cigarette/basecamera.h index 47dc3e49..8959e049 100644 --- a/1280x800 TH/Cigarette/basecamera.h +++ b/1280x800-XH/Cigarette/basecamera.h @@ -2,7 +2,7 @@ #include -#define NumberOfSupportedCameras 3 +#define NumberOfSupportedCameras 2 //Ë«Èí¼þ #define NumberOfIdentityCameras 8 #define EdgeEvent 1 diff --git a/1280x800 TH/Cigarette/baslercamera.cpp b/1280x800-XH/Cigarette/baslercamera.cpp similarity index 100% rename from 1280x800 TH/Cigarette/baslercamera.cpp rename to 1280x800-XH/Cigarette/baslercamera.cpp diff --git a/1280x800 TH/Cigarette/baslercamera.h b/1280x800-XH/Cigarette/baslercamera.h similarity index 100% rename from 1280x800 TH/Cigarette/baslercamera.h rename to 1280x800-XH/Cigarette/baslercamera.h diff --git a/1280x800 TH/Cigarette/camera_glue.cpp b/1280x800-XH/Cigarette/camera_glue.cpp similarity index 100% rename from 1280x800 TH/Cigarette/camera_glue.cpp rename to 1280x800-XH/Cigarette/camera_glue.cpp diff --git a/1280x800 TH/Cigarette/camera_glue.h b/1280x800-XH/Cigarette/camera_glue.h similarity index 100% rename from 1280x800 TH/Cigarette/camera_glue.h rename to 1280x800-XH/Cigarette/camera_glue.h diff --git a/1280x800 TH/Cigarette/camera_glue.ui b/1280x800-XH/Cigarette/camera_glue.ui similarity index 96% rename from 1280x800 TH/Cigarette/camera_glue.ui rename to 1280x800-XH/Cigarette/camera_glue.ui index 9a751b48..99840359 100644 --- a/1280x800 TH/Cigarette/camera_glue.ui +++ b/1280x800-XH/Cigarette/camera_glue.ui @@ -6,8 +6,8 @@ 0 0 - 433 - 262 + 319 + 270 @@ -16,7 +16,7 @@ - 220 + 190 50 70 30 @@ -40,8 +40,8 @@ - 320 - 50 + 290 + 1810 70 30 @@ -65,7 +65,7 @@ 390 - 1850 + 1810 70 30 @@ -88,8 +88,8 @@ - 320 - 100 + 290 + 1860 70 30 @@ -112,7 +112,7 @@ - 220 + 190 100 70 30 @@ -137,7 +137,7 @@ 390 - 1900 + 1860 70 30 @@ -160,8 +160,8 @@ - 320 - 150 + 290 + 1910 70 30 @@ -184,7 +184,7 @@ - 220 + 190 150 70 30 @@ -209,7 +209,7 @@ 390 - 1950 + 1910 70 30 @@ -232,7 +232,7 @@ - 120 + 90 100 70 30 @@ -256,7 +256,7 @@ - 120 + 90 50 70 30 @@ -280,7 +280,7 @@ - 120 + 90 150 70 30 @@ -304,7 +304,7 @@ - 40 + 10 53 61 21 @@ -325,7 +325,7 @@ - 40 + 10 105 61 21 @@ -346,7 +346,7 @@ - 40 + 10 155 61 21 @@ -367,7 +367,7 @@ - 120 + 90 20 70 20 @@ -388,7 +388,7 @@ - 220 + 190 20 70 20 @@ -409,8 +409,8 @@ - 320 - 20 + 290 + 1780 70 20 @@ -431,7 +431,7 @@ 390 - 1820 + 1780 70 20 @@ -451,7 +451,7 @@ - 140 + 50 190 285 25 @@ -470,7 +470,7 @@ - 140 + 80 220 141 31 @@ -492,7 +492,7 @@ 490 - 1950 + 1910 70 30 @@ -516,7 +516,7 @@ 490 - 1820 + 1780 70 20 @@ -537,7 +537,7 @@ 490 - 1900 + 1860 70 30 @@ -561,7 +561,7 @@ 490 - 1850 + 1810 70 30 @@ -585,7 +585,7 @@ 590 - 1950 + 1910 70 30 @@ -609,7 +609,7 @@ 590 - 1820 + 1780 70 20 @@ -630,7 +630,7 @@ 590 - 1900 + 1860 70 30 @@ -654,7 +654,7 @@ 590 - 1850 + 1810 70 30 @@ -678,7 +678,7 @@ 690 - 1950 + 1910 70 30 @@ -702,7 +702,7 @@ 690 - 1820 + 1780 70 20 @@ -723,7 +723,7 @@ 690 - 1900 + 1860 70 30 @@ -747,7 +747,7 @@ 690 - 1850 + 1810 70 30 @@ -771,7 +771,7 @@ 790 - 1950 + 1910 70 30 @@ -795,7 +795,7 @@ 790 - 1820 + 1780 70 20 @@ -816,7 +816,7 @@ 790 - 1900 + 1860 70 30 @@ -840,7 +840,7 @@ 790 - 1850 + 1810 70 30 diff --git a/1280x800 TH/Cigarette/change_shift.cpp b/1280x800-XH/Cigarette/change_shift.cpp similarity index 100% rename from 1280x800 TH/Cigarette/change_shift.cpp rename to 1280x800-XH/Cigarette/change_shift.cpp diff --git a/1280x800 TH/Cigarette/change_shift.h b/1280x800-XH/Cigarette/change_shift.h similarity index 100% rename from 1280x800 TH/Cigarette/change_shift.h rename to 1280x800-XH/Cigarette/change_shift.h diff --git a/1280x800 TH/Cigarette/change_shift.ui b/1280x800-XH/Cigarette/change_shift.ui similarity index 100% rename from 1280x800 TH/Cigarette/change_shift.ui rename to 1280x800-XH/Cigarette/change_shift.ui diff --git a/1280x800 TH/Cigarette/cigarette.cpp b/1280x800-XH/Cigarette/cigarette.cpp similarity index 97% rename from 1280x800 TH/Cigarette/cigarette.cpp rename to 1280x800-XH/Cigarette/cigarette.cpp index 52adbdec..0d011607 100644 --- a/1280x800 TH/Cigarette/cigarette.cpp +++ b/1280x800-XH/Cigarette/cigarette.cpp @@ -278,8 +278,13 @@ Cigarette::Cigarette(QWidget* parent) //ä¿å­˜å›¾ç‰‡çº¿ç¨‹ saveThread.init();//åˆå§‹åŒ– +#ifdef __TCPSend #ifdef __ExportData - connect(&saveThread, &SaveThread::sendDataToExport, &exportDataThread, &ExportDataThread::GetDataFromSaveThread); +#ifdef SYNC_CAMERA + connect(&sync_work_thread, &SyncWorkThread::sendDataToCompress, &exportDataThread, &ExportDataThread::GetDataFromSaveThread); +#endif + connect(&work_thread[NumberOfSupportedCameras], &WorkThread::sendDataToCompress, &exportDataThread, &ExportDataThread::GetDataFromSaveThread); +#endif #endif saveThread.start_work(); #ifdef __UDPSend @@ -344,7 +349,6 @@ Cigarette::Cigarette(QWidget* parent) EnumerateCameras((SingleCamInfoStruct*)&SingleCamInfo, true, g_sys_conf);//枚举相机 - // 剔除值清0 int ret = m_PLCDevice->write_bit_2_plc(g_modbus_conf.shift, 1);//ç»™PLCå‘é€æ¢ç­æ¶ˆæ¯ @@ -480,14 +484,14 @@ Cigarette::Cigarette(QWidget* parent) //定时自动清ç†ç…§ç‰‡ clean_pTimer = new QTimer(this); connect(clean_pTimer, SIGNAL(timeout()), this, SLOT(CleanThreadStartAuto())); - clean_pTimer->start(3600000); + clean_pTimer->start(43200000); //报警标签åŒå‡»æ¶ˆè­¦ connect(ui.label_alarm, SIGNAL(QlabelDoubleClick()), this, SLOT(OnCancelAlarm()));// //心跳检测 - heartbeat_pTimer = new QTimer(this); + /*heartbeat_pTimer = new QTimer(this); connect(heartbeat_pTimer, SIGNAL(timeout()), this, SLOT(heartbeat())); - heartbeat_pTimer->start(5000); + heartbeat_pTimer->start(5000);*/ //æ— å‚对有å‚需è¦åˆ©ç”¨ä¿¡å·è½¬å‘器QSignalMapper(this) //ä¿¡å·è½¬å‘器 @@ -640,11 +644,6 @@ void Cigarette::start_work() BeforeWork(g_sys_conf.shoot); int ret = m_PLCDevice->write_bit_2_plc(g_modbus_conf.work, 1); - /*::Sleep(5000); - ret = m_PLCDevice->write_bit_2_plc( g_modbus_conf.work, 0); - ::Sleep(5000); - ret = m_PLCDevice->write_bit_2_plc( g_modbus_conf.work, 1);*/ - //printf("write:\t%d\n", ret); ui.label_title->setStyleSheet(tr("background-color: rgb(0, 170, 0);")); ui.label_title_2->setStyleSheet(tr("background-color: rgb(0, 170, 0);")); ui.label_title_2->setText(QStringLiteral("è¿è¡Œä¸­")); @@ -664,8 +663,6 @@ void Cigarette::start_work() //开始按钮 void Cigarette::on_btn_start_released() { - uint16_t data[2] = { 1111,0 }; - m_PLCTCPDevice->write_2_plc(0, 70, data);//æ¡ç›’ emit sengMsgToClog("Start to work."); if (!g_admin_mode) { @@ -674,7 +671,7 @@ void Cigarette::on_btn_start_released() emit sengMsgToClog("Start to login in."); dialogin = new Dialogin(this); connect(dialogin, SIGNAL(enter_op()), this, SLOT(OnOp())); - dialogin->setModal(true); + dialogin->setModal(false); dialogin->show(); dialogin->move((this->width() - dialogin->width()) / 2, (this->height() - dialogin->height()) / 2); return; @@ -794,7 +791,7 @@ void Cigarette::on_btn_pause_released() emit sengMsgToClog("Start to login in."); dialogin = new Dialogin(this); connect(dialogin, SIGNAL(enter_op()), this, SLOT(OnOp())); - dialogin->setModal(true); + dialogin->setModal(false); dialogin->show(); dialogin->move((this->width() - dialogin->width()) / 2, (this->height() - dialogin->height()) / 2); return; @@ -816,7 +813,7 @@ void Cigarette::on_btn_lock_released() emit sengMsgToClog("Unlock the application."); dialog_setup_passwd = new DialogSetupPasswd(this); connect(dialog_setup_passwd, SIGNAL(enter_admin()), this, SLOT(OnAdmin())); - dialog_setup_passwd->setModal(true); + dialog_setup_passwd->setModal(false); dialog_setup_passwd->show(); dialog_setup_passwd->move((this->width() - dialog_setup_passwd->width()) / 2, (this->height() - dialog_setup_passwd->height()) / 2); } @@ -854,7 +851,7 @@ void Cigarette::on_btn_setup_released() connect(dialog_setup, SIGNAL(_testimg()), this, SLOT(TestImg())); connect(dialog_setup, SIGNAL(_testimgs()), this, SLOT(TestImgs())); #endif - dialog_setup->setModal(true); + dialog_setup->setModal(false); dialog_setup->show(); dialog_setup->move((this->width() - dialog_setup->width()) / 2, (this->height() - dialog_setup->height()) / 2); @@ -895,7 +892,7 @@ void Cigarette::TestImgs() std::cout << "srcDirPath=" << srcDirPath.toStdString() << std::endl; srcDirPath += "/"; //获å–该路径下的所有文件 - getFiles(srcDirPath.toStdString() + "*.bmp", files); + getFiles(srcDirPath.toStdString() + "*.jpg", files); if (files.size() == 0) { QMessageBox::StandardButton result = QMessageBox::information(NULL, QStringLiteral("æ示"), QStringLiteral("没有找到图片")); @@ -1195,16 +1192,13 @@ void Cigarette::OnDBClickHub(int Num_Cnt) emit sengMsgToClog("Set the picture of camera " + QString::number(Num) + " to full screen."); g_display_label_conf[Num].g_max[Cnt] = true; display_lable_mat[Num][Cnt]->setGeometry(0, 0, 1280, 800); - - //rotate_mat[Num]->setGeometry(1230, 10, 40, 40); - if (g_debug_mode)//是å¦ä¸ºè°ƒè¯•æ¨¡å¼ { - rotate_mat[Num]->setGeometry(1230, 10, 40, 40); + rotate_mat[Num]->setGeometry(1230, 20, 40, 40); } else { - rotate_mat[Num]->setGeometry(1230, 10, 0, 0); + rotate_mat[Num]->setGeometry(1230, 20, 0, 0); } display_lable_mat[Num][Cnt]->raise(); @@ -1389,7 +1383,8 @@ void Cigarette::OnOKHub(int Num) UDPSendInfo.ok[Num] = ok[Num]; UDP_Info_queue->put(UDPSendInfo); #endif - lcdNumber_ok_mat[Num]->display(ok[Num]); + lcdNumber_ok_mat[0]->display(ok[0]); + lcdNumber_ok_mat[1]->display(production_number[0]-ng[1]); label_reslut_mat[Num]->setText("OK"); label_reslut_mat[Num]->setStyleSheet(tr("background-color: rgb(0, 255, 0);")); #ifdef __ExportData @@ -1439,7 +1434,7 @@ void Cigarette::on_checkBox_unkick_clicked(bool checked) emit sengMsgToClog("Start to login in."); dialogin = new Dialogin(this); connect(dialogin, SIGNAL(enter_op()), this, SLOT(OnOp())); - dialogin->setModal(true); + dialogin->setModal(false); dialogin->show(); dialogin->move((this->width() - dialogin->width()) / 2, (this->height() - dialogin->height()) / 2); ui.checkBox_unkick->setChecked(false); @@ -1455,7 +1450,6 @@ void Cigarette::on_checkBox_unkick_clicked(bool checked) if (checked) { emit sengMsgToClog("Enter unkick mode."); - ui.checkBox_unkick->setStyleSheet(tr("background-color: rgb(255, 0, 0);")); int ret = m_PLCDevice->write_bit_2_plc(g_modbus_conf.no_kick, 1); #ifdef __UDPSend sThread.sendData("UnKickOk", g_sys_conf.FeedbackPort); @@ -1464,7 +1458,6 @@ void Cigarette::on_checkBox_unkick_clicked(bool checked) else { emit sengMsgToClog("Exit unkick mode."); - ui.checkBox_unkick->setStyleSheet(tr("background-color: rgb(55, 55, 55);")); int ret = m_PLCDevice->write_bit_2_plc(g_modbus_conf.no_kick, 0); #ifdef __UDPSend sThread.sendData("KickOk", g_sys_conf.FeedbackPort); @@ -1555,7 +1548,7 @@ void Cigarette::on_toolButton_plc_released() { g_plc_dialog_open = true; dialog_plc_setup = new PlcSetup(this); - dialog_plc_setup->setModal(true); + dialog_plc_setup->setModal(false); dialog_plc_setup->show(); dialog_plc_setup->move((this->width() - dialog_plc_setup->width()) / 2, (this->height() - dialog_plc_setup->height()) / 2); } @@ -1947,7 +1940,7 @@ void Cigarette::OnCancelAlarm() //åŒå‡»æ¶ˆè­¦ { dialogin = new Dialogin(this); connect(dialogin, SIGNAL(enter_op()), this, SLOT(OnOp())); - dialogin->setModal(true); + dialogin->setModal(false); dialogin->show(); dialogin->move((this->width() - dialogin->width()) / 2, (this->height() - dialogin->height()) / 2); return; @@ -1988,14 +1981,14 @@ void Cigarette::on_toolButton_alarm_released() emit sengMsgToClog("Start to login in."); dialogin = new Dialogin(this); connect(dialogin, SIGNAL(enter_op()), this, SLOT(OnOp())); - dialogin->setModal(true); + dialogin->setModal(false); dialogin->show(); dialogin->move((this->width() - dialogin->width()) / 2, (this->height() - dialogin->height()) / 2); return; } } AlarmDialog* alarm_dialog = new AlarmDialog(this); - alarm_dialog->setModal(true); + alarm_dialog->setModal(false); alarm_dialog->show(); alarm_dialog->move((this->width() - alarm_dialog->width()) / 2, (this->height() - alarm_dialog->height()) / 2); g_op_time = OP_TIME; @@ -2011,7 +2004,7 @@ void Cigarette::on_pushButton_clear_released()//æ¢ç­ { dialogin = new Dialogin(this); connect(dialogin, SIGNAL(enter_op()), this, SLOT(OnOp())); - dialogin->setModal(true); + dialogin->setModal(false); dialogin->show(); dialogin->move((this->width() - dialogin->width()) / 2, (this->height() - dialogin->height()) / 2); return; @@ -2310,6 +2303,10 @@ bool Cigarette::read_sys_config(SysConf& conf, QString conf_path) else if (tmp_key == "TIMING_SHIFT") { /// 是å¦å®šæ—¶æ¢ç­ï¼š0å¦ï¼›1是 conf.timing_shift = atoi(line.substr(pos + 1).c_str()); + } + else if (tmp_key == "ANGLE") + { + conf.angle = atoi(line.substr(pos + 1).c_str()); } else if (tmp_key == "SHIFT_A") { @@ -3495,7 +3492,7 @@ void Cigarette::EnumerateCameras(SingleCamInfoStruct* TempSingleCamInfoStruct, b if (showinfo)std::cout << "Camera:" << i << ",vendor = " << manufacture << std::endl; transform(manufacture.begin(), manufacture.end(), manufacture.begin(), ::toupper); SingleCamInfoStruct CamInfo; - if ((!manufacture.compare(0, 3, "HIK")) || (!manufacture.compare(0, 3, "U3V"))) + if ((!manufacture.compare(0, 3, "HIK")) || (!manufacture.compare(0, 3, "U3V")) || (!manufacture.compare(0, 3, "GEV"))) { void* camhandle; MVCC_STRINGVALUE UserID; @@ -3727,64 +3724,43 @@ void Cigarette::record_output_statistic(qint64 quantity, int Kick[NumberOfSuppor file_name = QString(STATISTIC_FILE).arg(i); file_path = g_conf_path.config_path + "/" + file_name; char buf[256]; - QDateTime date = QDateTime::currentDateTime(); - string nowtime = date.toString("yyyy-MM-dd_HH:mm:ss").toStdString().c_str(); - double ng_rate; - if (ng[i] > 0) - { - ng_rate = double(ng[i]) / production_number[i]; - } - else - { - ng_rate = 0; - } - if (quantity > 0) - { - sprintf(buf, "%c 总产é‡:%010I64d 剔除率:%02.5f%% åˆæ ¼çŽ‡:%02.5f%% NG率:%02.5f%%\n", (shift == 0) ? 'A' : ((shift == 1) ? 'B' : 'C'), quantity, ((double)Kick[i] / quantity) * 100, (1.0 - ng_rate) * 100, ng_rate * 100); - } - else - { - sprintf(buf, "%c 总产é‡:%010I64d 剔除率:%02.5f%% åˆæ ¼çŽ‡:%02.5f%% NG率:%02.5f%%\n", (shift == 0) ? 'A' : ((shift == 1) ? 'B' : 'C'), quantity, 0.00, 0.00, 0.00); - } - std::ifstream file(file_path.toStdString()); - std::ifstream file_(file_path.toStdString()); - std::vector lines; //用于存储文件的所有行 - if (file_.good()) - { - file_.close(); - } - else - { - std::ofstream outFile(file_path.toStdString()); - std::string fristNews = "**************************************************************************************\n" + nowtime + "\n" + buf; - outFile << fristNews << endl; - outFile.close(); - } - if (file.is_open()) + memset(buf, 0, 256); + sprintf(buf, "%s", file_path.toLocal8Bit().constData()); + + cfg_file.open(buf, std::ios::app); + if (cfg_file.good()) { - std::string line; - while (std::getline(file, line)) + + memset(buf, 0, 256); + sprintf(buf, "\n\n**************************************************************************************\n"); + cfg_file.write(buf, strlen(buf)); + QDateTime date = QDateTime::currentDateTime(); + memset(buf, 0, 256); + sprintf(buf, "%s:\n", date.toString("yyyy-MM-dd_HH:mm:ss").toStdString().c_str()); + cfg_file.write(buf, strlen(buf)); + + memset(buf, 0, 256); + double ng_rate; + if (ng[i] > 0) + { + ng_rate = double(ng[i]) / production_number[i]; + } + else { - lines.push_back(line); + ng_rate = 0; } - file.close(); - // åœ¨ç¬¬ä¸€è¡Œæ·»åŠ æ•°æ® - std::string newData = "**************************************************************************************\n"+nowtime +"\n" + buf; - if (!lines.empty()) + if (quantity > 0) { - lines.insert(lines.begin(), newData); // 在vector的开始ä½ç½®æ’å…¥æ–°æ•°æ® + sprintf(buf, "%c 总产é‡:%010I64d 剔除率:%02.5f%% åˆæ ¼çŽ‡:%02.5f%% NG率:%02.5f%%\n", (shift == 0) ? 'A' : ((shift == 1) ? 'B' : 'C'), quantity, ((double)Kick[i] / quantity) * 100, (1.0 - ng_rate) * 100, ng_rate * 100); } - // 将修改åŽçš„æ•°æ®å†™å›žæ–‡ä»¶ - std::ofstream outFile(file_path.toStdString()); - if (outFile.is_open()) + else { - for (const auto& l : lines) - { - outFile << l << std::endl; - } - outFile.close(); + sprintf(buf, "%c 总产é‡:%010I64d 剔除率:%02.5f%% åˆæ ¼çŽ‡:%02.5f%% NG率:%02.5f%%\n", (shift == 0) ? 'A' : ((shift == 1) ? 'B' : 'C'), quantity, 0.00, 0.00, 0.00); } + cfg_file.write(buf, strlen(buf)); + memset(buf, 0, 256); } + cfg_file.close(); } } last_shift = shift; diff --git a/1280x800 TH/Cigarette/cigarette.h b/1280x800-XH/Cigarette/cigarette.h similarity index 100% rename from 1280x800 TH/Cigarette/cigarette.h rename to 1280x800-XH/Cigarette/cigarette.h diff --git a/1280x800 TH/Cigarette/cigarette.qrc b/1280x800-XH/Cigarette/cigarette.qrc similarity index 100% rename from 1280x800 TH/Cigarette/cigarette.qrc rename to 1280x800-XH/Cigarette/cigarette.qrc diff --git a/1280x800 TH/Cigarette/cigarette.ui b/1280x800-XH/Cigarette/cigarette.ui similarity index 84% rename from 1280x800 TH/Cigarette/cigarette.ui rename to 1280x800-XH/Cigarette/cigarette.ui index a293d6e4..30c622e5 100644 --- a/1280x800 TH/Cigarette/cigarette.ui +++ b/1280x800-XH/Cigarette/cigarette.ui @@ -46,102 +46,11 @@ - - - - 1020 - 10 - 191 - 21 - - - - - 微软雅黑 - 12 - 50 - false - - - - color:white - - - Tel:87907256(0532) - - - - - - 1170 - 10 - 81 - 21 - - - - - 微软雅黑 - 12 - 50 - false - - - - color:white - - - é’岛维克 - - - - - - 990 - 30 - 211 - 31 - - - - - 微软雅黑 - 12 - 50 - false - - - - color:white - - - 2020-10-10 13:15:39 - - - Qt::AlignCenter - - - - - - 10 - 240 - 231 - 401 - - - - background-color: rgb(0, 0, 0); - - - - - 170 - 1880 + 1380 160 110 @@ -186,7 +95,7 @@ 610 - 1735 + 2065 90 20 @@ -202,7 +111,7 @@ 490 - 1880 + 1380 160 110 @@ -218,7 +127,7 @@ 610 - 1765 + 2095 90 20 @@ -234,7 +143,7 @@ 610 - 1705 + 2035 90 20 @@ -279,7 +188,7 @@ 515 - 1705 + 2035 90 20 @@ -303,7 +212,7 @@ 515 - 1735 + 2065 90 20 @@ -327,7 +236,7 @@ 515 - 1795 + 2125 90 20 @@ -351,7 +260,7 @@ 185 - 1815 + 2145 511 51 @@ -392,7 +301,7 @@ 80 20 - 50 + 61 20 @@ -414,7 +323,7 @@ 220 20 - 50 + 61 20 @@ -474,7 +383,7 @@ 360 20 - 50 + 61 20 @@ -523,7 +432,7 @@ 185 - 1705 + 2035 320 110 @@ -539,7 +448,7 @@ 610 - 1795 + 2125 90 20 @@ -555,7 +464,7 @@ 515 - 1765 + 2095 90 20 @@ -604,43 +513,11 @@ - - - - 800 - 240 - 231 - 401 - - - - background-color: rgb(0, 0, 0); - - - - - - - - - 1040 - 240 - 231 - 401 - - - - background-color: rgb(0, 0, 0); - - - - - 1175 - 1360 + 1700 90 20 @@ -656,7 +533,7 @@ 1175 - 1255 + 1595 90 20 @@ -672,7 +549,7 @@ 750 - 1360 + 1700 320 110 @@ -688,7 +565,7 @@ 1080 - 1450 + 1790 90 20 @@ -712,7 +589,7 @@ 1080 - 1195 + 1535 90 20 @@ -736,7 +613,7 @@ 1080 - 1705 + 2035 90 20 @@ -789,7 +666,7 @@ 1080 - 1795 + 2125 90 20 @@ -813,7 +690,7 @@ 1080 - 1540 + 1870 90 20 @@ -837,7 +714,7 @@ 1080 - 1420 + 1760 90 20 @@ -890,7 +767,7 @@ 1080 - 1255 + 1595 90 20 @@ -914,7 +791,7 @@ 1175 - 1600 + 1930 90 20 @@ -930,7 +807,7 @@ 1080 - 1570 + 1900 90 20 @@ -954,7 +831,7 @@ 970 - 1880 + 1380 160 110 @@ -970,7 +847,7 @@ 750 - 1475 + 1815 510 50 @@ -1011,7 +888,7 @@ 80 20 - 50 + 61 20 @@ -1033,7 +910,7 @@ 220 20 - 50 + 61 20 @@ -1093,7 +970,7 @@ 360 20 - 50 + 61 20 @@ -1142,7 +1019,7 @@ 1175 - 1420 + 1760 90 20 @@ -1158,7 +1035,7 @@ 750 - 1705 + 2035 320 110 @@ -1174,7 +1051,7 @@ 1175 - 1705 + 2035 90 20 @@ -1190,7 +1067,7 @@ 750 - 1815 + 2145 511 51 @@ -1231,7 +1108,7 @@ 80 20 - 50 + 61 20 @@ -1253,7 +1130,7 @@ 220 20 - 50 + 61 20 @@ -1313,7 +1190,7 @@ 360 20 - 50 + 61 20 @@ -1362,7 +1239,7 @@ 750 - 1650 + 1980 510 50 @@ -1403,7 +1280,7 @@ 80 20 - 50 + 61 20 @@ -1425,7 +1302,7 @@ 220 20 - 50 + 61 20 @@ -1485,7 +1362,7 @@ 360 20 - 50 + 61 20 @@ -1534,7 +1411,7 @@ 1080 - 1285 + 1625 90 20 @@ -1558,7 +1435,7 @@ 1175 - 1765 + 2095 90 20 @@ -1574,7 +1451,7 @@ 1175 - 1285 + 1625 90 20 @@ -1590,7 +1467,7 @@ 1080 - 1630 + 1960 90 20 @@ -1614,7 +1491,7 @@ 1175 - 1390 + 1730 90 20 @@ -1630,7 +1507,7 @@ 750 - 1305 + 1645 510 50 @@ -1671,7 +1548,7 @@ 80 20 - 50 + 61 20 @@ -1693,7 +1570,7 @@ 220 20 - 50 + 61 20 @@ -1753,7 +1630,7 @@ 360 20 - 50 + 61 20 @@ -1802,7 +1679,7 @@ 1175 - 1630 + 1960 90 20 @@ -1818,7 +1695,7 @@ 750 - 1195 + 1535 320 110 @@ -1834,7 +1711,7 @@ 1080 - 1225 + 1565 90 20 @@ -1858,7 +1735,7 @@ 1080 - 1360 + 1700 90 20 @@ -1882,7 +1759,7 @@ 1080 - 1735 + 2065 90 20 @@ -1906,7 +1783,7 @@ 1175 - 1735 + 2065 90 20 @@ -1922,7 +1799,7 @@ 1175 - 1225 + 1565 90 20 @@ -1938,7 +1815,7 @@ 1080 - 1765 + 2095 90 20 @@ -1962,7 +1839,7 @@ 1175 - 1540 + 1870 90 20 @@ -1978,7 +1855,7 @@ 1175 - 1450 + 1790 90 20 @@ -1994,7 +1871,7 @@ 1080 - 1600 + 1930 90 20 @@ -2018,7 +1895,7 @@ 1175 - 1195 + 1535 90 20 @@ -2034,7 +1911,7 @@ 650 - 1880 + 1380 160 110 @@ -2050,7 +1927,7 @@ 1130 - 1880 + 1380 160 110 @@ -2066,7 +1943,7 @@ 1175 - 1570 + 1900 90 20 @@ -2082,7 +1959,7 @@ 1080 - 1390 + 1730 90 20 @@ -2106,7 +1983,7 @@ 810 - 1880 + 1380 160 110 @@ -2122,7 +1999,7 @@ 1175 - 1795 + 2125 90 20 @@ -2196,7 +2073,7 @@ 750 - 1540 + 1870 320 110 @@ -2208,103 +2085,141 @@ - + - 1180 - 35 - 121 - 21 + 110 + 1790 + 41 + 41 + + + + border-image: url(:/Cigarette/Resources/cam7_no.png); + + + + + + + + + 100 + 1840 + 61 + 16 微软雅黑 - 12 - 50 - false + 10 + 75 + true - color:white + background-color: rgb(255, 255, 0); - CDTH + è”机 + + + Qt::AlignCenter - + - 430 - 0 - 441 - 51 + 30 + 1880 + 41 + 41 + + + + border-image: url(:/Cigarette/Resources/cam4_no.png); + + + + + + + + + 100 + 1660 + 61 + 16 微软雅黑 - 24 + 10 + 75 + true background-color: rgb(255, 255, 0); - æ¡ç›’胶点检测系统 + è”机 Qt::AlignCenter - + - 80 - 7 - 271 - 31 + 100 + 1680 + 61 + 16 微软雅黑 - 13 + 10 + 75 + true - color:white + background-color: rgb(255, 255, 0); - 上海烟è‰æœºæ¢°æœ‰é™è´£ä»»å…¬å¸ + 工作 Qt::AlignCenter - + - 10 - 5 - 70 - 61 + 110 + 1700 + 41 + 41 - border-image: url(:/Cigarette/Resources/logo.png); - + border-image: url(:/Cigarette/Resources/cam6_no.png); - + - 80 - 40 - 341 + 20 + 1930 + 61 16 @@ -2312,23 +2227,25 @@ 微软雅黑 10 + 75 + true - color:white + background-color: rgb(255, 255, 0); - SHANGHAI TOBACCO MACHINERY CO.,LTD + è”机 Qt::AlignCenter - + - 90 - 1740 + 100 + 1930 61 16 @@ -2351,11 +2268,11 @@ Qt::AlignCenter - + - 10 - 1850 + 100 + 1750 61 16 @@ -2372,17 +2289,17 @@ background-color: rgb(255, 255, 0); - 工作 + è”机 Qt::AlignCenter - + - 90 - 1760 + 100 + 1770 61 16 @@ -2405,27 +2322,11 @@ Qt::AlignCenter - - - - 100 - 1600 - 41 - 41 - - - - border-image: url(:/Cigarette/Resources/cam6_no.png); - - - - - - + - 90 - 1670 + 20 + 1950 61 16 @@ -2451,8 +2352,8 @@ - 100 - 1510 + 110 + 1610 41 41 @@ -2464,81 +2365,11 @@ - + 100 - 1780 - 41 - 41 - - - - border-image: url(:/Cigarette/Resources/cam8_no.png); - - - - - - - - - 10 - 1830 - 61 - 16 - - - - - 微软雅黑 - 10 - 75 - true - - - - background-color: rgb(255, 255, 0); - - - è”机 - - - Qt::AlignCenter - - - - - - 90 - 1650 - 61 - 16 - - - - - 微软雅黑 - 10 - 75 - true - - - - background-color: rgb(255, 255, 0); - - - è”机 - - - Qt::AlignCenter - - - - - - 90 - 1580 + 1860 61 16 @@ -2561,81 +2392,27 @@ Qt::AlignCenter - + - 100 - 1690 + 110 + 1880 41 41 - border-image: url(:/Cigarette/Resources/cam7_no.png); + border-image: url(:/Cigarette/Resources/cam8_no.png); - - - - 90 - 1560 - 61 - 16 - - - - - 微软雅黑 - 10 - 75 - true - - - - background-color: rgb(255, 255, 0); - - - è”机 - - - Qt::AlignCenter - - - - - - 90 - 1830 - 61 - 16 - - - - - 微软雅黑 - 10 - 75 - true - - - - background-color: rgb(255, 255, 0); - - - è”机 - - - Qt::AlignCenter - - - 90 - 1850 + 100 + 1950 61 16 @@ -2658,179 +2435,44 @@ Qt::AlignCenter - - - - 20 - 1780 - 41 - 41 - - - - border-image: url(:/Cigarette/Resources/cam4_no.png); - - - - - - - - - 250 - 240 - 231 - 401 - - - - background-color: rgb(0, 0, 0); - - - - - - - - - 580 - 60 - 691 - 171 - - - - - 宋体 - 14 - - - - color:white - - - 状æ€åŒº - - - + - 600 - 180 - 71 + 620 + 1880 + 111 31 - - - 微软雅黑 - 10 - 75 - true - - color:white - - 1#剔除数 + + 10 - + - 170 - 180 - 151 - 51 + 510 + 1630 + 201 + 101 微软雅黑 - 18 + 12 - - background-color: rgb(255, 255, 0); - - - 未è¿è¡Œ - - - Qt::AlignCenter - - - - - - 1150 - 90 - 111 - 31 - - - - color:white - - - 10 - - - - - - 920 - 120 - 111 - 31 - - color:white - - 10 - - - - - - 920 - 180 - 111 - 31 - - - - color:white + + 3#相机分æžç»“æžœ - - 10 - - - - - - 10 - 640 - 471 - 101 - - - - - 微软雅黑 - 12 - - - - color:white - - - 1#相机分æžç»“æžœ - - + 10 @@ -2849,7 +2491,7 @@ 采集速度： - + 75 @@ -2871,7 +2513,7 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - + 80 @@ -2893,7 +2535,7 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - + 10 @@ -2912,7 +2554,7 @@ 胶点个数： - + 230 @@ -2931,7 +2573,7 @@ 识别时间： - + 300 @@ -2953,7 +2595,7 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - + 230 @@ -2981,11 +2623,27 @@ - + + + + 620 + 1820 + 111 + 31 + + + + color:white + + + 10 + + + - 830 - 90 + 530 + 1790 71 31 @@ -3002,275 +2660,639 @@ color:white - 2#总个数 + 3#总个数 - + - 0 - 750 - 1281 - 53 + 530 + 1880 + 71 + 31 微软雅黑 - 12 + 10 75 true - + + color:white + + + 3#剔除数 + + + + + + 530 + 1850 + 71 + 31 + + + + + 微软雅黑 + 10 + 75 + true + + + + color:white + + + 3#NGæ•° + + + + + + 1240 + 1500 + 20 + 20 + + + + Qt::ClickFocus + + + false + + + border-image:url(:/Cigarette/Resources/rotate.png) + + + ... + + + + ../../../资料/烟厂软件代ç /230720-郑州冷胶ZB416æ¡ç›’-3相机-1280x800/Cigarette/Resources/rotate.png../../../资料/烟厂软件代ç /230720-郑州冷胶ZB416æ¡ç›’-3相机-1280x800/Cigarette/Resources/rotate.png + + + + 40 + 40 + + + + + + + 530 + 1820 + 71 + 31 + + + + + 微软雅黑 + 10 + 75 + true + + + + color:white + + + 3#OKæ•° + + + + + + 620 + 1790 + 111 + 31 + + + + color:white + + + 10 + + + + + + 190 + 1500 + 191 + 121 + + + + background-color: rgb(0, 0, 0); + + - - - - 940 - 10 - 81 - 31 - - - - - 微软雅黑 - 12 - 75 - true - - - - color:white - - - 无报警 - - - Qt::AlignCenter - - - - - - 380 - 10 - 41 - 31 - - - - - 微软雅黑 - 12 - 75 - true - - - - color:white - - - å½“ç­ - - - - - - 770 - 10 - 81 - 31 - - - - - 微软雅黑 - 12 - 75 - true - - - - color:white - - - PLC正常 - - - Qt::AlignCenter - - - - - - 430 - 5 - 161 - 41 - - - - color:white - - - 8 - - - + + + + + 620 + 1850 + 111 + 31 + + + + color:white + + + 10 + + + + + + 440 + 1500 + 231 + 121 + + + + background-color: rgb(0, 0, 0); + + + + + + + + + 0 + 1370 + 161 + 131 + + + + background-color: rgb(0, 0, 0); + + + + + + + + + 20 + 1790 + 45 + 30 + + + + + 微软雅黑 + 16 + 50 + false + + + + background-color: rgb(255, 255, 0); + + + è”机 + + + Qt::AlignCenter + + + + + + 20 + 1830 + 45 + 30 + + + + + 微软雅黑 + 16 + 50 + false + + + + background-color: rgb(255, 255, 0); + + + 工作 + + + Qt::AlignCenter + + + + + + 20 + 1740 + 50 + 50 + + + + border-image: url(:/Cigarette/Resources/cam3_no.png); + + + + + + + + + 1180 + 35 + 131 + 30 + + + + + 微软雅黑 + 12 + 50 + false + + + + Qt::LeftToRight + + + color:white + + + CDTH + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + 730 + 85 + 531 + 481 + + + + background-color: rgb(0, 0, 0); + + + + + + + + + 480 + 625 + 81 + 31 + + + + + 微软雅黑 + 10 + 75 + true + + + + color:white + + + 1#NG次数 + + + + + + 10 + 75 + 171 + 291 + + + + + 微软雅黑 + 14 + 75 + true + + + + color:white + + + æ“作区 + + - 880 - 5 - 41 - 41 + 10 + 24 + 72 + 96 + + + 微软雅黑 + + - border-image: url(:/Cigarette/Resources/alarm.png); + border-image: url(:/Cigarette/Resources/start.png); + + false + - + - 690 - 5 - 51 - 41 + 95 + 24 + 72 + 96 + + + 微软雅黑 + + - border-image: url(:/Cigarette/Resources/plc.png); + border-image: url(:/Cigarette/Resources/pause.png); + + + false + - + - 610 - 5 - 51 - 41 + 10 + 120 + 72 + 96 微软雅黑 - 12 - color:white + border-image: url(:/Cigarette/Resources/unlock.png); - æ¢ç­ + + + + false - + - 10 - 10 - 81 - 31 + 90 + 120 + 72 + 96 微软雅黑 - 12 - 75 - true - color:white + border-image: url(:/Cigarette/Resources/setup.png); + - 登陆用户： + - - Qt::AlignCenter + + false - + - 100 - 10 - 71 - 31 + 10 + 230 + 151 + 51 微软雅黑 - 12 - 50 - false + 16 color:white - æ“作员 + 切æ¢çª—å£ - + + + + + 200 + 625 + 91 + 31 + + + + + 微软雅黑 + 10 + 75 + true + + + + color:white + + + 1#剔除次数 + + + + + + 732 + 675 + 541 + 61 + + + + + 微软雅黑 + 14 + + + + color:white + + + 2#相机分æžç»“æžœ + + - 160 - 10 - 41 - 31 + 10 + 30 + 71 + 21 微软雅黑 - 12 + 11 + + + + 采集速度： + + + + + + 80 + 30 + 71 + 21 + + + + + 微软雅黑 + 11 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 230 + 30 + 60 + 21 + + + + + 微软雅黑 + 11 + true + + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + 450 + 20 + 81 + 31 + + + + + SimSun + 18 75 true - color:white + background-color: rgb(0, 255, 0); - ä¸Šç­ + OK + + + Qt::AlignCenter - + - 210 - 5 - 161 - 41 + 300 + 30 + 71 + 21 - - color:white + + + 微软雅黑 + 11 + - - 8 + + 识别时间： - + - 1050 - 10 - 221 - 31 + 160 + 30 + 71 + 21 @@ -3279,24 +3301,432 @@ 11 - - color:white + + 胶点个数： + + + + + + 370 + 30 + 50 + 20 + + + + + 微软雅黑 + 11 + - è¿è¡Œ1å¹´10月25天9æ—¶15分 + - Qt::AlignCenter + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + label_33 + label_cap_speed_2 + label_jd_no_2 + label_24 + label_25 + label_timecost_2 + label_reslut_2 + + + + + 190 + 675 + 540 + 61 + + + + + 微软雅黑 + 14 + + + + color:white + + + 1#相机分æžç»“æžœ + + + + + 10 + 30 + 71 + 21 + + + + + 微软雅黑 + 11 + + + + 采集速度： + + + + + + 80 + 30 + 71 + 21 + + + + + 微软雅黑 + 11 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 230 + 30 + 60 + 21 + + + + + 微软雅黑 + 11 + + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + 160 + 30 + 71 + 21 + + + + + 微软雅黑 + 11 + + + + 胶点个数： + + + + + + 300 + 30 + 71 + 21 + + + + + 微软雅黑 + 11 + + + + 识别时间： + + + + + + 370 + 30 + 50 + 20 + + + + + 微软雅黑 + 11 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 450 + 20 + 81 + 31 + + + + + SimSun + 18 + 75 + true + + + + background-color: rgb(0, 255, 0); + + + OK + + + Qt::AlignCenter + + + + + + + 10 + 0 + 70 + 61 + + + + border-image: url(:/Cigarette/Resources/logo.png); + + + + + + + + + + 1030 + 625 + 81 + 31 + + + + + 微软雅黑 + 10 + 75 + true + + + + color:white + + + 2#NG次数 + + + + + + 580 + 575 + 131 + 41 + + + + color:white + + + 10 + + + + + + 430 + 5 + 441 + 61 + + + + + 微软雅黑 + 24 + + + + background-color: rgb(255, 255, 0); + + + å°ç›’å°ç­¾çº¸çº¸èƒ¶ç‚¹æ£€æµ‹ç³»ç»Ÿ + + + Qt::AlignCenter + + + + + + 580 + 625 + 131 + 41 + + + + color:white + + + 10 + + + + + + 960 + 35 + 221 + 31 + + + + + 微软雅黑 + 12 + 50 + false + + + + color:white + + + 2020-10-10 13:15:39 + + + Qt::AlignCenter + + + + + + 190 + 85 + 531 + 481 + + + + background-color: rgb(0, 0, 0); + + + + + + + + + 690 + 95 + 20 + 20 + + + + Qt::ClickFocus + + + false + + + border-image: url(:/Cigarette/Resources/rotate.png) + + + ... + + + + ../../../资料/烟厂/0-软件代ç /221209-上海FX2æ¡ç›’两相机 -GPU-延åŽä¸€ä¸ª/Cigarette/Resources/rotate.png../../../资料/烟厂/0-软件代ç /221209-上海FX2æ¡ç›’两相机 -GPU-延åŽä¸€ä¸ª/Cigarette/Resources/rotate.png + + + + 40 + 40 + + + + + + + 1030 + 575 + 81 + 31 + + + + + 微软雅黑 + 10 + 75 + true + + + + color:white + + + 2#OK次数 + + + + + + 870 + 570 + 131 + 41 + + + + color:white + + + 10 + - + - 690 - 150 - 111 - 31 + 320 + 575 + 131 + 41 @@ -3306,12 +3736,36 @@ 10 - + - 600 - 90 - 71 + 990 + 15 + 191 + 21 + + + + + 微软雅黑 + 12 + 50 + false + + + + color:white + + + Tel:87907256(0532) + + + + + + 750 + 575 + 91 31 @@ -3327,16 +3781,16 @@ color:white - 1#总个数 + 2#检测个数 - + - 920 - 90 - 111 - 31 + 1130 + 625 + 131 + 41 @@ -3346,28 +3800,36 @@ 10 - + - 920 - 150 - 111 - 31 + 1180 + 15 + 81 + 21 + + + 微软雅黑 + 12 + 50 + false + + color:white - - 10 + + é’岛维克 - + - 830 - 120 - 71 + 750 + 625 + 91 31 @@ -3383,15 +3845,31 @@ color:white - 2#OKæ•° + 2#剔除次数 - + - 600 - 150 - 71 + 1130 + 575 + 131 + 41 + + + + color:white + + + 10 + + + + + + 200 + 580 + 91 31 @@ -3407,165 +3885,349 @@ color:white - 1#NGæ•° + 1#检测个数 - + - 490 - 240 - 301 - 401 + 80 + 45 + 341 + 16 + + + 微软雅黑 + 10 + + - background-color: rgb(0, 0, 0); + color:white - + SHANGHAI TOBACCO MACHINERY CO.,LTD + + + Qt::AlignCenter - + 10 - 60 - 311 - 111 + 740 + 1264 + 53 - 宋体 - 14 - 50 - false + 微软雅黑 + 12 + 75 + true - - color:white - - æ“作区 + - + + + + 919 + 10 + 71 + 31 + + + + + 微软雅黑 + 12 + 75 + true + + + + color:white + + + 无报警 + + + Qt::AlignCenter + + + + + + 410 + 10 + 41 + 31 + + + + + 微软雅黑 + 12 + 75 + true + + + + color:white + + + å½“ç­ + + + + + + 740 + 10 + 81 + 31 + + + + + 微软雅黑 + 12 + 75 + true + + + + color:white + + + PLC正常 + + + Qt::AlignCenter + + + + + + 450 + 5 + 171 + 41 + + + + color:white + + + 8 + + + + + + 880 + 5 + 41 + 41 + + + + border-image: url(:/Cigarette/Resources/alarm.png); + + + + + + + + + 690 + 5 + 51 + 41 + + + + border-image: url(:/Cigarette/Resources/plc.png); + + + + + + + + + 630 + 5 + 51 + 41 + + + + + 微软雅黑 + 12 + + + + color:white + + + æ¢ç­ + + + - 20 - 20 - 53 - 70 + 1000 + 16 + 250 + 20 + + + 微软雅黑 + 12 + 75 + true + + - border-image: url(:/Cigarette/Resources/start.png); + color:white - + è¿è¡Œ1å¹´10月25天9æ—¶15分 - - false + + Qt::AlignCenter - + - 90 - 20 - 53 - 70 + 10 + 10 + 101 + 31 + + + 微软雅黑 + 12 + 75 + true + + - border-image: url(:/Cigarette/Resources/pause.png); - + color:white - + 登陆用户： - - false + + Qt::AlignCenter - + - 170 - 20 - 53 - 70 + 110 + 10 + 71 + 31 + + + 微软雅黑 + 12 + 50 + false + + - border-image: url(:/Cigarette/Resources/unlock.png); + color:white - - - - false + æ“作员 - + - 250 - 20 - 53 - 70 + 190 + 10 + 41 + 31 + + + 微软雅黑 + 12 + 75 + true + + - border-image: url(:/Cigarette/Resources/setup.png); - + color:white - + ä¸Šç­ - - false + + + + + 230 + 5 + 171 + 41 + + + + color:white + + + 8 + + + + + + 825 + 5 + 51 + 41 + + + + + 微软雅黑 + 12 + + + + color:white + + + å¤ä½ - - - - 1150 - 120 - 111 - 31 - - - - color:white - - - 10 - - - - - - 1150 - 180 - 111 - 31 - - - - color:white - - - 10 - - - + - 1060 - 150 - 71 + 480 + 575 + 81 31 @@ -3581,62 +4243,47 @@ color:white - 3#NGæ•° + 1#OK次数 - + - 600 - 120 - 71 + 80 + 2 + 271 31 微软雅黑 - 10 - 75 - true + 13 color:white - 1#OKæ•° - - - - - - 690 - 180 - 111 - 31 - - - - color:white + 上海烟è‰æœºæ¢°æœ‰é™è´£ä»»å…¬å¸ - - 10 + + Qt::AlignCenter - + - 830 - 150 - 71 - 31 + 10 + 365 + 171 + 371 微软雅黑 - 10 + 14 75 true @@ -3644,474 +4291,362 @@ color:white - - 2#NGæ•° - - - - - - 690 - 120 - 111 - 31 - - - - color:white - - - 10 - - - - - - 490 - 640 - 301 - 101 - - - - - 微软雅黑 - 12 - - - - color:white - - 2#相机分æžç»“æžœ + 设备区 - + 10 30 - 71 - 21 - - - - - 微软雅黑 - 11 - - - - 采集速度： - - - - - - 75 - 30 - 65 - 21 - - - - - 微软雅黑 - 11 - + 71 + 71 + + + + border-image: url(:/Cigarette/Resources/cam1_no.png); - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + - 80 - 70 - 60 - 21 + 95 + 30 + 71 + 71 - - - 微软雅黑 - 11 - + + border-image: url(:/Cigarette/Resources/cam2_no.png); - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + - 170 - 60 - 111 + 95 + 120 + 71 31 - SimSun + 微软雅黑 18 75 true - background-color: rgb(0, 255, 0); + background-color: rgb(255, 255, 0); - OK + è”机 Qt::AlignCenter - + - 160 - 30 + 95 + 155 71 - 21 + 31 微软雅黑 - 11 + 18 + 75 + true + + background-color: rgb(255, 255, 0); + - 识别时间： + 工作 + + + Qt::AlignCenter - + 10 - 70 + 155 71 - 21 + 31 微软雅黑 - 11 + 18 + 75 + true - - 胶点个数： - - - - - - 230 - 30 - 50 - 20 - - - - - 微软雅黑 - 11 - + + background-color: rgb(255, 255, 0); - + 工作 - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignCenter - label_33 - label_cap_speed_2 - label_jd_no_2 - label_24 - label_25 - label_timecost_2 - label_reslut_2 - - - - - 800 - 640 - 471 - 101 - - - - - 微软雅黑 - 12 - - - - color:white - - - 3#相机分æžç»“æžœ - - + 10 - 30 - 71 + 320 + 91 21 微软雅黑 - 11 + 12 + 75 + true + + color:white + - 采集速度： + è°ƒè¯•æ¨¡å¼ - + - 75 - 30 - 65 + 10 + 340 + 81 21 微软雅黑 - 11 + 12 + 75 + true - - + + color:white - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + ä¸å‰”除 - + - 80 - 70 - 60 - 21 + 10 + 1560 + 61 + 16 微软雅黑 - 11 + 10 + 75 + true + + background-color: rgb(255, 255, 0); + - + 工作 - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignCenter - + - 10 - 70 - 71 - 21 + 20 + 1490 + 41 + 41 - - - 微软雅黑 - 11 - + + border-image: url(:/Cigarette/Resources/cam4_no.png); - 胶点个数： + - + - 230 - 30 - 71 - 21 + 100 + 1310 + 41 + 41 - - - 微软雅黑 - 11 - + + border-image: url(:/Cigarette/Resources/cam6_no.png); - 识别时间： + - + - 300 - 30 - 50 - 20 + 100 + 1490 + 41 + 41 - - - 微软雅黑 - 11 - + + border-image: url(:/Cigarette/Resources/cam8_no.png); - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + - 230 - 60 - 111 - 31 + 90 + 1540 + 61 + 16 - SimSun - 18 + 微软雅黑 + 10 75 true - background-color: rgb(0, 255, 0); + background-color: rgb(255, 255, 0); - OK - - - Qt::AlignCenter - - - - - - - 330 - 60 - 241 - 171 - - - - - 宋体 - 14 - 50 - false - - - - color:white - - - 设备区 - - + è”机 + + + Qt::AlignCenter + + + - 20 - 70 - 45 - 30 + 90 + 1560 + 61 + 16 微软雅黑 - 16 - 50 - false + 10 + 75 + true background-color: rgb(255, 255, 0); - è”机 + 工作 Qt::AlignCenter - + 20 - 20 - 51 - 50 + 1400 + 41 + 41 - border-image: url(:/Cigarette/Resources/cam1_no.png); + border-image: url(:/Cigarette/Resources/cam3_no.png); - + 100 - 20 - 50 - 50 + 1220 + 41 + 41 - border-image: url(:/Cigarette/Resources/cam2_no.png); + border-image: url(:/Cigarette/Resources/cam5_no.png); - + 100 - 70 - 45 - 30 + 1400 + 41 + 41 + + + + border-image: url(:/Cigarette/Resources/cam7_no.png); + + + + + + + + + 90 + 1270 + 61 + 16 微软雅黑 - 16 - 50 - false + 10 + 75 + true @@ -4124,123 +4659,129 @@ Qt::AlignCenter - + - 100 - 110 - 45 - 30 + 10 + 1450 + 61 + 16 微软雅黑 - 16 - 50 - false + 10 + 75 + true background-color: rgb(255, 255, 0); - 工作 + è”机 Qt::AlignCenter - + - 20 - 110 - 45 - 30 + 90 + 1450 + 61 + 16 微软雅黑 - 16 - 50 - false + 10 + 75 + true background-color: rgb(255, 255, 0); - 工作 + è”机 Qt::AlignCenter - + - 10 - 140 - 91 - 21 + 90 + 1360 + 61 + 16 微软雅黑 10 - 50 - false + 75 + true - color:white + background-color: rgb(255, 255, 0); - è°ƒè¯•æ¨¡å¼ + è”机 + + + Qt::AlignCenter - + - 140 - 140 - 71 - 21 + 10 + 1540 + 61 + 16 微软雅黑 10 - 50 - false + 75 + true - color:white + background-color: rgb(255, 255, 0); - ä¸å‰”除 + è”机 + + + Qt::AlignCenter - + - 180 - 110 - 45 - 30 + 10 + 1470 + 61 + 16 微软雅黑 - 16 - 50 - false + 10 + 75 + true @@ -4253,19 +4794,19 @@ Qt::AlignCenter - + 90 - 675 - 71 - 31 + 1290 + 61 + 16 微软雅黑 - 18 + 10 75 true @@ -4274,41 +4815,25 @@ background-color: rgb(255, 255, 0); - è”机 + 工作 Qt::AlignCenter - - - - 180 - 20 - 50 - 50 - - - - border-image: url(:/Cigarette/Resources/cam3_no.png); - - - - - - + 90 - 710 - 71 - 31 + 1380 + 61 + 16 微软雅黑 - 18 + 10 75 true @@ -4323,37 +4848,48 @@ Qt::AlignCenter - + 90 - 585 - 72 - 72 + 1470 + 61 + 16 + + + 微软雅黑 + 10 + 75 + true + + - border-image: url(:/Cigarette/Resources/cam4_no.png); + background-color: rgb(255, 255, 0); - + 工作 + + + Qt::AlignCenter - + - 180 - 70 - 45 - 30 + 10 + 120 + 71 + 31 微软雅黑 - 16 - 50 - false + 18 + 75 + true @@ -4362,318 +4898,43 @@ è”机 - - Qt::AlignCenter - - - - - - - 1060 - 90 - 71 - 31 - - - - - 微软雅黑 - 10 - 75 - true - - - - color:white - - - 3#总个数 - - - - - - 10 - 1070 - 67 - 51 - - - - - - - - - 255 - 255 - 255 - - - - - - - 55 - 55 - 55 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 55 - 55 - 55 - - - - - - - 55 - 55 - 55 - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - 55 - 55 - 55 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 55 - 55 - 55 - - - - - - - 55 - 55 - 55 - - - - - - - 255 - 255 - 255 - - - - - - - - - 120 - 120 - 120 - - - - - - - 55 - 55 - 55 - - - - - - - 120 - 120 - 120 - - - - - - - 120 - 120 - 120 - - - - - - - 55 - 55 - 55 - - - - - - - 55 - 55 - 55 - - - - - - - 0 - 0 - 0 - - - - - - - - - 微软雅黑 - 10 - - - - 清ç†å›¾ç‰‡ - - - - - - 460 - 240 - 20 - 20 - - - - Qt::ClickFocus - - - false - - - border-image:url(:/Cigarette/Resources/rotate.png) - - - ... - - - - ../../../烟厂软件代ç /230720-郑州冷胶ZB416æ¡ç›’-3相机-1280x800/Cigarette/Resources/rotate.png../../../烟厂软件代ç /230720-郑州冷胶ZB416æ¡ç›’-3相机-1280x800/Cigarette/Resources/rotate.png - - - - 40 - 40 - - - - - - - 770 - 240 - 20 - 20 - - - - border-image:url(:/Cigarette/Resources/rotate.png) - - - ... - - - - ../../../烟厂软件代ç /230720-郑州冷胶ZB416æ¡ç›’-3相机-1280x800/Cigarette/Resources/rotate.png../../../烟厂软件代ç /230720-郑州冷胶ZB416æ¡ç›’-3相机-1280x800/Cigarette/Resources/rotate.png - - - - 40 - 40 - - + + Qt::AlignCenter + + + + + + 10 + 200 + 151 + 111 + + + + + 微软雅黑 + 30 + + + + background-color: rgb(255, 255, 0); + + + è¿è¡Œä¸­ + + + Qt::AlignCenter + + - + - 690 - 90 - 111 - 31 + 320 + 625 + 131 + 41 @@ -4683,117 +4944,13 @@ 10 - - - - 1060 - 120 - 71 - 31 - - - - - 微软雅黑 - 10 - 75 - true - - - - color:white - - - 3#OKæ•° - - - - - - 1250 - 240 - 20 - 20 - - - - Qt::ClickFocus - - - false - - - border-image:url(:/Cigarette/Resources/rotate.png) - - - ... - - - - ../../../烟厂软件代ç /230720-郑州冷胶ZB416æ¡ç›’-3相机-1280x800/Cigarette/Resources/rotate.png../../../烟厂软件代ç /230720-郑州冷胶ZB416æ¡ç›’-3相机-1280x800/Cigarette/Resources/rotate.png - - - - 40 - 40 - - - - - - - 830 - 180 - 71 - 31 - - - - - 微软雅黑 - 10 - 75 - true - - - - color:white - - - 2#剔除数 - - - - - - 1060 - 180 - 71 - 31 - - - - - 微软雅黑 - 10 - 75 - true - - - - color:white - - - 3#剔除数 - - - + - 1150 - 150 - 111 - 31 + 870 + 625 + 131 + 41 @@ -4803,253 +4960,8 @@ 10 - - - - 20 - 2300 - 131 - 51 - - - - - 微软雅黑 - 12 - - - - color:white - - - 切æ¢çª—å£ - - - - - - 20 - 180 - 141 - 51 - - - - - - - - - 255 - 255 - 255 - - - - - - - 55 - 55 - 55 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 55 - 55 - 55 - - - - - - - 55 - 55 - 55 - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - 55 - 55 - 55 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 55 - 55 - 55 - - - - - - - 55 - 55 - 55 - - - - - - - 255 - 255 - 255 - - - - - - - - - 120 - 120 - 120 - - - - - - - 55 - 55 - 55 - - - - - - - 120 - 120 - 120 - - - - - - - 120 - 120 - 120 - - - - - - - 55 - 55 - 55 - - - - - - - 55 - 55 - 55 - - - - - - - 0 - 0 - 0 - - - - - - - - - 微软雅黑 - 18 - - - - å¤ä½ - - - rotate_11 - rotate_10 rotate_9 rotate_1 - label_17 - label_18 - label_cur_time rotate_2 lcdNumber_ok_4 lcdNumber_ng_4 @@ -5062,7 +4974,6 @@ image_label_41 lcdNumber_kick_4 label_ng_4 - image_label_31 rotate_3 lcdNumber_total_6 lcdNumber_ng_5 @@ -5109,70 +5020,73 @@ rotate_7 image_label_71 image_label_22 - image_label_32 image_label_42 image_label_52 image_label_62 image_label_72 image_label_82 - image_label_12 - location - label_title - label_title_6 - toolButton_4 - label_title_7 + toolButton_cam_7 cam_status_7 - cam_work_4 - cam_work_7 + toolButton_cam_4 + cam_status_5 + cam_work_5 toolButton_cam_6 + cam_status_4 + cam_status_8 + cam_status_6 cam_work_6 + cam_work_4 toolButton_cam_5 + cam_work_7 toolButton_cam_8 - cam_status_4 - cam_status_6 - cam_work_5 - toolButton_cam_7 - cam_status_5 - cam_status_8 cam_work_8 - toolButton_cam_4 - image_label_11 - groupBox_a_2 - label_4 - label_title_2 + lcdNumber_kick_3 + groupBox_11 + lcdNumber_ok_3 + label_7 + label_9 + label_ng_3 + rotate_11 + label_3 lcdNumber_total_3 - lcdNumber_ok_2 - lcdNumber_kick_2 - groupBox_a - label_6 - groupBox_status - lcdNumber_ng_1 - label - lcdNumber_total_2 - lcdNumber_ng_2 - label_10 - label_ng_1 + image_label_31 + lcdNumber_ng_3 + image_label_32 + image_label_12 + cam_status_3 + cam_work_3 + toolButton_cam_3 + location image_label_21 + label_ng_1 groupBox_op - lcdNumber_ok_3 - lcdNumber_kick_3 - label_ng_3 - label_2 - lcdNumber_kick_1 + label_4 + groupBox_b + groupBox_a + toolButton_4 label_ng_2 lcdNumber_ok_1 - groupBox_b - groupBox_11 - groupBox_dev - label_7 - pushButton_Clear_Pic + label_title + lcdNumber_ng_1 + label_cur_time + image_label_11 + label_10 + lcdNumber_total_2 lcdNumber_total_1 - label_3 + label_17 + label_6 + lcdNumber_ng_2 + label_18 label_11 - label_9 - lcdNumber_ng_3 - pushButton_wintab - pushButton_reset + lcdNumber_ok_2 + label + label_title_7 + groupBox_status + label_2 + label_title_6 + groupBox_dev + lcdNumber_kick_1 + lcdNumber_kick_2 diff --git a/1280x800 TH/Cigarette/common.cpp b/1280x800-XH/Cigarette/common.cpp similarity index 99% rename from 1280x800 TH/Cigarette/common.cpp rename to 1280x800-XH/Cigarette/common.cpp index e5d28744..b3fe9f2e 100644 --- a/1280x800 TH/Cigarette/common.cpp +++ b/1280x800-XH/Cigarette/common.cpp @@ -57,7 +57,7 @@ void DrawSelectRects(cv::Mat input, DisplayLabelConf& t_DisplayLabelConf, int Cn cv::Point( t_DisplayLabelConf.processPoint.x * input.cols, t_DisplayLabelConf.processPoint.y * input.rows), - cv::Scalar(127, 255, 0), + cv::Scalar(0, 255,0), 4); } for (int i = 0; i < t_DisplayLabelConf.RectVet[Cnt].size(); i++) { @@ -69,7 +69,7 @@ void DrawSelectRects(cv::Mat input, DisplayLabelConf& t_DisplayLabelConf, int Cn cv::Point( t_DisplayLabelConf.RectVet[Cnt][i].BR.x * input.cols, t_DisplayLabelConf.RectVet[Cnt][i].BR.y * input.rows), - cv::Scalar(127, 255, 0), + cv::Scalar(0, 255, 0), 4); } } diff --git a/1280x800 TH/Cigarette/common.h b/1280x800-XH/Cigarette/common.h similarity index 95% rename from 1280x800 TH/Cigarette/common.h rename to 1280x800-XH/Cigarette/common.h index 916a5042..ccbd9faf 100644 --- a/1280x800 TH/Cigarette/common.h +++ b/1280x800-XH/Cigarette/common.h @@ -21,7 +21,7 @@ #define USB_BASLER_NEW_FW //使用basler定制固件 //#define IMM_PROCESS //æ‹ç…§åŽç«‹é©¬å¤„ç†ï¼Œä¸ç­‰æ ¡éªŒä¿¡å· //#define IMM_FEED_BACK //处ç†å®ŒåŽç«‹é©¬å馈，ä¸ç­‰æ ¡éªŒä¿¡å· -#define ONE_TIME_SHIFT //错开一æ‹å‘é€å馈(默认错开两次) +//#define ONE_TIME_SHIFT //错开一æ‹å‘é€å馈(默认错开两次) //CAP_FEED_BACKå’ŒDOUBLE_FEED_BACKä¸è¦ä¸€èµ·å¼€ #if defined (ONE_TIME_SHIFT) //#define CAP_FEED_BACK //æ‹ç…§æ—¶ä¹Ÿæ£€æµ‹æœ‰æ²¡æœ‰æµ‹è¯•ç»“果，有的è¯å°±å馈 @@ -31,17 +31,17 @@ #define AI_WARM_UP //AI识别开始å‰çš„热身动作 #define LICENSE_VERIFY //å¼€å¯license文件校验 #define identify_Hik_YSXID//识别海康相机YSXID -#define DRAW_RECT // 鼠标画框功能 +//#define DRAW_RECT // 鼠标画框功能 //#define SYNC_CAMERA //相机åŒæ­¥å¤„ç†å›¾ç‰‡ //#define IS_CAM_NG_OK_DATA_MERGED //åˆå¹¶ç›¸æœºNG/OKæ•°æ® +#define EquipmentModel "THXH"//è®¾å¤‡åž‹å· #define Queue_Size 15 #define Unit_Queue_Size Queue_Size*3 #define StrobeLineTime 10000 -#define EquipmentModel "TH"//è®¾å¤‡åž‹å· -#define image_w 512 //图片宽度 -#define image_h 512 //图片高度 +#define image_w 416 //图片宽度 +#define image_h 416 //图片高度 #ifdef __DEBUG #define DEBUG(format, ...) printf (format, ##__VA_ARGS__) @@ -53,8 +53,8 @@ #define DEFAULT_CONFPATH_PATH "D:/conf" #define DEFAULT_PIC_SAVE_PATH "D:/image" // 主界é¢åŸºæœ¬å‚æ•°é…置文件 -//#define CONFPATH "D:/Release/conf_path2.txt"//å°ç›’ -#define CONFPATH "D:/Release/conf_path3.txt"//æ¡ç›’ +#define CONFPATH "D:/Release/conf_path2.txt"//å°ç›’ +//#define CONFPATH "D:/Release/conf_path3.txt"//æ¡ç›’ // 相机旋转角度é…置文件 #define ROTATE_FILE "rotate.txt" #define MODBUS_CONFIGURE_FILE "modbus.txt" @@ -114,6 +114,7 @@ public: QString model_name; // 模型å QString model_jpg_path; // 模型图片路径 int timing_shift; // 是å¦å®šæ—¶æ¢ç­ï¼Œ0å¦ï¼Œ1是 + double angle; //矩形角度 int expo[NumberOfSupportedCameras]; // 相机æ›å…‰æ—¶é—´ï¼Œå•ä½å¾®ç§’ int gain[NumberOfSupportedCameras]; // 相机模拟增益，范围0~64 int filter[NumberOfSupportedCameras]; // 相机滤波时间 @@ -148,9 +149,10 @@ public: auto_shift = 0; //是å¦è‡ªåŠ¨æ¢ç­ï¼Œ0å¦ï¼Œ1是 shift_byhand = 1; //是å¦æ‰‹åŠ¨æ¢ç­ï¼Œ0å¦ï¼Œ1是 timing_shift = 0; //是å¦å®šæ—¶æ¢ç­ï¼Œ0å¦ï¼Œ1是 + angle = 0; //矩形角度 location = ""; model_path = ""; - model_name = ""; + model_jpg_path = ""; shiftA.setHMS(0, 0, 0); shiftB.setHMS(0, 0, 0); diff --git a/1280x800 TH/Cigarette/conf_path.txt b/1280x800-XH/Cigarette/conf_path.txt similarity index 100% rename from 1280x800 TH/Cigarette/conf_path.txt rename to 1280x800-XH/Cigarette/conf_path.txt diff --git a/1280x800 TH/Cigarette/db_label.cpp b/1280x800-XH/Cigarette/db_label.cpp similarity index 100% rename from 1280x800 TH/Cigarette/db_label.cpp rename to 1280x800-XH/Cigarette/db_label.cpp diff --git a/1280x800 TH/Cigarette/db_label.h b/1280x800-XH/Cigarette/db_label.h similarity index 100% rename from 1280x800 TH/Cigarette/db_label.h rename to 1280x800-XH/Cigarette/db_label.h diff --git a/1280x800 TH/Cigarette/debugthread.cpp b/1280x800-XH/Cigarette/debugthread.cpp similarity index 100% rename from 1280x800 TH/Cigarette/debugthread.cpp rename to 1280x800-XH/Cigarette/debugthread.cpp diff --git a/1280x800 TH/Cigarette/debugthread.h b/1280x800-XH/Cigarette/debugthread.h similarity index 100% rename from 1280x800 TH/Cigarette/debugthread.h rename to 1280x800-XH/Cigarette/debugthread.h diff --git a/1280x800 TH/Cigarette/dialogin.cpp b/1280x800-XH/Cigarette/dialogin.cpp similarity index 100% rename from 1280x800 TH/Cigarette/dialogin.cpp rename to 1280x800-XH/Cigarette/dialogin.cpp diff --git a/1280x800 TH/Cigarette/dialogin.hpp b/1280x800-XH/Cigarette/dialogin.hpp similarity index 100% rename from 1280x800 TH/Cigarette/dialogin.hpp rename to 1280x800-XH/Cigarette/dialogin.hpp diff --git a/1280x800 TH/Cigarette/dialogin.ui b/1280x800-XH/Cigarette/dialogin.ui similarity index 100% rename from 1280x800 TH/Cigarette/dialogin.ui rename to 1280x800-XH/Cigarette/dialogin.ui diff --git a/1280x800 TH/Cigarette/dialogsetup.cpp b/1280x800-XH/Cigarette/dialogsetup.cpp similarity index 89% rename from 1280x800 TH/Cigarette/dialogsetup.cpp rename to 1280x800-XH/Cigarette/dialogsetup.cpp index 081a6a59..d039ac1c 100644 --- a/1280x800 TH/Cigarette/dialogsetup.cpp +++ b/1280x800-XH/Cigarette/dialogsetup.cpp @@ -1,4 +1,4 @@ -#include "dialogsetup.hpp" +#include "dialogsetup.hpp" #include #include #include @@ -10,16 +10,16 @@ #include #include #include "basecamera.h" -#include //ÓÃÓÚÏÔʾ×ÀÃæ -#include //ÓÃÓÚÏÔʾ×ÀÃæ +#include //ç”¨äºŽæ˜¾ç¤ºæ¡Œé¢ +#include //ç”¨äºŽæ˜¾ç¤ºæ¡Œé¢ #include #include "Cleanthread.h" extern ConfPath g_conf_path; -extern SysConf g_sys_conf; //ϵͳÅäÖòÎÊý -extern QString g_admin_pswd; //¹ÜÀíÔ±ÃÜÂë -extern QString g_op_pswd; //²Ù×÷Ô±ÃÜÂë +extern SysConf g_sys_conf; //系统é…ç½®å‚æ•° +extern QString g_admin_pswd; //管ç†å‘˜å¯†ç  +extern QString g_op_pswd; //æ“ä½œå‘˜å¯†ç  void task_osk() { @@ -29,7 +29,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++) { @@ -57,10 +57,10 @@ DialogSetup::DialogSetup(QWidget* parent) : QDialog(parent) { } if (!g_conf_path.config_path.isEmpty()) { - // Èç¹ûÅäÖÃÎļþ´æ´¢Â·¾¶·Ç¿Õ + // 如果é…置文件存储路径éžç©º QDir* dirinfo = new QDir(g_conf_path.config_path); if (!dirinfo->exists()) { - // Èç¹ûÎļþ¼ÐÐÅÏ¢²»´æÔÚ + // 如果文件夹信æ¯ä¸å­˜åœ¨ delete dirinfo, dirinfo = nullptr; g_conf_path.config_path = DEFAULT_CONFPATH_PATH; } @@ -71,43 +71,43 @@ DialogSetup::DialogSetup(QWidget* parent) : QDialog(parent) { delete dirinfo, dirinfo = nullptr; } else { - // Èç¹û·¾¶¿Õ + // 如果路径空 g_conf_path.config_path = DEFAULT_CONFPATH_PATH; } ui.comboBox_config_path->addItem(g_conf_path.config_path); - // ¸ü»»Ñ¡ÔñÎļþ + // æ›´æ¢é€‰æ‹©æ–‡ä»¶ connect(ui.comboBox_config_path, SIGNAL(currentIndexChanged(int)), this, SLOT(onComboBoxConfSelect(int))); if (!g_sys_conf.model_path.isEmpty()) { - // Èç¹ûÔø¾­Ñ¡Ôñ¹ýÄ£ÐÍÎļþ¼Ð - // ²é¿´model_path·¾¶ÏÂÎļþ¼ÐÏêÇé + // 如果曾ç»é€‰æ‹©è¿‡æ¨¡åž‹æ–‡ä»¶å¤¹ + // 查看model_path路径下文件夹详情 QDir* dirinfo = new QDir(g_sys_conf.model_path); if (!dirinfo->exists()) delete dirinfo, dirinfo = nullptr; - dirinfo->setNameFilters(QStringList("*.weights")); // ÉèÖùýÂËÆ÷ + dirinfo->setNameFilters(QStringList("*.weights")); // 设置过滤器 QStringList fileList = dirinfo->entryList(QDir::Files); fileList.removeOne("."); fileList.removeOne(".."); ui.comboBox_model_path->clear(); ui.comboBox_model_path->addItems(fileList); if (!g_sys_conf.model_name.isEmpty()) { - // Èç¹ûÔøÑ¡Ôñ¹ýÄ£ÐÍ£¬ÔòÔÚcomboBoxÏÔʾѡÔñÄ£Ð͵ÄÎļþÃû + // 如果曾选择过模型，则在comboBox显示选择模型的文件å ui.comboBox_model_path->setCurrentText(g_sys_conf.model_name); } delete dirinfo, dirinfo = nullptr; } else { - // Èç¹ûδÔøÑ¡Ôñ¹ýÄ£ÐÍÎļþ¼Ð + // 如果未曾选择过模型文件夹 if (!g_sys_conf.model_name.isEmpty()) { - // Èç¹ûÔø¾­Ñ¡Ôñ¹ýÄ£ÐÍÎļþ + // 如果曾ç»é€‰æ‹©è¿‡æ¨¡åž‹æ–‡ä»¶ ui.comboBox_model_path->addItem(g_sys_conf.model_name); } } - // ¸ü»»Ä£ÐÍʼþ + // æ›´æ¢æ¨¡åž‹äº‹ä»¶ connect(ui.comboBox_model_path, SIGNAL(currentIndexChanged(int)), this, SLOT(onComboBoxSelect(int))); if (!g_conf_path.save_pics_path.isEmpty()) { - // Èç¹ûÅäÖÃÎļþÀï±£´æͼƬ·¾¶·Ç¿Õ + // 如果é…置文件里ä¿å­˜å›¾ç‰‡è·¯å¾„éžç©º QDir* dirinfo = new QDir(g_conf_path.save_pics_path); if (!dirinfo->exists()) { //delete dirinfo, dirinfo = nullptr; @@ -127,7 +127,7 @@ DialogSetup::DialogSetup(QWidget* parent) : QDialog(parent) { ui.comboBox_save_pics_path->setCurrentText(dirPath); g_conf_path.save_pics_path = dirPath; } - // ¸ü»»Ñ¡ÔñÎļþ + // æ›´æ¢é€‰æ‹©æ–‡ä»¶ connect(ui.comboBox_save_pics_path, SIGNAL(currentIndexChanged(int)), this, SLOT(onComboBoxPicsPathSelect(int))); @@ -158,22 +158,22 @@ DialogSetup::~DialogSetup() { void DialogSetup::onComboBoxPicsPathSelect(int index) { QString cp = ui.comboBox_save_pics_path->currentText(); - //QMessageBox::information(this, QStringLiteral("Ìáʾ"), QStringLiteral("ÄúÑ¡ÔñµÄÏîΪ") + cp, NULL); + //QMessageBox::information(this, QStringLiteral("æ示"), QStringLiteral("您选择的项为") + cp, NULL); g_conf_path.save_pics_path = cp; write_conf_path(); } void DialogSetup::onComboBoxConfSelect(int index) { QString cp = ui.comboBox_config_path->currentText(); - //QMessageBox::information(this, QStringLiteral("Ìáʾ"), QStringLiteral("ÄúÑ¡ÔñµÄÏîΪ") + cp, NULL); + //QMessageBox::information(this, QStringLiteral("æ示"), QStringLiteral("您选择的项为") + cp, NULL); g_conf_path.config_path = cp; write_conf_path(); } void DialogSetup::onComboBoxSelect(int index) { - // »ñÈ¡comboBoxµ±Ç°ÄÚÈÝ + // 获å–comboBox当å‰å†…容 QString ct = ui.comboBox_model_path->currentText(); - // ±£´æµ½ÅäÖÃÎļþÖÐ + // ä¿å­˜åˆ°é…置文件中 g_sys_conf.model_name = ct; } @@ -184,7 +184,7 @@ void DialogSetup::on_toolButton_keyboard_released() } void DialogSetup::on_pushButton_exit_released() { - if (QMessageBox::Yes == QMessageBox::critical(NULL, QStringLiteral("Í˳öϵͳ"), QStringLiteral("È·¶¨Í˳öϵͳ?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes)) + if (QMessageBox::Yes == QMessageBox::critical(NULL, QStringLiteral("退出系统"), QStringLiteral("确定退出系统?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes)) { emit system_exit(); this->close(); @@ -196,7 +196,7 @@ void DialogSetup::on_pushButton_desktop_released() CoInitialize(0); IShellDispatch4* pdisp = NULL; CoCreateInstance(CLSID_Shell, NULL, CLSCTX_ALL, __uuidof(IShellDispatch4), (void**)&pdisp); - pdisp->ToggleDesktop(); // Õâ¾äÊÇÓÃÀ´Çл»×ÀÃæµÄ + pdisp->ToggleDesktop(); // è¿™å¥æ˜¯ç”¨æ¥åˆ‡æ¢æ¡Œé¢çš„ pdisp->Release(); CoUninitialize(); } @@ -208,7 +208,7 @@ void DialogSetup::on_pushButton_expo_released() g_sys_conf.expo[i] = (lineEdit_expo_mat[i]->text()).toInt(); g_sys_conf.gain[i] = (lineEdit_gain_mat[i]->text()).toInt(); } - QMessageBox::information(NULL, QStringLiteral("Ìáʾ"), QStringLiteral("ÉèÖóɹ¦"), QMessageBox::Ok); + QMessageBox::information(NULL, QStringLiteral("æ示"), QStringLiteral("设置æˆåŠŸ"), QMessageBox::Ok); } void DialogSetup::on_checkBox_auto_open_clicked(bool checked) @@ -241,7 +241,7 @@ void DialogSetup::on_pushButton_filter_released() { g_sys_conf.filter[i] = (lineEdit_filter_mat[i]->text()).toInt(); } - QMessageBox::information(NULL, QStringLiteral("Ìáʾ"), QStringLiteral("ÉèÖóɹ¦"), QMessageBox::Ok); + QMessageBox::information(NULL, QStringLiteral("æ示"), QStringLiteral("设置æˆåŠŸ"), QMessageBox::Ok); } void DialogSetup::on_pushButton_image_released() @@ -258,7 +258,7 @@ void DialogSetup::on_pushButton_image_released() { g_sys_conf.save = 2; } - QMessageBox::information(NULL, QStringLiteral("Ìáʾ"), QStringLiteral("ÉèÖóɹ¦"), QMessageBox::Ok); + QMessageBox::information(NULL, QStringLiteral("æ示"), QStringLiteral("设置æˆåŠŸ"), QMessageBox::Ok); } void DialogSetup::on_pushButton_pswd_released() @@ -272,14 +272,14 @@ void DialogSetup::on_pushButton_pswd_released() { g_admin_pswd = QCryptographicHash::hash(pswd_new.toLatin1(), QCryptographicHash::Md5).toHex(); write_pswd(); - QMessageBox::information(NULL, QStringLiteral("Ìáʾ"), QStringLiteral("¹ÜÀíÔ±ÃÜÂëÐ޸ijɹ¦"), QMessageBox::Ok); + QMessageBox::information(NULL, QStringLiteral("æ示"), QStringLiteral("管ç†å‘˜å¯†ç ä¿®æ”¹æˆåŠŸ"), QMessageBox::Ok); } else { - QMessageBox::information(NULL, QStringLiteral("ÌáʾÏûÏ¢"), QStringLiteral("ÐÂÃÜÂëÁ½´ÎÊäÈë²»Ò»Ö£¬ÇëÖØÐÂÊäÈë"), QMessageBox::Ok); + QMessageBox::information(NULL, QStringLiteral("æ示消æ¯"), QStringLiteral("新密ç ä¸¤æ¬¡è¾“å…¥ä¸ä¸€è‡´ï¼Œè¯·é‡æ–°è¾“å…¥"), QMessageBox::Ok); } } else { - QMessageBox::information(NULL, QStringLiteral("ÌáʾÏûÏ¢"), QStringLiteral("Ô­ÃÜÂë´íÎó£¬ÇëÖØÐÂÊäÈë"), QMessageBox::Ok); + QMessageBox::information(NULL, QStringLiteral("æ示消æ¯"), QStringLiteral("原密ç é”™è¯¯ï¼Œè¯·é‡æ–°è¾“å…¥"), QMessageBox::Ok); } } void DialogSetup::on_pushButton_pswd_op_released() @@ -293,19 +293,19 @@ void DialogSetup::on_pushButton_pswd_op_released() { g_op_pswd = QCryptographicHash::hash(pswd_new.toLatin1(), QCryptographicHash::Md5).toHex(); write_pswd_op(); - QMessageBox::information(NULL, QStringLiteral("Ìáʾ"), QStringLiteral("²Ù×÷Ô±ÃÜÂëÐ޸ijɹ¦"), QMessageBox::Ok); + QMessageBox::information(NULL, QStringLiteral("æ示"), QStringLiteral("æ“作员密ç ä¿®æ”¹æˆåŠŸ"), QMessageBox::Ok); } else { - QMessageBox::information(NULL, QStringLiteral("ÌáʾÏûÏ¢"), QStringLiteral("ÐÂÃÜÂëÁ½´ÎÊäÈë²»Ò»Ö£¬ÇëÖØÐÂÊäÈë"), QMessageBox::Ok); + QMessageBox::information(NULL, QStringLiteral("æ示消æ¯"), QStringLiteral("新密ç ä¸¤æ¬¡è¾“å…¥ä¸ä¸€è‡´ï¼Œè¯·é‡æ–°è¾“å…¥"), QMessageBox::Ok); } } else { - QMessageBox::information(NULL, QStringLiteral("ÌáʾÏûÏ¢"), QStringLiteral("Ô­ÃÜÂë´íÎó£¬ÇëÖØÐÂÊäÈë"), QMessageBox::Ok); + QMessageBox::information(NULL, QStringLiteral("æ示消æ¯"), QStringLiteral("原密ç é”™è¯¯ï¼Œè¯·é‡æ–°è¾“å…¥"), QMessageBox::Ok); } } void DialogSetup::on_pushButton_save_released() { - //´æͼÉèÖà + //存图设置 if (ui.radioButton_none->isChecked()) { g_sys_conf.save = 0; @@ -326,7 +326,7 @@ void DialogSetup::on_pushButton_save_released() } write_config(); - QMessageBox::information(NULL, QStringLiteral("Ìáʾ"), QStringLiteral("±£´æ²ÎÊý³É¹¦,²¿·ÖÅäÖÃÐèÒªÖØÆô³ÌÐòºóÉúЧ"), QMessageBox::Ok); + QMessageBox::information(NULL, QStringLiteral("æ示"), QStringLiteral("ä¿å­˜å‚æ•°æˆåŠŸ,部分é…置需è¦é‡å¯ç¨‹åºåŽç”Ÿæ•ˆ"), QMessageBox::Ok); } void DialogSetup::on_pushButton_close_released() @@ -350,9 +350,9 @@ void DialogSetup::on_pushButton_clear_pic_released() } void DialogSetup::on_toolButton_choose_config_path_released() { - QString dirName = QFileDialog::getExistingDirectory(this, QStringLiteral("ÇëÑ¡ÔñÅäÖÃÎļþËùÔÚÎļþ¼Ð"), "./"); + QString dirName = QFileDialog::getExistingDirectory(this, QStringLiteral("请选择é…置文件所在文件夹"), "./"); if (dirName.isEmpty()) { - // µã»÷È¡Ïû°´Å¥ + // 点击å–消按钮 if (g_conf_path.config_path.isEmpty()) dirName = DEFAULT_CONFPATH_PATH; else @@ -387,8 +387,8 @@ void DialogSetup::on_toolButton_choose_config_path_released() { } void DialogSetup::on_toolButton_choose_model_path_released() { - // µã»÷ä¯ÀÀÎļþ°´Å¥ºó´¥·¢µÄʼþ - QString dirName = QFileDialog::getExistingDirectory(this, QStringLiteral("ÇëÑ¡ÔñÄ£ÐÍËùÔÚÎļþ¼Ð"), "./"); + // 点击æµè§ˆæ–‡ä»¶æŒ‰é’®åŽè§¦å‘的事件 + QString dirName = QFileDialog::getExistingDirectory(this, QStringLiteral("请选择模型所在文件夹"), "./"); //std::cout << "dirName is " << dirName.toStdString().c_str() << std::endl; //std::cout << "g_sys_conf.dir_path is " << g_sys_conf.dir_path.toStdString().c_str() << std::endl; //std::cout << "g_sys_conf.model_name is " << g_sys_conf.model_name.toStdString().c_str() << std::endl; @@ -427,9 +427,9 @@ void DialogSetup::on_toolButton_choose_model_path_released() { } void DialogSetup::on_toolButton_choose_save_pics_path_released() { - // ¸Ä±äͼƬµÄ´æ´¢Â·¾¶ - QString dirName = QFileDialog::getExistingDirectory(this, QStringLiteral("ÇëÑ¡ÔñͼƬ´æ´¢Â·¾¶"), "./"); - // Èç¹ûûÓÐÑ¡Ôñ·¾¶ + // 改å˜å›¾ç‰‡çš„存储路径 + QString dirName = QFileDialog::getExistingDirectory(this, QStringLiteral("请选择图片存储路径"), "./"); + // 如果没有选择路径 if (dirName.isEmpty()) { if (g_conf_path.save_pics_path.isEmpty()) dirName = DEFAULT_PIC_SAVE_PATH; @@ -457,14 +457,14 @@ void DialogSetup::on_toolButton_choose_save_pics_path_released() { } void DialogSetup::on_toolButton_choose_path_jpg_released() { - QString JpgPath = QFileDialog::getOpenFileName(this, "Ñ¡ÔñjpgÎļþ", "/", "jpg files(*.jpg)"); + QString JpgPath = QFileDialog::getOpenFileName(this, "选择jpg文件", "/", "jpg files(*.jpg)"); if (JpgPath.isEmpty()) { return; } else { if (ui.comboBox_2->findText(JpgPath) == -1) { - ui.comboBox_2->addItem(JpgPath); // ÔÚcomboBoxÖÐÏÔʾÎļþ·¾¶ - g_sys_conf.model_jpg_path = JpgPath; // ½«Ñ¡ÔñµÄ·¾¶Ð´ÈëconfÅäÖÃÎļþÖÐ + ui.comboBox_2->addItem(JpgPath); // 在comboBox中显示文件路径 + g_sys_conf.model_jpg_path = JpgPath; // 将选择的路径写入confé…置文件中 } } } @@ -550,6 +550,9 @@ void DialogSetup::write_config() memset(buf, 0, 256); sprintf(buf, "TIMING_SHIFT=%d\n", g_sys_conf.timing_shift); cfg_file.write(buf, strlen(buf)); + memset(buf, 0, 256); + sprintf(buf, "ANGLE=%f\n", g_sys_conf.angle); + cfg_file.write(buf, strlen(buf)); memset(buf, 0, 256); sprintf(buf, "SHIFT_BYHAND=%d\n", g_sys_conf.shift_byhand); cfg_file.write(buf, strlen(buf)); @@ -823,7 +826,7 @@ void DialogSetup::on_pushButton_config_released() connect(m_camera_glue, &camera_glue::sendMsgToDialogSetup, this, &DialogSetup::recMsgFromDialogConfig); connect(this, &DialogSetup::sendMsgToConfig, m_camera_glue, &camera_glue::recMsgFromDialogSetup); m_camera_glue->show(); - m_camera_glue->move(this->geometry().center() - m_camera_glue->rect().center());//Òƶ¯¸¸´°¿ÚÖÐÐÄλÖà + m_camera_glue->move(this->geometry().center() - m_camera_glue->rect().center());//移动父窗å£ä¸­å¿ƒä½ç½® emit sendMsgToConfig(g_sys_conf.no); } void DialogSetup::recMsgFromDialogConfig(int ptr[][3]) diff --git a/1280x800 TH/Cigarette/dialogsetup.hpp b/1280x800-XH/Cigarette/dialogsetup.hpp similarity index 100% rename from 1280x800 TH/Cigarette/dialogsetup.hpp rename to 1280x800-XH/Cigarette/dialogsetup.hpp diff --git a/1280x800-XH/Cigarette/dialogsetup.ui b/1280x800-XH/Cigarette/dialogsetup.ui new file mode 100644 index 00000000..1818a317 --- /dev/null +++ b/1280x800-XH/Cigarette/dialogsetup.ui @@ -0,0 +1,2184 @@ + + + DialogSetup + + + + 0 + 0 + 663 + 750 + + + + + 微软雅黑 + 14 + 75 + true + + + + DialogSetup + + + background-color: rgb(240, 240, 240); + + + + + 0 + 0 + 851 + 1121 + + + + + + 0 + 0 + 781 + 1011 + + + + + 0 + 0 + + + + + 0 + 0 + + + + true + + + + + 0 + 0 + 779 + 1009 + + + + + 0 + 0 + + + + + 670 + 1000 + + + + + + 10 + 60 + 641 + 61 + + + + + 微软雅黑 + 12 + 75 + true + + + + å¯åŠ¨è®¾ç½® + + + + + 30 + 30 + 220 + 22 + + + + + 微软雅黑 + 12 + 75 + true + + + + 自动打开所有相机 + + + + + + 380 + 30 + 261 + 21 + + + + + 微软雅黑 + 12 + 75 + true + + + + 程åºå¯åŠ¨åŽè‡ªåŠ¨å¼€å§‹å·¥ä½œ + + + + + + + 10 + 450 + 641 + 81 + + + + + 微软雅黑 + 12 + 75 + true + + + + 管ç†å‘˜å¯†ç ä¿®æ”¹ + + + + + 540 + 20 + 91 + 51 + + + + + 微软雅黑 + 12 + 75 + true + + + + 确定 + + + + + + 190 + 30 + 61 + 31 + + + + + 微软雅黑 + 12 + 75 + true + + + + 新密ç ï¼š + + + + + + 445 + 32 + 91 + 31 + + + + + 微软雅黑 + 12 + 75 + true + + + + + + + QLineEdit::Password + + + + + + 250 + 30 + 101 + 31 + + + + + 微软雅黑 + 12 + 75 + true + + + + + + + QLineEdit::Password + + + + + + 360 + 30 + 81 + 31 + + + + + 微软雅黑 + 12 + 75 + true + + + + 确认密ç ï¼š + + + + + + 90 + 30 + 91 + 31 + + + + + 微软雅黑 + 12 + 75 + true + + + + + + + QLineEdit::Password + + + + + + 20 + 30 + 61 + 31 + + + + + 微软雅黑 + 12 + 75 + true + + + + 原密ç ï¼š + + + + + + + 10 + 180 + 640 + 111 + + + + + 微软雅黑 + 12 + 75 + true + + + + 相机å‚æ•° + + + + + 20 + 40 + 180 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + 1#相机æ›å…‰æ—¶é—´(微秒)： + + + + + + 210 + 40 + 90 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + + + + + + + 210 + 70 + 90 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + + + + + + + 20 + 70 + 180 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + 2#相机æ›å…‰æ—¶é—´(微秒)： + + + + + + 510 + 70 + 90 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + + + + + + + 320 + 40 + 180 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + 1#相机模拟增益(0~64)： + + + + + + 320 + 70 + 180 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + 2#相机模拟增益(0~64)： + + + + + + 510 + 40 + 90 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + + + + + + + 210 + 1780 + 90 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + + + + + + + 20 + 1810 + 180 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + 4#相机æ›å…‰æ—¶é—´(微秒)： + + + + + + 210 + 1810 + 90 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + + + + + + + 20 + 1780 + 180 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + 3#相机æ›å…‰æ—¶é—´(微秒)： + + + + + + 510 + 1810 + 90 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + + + + + + + 320 + 1780 + 180 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + 3#相机模拟增益(0~64)： + + + + + + 320 + 1810 + 180 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + 4#相机模拟增益(0~64)： + + + + + + 510 + 1780 + 90 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + + + + + + + 680 + 90 + 91 + 51 + + + + + 微软雅黑 + 12 + 75 + true + + + + 确定 + + + + + + 20 + 1840 + 180 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + 5#相机æ›å…‰æ—¶é—´(微秒)： + + + + + + 20 + 1870 + 180 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + 6#相机æ›å…‰æ—¶é—´(微秒)： + + + + + + 20 + 1900 + 180 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + 7#相机æ›å…‰æ—¶é—´(微秒)： + + + + + + 210 + 1840 + 90 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + + + + + + + 210 + 1870 + 90 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + + + + + + + 210 + 1900 + 90 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + + + + + + + 320 + 1840 + 180 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + 5#相机模拟增益(0~64)： + + + + + + 320 + 1870 + 180 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + 6#相机模拟增益(0~64)： + + + + + + 320 + 1900 + 180 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + 7#相机模拟增益(0~64)： + + + + + + 510 + 1840 + 90 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + + + + + + + 510 + 1870 + 90 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + + + + + + + 510 + 1900 + 90 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + + + + + + + 20 + 1930 + 180 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + 8#相机æ›å…‰æ—¶é—´(微秒)： + + + + + + 210 + 1930 + 90 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + + + + + + + 320 + 1930 + 180 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + 8#相机模拟增益(0~64)： + + + + + + 510 + 1930 + 90 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + + + + + + + + 10 + 610 + 641 + 61 + + + + + 微软雅黑 + 12 + 75 + true + + + + 滤波设置 + + + + + 20 + 30 + 180 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + 1#相机滤波时间(微秒)： + + + + + + 210 + 30 + 90 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + + + + + + + 510 + 30 + 90 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + + + + + + + 320 + 30 + 180 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + 2#相机滤波时间(微秒)： + + + + + + 510 + 1040 + 90 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + + + + + + + 20 + 1040 + 180 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + 3#相机滤波时间(微秒)： + + + + + + 210 + 1040 + 90 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + + + + + + + 320 + 1040 + 180 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + 4#相机滤波时间(微秒)： + + + + + + 680 + 50 + 91 + 51 + + + + + 微软雅黑 + 12 + 75 + true + + + + 确定 + + + + + + 20 + 1070 + 180 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + 5#相机滤波时间(微秒)： + + + + + + 320 + 1070 + 180 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + 6#相机滤波时间(微秒)： + + + + + + 20 + 1100 + 180 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + 7#相机滤波时间(微秒)： + + + + + + 320 + 1100 + 180 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + 8#相机滤波时间(微秒)： + + + + + + 210 + 1070 + 90 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + + + + + + + 210 + 1100 + 90 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + + + + + + + 510 + 1070 + 90 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + + + + + + + 510 + 1100 + 90 + 20 + + + + + 微软雅黑 + 10 + 75 + true + + + + + + + + + + + 10 + 120 + 641 + 61 + + + + + 微软雅黑 + 12 + 75 + true + + + + 存图设置 + + + + + 30 + 30 + 90 + 21 + + + + + 微软雅黑 + 12 + 75 + true + + + + ä¸å­˜ + + + + + + 230 + 30 + 90 + 21 + + + + + 微软雅黑 + 12 + 75 + true + + + + å­˜NG + + + + + + 440 + 30 + 90 + 21 + + + + + 微软雅黑 + 12 + 75 + true + + + + 全存 + + + + + + 570 + 25 + 50 + 30 + + + + + 微软雅黑 + 12 + 75 + true + + + + 确定 + + + + + + + 110 + 690 + 131 + 51 + + + + + 微软雅黑 + 12 + 75 + true + + + + ä¿å­˜å‚æ•° + + + + + + 520 + 10 + 130 + 50 + + + + + 微软雅黑 + 12 + 75 + true + + + + 退出系统 + + + + + + 10 + 530 + 641 + 81 + + + + + 微软雅黑 + 12 + 75 + true + + + + æ“作员密ç ä¿®æ”¹ + + + + + 190 + 30 + 61 + 31 + + + + + 微软雅黑 + 12 + 75 + true + + + + 新密ç ï¼š + + + + + + 445 + 32 + 91 + 31 + + + + + 微软雅黑 + 12 + 75 + true + + + + + + + QLineEdit::Password + + + + + + 250 + 30 + 101 + 31 + + + + + 微软雅黑 + 12 + 75 + true + + + + + + + QLineEdit::Password + + + + + + 360 + 30 + 81 + 31 + + + + + 微软雅黑 + 12 + 75 + true + + + + 确认密ç ï¼š + + + + + + 90 + 30 + 91 + 31 + + + + + 微软雅黑 + 12 + 75 + true + + + + + + + QLineEdit::Password + + + + + + 20 + 30 + 61 + 31 + + + + + 微软雅黑 + 12 + 75 + true + + + + 原密ç ï¼š + + + + + + 540 + 20 + 91 + 51 + + + + + 微软雅黑 + 12 + 75 + true + + + + 确定 + + + + + + + 370 + 690 + 131 + 51 + + + + + 微软雅黑 + 12 + 75 + true + + + + å…³é—­çª—å£ + + + + + + 220 + 10 + 130 + 50 + + + + + 微软雅黑 + 12 + 75 + true + + + + æ˜¾ç¤ºæ¡Œé¢ + + + + + + 110 + 10 + 91 + 41 + + + + + 微软雅黑 + 12 + 75 + true + + + + border-image: url(:/Cigarette/Resources/keyboard.png); + + + + + + + + + 20 + 20 + 81 + 21 + + + + + 微软雅黑 + 12 + 75 + true + + + + 系统设置 + + + + + + 40 + 300 + 101 + 41 + + + + + 微软雅黑 + 12 + 75 + true + + + + é…方设置 + + + + + + 40 + 400 + 101 + 41 + + + + + 微软雅黑 + 12 + 75 + true + + + + æ¢ç­è®¾ç½® + + + + + + 40 + 350 + 101 + 41 + + + + + 微软雅黑 + 12 + 75 + true + + + + 产é‡ç»Ÿè®¡ + + + + + + 620 + 1380 + 27 + 25 + + + + + 微软雅黑 + + + + ... + + + + + + 190 + 1380 + 171 + 30 + + + + + 微软雅黑 + 12 + 75 + true + + + + 模型存储路径 + + + Qt::AlignCenter + + + + + + 370 + 1380 + 241 + 30 + + + + + 微软雅黑 + 10 + + + + + + + 340 + 1020 + 91 + 21 + + + + + 微软雅黑 + 75 + true + + + + 图片存储路径 + + + + + + 440 + 1020 + 171 + 25 + + + + + 微软雅黑 + + + + + + + 620 + 1020 + 27 + 26 + + + + + 微软雅黑 + + + + ... + + + + + + 370 + 10 + 130 + 50 + + + + + 微软雅黑 + 12 + 75 + true + + + + 清ç†å›¾ç‰‡ + + + + + + 520 + 690 + 131 + 21 + + + + + 微软雅黑 + 75 + true + + + + 测试å•å¼ å›¾ç‰‡ + + + + + + 520 + 720 + 131 + 21 + + + + + 微软雅黑 + 75 + true + + + + 测试多张图片 + + + + + + 190 + 330 + 171 + 30 + + + + + 微软雅黑 + 12 + 75 + true + + + + é…置文件存储路径 + + + Qt::AlignCenter + + + + + + 370 + 330 + 241 + 30 + + + + + 微软雅黑 + 10 + + + + + + + 620 + 330 + 27 + 25 + + + + + 微软雅黑 + + + + ... + + + + + + 190 + 390 + 171 + 30 + + + + + 微软雅黑 + 12 + 75 + true + + + + 图片存储路径 + + + Qt::AlignCenter + + + + + + 370 + 390 + 241 + 30 + + + + + 微软雅黑 + 10 + + + + + + + 620 + 390 + 27 + 25 + + + + + 微软雅黑 + + + + ... + + + + + + + + + + + + diff --git a/1280x800 TH/Cigarette/dialogsetuppasswd.cpp b/1280x800-XH/Cigarette/dialogsetuppasswd.cpp similarity index 100% rename from 1280x800 TH/Cigarette/dialogsetuppasswd.cpp rename to 1280x800-XH/Cigarette/dialogsetuppasswd.cpp diff --git a/1280x800 TH/Cigarette/dialogsetuppasswd.hpp b/1280x800-XH/Cigarette/dialogsetuppasswd.hpp similarity index 100% rename from 1280x800 TH/Cigarette/dialogsetuppasswd.hpp rename to 1280x800-XH/Cigarette/dialogsetuppasswd.hpp diff --git a/1280x800 TH/Cigarette/dialogsetuppasswd.ui b/1280x800-XH/Cigarette/dialogsetuppasswd.ui similarity index 100% rename from 1280x800 TH/Cigarette/dialogsetuppasswd.ui rename to 1280x800-XH/Cigarette/dialogsetuppasswd.ui diff --git a/1280x800-XH/Cigarette/exportData-1.cpp b/1280x800-XH/Cigarette/exportData-1.cpp new file mode 100644 index 00000000..d1947d73 --- /dev/null +++ b/1280x800-XH/Cigarette/exportData-1.cpp @@ -0,0 +1,587 @@ +#include "exportData.h" +#include "QtCore\qfile.h" +#include "QtCore\qtextstream.h" +#include +#include +#include +#include +#include +#include +#include +#include +//#include +#include +#include +#include +#include +#pragma comment(lib, "Wininet.lib") + +Cigarette* cg; +extern SyncQueue<_XMLExportDataInfo>* export_XMLData_Info_queue; +extern ConfPath g_conf_path; +extern bool flag; +extern SysConf g_sys_conf; //系统é…ç½®å‚æ•° + +ExportDataThread::ExportDataThread(QObject* parent) : QThread(parent) +{ + /* Move to init() + //第一步执行 + cg->read_conf(g_conf_path); + for (int index = 0; index < NumberOfSupportedCameras; index++) + { + XMLError error; + pDocument[index] = new tinyxml2::XMLDocument(); + QString xmlPath = QString(EXPORTDATA_FILE).arg(index); + QString filePath = g_conf_path.config_path + "/" + xmlPath; + + error = pDocument[index]->LoadFile(filePath.toLocal8Bit().constData()); + if (error != XML_SUCCESS) { + XMLDeclaration* declaration = pDocument[index]->NewDeclaration(); + pDocument[index]->InsertFirstChild(declaration); + } + } + init(ip,port,username,userpwd); + cout << "11111111111111"; + hint = InternetOpen(0, INTERNET_OPEN_TYPE_PRECONFIG, 0, 0, 0); + if (hint == NULL) { + return; + } + if (!ConnectFtp(&ip, &port, &username, &userpwd)) + qDebug() << "First connect FTP failed because " << GetLastError(); + */ + readyToSendZip = false; + listToZip.clear(); + tmpListToZip.clear(); + lastTimeStamp.clear(); + zipTimeStamp.clear(); + hftp = NULL; + hint = NULL; + +} + +void ExportDataThread::init(string ip_, int port_, string username_, string userpwd_) +{ + //åˆå§‹åŒ–FTPè¿žæŽ¥ä¿¡æ¯ + ip = ip_; + port = port_; + username = username_; + userpwd = userpwd_; + cout << "ftp ip =" << ip << "| prot =" << port << endl; + cout << "username =" << username << "| pwd =" << userpwd << endl; + b_quit = false; + flag = false; + + timer = new QTimer(this); + timer->setTimerType(Qt::PreciseTimer); + timer->setSingleShot(true); + + //第一步执行 + cg->read_conf(g_conf_path); + for (int index = 0; index < NumberOfSupportedCameras; index++) + { + XMLError error; + pDocument[index] = new tinyxml2::XMLDocument(); + QString xmlPath = QString(EXPORTDATA_FILE).arg(index); + QString filePath = g_conf_path.config_path + "/" + xmlPath; + + error = pDocument[index]->LoadFile(filePath.toLocal8Bit().constData()); + if (error != XML_SUCCESS) { + XMLDeclaration* declaration = pDocument[index]->NewDeclaration(); + pDocument[index]->InsertFirstChild(declaration); + } + } + + //init(ip, port, username, userpwd); + hint = InternetOpen(0, INTERNET_OPEN_TYPE_PRECONFIG, 0, 0, 0); + if (hint == NULL) { + return; + } + if (!ConnectFtp(&ip, &port, &username, &userpwd)) + qDebug() << "First connect FTP failed because " << GetLastError(); + +} + +void ExportDataThread::start_work() +{ + //start(HighestPriority);///优先级 + //start(HighPriority); + start(); +} + +void ExportDataThread::stop() +{ + b_quit = true; + _XMLExportDataInfo data; + export_XMLData_Info_queue->put(data); + //InternetCloseHandle(hftp); + //InternetCloseHandle(hint); +} + +bool ExportDataThread::FtpConnectionTest () { + int retryCount = 3; + if ((hftp == NULL) || (!FtpSetCurrentDirectoryA(hftp, "/"))) { + while (!ConnectFtp(&ip, &port, &username, &userpwd)) { + if (retryCount-- == 0) { + break; + } + QTime delayTime = QTime::currentTime().addMSecs(100); //100ms + while (QTime::currentTime() < delayTime) { + QCoreApplication::processEvents(QEventLoop::AllEvents, 100); + } + } + } + + return (retryCount > 0); +} + +bool ExportDataThread::ConnectFtp(string *ip_, int *port_, string *username_, string *userpwd_) { + + //// FTPåœ°å€ + //string ftpServer = "192.168.1.180"; + ///* 端å£å·ï¼Œä¸€èˆ¬ä¸º21 */ + //int port = 666; + ///* 用户å */ + //string userName = "FTP2"; + ///* å¯†ç  */ + //string pwd = "123"; + + if (hftp != NULL) { + InternetCloseHandle(hftp); + hftp = NULL; + } + + // 创建ftp连接 + // hftp = InternetConnectA(hint, ftpServer.c_str(), port, userName.c_str(), pwd.c_str(), INTERNET_SERVICE_FTP, 0, 0); + hftp = InternetConnectA(hint, ip_->c_str(), *port_, username_->c_str(), userpwd_->c_str(), INTERNET_SERVICE_FTP, 0, 0); + if (hftp == NULL) { + qDebug() << "ftp connect failed because " << GetLastError(); + return false; + } + //else + // qDebug() << "ftp reconnect success"; + return true; + +} + +//bool _ExportDataInfo::getAverageData(map& averageData, int index) +//{ +// tinyxml2::XMLDocument doc; +// //char xmlPath[256]; +// XMLError error; +// map data; +// //memset(xmlPath, 0, 256); +// QString xmlPath = QString(EXPORTDATA_FILE).arg(index); +// //sprintf(xmlPath, EXPORTDATA_FILE, index); +// QString filePath = g_conf_path.config_path + "/" + xmlPath; +// error = doc.LoadFile(filePath.toLocal8Bit().constData()); +// if (error != XML_SUCCESS) +// if (doc.LoadFile(filePath.toLocal8Bit().constData()) != 0) +// { +// cout << "load xml file failed" << endl; +// return false; +// } +// XMLElement* root = doc.RootElement(); +// XMLElement* userNode = root->FirstChildElement("Camera"); +// data["CameraId"] = index; +// data["IsNG"] = 0; +// data["IsJdExist"] = 0; +// data["Total"] = 0; +// while (userNode != NULL) +// { +// if (atoi(userNode->Attribute("Id")) == index) { +// data["IsNG"]++; +// data["IsJdExist"]++; +// data["Total"]++; +// XMLElement* IsNgNode = userNode->FirstChildElement("IsNG"); +// data["IsNg"] = strcmp(IsNgNode->GetText(), "TRUE"); +// XMLElement* IsJdExistNode = userNode->FirstChildElement("IsJdExist"); +// if (strcmp(IsJdExistNode->GetText(), "TRUE") == 0) +// data["IsJdExist"]++; +// XMLElement* TimeCostNode = userNode->FirstChildElement("TimeCost"); +// data["TimeCost"] += stof(TimeCostNode->GetText()); +// } +// userNode = userNode->NextSiblingElement();//下一个兄弟节点 +// } +// if (data["Total"] == 0) +// return false; +// data["TimeCost"] = data["TimeCost"] / data["Total"]; +// +// averageData = data; +// +// return true; +//} +//XML文件 +//写数æ®åˆ°XML文件 +int ExportDataThread::insertXMLNode(const char* xmlPath, _XMLExportDataInfo& data) +{ + XMLElement* root = pDocument[data.cameraId]->RootElement(); + + if (root == NULL) { + root = pDocument[data.cameraId]->NewElement("Root"); + pDocument[data.cameraId]->InsertEndChild(root); + pDocument[data.cameraId]->SaveFile(xmlPath); + //return 0; + } + + /// æ€»ç»Ÿè®¡æ•°æ® + // æ€»æ£€æµ‹æ•°é‡ + XMLElement* Total = pDocument[data.cameraId]->NewElement("TotalDatas"); + + XMLElement* time = pDocument[data.cameraId]->NewElement("CurrentTime"); + QString currentTime = QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss"); + time->InsertEndChild(pDocument[data.cameraId]->NewText(currentTime.toStdString().c_str())); + Total->InsertEndChild(time); + + XMLElement* TotalCheckNum = pDocument[data.cameraId]->NewElement("TotalCheckNum"); + char s[20]; + TotalCheckNum->InsertEndChild(pDocument[data.cameraId]->NewText(itoa(data.TotalCheckNum, s, 10))); + Total->InsertEndChild(TotalCheckNum); + + // æ€»å‰”é™¤æ•°é‡ + XMLElement* TotalKickNum = pDocument[data.cameraId]->NewElement("TotalKickNum"); + TotalKickNum->InsertEndChild(pDocument[data.cameraId]->NewText(itoa(data.TotalKickNum, s, 10))); + Total->InsertEndChild(TotalKickNum); + + root->InsertEndChild(Total); + + /// å„ç›¸æœºæ•°æ® + // 相机id & 总数 + XMLElement* CameraNode = pDocument[data.cameraId]->NewElement("Camera"); + CameraNode->SetAttribute("Count ", data.cameraTotal); + CameraNode->SetAttribute("Id", data.cameraId); + + XMLElement* JudgeNum = pDocument[data.cameraId]->NewElement("JudgeNum"); + // å„ç›¸æœºæ£€æµ‹æ•°é‡ + XMLElement* checkNum = pDocument[data.cameraId]->NewElement("CheckNum"); + checkNum->InsertEndChild(pDocument[data.cameraId]->NewText(itoa(data.checkNum, s, 10))); + JudgeNum->InsertEndChild(checkNum); + // å„相机okæ•°é‡ + XMLElement* okNum = pDocument[data.cameraId]->NewElement("OkNum"); + okNum->InsertEndChild(pDocument[data.cameraId]->NewText(itoa(data.okNum, s, 10))); + JudgeNum->InsertEndChild(okNum); + // å„相机ngæ•°é‡ + XMLElement* ngNum = pDocument[data.cameraId]->NewElement("NgNum"); + ngNum->InsertEndChild(pDocument[data.cameraId]->NewText(itoa(data.ngNum, s, 10))); + JudgeNum->InsertEndChild(ngNum); + // å„相机实际剔除数é‡ï¼ˆå•é€šé“剔除时为总剔除数é‡ï¼‰ + XMLElement* kickNum = pDocument[data.cameraId]->NewElement("KickNum"); + kickNum->InsertEndChild(pDocument[data.cameraId]->NewText(itoa(data.kickNum, s, 10))); + JudgeNum->InsertEndChild(kickNum); + + // åˆæ ¼çŽ‡ + XMLElement* PassRate = pDocument[data.cameraId]->NewElement("PassRate"); + std::string temp_str = std::to_string(data.PassRate * 100) + "%"; + const char* temp_char = temp_str.c_str(); + PassRate->InsertEndChild(pDocument[data.cameraId]->NewText(temp_char)); + JudgeNum->InsertEndChild(PassRate); + + // 剔除率 + XMLElement* KickRate = pDocument[data.cameraId]->NewElement("KickRate"); + temp_str = std::to_string(data.KickRate * 100) + "%"; + temp_char = temp_str.c_str(); + KickRate->InsertEndChild(pDocument[data.cameraId]->NewText(temp_char)); + JudgeNum->InsertEndChild(KickRate); + + // å„相机胶点识别个数 + XMLElement* JdNum = pDocument[data.cameraId]->NewElement("JdNum"); + JdNum->InsertEndChild(pDocument[data.cameraId]->NewText(data.jdNum.toStdString().c_str())); + JudgeNum->InsertEndChild(JdNum); + + XMLElement* shotCounts = pDocument[data.cameraId]->NewElement("ShotCounts"); + shotCounts->InsertEndChild(pDocument[data.cameraId]->NewText(itoa(data.shotCounts, s, 10))); + JudgeNum->InsertEndChild(shotCounts); + + CameraNode->InsertEndChild(JudgeNum); + + // å„相机采集速度 + XMLElement* speed = pDocument[data.cameraId]->NewElement("Speed"); + + XMLElement* AcquisitionSpeed = pDocument[data.cameraId]->NewElement("AcquisitionSpeed"); + AcquisitionSpeed->InsertEndChild(pDocument[data.cameraId]->NewText(data.AcquisitionSpeed.toStdString().c_str())); + speed->InsertEndChild(AcquisitionSpeed); + // å„相机检测速度 + XMLElement* DetectSpeed = pDocument[data.cameraId]->NewElement("DetectSpeed"); + DetectSpeed->InsertEndChild(pDocument[data.cameraId]->NewText(data.DetectSpeed.toStdString().c_str())); + speed->InsertEndChild(DetectSpeed); + CameraNode->InsertEndChild(speed); + + root->InsertEndChild(CameraNode); + + return pDocument[data.cameraId]->SaveFile(xmlPath); +} + +void ExportDataThread::run() +{ + try { + while (!b_quit || (b_quit && (!export_XMLData_Info_queue->isEmpty() || readyToSendZip || !tmpListToZip.isEmpty()))) { + _XMLExportDataInfo element; + if (!export_XMLData_Info_queue->isEmpty()) { + export_XMLData_Info_queue->take(element); + + if (element.cameraId != -1 && flag) { + char buf[256]; + memset(buf, 0, 256); + QString xmlPath = QString(EXPORTDATA_FILE).arg(element.cameraId); + QString filePath = g_conf_path.config_path + "/" + xmlPath; + sprintf(buf, filePath.toLocal8Bit().constData(), element.cameraId); + insertXMLNode(buf, element); + QString remotePath = "/tmp/" + xmlPath; + ConnectServer(filePath, remotePath); + } + } + + if ((b_quit || (!timer->isActive() && !readyToSendZip)) && (!tmpListToZip.isEmpty())) { + listToZip.unite(tmpListToZip); + tmpListToZip.clear(); + zipTimeStamp.append(lastTimeStamp[0]); + lastTimeStamp.clear(); + readyToSendZip = true; + } + + if (readyToSendZip && !listToZip.isEmpty()) { + QString remotePath; + QStringList zipFilePaths; + QStringList fileList; + QString okStr = "1"; + QProcess process(0); + //QDateTime now_ts = QDateTime::currentDateTime(); + QStringList argsNg; + QStringList argsOk; + + //æ¡ç›’TJ å°ç›’BJ + zipFilePaths.append("416_BJ_" + zipTimeStamp[0] + "-00_" + zipTimeStamp[0] + "-59_0.zip"); + zipFilePaths.append("416_BJ_" + zipTimeStamp[0] + "-00_" + zipTimeStamp[0] + "-59_1.zip"); + fileList.append(zipTimeStamp[0] + "ng.txt"); + fileList.append(zipTimeStamp[0] + "ok.txt"); + + zipTimeStamp.clear(); + + QFile* file[2] = { NULL }; + + file[0] = new QFile(fileList[0]); + file[1] = new QFile(fileList[1]); + + //QFile fileNg(fileList[0]); + // QFile fileOk(fileList[1]); + + file[0]->open(QIODevice::WriteOnly); + file[1]->open(QIODevice::WriteOnly); + + QTextStream ngStream(file[0]); + QTextStream okStream(file[1]); + + argsNg.append("a"); + argsNg.append(zipFilePaths[0]); + + argsOk.append("a"); + argsOk.append(zipFilePaths[1]); + + // create zip file + QMapIterator iterator(listToZip); + while (iterator.hasNext()) { + iterator.next(); + if (iterator.value()) { + ngStream << iterator.key() << endl; + } + else { + okStream << iterator.key() << endl; + } + } + argsNg.append("-i@" + fileList[0]); + argsNg.append("-mx=3"); + + argsOk.append("-i@" + fileList[1]); + argsOk.append("-mx=3"); + + file[0]->close(); + file[1]->close(); + + for (int i = 0; i < zipFilePaths.size(); i++) { + if (file[i]->size() == 0) { + continue; + } + process.start(QApplication::applicationDirPath() + "/7z.exe", i == 0 ? argsNg : argsOk); + process.waitForStarted(); + process.waitForFinished(); + //QString out = QString::fromLocal8Bit(process.readAllStandardOutput()); + //qDebug() << out; + remotePath = zipFilePaths[i].mid(zipFilePaths[i].indexOf("image") - 1); + qDebug() << remotePath; + ConnectServer(zipFilePaths[i], remotePath); + QFile file(zipFilePaths[i]); + file.remove(); + } + file[0]->remove(); + file[1]->remove(); + listToZip.clear(); + readyToSendZip = false; + } + } + flag = false; + + for (int index = 0; index < NumberOfSupportedCameras; index++) { + pDocument[index]->~XMLDocument(); + } + + if (hftp != NULL) { + InternetCloseHandle(hftp); + hftp = NULL; + } + if (hftp != NULL) { + InternetCloseHandle(hint); + hint = NULL; + } + } + catch (const std::exception& e) { + // 注æ„：std::exception通常ä¸æ•èŽ·ç”±è¿è¡Œæ—¶é”™è¯¯å¼•å‘的异常 + // 但这里是为了演示catchå—的结构 + std::cerr << __FUNCTION__<<"æ•èŽ·åˆ°å¼‚常: " << e.what() << std::endl; + } + catch (...) { + // 使用çœç•¥å·ï¼ˆ...）å¯ä»¥æ•èŽ·æ‰€æœ‰ç±»åž‹çš„异常，这是一ç§é€šç”¨çš„æ•èŽ·æ–¹å¼ + std::cerr << "æ•èŽ·åˆ°æœªçŸ¥ç±»åž‹çš„异常" << std::endl; + } +} + +//*****************************************å·²ç»è°ƒè¯•å¥½ï¼Œæ²¡æœ‰ç†æ¸…逻辑å‰ä¸è¦åŠ¨********************** +void ExportDataThread::check_save_dir(std::string dir_path) +{ + // 如果目的路径ä¸å­˜åœ¨ï¼Œä¸€çº§ä¸€çº§åˆ›å»º + // 目的路径格å¼ä¸º:"./dir/dir1/.../" + + if (FALSE == FtpSetCurrentDirectoryA(hftp, dir_path.c_str())) { + FtpSetCurrentDirectoryA(hftp, "/"); + int pos = 1; + while (pos > 0) { + // 从第二个“/â€å¼€å§‹ä¾æ¬¡æ‰¾åˆ°ç›®çš„路径中的“/â€ä½ç½® + pos = dir_path.find_first_of('/', pos + 1); + if (pos == -1) + break; + string tempPath = dir_path.substr(0, pos + 1); + FtpCreateDirectoryA(hftp, tempPath.c_str()); + } + //FtpSetCurrentDirectoryA(hftp, dir_path.c_str()); + } +} + +void ExportDataThread::EDrecMsgFromCigarette() { + flag = true; +} +//å‘é€æ•°æ®ç»™æœåŠ¡å™¨ +void ExportDataThread::ConnectServer(QString srcPath, QString destPath) { + string filePath = srcPath.toLocal8Bit().constData(); + string remotePath = destPath.toLocal8Bit().constData(); + + std::vector files; + // 判断上传的是文件还是文件夹标识 + int size = 0; + struct stat st; + stat(filePath.c_str(), &st); + if (st.st_mode & S_IFDIR) { + //qDebug() << "filePath is Directory"; + // 获å–文件夹下所有文件å + GetFiles(filePath, files); + size = files.size(); + } + + if (!FtpConnectionTest()) { + qDebug() << "Failed to connect FTP server"; + return; + } + + // 上传文件æºä¸ºä¸€ä¸ªæ–‡ä»¶ + if (size == 0) { + int pos = remotePath.find_last_of('/'); + string destFileName = remotePath.substr(pos + 1); + string tempPath = remotePath.substr(0, pos + 1); + + if (!InternetGetConnectedState(NULL, 0)) { + qDebug() << "计算机未连接到互è”网"; + } + else { + check_save_dir(tempPath); + while (!FtpPutFileA(hftp, filePath.c_str(), remotePath.c_str(), FTP_TRANSFER_TYPE_BINARY, 0)) { + qDebug() << "ftp put file " << filePath.c_str() << "failed because" << GetLastError(); + if (!ConnectFtp(&ip, &port, &username, &userpwd)) + qDebug() << "connect FTP failed because " << GetLastError(); + } + } + } + // 上传æºä¸ºä¸€ä¸ªæ–‡ä»¶å¤¹ + else { + for (int i = 0; i < size; i++) { + string tempFilePath = (string(files[i]).erase(0, filePath.length() + 1)).c_str(); + // 获å–上传路径中的文件å + int pos = tempFilePath.find_last_of('/'); + string destFileName = tempFilePath.substr(pos + 1); + check_save_dir(remotePath + tempFilePath.substr(0, pos + 1)); + //å‘é€å‡½æ•° + if (!FtpPutFileA(hftp, files[i].c_str(), destFileName.c_str(), FTP_TRANSFER_TYPE_BINARY, 0)) + qDebug() << "ftp put files failed because " << GetLastError(); + } + } +} + +void ExportDataThread::GetDataFromSaveThread(QString filePath, bool Ng) { + QString remotePath; + QStringList currentTimeStamp; + QRegExp rx("((([0-9]{3}[1-9]|[0-9]{2}[1-9][0-9]{1}|[0-9]{1}[1-9][0-9]{2}|[1-9][0-9]{3})-(((0[13578]|1[02])-(0[1-9]|[12][0-9]|3[01]))|((0[469]|11)-(0[1-9]|[12][0-9]|30))|(02-(0[1-9]|[1][0-9]|2[0-8]))))|((([0-9]{2})(0[48]|[2468][048]|[13579][26])|((0[48]|[2468][048]|[3579][26])00))-02-29))_([0-1]?[0-9]|2[0-3])-([0-5][0-9])"); + + + + if (filePath.indexOf("ng") == -1) { + + if (rx.indexIn(filePath) != -1) { + currentTimeStamp = rx.capturedTexts(); + } + else { + QDateTime now_ts = QDateTime::currentDateTime(); + currentTimeStamp.append(now_ts.toString("yyyy-MM-dd_HH-mm")); + } + + if (lastTimeStamp.isEmpty() || (currentTimeStamp[0] != lastTimeStamp[0])) { + if (!tmpListToZip.isEmpty()) { + listToZip.unite(tmpListToZip); + tmpListToZip.clear(); + } + if (!listToZip.isEmpty()) { + zipTimeStamp.append(lastTimeStamp[0]); + readyToSendZip = true; + } + lastTimeStamp.clear(); + lastTimeStamp.append(currentTimeStamp[0]); + timer->stop(); + timer->start(1000 * (60 * 1 + 10)); + } + tmpListToZip.insert(filePath, Ng); + } + +} + +//*****************************************å·²ç»è°ƒè¯•å¥½ï¼Œæ²¡æœ‰ç†æ¸…逻辑å‰ä¸è¦åŠ¨********************** +void ExportDataThread::GetFiles(string path, std::vector& files) { + //文件å¥æŸ„ + intptr_t hFile = 0; + //文件信æ¯çš„结构体 + struct _finddata_t fileinfo; + string p; + if ((hFile = _findfirst(p.assign(path).append("\\*").c_str(), &fileinfo)) != -1) + { + // "\\*"是指读å–文件夹下的所有类型的文件 + do + { + //如果是目录,迭代之 + //如果ä¸æ˜¯,加入列表 + if ((fileinfo.attrib & _A_SUBDIR)) + { + if (strcmp(fileinfo.name, ".") != 0 && strcmp(fileinfo.name, "..") != 0) + GetFiles(p.assign(path).append("/").append(fileinfo.name), files); + } + else + { + files.push_back(p.assign(path).append("/").append(fileinfo.name)); + } + } while (_findnext(hFile, &fileinfo) == 0); + _findclose(hFile); + } +} diff --git a/1280x800 TH/Cigarette/exportData.cpp b/1280x800-XH/Cigarette/exportData.cpp similarity index 91% rename from 1280x800 TH/Cigarette/exportData.cpp rename to 1280x800-XH/Cigarette/exportData.cpp index 578c853a..2cc22c9c 100644 --- a/1280x800 TH/Cigarette/exportData.cpp +++ b/1280x800-XH/Cigarette/exportData.cpp @@ -14,6 +14,8 @@ #include #include #include +#include + #pragma comment(lib, "Wininet.lib") Cigarette* cg; @@ -21,6 +23,7 @@ extern SyncQueue<_XMLExportDataInfo>* export_XMLData_Info_queue; extern ConfPath g_conf_path; extern bool flag; extern SysConf g_sys_conf; //系统é…ç½®å‚æ•° +mutex lastTimeStamp_lock; ExportDataThread::ExportDataThread(QObject* parent) : QThread(parent) { @@ -103,7 +106,9 @@ void ExportDataThread::init(string ip_, int port_, string username_, string user void ExportDataThread::start_work() { - start(HighestPriority); + //start(HighestPriority);///优先级 + //start(HighPriority); + start(); } void ExportDataThread::stop() @@ -310,10 +315,11 @@ int ExportDataThread::insertXMLNode(const char* xmlPath, _XMLExportDataInfo& dat void ExportDataThread::run() { - while (!b_quit || (b_quit && (!export_XMLData_Info_queue->isEmpty() || readyToSendZip || !tmpListToZip.isEmpty()))) { - _XMLExportDataInfo element; - if (!export_XMLData_Info_queue->isEmpty()) { - export_XMLData_Info_queue->take(element); + try { + while (!b_quit || (b_quit && (!export_XMLData_Info_queue->isEmpty() || readyToSendZip || !tmpListToZip.isEmpty()))) { + _XMLExportDataInfo element; + if (!export_XMLData_Info_queue->isEmpty()) { + export_XMLData_Info_queue->take(element); if (element.cameraId != -1 && flag) { char buf[256]; @@ -328,7 +334,8 @@ void ExportDataThread::run() } if ((b_quit || (!timer->isActive() && !readyToSendZip)) && (!tmpListToZip.isEmpty())) { - listToZip += tmpListToZip; + lock_guard locker(lastTimeStamp_lock); + listToZip.unite(tmpListToZip); tmpListToZip.clear(); zipTimeStamp.append(lastTimeStamp[0]); lastTimeStamp.clear(); @@ -346,10 +353,6 @@ void ExportDataThread::run() QStringList argsOk; //æ¡ç›’TJ å°ç›’BJ - /*zipFilePaths.append(g_conf_path.save_pics_path + "/" + "416_BJ_" + zipTimeStamp[0] + "-00_" + zipTimeStamp[0] + "-59_0.zip"); - zipFilePaths.append(g_conf_path.save_pics_path + "/" + "416_BJ_" + zipTimeStamp[0] + "-00_" + zipTimeStamp[0] + "-59_1.zip"); - fileList.append(g_conf_path.save_pics_path + "/" + zipTimeStamp[0] + "ng.txt"); - fileList.append(g_conf_path.save_pics_path + "/" + zipTimeStamp[0] + "ok.txt");*/ zipFilePaths.append("416_BJ_" + zipTimeStamp[0] + "-00_" + zipTimeStamp[0] + "-59_0.zip"); zipFilePaths.append("416_BJ_" + zipTimeStamp[0] + "-00_" + zipTimeStamp[0] + "-59_1.zip"); fileList.append(zipTimeStamp[0] + "ng.txt"); @@ -359,12 +362,14 @@ void ExportDataThread::run() QFile* file[2] = { NULL }; - file[0] = new QFile(fileList[0]); - file[1] = new QFile(fileList[1]); + /*file[0] = new QFile(fileList[0]); + file[1] = new QFile(fileList[1]);*/ + QFile fileNg(fileList[0]); + QFile fileOk(fileList[1]); - //QFile fileNg(fileList[0]); - // QFile fileOk(fileList[1]); + file[0] = &fileNg; + file[1] = &fileOk; file[0]->open(QIODevice::WriteOnly); file[1]->open(QIODevice::WriteOnly); @@ -377,17 +382,16 @@ void ExportDataThread::run() argsOk.append("a"); argsOk.append(zipFilePaths[1]); + // create zip file - for (int i = 0; i < listToZip.size(); i++) { - QStringList strList = listToZip[i].split("_"); - strList = strList[strList.size() - 1].split("."); - int index = listToZip[i].lastIndexOf("/\\", 0); - if (strList[0] == okStr) { - okStream << listToZip[i] << endl; + QMapIterator iterator(listToZip); + while (iterator.hasNext()) { + iterator.next(); + if (iterator.value()) { + ngStream << iterator.key() << endl; } else { - - ngStream << listToZip[i] << endl; + okStream << iterator.key() << endl; } } argsNg.append("-i@" + fileList[0]); @@ -433,6 +437,16 @@ void ExportDataThread::run() if (hftp != NULL) { InternetCloseHandle(hint); hint = NULL; + } + } + catch (const std::exception& e) { + // 注æ„：std::exception通常ä¸æ•èŽ·ç”±è¿è¡Œæ—¶é”™è¯¯å¼•å‘的异常 + // 但这里是为了演示catchå—的结构 + std::cerr << __FUNCTION__<<"æ•èŽ·åˆ°å¼‚常: " << e.what() << std::endl; + } + catch (...) { + // 使用çœç•¥å·ï¼ˆ...）å¯ä»¥æ•èŽ·æ‰€æœ‰ç±»åž‹çš„异常，这是一ç§é€šç”¨çš„æ•èŽ·æ–¹å¼ + std::cerr << "æ•èŽ·åˆ°æœªçŸ¥ç±»åž‹çš„异常" << std::endl; } } @@ -515,13 +529,12 @@ void ExportDataThread::ConnectServer(QString srcPath, QString destPath) { } } -void ExportDataThread::GetDataFromSaveThread(QString filePath) { +void ExportDataThread::GetDataFromSaveThread(QString filePath, bool Ng) { QString remotePath; QStringList currentTimeStamp; QRegExp rx("((([0-9]{3}[1-9]|[0-9]{2}[1-9][0-9]{1}|[0-9]{1}[1-9][0-9]{2}|[1-9][0-9]{3})-(((0[13578]|1[02])-(0[1-9]|[12][0-9]|3[01]))|((0[469]|11)-(0[1-9]|[12][0-9]|30))|(02-(0[1-9]|[1][0-9]|2[0-8]))))|((([0-9]{2})(0[48]|[2468][048]|[13579][26])|((0[48]|[2468][048]|[3579][26])00))-02-29))_([0-1]?[0-9]|2[0-3])-([0-5][0-9])"); - + lock_guard locker(lastTimeStamp_lock); - if (filePath.indexOf("ng") == -1) { if (rx.indexIn(filePath) != -1) { @@ -533,20 +546,24 @@ void ExportDataThread::GetDataFromSaveThread(QString filePath) { } if (lastTimeStamp.isEmpty() || (currentTimeStamp[0] != lastTimeStamp[0])) { + if(!lastTimeStamp.isEmpty()) { + lastTimeStamp.clear(); + } + lastTimeStamp.append(currentTimeStamp[0]); + if (!tmpListToZip.isEmpty()) { - listToZip = tmpListToZip; + listToZip.unite(tmpListToZip); tmpListToZip.clear(); } if (!listToZip.isEmpty()) { zipTimeStamp.append(lastTimeStamp[0]); readyToSendZip = true; } - lastTimeStamp.clear(); - lastTimeStamp.append(currentTimeStamp[0]); + timer->stop(); timer->start(1000 * (60 * 1 + 10)); } - tmpListToZip.append(filePath); + tmpListToZip.insert(filePath, Ng); } } diff --git a/1280x800 TH/Cigarette/exportData.h b/1280x800-XH/Cigarette/exportData.h similarity index 95% rename from 1280x800 TH/Cigarette/exportData.h rename to 1280x800-XH/Cigarette/exportData.h index 028cedf4..5b5ed717 100644 --- a/1280x800 TH/Cigarette/exportData.h +++ b/1280x800-XH/Cigarette/exportData.h @@ -1,5 +1,7 @@ #pragma once #include +#include +#include #include "ui_output_statistic.h" #include #include @@ -11,9 +13,10 @@ #include "common.h" #include "cigarette.h" #include "qdebug.h" -#define EXPORTDATA_FILE "camera%1_data_info.xml" #include +#define EXPORTDATA_FILE "camera%1_data_info.xml" + using namespace tinyxml2; class _XMLExportDataInfo { @@ -116,8 +119,9 @@ public: wait(); } QTimer* timer; - QStringList listToZip; - QStringList tmpListToZip; + + QMap listToZip; + QMap tmpListToZip; BOOLEAN readyToSendZip; @@ -145,7 +149,7 @@ public: public slots: void EDrecMsgFromCigarette(); - void GetDataFromSaveThread(QString filePath); + void GetDataFromSaveThread(QString filePath, bool Ng); private: diff --git a/1280x800 TH/Cigarette/hikcamera.cpp b/1280x800-XH/Cigarette/hikcamera.cpp similarity index 100% rename from 1280x800 TH/Cigarette/hikcamera.cpp rename to 1280x800-XH/Cigarette/hikcamera.cpp diff --git a/1280x800 TH/Cigarette/hikcamera.h b/1280x800-XH/Cigarette/hikcamera.h similarity index 100% rename from 1280x800 TH/Cigarette/hikcamera.h rename to 1280x800-XH/Cigarette/hikcamera.h diff --git a/1280x800-XH/Cigarette/histogram.h b/1280x800-XH/Cigarette/histogram.h new file mode 100644 index 00000000..70d440d3 --- /dev/null +++ b/1280x800-XH/Cigarette/histogram.h @@ -0,0 +1,73 @@ +#pragma once + +#include +#include + +template +class Histogram +{ +public: + Histogram(const T lower_bound, const T upper_bound, const size_t histogram_bins) + { + lower_bound_ = lower_bound; + upper_bound_ = upper_bound; + range_inverse_ = 1.0/(upper_bound_-lower_bound_); + histogram_bins_ = histogram_bins; + data_.resize(histogram_bins); + for (size_t i=0; i(val, weight)); + } + + size_t getMaxBin() + { + double max_val = 0.; + size_t max_bin = 0; + for (size_t i=0; i > RawData; + + std::vector data_; // stores the histogram + std::vector raw_data_; // stores all entered data pairs (data, weight) for each histogram bin + T lower_bound_; // lowest possible value + T upper_bound_; // highest possible value + T range_inverse_; // = 1.0/(upper_bound_-lower_bound_) + size_t histogram_bins_; // number of histogram bins +}; diff --git a/1280x800-XH/Cigarette/innerRect.cpp b/1280x800-XH/Cigarette/innerRect.cpp new file mode 100644 index 00000000..b07d42eb --- /dev/null +++ b/1280x800-XH/Cigarette/innerRect.cpp @@ -0,0 +1,225 @@ +#include "innerRect.h" +#include + +// Constructor +InnerRect::InnerRect() +{ + +} + +void InnerRect::getInnerRect(const cv::Mat& image, std::vector& Rect_points, const double grid_spacing_in_pixel) +{ + const int grid_spacing_as_int = std::floor(grid_spacing_in_pixel); + const int half_grid_spacing_as_int = std::floor(grid_spacing_in_pixel*0.5); + + // *********************** I. Find the main directions of the map and rotate it in this manner. *********************** + cv::Mat R; + cv::Rect bbox; + cv::Mat rotated_image; + Rotator image_rotation; + image_rotation.computeImageRotationMatrix(image, R, bbox); + image_rotation.rotateImage(image, rotated_image, R, bbox); + + // compute min/max room coordinates + cv::Point min_room(1000000, 1000000), max_room(0, 0); + for (int v=0; v(v,u)==255) + { + min_room.x = std::min(min_room.x, u); + min_room.y = std::min(min_room.y, v); + max_room.x = std::max(max_room.x, u); + max_room.y = std::max(max_room.y, v); + } + } + } + + cv::Mat inflated_rotated_image; + cv::erode(rotated_image, inflated_rotated_image, cv::Mat(), cv::Point(-1, -1), half_grid_spacing_as_int); + + // *********************** II. Find the nodes and their neighbors *********************** + // get the nodes in the free space + std::vector > nodes; // 2-dimensional vector to easily find the neighbors + int number_of_nodes = 0; + + + // todo: create grid in external class - it is the same in all approaches + // todo: if first/last row or column in grid has accessible areas but center is inaccessible, create a node in the accessible area + for(int y=min_room.y+half_grid_spacing_as_int; y current_row; + for(int x=min_room.x+half_grid_spacing_as_int; x(y,x) == 255) + // could make sense to test all pixels of the cell, not only the center + if (completeCellTest(inflated_rotated_image, current_node.center_, grid_spacing_as_int) == true) + { + //如果是第一个元素，则为0，å¦åˆ™æ˜¯å‰ä¸€ä¸ªå…ƒç´ è®¡æ•°åŸºç¡€ä¸ŠåŠ 1 + current_node.leftCount = (x == (min_room.x+half_grid_spacing_as_int) ? 0 : (current_row.back().leftCount +1)); + ++number_of_nodes; + } + // add the obstacle nodes as already visited + else + { + current_node.leftCount = 0; + ++number_of_nodes; + } + current_row.push_back(current_node); + } + + // insert the current row into grid + nodes.push_back(current_row); + } + //std::cout << "found " << number_of_nodes << " nodes" << std::endl; + + if(nodes.empty()) + { + return; + } + + //采用柱状直方图统计方å¼ï¼Œå¯¹æ¯ä¸€åˆ—找最大é¢ç§¯ + int max_area = 0; + int max_up = 0; + int max_down = 0; + int max_left = 0; + int max_right = 0; + int m = nodes.size(); + int n = nodes[0].size(); + for(int j = 0; j < n; j++) + { + std::vector up(m, 0), down(m, 0); + + std::stack stk; + for(int i = 0; i < m; i++) + { + while(!stk.empty() && nodes[stk.top()][j].leftCount >= nodes[i][j].leftCount) + { + stk.pop(); + } + up[i] = stk.empty() ? -1 : stk.top(); + stk.push(i); + } + stk = std::stack(); + for (int i = m-1; i >= 0; i--){ + while(!stk.empty() && nodes[stk.top()][j].leftCount >= nodes[i][j].leftCount) + { + stk.pop(); + } + down[i] = stk.empty() ? m : stk.top(); + stk.push(i); + } + + + for(int i = 0; i < m; i++) + { + int height = down[i] - up[i] -1; + int area = height * nodes[i][j].leftCount; + if(max_area < area) + { + max_area = area; + max_up = up[i] + 1; + max_down = down[i]; + max_left = j - nodes[i][j].leftCount + 1; + max_right = j; + } + } + } + + int min_x = min_room.x + max_left * grid_spacing_as_int + half_grid_spacing_as_int; + int min_y = min_room.y + max_up * grid_spacing_as_int + half_grid_spacing_as_int; + int max_x = min_room.x + max_right * grid_spacing_as_int + half_grid_spacing_as_int; + int max_y = min_room.y + max_down * grid_spacing_as_int; + + + + //transform the calculated path back to the originally rotated map + std::vector fov_poses; + std::vector fov_coverage_path; + + fov_coverage_path.push_back(cv::Point2f(min_x, min_y)); + fov_coverage_path.push_back(cv::Point2f(max_x, min_y)); + fov_coverage_path.push_back(cv::Point2f(max_x, max_y)); + fov_coverage_path.push_back(cv::Point2f(min_x, max_y)); + fov_coverage_path.push_back(cv::Point2f(min_x, min_y)); + + image_rotation.transformPathBackToOriginalRotation(fov_coverage_path, fov_poses, R); + + Rect_points.clear(); + Rect_points.insert(Rect_points.end(), fov_poses.begin(), fov_poses.end()); + +} + +bool InnerRect::completeCellTest(const cv::Mat& image, cv::Point& cell_center, const int cell_size) +{ + const int x = cell_center.x; + const int y = cell_center.y; + if (image.at(y,x)==255) + { + // just take cell center if accessible + return true; + } + else + { + const uint16_t half_cell_size = (uint16_t)cell_size/(uint16_t)2; // just ensure that the rounding is always reproducible + const bool even_grid_size = ((cell_size%2)==0); + + // check whether there are accessible pixels within the cell + const int upper_bound = even_grid_size==true ? half_cell_size-1 : half_cell_size; // adapt the neighborhood accordingly for even and odd grid sizes + cv::Mat cell_pixels = cv::Mat::zeros(cell_size, cell_size, CV_8UC1); + int accessible_pixels = 0; + for (int dy=-half_cell_size; dy<=upper_bound; ++dy) + { + for (int dx=-half_cell_size; dx<=upper_bound; ++dx) + { + const int nx = x+dx; + const int ny = y+dy; + if (nx<0 || nx>=image.cols || ny<0 || ny>=image.rows) + continue; + if (image.at(ny,nx)==255) + { + ++accessible_pixels; + cell_pixels.at(half_cell_size+dy, half_cell_size+dx) = 255; + } + } + } + // if there are accessible pixels within the cell, find their center and use this as cell center + if (accessible_pixels>0) + { + return true; + // use distance transform to find the pixels with maximum distance to obstacles, take from the maximum distance pixels the one + // closest to the original cell center + cv::Mat distances; + cv::distanceTransform(cell_pixels, distances, CV_DIST_L2, 5); + double max_distance = 0.; + cv::minMaxLoc(distances, 0, &max_distance, 0, &cell_center); + cell_center.x += x-half_cell_size; + cell_center.y += y-half_cell_size; + // if there are multiple candidates with same max distance, take the one closest to the center + double min_squared_center_distance = (x-cell_center.x)*(x-cell_center.x) + (y-cell_center.y)*(y-cell_center.y); + for (int v=0; v(v,u)==max_distance) + { + const double squared_center_distance = (u-half_cell_size)*(u-half_cell_size)+(v-half_cell_size)*(v-half_cell_size); + if (squared_center_distance < min_squared_center_distance) + { + cell_center = cv::Point(x-half_cell_size+u, y-half_cell_size+v); + min_squared_center_distance = squared_center_distance; + } + } + } + } + + return true; + } + } + return false; +} diff --git a/1280x800-XH/Cigarette/innerRect.h b/1280x800-XH/Cigarette/innerRect.h new file mode 100644 index 00000000..b80dafdd --- /dev/null +++ b/1280x800-XH/Cigarette/innerRect.h @@ -0,0 +1,44 @@ + +// #pragma once +#ifndef __INNER_RECT_H__ +#define __INNER_RECT_H__ + +#include +#include +#include +#include +#include +#include + +#include "rotator.h" + + +const double PI = 3.14159265359; +const double PI_2_INV = 1./(0.5*PI); + + + +// Struct that is used to create a node and save the corresponding neighbors. +struct InnerExploratorNode +{ + cv::Point center_; + int leftCount; + InnerExploratorNode() + { + leftCount = 0; + } +}; + + +class InnerRect +{ +public: + // constructor + InnerRect(); + + void getInnerRect(const cv::Mat& image, std::vector& Rect_points, const double grid_spacing_in_pixel); + bool completeCellTest(const cv::Mat& image, cv::Point& cell_center, const int cell_size); + +}; + +#endif \ No newline at end of file diff --git a/1280x800 TH/Cigarette/main.cpp b/1280x800-XH/Cigarette/main.cpp similarity index 94% rename from 1280x800 TH/Cigarette/main.cpp rename to 1280x800-XH/Cigarette/main.cpp index c22f52c1..35e5cff1 100644 --- a/1280x800 TH/Cigarette/main.cpp +++ b/1280x800-XH/Cigarette/main.cpp @@ -9,7 +9,7 @@ #include "CryptoToolLib.h" #endif //Òþ²Ø¿ØÖÆ´°¿Ú -//#pragma comment( linker, "/subsystem:\"windows\" /entry:\"mainCRTStartup\"" ) +#pragma comment( linker, "/subsystem:\"windows\" /entry:\"mainCRTStartup\"" ) int main(int argc, char* argv[]) { #if defined LICENSE_VERIFY diff --git a/1280x800 TH/Cigarette/modbus/modbus-private.h b/1280x800-XH/Cigarette/modbus/modbus-private.h similarity index 100% rename from 1280x800 TH/Cigarette/modbus/modbus-private.h rename to 1280x800-XH/Cigarette/modbus/modbus-private.h diff --git a/1280x800 TH/Cigarette/modbus/modbus-rtu-private.h b/1280x800-XH/Cigarette/modbus/modbus-rtu-private.h similarity index 100% rename from 1280x800 TH/Cigarette/modbus/modbus-rtu-private.h rename to 1280x800-XH/Cigarette/modbus/modbus-rtu-private.h diff --git a/1280x800 TH/Cigarette/modbus/modbus-rtu.h b/1280x800-XH/Cigarette/modbus/modbus-rtu.h similarity index 100% rename from 1280x800 TH/Cigarette/modbus/modbus-rtu.h rename to 1280x800-XH/Cigarette/modbus/modbus-rtu.h diff --git a/1280x800 TH/Cigarette/modbus/modbus-tcp-private.h b/1280x800-XH/Cigarette/modbus/modbus-tcp-private.h similarity index 100% rename from 1280x800 TH/Cigarette/modbus/modbus-tcp-private.h rename to 1280x800-XH/Cigarette/modbus/modbus-tcp-private.h diff --git a/1280x800 TH/Cigarette/modbus/modbus-tcp.h b/1280x800-XH/Cigarette/modbus/modbus-tcp.h similarity index 100% rename from 1280x800 TH/Cigarette/modbus/modbus-tcp.h rename to 1280x800-XH/Cigarette/modbus/modbus-tcp.h diff --git a/1280x800 TH/Cigarette/modbus/modbus-version.h b/1280x800-XH/Cigarette/modbus/modbus-version.h similarity index 100% rename from 1280x800 TH/Cigarette/modbus/modbus-version.h rename to 1280x800-XH/Cigarette/modbus/modbus-version.h diff --git a/1280x800 TH/Cigarette/modbus/modbus.h b/1280x800-XH/Cigarette/modbus/modbus.h similarity index 100% rename from 1280x800 TH/Cigarette/modbus/modbus.h rename to 1280x800-XH/Cigarette/modbus/modbus.h diff --git a/1280x800 TH/Cigarette/modbus/modbus.lib b/1280x800-XH/Cigarette/modbus/modbus.lib similarity index 100% rename from 1280x800 TH/Cigarette/modbus/modbus.lib rename to 1280x800-XH/Cigarette/modbus/modbus.lib diff --git a/1280x800 TH/Cigarette/output_statistic.cpp b/1280x800-XH/Cigarette/output_statistic.cpp similarity index 100% rename from 1280x800 TH/Cigarette/output_statistic.cpp rename to 1280x800-XH/Cigarette/output_statistic.cpp diff --git a/1280x800 TH/Cigarette/output_statistic.h b/1280x800-XH/Cigarette/output_statistic.h similarity index 100% rename from 1280x800 TH/Cigarette/output_statistic.h rename to 1280x800-XH/Cigarette/output_statistic.h diff --git a/1280x800 TH/Cigarette/output_statistic.ui b/1280x800-XH/Cigarette/output_statistic.ui similarity index 78% rename from 1280x800 TH/Cigarette/output_statistic.ui rename to 1280x800-XH/Cigarette/output_statistic.ui index 4a7727b9..e2efce90 100644 --- a/1280x800 TH/Cigarette/output_statistic.ui +++ b/1280x800-XH/Cigarette/output_statistic.ui @@ -13,7 +13,7 @@ 产é‡ç»Ÿè®¡ - + @@ -22,7 +22,7 @@ QFrame::Raised - + @@ -31,7 +31,7 @@ - 2 + 1 @@ -53,16 +53,6 @@ - - - Camera3 - - - - - - - diff --git a/1280x800 TH/Cigarette/plc_item.cpp b/1280x800-XH/Cigarette/plc_item.cpp similarity index 100% rename from 1280x800 TH/Cigarette/plc_item.cpp rename to 1280x800-XH/Cigarette/plc_item.cpp diff --git a/1280x800 TH/Cigarette/plc_item.h b/1280x800-XH/Cigarette/plc_item.h similarity index 100% rename from 1280x800 TH/Cigarette/plc_item.h rename to 1280x800-XH/Cigarette/plc_item.h diff --git a/1280x800 TH/Cigarette/plcsetup.cpp b/1280x800-XH/Cigarette/plcsetup.cpp similarity index 100% rename from 1280x800 TH/Cigarette/plcsetup.cpp rename to 1280x800-XH/Cigarette/plcsetup.cpp diff --git a/1280x800 TH/Cigarette/plcsetup.hpp b/1280x800-XH/Cigarette/plcsetup.hpp similarity index 100% rename from 1280x800 TH/Cigarette/plcsetup.hpp rename to 1280x800-XH/Cigarette/plcsetup.hpp diff --git a/1280x800 TH/Cigarette/plcsetup.ui b/1280x800-XH/Cigarette/plcsetup.ui similarity index 100% rename from 1280x800 TH/Cigarette/plcsetup.ui rename to 1280x800-XH/Cigarette/plcsetup.ui diff --git a/1280x800 TH/Cigarette/pswd.txt b/1280x800-XH/Cigarette/pswd.txt similarity index 100% rename from 1280x800 TH/Cigarette/pswd.txt rename to 1280x800-XH/Cigarette/pswd.txt diff --git a/1280x800 TH/Cigarette/pswd_op.txt b/1280x800-XH/Cigarette/pswd_op.txt similarity index 100% rename from 1280x800 TH/Cigarette/pswd_op.txt rename to 1280x800-XH/Cigarette/pswd_op.txt diff --git a/1280x800-XH/Cigarette/rotator.cpp b/1280x800-XH/Cigarette/rotator.cpp new file mode 100644 index 00000000..1af15507 --- /dev/null +++ b/1280x800-XH/Cigarette/rotator.cpp @@ -0,0 +1,155 @@ + +#include "rotator.h" + +void Rotator::rotateImage(const cv::Mat& image, cv::Mat& rotated_image, const cv::Mat& R, const cv::Rect& bounding_rect) +{ + // rotate the image + cv::warpAffine(image, rotated_image, R, bounding_rect.size(), cv::INTER_AREA); + + // apply a binary filter to create a binary image, also use a closing operator to smooth the output (the rotation might produce + // black pixels reaching into the white area that were not there before, causing new, wrong cells to open) + cv::threshold(rotated_image, rotated_image, 127, 255, CV_THRESH_BINARY); +} + +// compute the affine rotation matrix for rotating a image into parallel alignment with x-axis (longer side of the image is aligned with x-axis) +// R is the transform +// bounding_rect is the ROI of the warped image +double Rotator::computeImageRotationMatrix(const cv::Mat& image, cv::Mat& R, cv::Rect& bounding_rect, const cv::Point* center, const double rotation_offset) +{ + // rotation angle of the image s.t. the most occurring gradient is in 90 degree to the x-axis + double rotation_angle = computeImageMainDirection(image) + rotation_offset; + //std::cout << "Rotator::computeImageRotationMatrix: main rotation angle: " << rotation_angle << std::endl; + + // get rotation matrix R for rotating the image around the center of the room contour + // Remark: rotation angle in degrees for opencv + cv::Point center_of_rotation; + if (center == 0) + { + cv::Point min_room, max_room; + getMinMaxCoordinates(image, min_room, max_room); + center_of_rotation.x = 0.5*(min_room.x+max_room.x); + center_of_rotation.y = 0.5*(min_room.y+max_room.y); + } + else + center_of_rotation = *center; + + // compute rotation + R = cv::getRotationMatrix2D(center_of_rotation, (rotation_angle*180)/CV_PI, 1.0); + + // determine bounding rectangle to find the size of the new image + bounding_rect = cv::RotatedRect(center_of_rotation, image.size(), (rotation_angle*180)/CV_PI).boundingRect(); + // adjust transformation matrix + R.at(0,2) += 0.5*bounding_rect.width - center_of_rotation.x; + R.at(1,2) += 0.5*bounding_rect.height - center_of_rotation.y; + + return rotation_angle; +} + +// computes the major direction of the walls from a map +// the map (image, CV_8UC1) is black (0) at impassable areas and white (255) on drivable areas +double Rotator::computeImageMainDirection(const cv::Mat& image) +{ + + // compute Hough transform on edge image of the map + cv::Mat edge_map; + + cv::Canny(image, edge_map, 50, 150, 3); + + + std::vector lines; + double min_line_length = 20; // in [m] + for (; min_line_length > 2; min_line_length -= 4) + { + cv::HoughLinesP(edge_map, lines, 1, CV_PI/180, min_line_length, min_line_length, 1.5*min_line_length); + cv::Mat room_hough = edge_map.clone(); + for (size_t i=0; i= 4) + break; + } + // setup a histogram on the line directions weighted by their length to determine the major direction + Histogram direction_histogram(0, CV_PI, 36); + for (size_t i=0; i 0.0) + { + double current_direction = std::atan2(dy, dx); + while (current_direction < 0.) + current_direction += CV_PI; + while (current_direction > CV_PI) + current_direction -= CV_PI; + direction_histogram.addData(current_direction, sqrt(dy*dy+dx*dx)); + //std::cout << " dx=" << dx << " dy=" << dy << " dir=" << current_direction << " len=" << sqrt(dy*dy+dx*dx) << std::endl; + } + } + return direction_histogram.getMaxBinPreciseVal(); +} + +void Rotator::transformPathBackToOriginalRotation(const std::vector& fov_middlepoint_path, std::vector& path_fov_poses, const cv::Mat& R) +{ + path_fov_poses.clear(); + + // transform the calculated path back to the originally rotated map + cv::Mat R_inv; + cv::invertAffineTransform(R, R_inv); + std::vector fov_middlepoint_path_transformed; + cv::transform(fov_middlepoint_path, fov_middlepoint_path_transformed, R_inv); + + // create poses with an angle + transformPointPathToPosePath(fov_middlepoint_path_transformed, path_fov_poses); +} + +void Rotator::transformPointPathToPosePath(const std::vector& point_path, std::vector& pose_path) +{ + // create poses with an angle + for(size_t point_index = 0; point_index < point_path.size(); ++point_index) + { + // get the vector from the previous to the current point + const cv::Point2f& current_point = point_path[point_index]; + + // add the next navigation goal to the path + cv::Point2f current_pose; + current_pose.x = current_point.x; + current_pose.y = current_point.y; + pose_path.push_back(current_pose); + + } +} + +void Rotator::transformPointPathToPosePath(std::vector& pose_path) +{ + // create point vector + std::vector point_path; + for (size_t i=0; i::max(); + min_room.y = std::numeric_limits::max(); + max_room.x = 0; + max_room.y = 0; + for (int v=0; v(v,u)==255) + { + min_room.x = std::min(min_room.x, u); + min_room.y = std::min(min_room.y, v); + max_room.x = std::max(max_room.x, u); + max_room.y = std::max(max_room.y, v); + } + } + } +} diff --git a/1280x800-XH/Cigarette/rotator.h b/1280x800-XH/Cigarette/rotator.h new file mode 100644 index 00000000..42630cdf --- /dev/null +++ b/1280x800-XH/Cigarette/rotator.h @@ -0,0 +1,44 @@ + +#pragma once + +#include +#include +#include +#include +#include "histogram.h" + + + +class Rotator +{ +public: + Rotator() + { + } + + void rotateImage(const cv::Mat& Image, cv::Mat& rotated_image, const cv::Mat& R, const cv::Rect& bounding_rect); + + // compute the affine rotation matrix for rotating a image into parallel alignment with x-axis (longer side of the image is aligned with x-axis) + // R is the transform + // bounding_rect is the ROI of the warped image + // rotation_offset is an optional offset to the determined rotation, in [rad] + // returns the computed optimal rotation angle, in [rad] + double computeImageRotationMatrix(const cv::Mat& image, cv::Mat& R, cv::Rect& bounding_rect, + const cv::Point* center=0, const double rotation_offset=0.); + + // computes the major direction of the walls from a image + // the image (CV_8UC1) is black (0) at impassable areas and white (255) on drivable areas + double computeImageMainDirection(const cv::Mat& image); + + // transforms a vector of points back to the original image and generates poses + void transformPathBackToOriginalRotation(const std::vector& fov_middlepoint_path, std::vector& path_fov_poses, const cv::Mat& R); + + // converts a point path to a pose path with angles + void transformPointPathToPosePath(const std::vector& point_path, std::vector& pose_path); + + // converts a point path to a pose path with angles, the points are already stored in pose_path + void transformPointPathToPosePath(std::vector& pose_path); + + // get min/max coordinates of free pixels (255) + void getMinMaxCoordinates(const cv::Mat& image, cv::Point& min_room, cv::Point& max_room); +}; diff --git a/1280x800 TH/Cigarette/savethread.h b/1280x800-XH/Cigarette/savethread.h similarity index 96% rename from 1280x800 TH/Cigarette/savethread.h rename to 1280x800-XH/Cigarette/savethread.h index d75b4a3d..2b59156d 100644 --- a/1280x800 TH/Cigarette/savethread.h +++ b/1280x800-XH/Cigarette/savethread.h @@ -39,7 +39,8 @@ public: } void start_work() { - start(HighestPriority); + start(HighestPriority);///优先级 + //start(HighPriority); } void stop() { @@ -61,7 +62,7 @@ protected: std::string dir_path = file_name.substr(0, found); check_save_dir(dir_path); bool b_save = cv::imwrite(file_name, image);//存本地 - if (IsALL && b_save) + if (b_save) { //sendDataToExport(QString::fromStdString(file_name)); sendDataToExport(QString::fromLocal8Bit(QByteArray::fromRawData(file_name.c_str(), file_name.size()))); diff --git a/1280x800 TH/Cigarette/splash.jpg b/1280x800-XH/Cigarette/splash.jpg similarity index 100% rename from 1280x800 TH/Cigarette/splash.jpg rename to 1280x800-XH/Cigarette/splash.jpg diff --git a/1280x800 TH/Cigarette/syncworkthread.cpp b/1280x800-XH/Cigarette/syncworkthread.cpp similarity index 82% rename from 1280x800 TH/Cigarette/syncworkthread.cpp rename to 1280x800-XH/Cigarette/syncworkthread.cpp index fbbf30e7..caf45830 100644 --- a/1280x800 TH/Cigarette/syncworkthread.cpp +++ b/1280x800-XH/Cigarette/syncworkthread.cpp @@ -34,6 +34,8 @@ extern PLCDevice* m_PLCDevice; extern bool g_debug_mode; bool IsALL = false;//是å¦æ˜¯å…¨å­˜ + + SyncWorkThread::~SyncWorkThread() { stop(); @@ -67,22 +69,26 @@ void SyncWorkThread::run() { try { uint32_t result_index[NumberOfSupportedCameras] = { 0 }; - while (!b_quit) { + while (!b_quit) + { QDateTime now_ts = QDateTime::currentDateTime(); + _TCPSendInfo TCPSendInfo; std::vector> element_vec; local_g_image_sync_queue->take(element_vec); + #ifdef IS_CAM_NG_OK_DATA_MERGED bool IsNGForAll = false; #endif + int merge_index; - cv::Mat merge_image = cv::Mat::zeros(image_h * g_sys_conf.shoot[0], image_w * work_camera_nums, CV_8UC3); + cv::Mat merge_image = cv::Mat::zeros(image_h * g_sys_conf.shoot[0], image_w * work_camera_nums, CV_8UC3);//640*work_camera_nums cv::Rect roi; - int j = 0; // 实际工作的相机标识，element_vec中å¯èƒ½æœ‰ç›¸æœºæ²¡åœ¨å·¥ä½œ + int j = 0; for (int i = 0; i < element_vec.size(); i++)//æ¯ä¸ªç›¸æœºçš„图轮æµé历 { + if (!SingleCamInfo[i].Detect || !SingleCamInfo[i].IsOpen || SingleCamInfo[i].OffLine) continue; - local_camera_number = i; std::pair element; element = element_vec[i]; @@ -113,9 +119,10 @@ void SyncWorkThread::run() UDPSendInfo.FrameID = info_frame; UDPSendInfo.index = local_camera_number; #endif - #ifdef __TCPSend - _TCPSendInfo TCPSendInfo; + QString sendName = "416_BJ_01_" + now_ts.toString("yyyy-MM-dd_HH-mm-ss.zzz"); + TCPSendInfo.pics_name = sendName.toLocal8Bit().constData(); + TCP_Info_queue->put(TCPSendInfo); #endif if (!image.data) { @@ -127,9 +134,9 @@ void SyncWorkThread::run() } cv::resize(image, image, cv::Size(image_w, image_h * unit_count)); if (local_SysConf.shoot[local_camera_number] == unit_count) - { + { std::vector vec_in; - int w = image.cols; + int w = image.cols ; int h = image.rows / unit_count; for (int index = 0; index < unit_count; index++) { cv::Rect temp_Rect(0, h * index, w, h); @@ -142,7 +149,6 @@ void SyncWorkThread::run() } vec_in.push_back(temp_image.clone()); } - std::vector vec_out; std::vector>> vec_results; QDateTime ts_start = QDateTime::currentDateTime(); @@ -154,8 +160,9 @@ void SyncWorkThread::run() vec_out.push_back(imageout.clone()); vec_results.push_back(results); } - else { - alg_jd[local_camera_number].detect_batch(vec_in, vec_out, vec_results); + else + { + alg_jd[local_camera_number].detect_batch(vec_in, vec_out, vec_results); } QDateTime ts_jd = QDateTime::currentDateTime(); int time_process = ts_start.msecsTo(ts_jd); @@ -176,7 +183,6 @@ void SyncWorkThread::run() emit display_jd_no(local_camera_number, jd_no); #endif - #ifdef __UDPSend UDPSendInfo.JD = jd_no; #endif @@ -184,7 +190,7 @@ void SyncWorkThread::run() bool IsNG = false; int ngReason = 0; QMap ng_reason_maps; - ng_reason_maps[0] = "1"; + ng_reason_maps[0] = "1";//1=OK ; 0=NG ng_reason_maps[1] = "0"; ng_reason_maps[2] = "0"; ng_reason_maps[3] = "0"; @@ -200,31 +206,10 @@ void SyncWorkThread::run() IsNG = false; ngReason = 0; } -// if (local_SysConf.save == 2)//三张照片分别存储 -// { -// IsALL = true; -// /// åˆæˆwork_camera_nums * unit_count å®«æ ¼å›¾åƒ -// cv::Mat m = vec_in[index].clone(); -// QString file_name; -// merge_index = j * unit_count + index + 1; -// roi = cv::Rect(index * m.cols, j * m.rows, m.cols, m.rows); -// m.copyTo(merge_image(roi)); -// -// if (merge_index == work_camera_nums * unit_count) { -// file_name = g_conf_path.save_pics_path + "/" -// + now_ts.toString("yyyy-MM-dd") + "/" -// + now_ts.toString("yyyy-MM-dd_HH-mm-ss_zzz_") +"_" +ng_reason_maps[ngReason] + ".jpg"; -// g_save_queue->put(std::make_pair(file_name.toLocal8Bit().constData(), merge_image)); -//#ifdef __TCPSend -// QString sendName = now_ts.toString("yyyy-MM-dd_HH-mm-ss_zzz_") + ".jpg"; -// TCPSendInfo.pics_name = sendName.toLocal8Bit().constData(); -// TCP_Info_queue->put(TCPSendInfo); -//#endif -// } -// } } + if (unit_count >= 2) { - image1 = vec_out[0].clone(); + image1 = vec_out[(result_index[i]) % 2].clone(); #ifdef DRAW_RECT IsNG |= CheckSelectRects(image1, vec_results, (result_index[i]) % 2, local_DisplayLabelConf, 0); if (IsNG) { @@ -246,7 +231,7 @@ void SyncWorkThread::run() #endif if (unit_count >= 3) { - image2 = vec_out[(result_index[i]) % 2 + 1].clone(); + image2 = vec_out[2].clone(); #ifdef DRAW_RECT DrawSelectRects(image2, local_DisplayLabelConf, 1); IsNG |= CheckSelectRects(image1, vec_results, 2, local_DisplayLabelConf, 1); @@ -278,7 +263,6 @@ void SyncWorkThread::run() #endif #ifndef IS_CAM_NG_OK_DATA_MERGED local_g_result_queue[local_camera_number]->put(false); - #else IsNGForAll = TRUE; #endif @@ -298,8 +282,8 @@ void SyncWorkThread::run() now_ts.toString("yyyy-MM-dd_HH-mm-ss_zzz_") + QString::number(local_camera_number + 1) + "#" + "_" + QString::number(index + 1) + "_" + ng_reason_maps[ngReason] + ".jpg"; - - g_save_queue->put(std::make_pair(file_name.toLocal8Bit().constData(), m)); + + g_save_queue->put(std::make_pair(file_name.toLocal8Bit().constData(), m)); m = vec_out[index].clone(); file_name = g_conf_path.save_pics_path + "/ng_result/" + @@ -314,8 +298,6 @@ void SyncWorkThread::run() } } } - - #ifdef SYNC_CAMERA if (!g_debug_mode) { @@ -330,51 +312,70 @@ void SyncWorkThread::run() { if (local_SysConf.save == 2)//照片存储 { - IsALL = true; /// åˆæˆwork_camera_nums * unit_count å®«æ ¼å›¾åƒ cv::Mat m = vec_in[index].clone(); QString file_name; - merge_index = j * unit_count + index + 1; roi = cv::Rect(j * m.cols, index * m.rows, m.cols, m.rows); m.copyTo(merge_image(roi)); - - if (merge_index == work_camera_nums * unit_count) { - if (!IsNG) - { - ngReason = 1; - } - else - { - ngReason = 0; - } + merge_index = j * unit_count + index + 1; + if (merge_index == work_camera_nums * unit_count) + { //æ¡ç›’TJ å°ç›’BJ file_name = g_conf_path.save_pics_path + "/" + now_ts.toString("yyyy-MM-dd") + "/"+"416_BJ_01_" - + now_ts.toString("yyyy-MM-dd_HH-mm-ss.zzz") + ".jpg"; - g_save_queue->put(std::make_pair(file_name.toLocal8Bit().constData(), merge_image)); -#ifdef __TCPSend - QString sendName = "416_BJ_01_" + now_ts.toString("yyyy-MM-dd_HH-mm-ss.zzz"); - TCPSendInfo.pics_name = sendName.toLocal8Bit().constData(); - TCP_Info_queue->put(TCPSendInfo); + + now_ts.toString("yyyy-MM-dd_HH-mm-ss.zzz")+ ".jpg"; + g_save_queue->put(std::make_pair(file_name.toLocal8Bit().constData(), merge_image)); +#ifdef __ExportData + sendDataToCompress(file_name, IsNG); #endif } } } - } else { + bool IsNG; #ifdef SYNC_CAMERA //ä¿è¯ä¸é”™ä½ if (!g_debug_mode) { if (local_SysConf.MisMatchAct == 1)//as ng + { emit event_ng(local_camera_number); + IsNG = true; + } + else if (local_SysConf.MisMatchAct == 0)//as ok + { emit event_ok(local_camera_number); + IsNG = false; + } emit display_check_total(local_camera_number, ++(frame_total[local_camera_number])); - qDebug() << local_camera_number << "#camera# " << now_ts.toString("yyyy-MM-dd_HH-mm-ss_zzz_") << "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx " << unit_count; + + cv::Mat m = image.clone(); + QString file_name; + if (local_SysConf.save == 2)//照片存储 + { + /// åˆæˆwork_camera_nums * unit_count å®«æ ¼å›¾åƒ + + merge_index = i * unit_count + unit_count; + if (merge_index == work_camera_nums * unit_count) + { + //æ¡ç›’TJ å°ç›’BJ + file_name = g_conf_path.save_pics_path + "/" + + now_ts.toString("yyyy-MM-dd") + "/"+"416_BJ_01_" + + now_ts.toString("yyyy-MM-dd_HH-mm-ss.zzz")+ ".jpg"; + g_save_queue->put(std::make_pair(file_name.toLocal8Bit().constData(), m)); + sendDataToCompress(file_name, IsNG); + } + } +#ifdef __TCPSend + QString sendName = "416_BJ_01_" + now_ts.toString("yyyy-MM-dd_HH-mm-ss.zzz"); + TCPSendInfo.pics_name = sendName.toLocal8Bit().constData(); + TCP_Info_queue->put(TCPSendInfo); +#endif + qDebug() << local_camera_number << "#camera# " << now_ts.toString("yyyy-MM-dd_HH-mm-ss_zzz_") << "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx " << unit_count; } #endif } @@ -395,12 +396,17 @@ void SyncWorkThread::run() } #endif - // emit display_check_total(local_camera_number, ++(frame_total[local_camera_number])); + } + + } + catch (const std::exception& e) { + // 注æ„：std::exception通常ä¸æ•èŽ·ç”±è¿è¡Œæ—¶é”™è¯¯å¼•å‘的异常 + // 但这里是为了演示catchå—的结构 + std::cerr << __FUNCTION__<<"æ•èŽ·åˆ°å¼‚常: " << e.what() << std::endl; } - catch (cv::Exception& e) - { - const char* err_msg = e.what(); - std::cout << "exception caught: " << err_msg << std::endl; + catch (...) { + // 使用çœç•¥å·ï¼ˆ...）å¯ä»¥æ•èŽ·æ‰€æœ‰ç±»åž‹çš„异常，这是一ç§é€šç”¨çš„æ•èŽ·æ–¹å¼ + std::cerr << "æ•èŽ·åˆ°æœªçŸ¥ç±»åž‹çš„异常" << std::endl; } } diff --git a/1280x800 TH/Cigarette/syncworkthread.h b/1280x800-XH/Cigarette/syncworkthread.h similarity index 92% rename from 1280x800 TH/Cigarette/syncworkthread.h rename to 1280x800-XH/Cigarette/syncworkthread.h index 879c0acc..02266e32 100644 --- a/1280x800 TH/Cigarette/syncworkthread.h +++ b/1280x800-XH/Cigarette/syncworkthread.h @@ -22,6 +22,10 @@ signals: void event_ok(int Num); void event_ng(int Num); #endif +#ifdef __TCPSend +signals: + void sendDataToCompress(QString filePath, bool Ng); +#endif public: SyncWorkThread(QObject* parent = 0) : QThread(parent) diff --git a/1280x800 TH/Cigarette/threadReceive.cpp b/1280x800-XH/Cigarette/threadReceive.cpp similarity index 100% rename from 1280x800 TH/Cigarette/threadReceive.cpp rename to 1280x800-XH/Cigarette/threadReceive.cpp diff --git a/1280x800 TH/Cigarette/threadReceive.h b/1280x800-XH/Cigarette/threadReceive.h similarity index 100% rename from 1280x800 TH/Cigarette/threadReceive.h rename to 1280x800-XH/Cigarette/threadReceive.h diff --git a/1280x800 TH/Cigarette/threadSend.cpp b/1280x800-XH/Cigarette/threadSend.cpp similarity index 74% rename from 1280x800 TH/Cigarette/threadSend.cpp rename to 1280x800-XH/Cigarette/threadSend.cpp index 0ee3fdb6..f087a348 100644 --- a/1280x800 TH/Cigarette/threadSend.cpp +++ b/1280x800-XH/Cigarette/threadSend.cpp @@ -25,41 +25,52 @@ void threadSend::stop() void threadSend::run() { - while (isLoop) - { - _UDPSendInfo UDPSendInfo; - Local_UDP_Info_queue->take(UDPSendInfo); - switch (UDPSendInfo.FrameID) { - case info_frame: { - sendData(&UDPSendInfo, dataport); - break; - } - case speed_frame: { - sendSpeed(&UDPSendInfo, dataport); - break; - } - case kick_frame: { - sendKick(&UDPSendInfo, dataport); - break; - } - case ok_frame: { - sendOK(&UDPSendInfo, dataport); - break; - } - case ng_frame: { - sendNG(&UDPSendInfo, dataport); - break; - } - case total_frame: { - sendTotal(&UDPSendInfo, dataport); - break; - } - case image_frame: { - sendImage(&UDPSendInfo, imageport); - break; - } + try { + while (isLoop) + { + _UDPSendInfo UDPSendInfo; + Local_UDP_Info_queue->take(UDPSendInfo); + switch (UDPSendInfo.FrameID) { + case info_frame: { + sendData(&UDPSendInfo, dataport); + break; + } + case speed_frame: { + sendSpeed(&UDPSendInfo, dataport); + break; + } + case kick_frame: { + sendKick(&UDPSendInfo, dataport); + break; + } + case ok_frame: { + sendOK(&UDPSendInfo, dataport); + break; + } + case ng_frame: { + sendNG(&UDPSendInfo, dataport); + break; + } + case total_frame: { + sendTotal(&UDPSendInfo, dataport); + break; + } + case image_frame: { + sendImage(&UDPSendInfo, imageport); + break; + } + } } } + catch (const std::exception& e) { + // 注æ„：std::exception通常ä¸æ•èŽ·ç”±è¿è¡Œæ—¶é”™è¯¯å¼•å‘的异常 + // 但这里是为了演示catchå—的结构 + std::cerr << __FUNCTION__<<"æ•èŽ·åˆ°å¼‚常: " << e.what() << std::endl; + } + catch (...) { + // 使用çœç•¥å·ï¼ˆ...）å¯ä»¥æ•èŽ·æ‰€æœ‰ç±»åž‹çš„异常，这是一ç§é€šç”¨çš„æ•èŽ·æ–¹å¼ + std::cerr << "æ•èŽ·åˆ°æœªçŸ¥ç±»åž‹çš„异常" << std::endl; + } } void threadSend::sendData(_UDPSendInfo* UDPSendInfo, int port) diff --git a/1280x800 TH/Cigarette/threadSend.h b/1280x800-XH/Cigarette/threadSend.h similarity index 100% rename from 1280x800 TH/Cigarette/threadSend.h rename to 1280x800-XH/Cigarette/threadSend.h diff --git a/1280x800 TH/Cigarette/threadSendTCP.cpp b/1280x800-XH/Cigarette/threadSendTCP.cpp similarity index 64% rename from 1280x800 TH/Cigarette/threadSendTCP.cpp rename to 1280x800-XH/Cigarette/threadSendTCP.cpp index 8fbd5de0..30ca938d 100644 --- a/1280x800 TH/Cigarette/threadSendTCP.cpp +++ b/1280x800-XH/Cigarette/threadSendTCP.cpp @@ -25,8 +25,9 @@ void threadSendTCP::init(SyncQueue<_TCPSendInfo>* p_TCP_Info_queue, std::string } void threadSendTCP::start_work() { - //start(HighestPriority); + //start(HighestPriority);/// start(); + } void threadSendTCP::stop() @@ -64,49 +65,59 @@ bool threadSendTCP::connectTCP() { void threadSendTCP::run() { - + try { #ifdef __TCPClient - if (!connectTCP()) - { - qDebug() << "TCP connect error!"; - } -#endif - while (isLoop) { - _TCPSendInfo TCPSendInfo; - Local_TCP_Info_queue->take(TCPSendInfo); - num++; - sendData(&TCPSendInfo, num); -#ifdef __TCPServer - if (ClientStatus == QAbstractSocket::ConnectedState) + if (!connectTCP()) { - sendData(&TCPSendInfo, num); + qDebug() << "TCP connect error!"; } +#endif + while (isLoop) { + _TCPSendInfo TCPSendInfo; + Local_TCP_Info_queue->take(TCPSendInfo); + num++; + sendData(&TCPSendInfo, num); +#ifdef __TCPServer + if (ClientStatus == QAbstractSocket::ConnectedState) + { + sendData(&TCPSendInfo, num); + } #endif #ifdef __TCPClient - sendData(&TCPSendInfo, num); + sendData(&TCPSendInfo, num); #endif - //mySocket->write("Hello! here is tcp client!\n"); - //mySocket->flush(); - + //mySocket->write("Hello! here is tcp client!\n"); + //mySocket->flush(); + } + } + catch (const std::exception& e) { + // 注æ„：std::exception通常ä¸æ•èŽ·ç”±è¿è¡Œæ—¶é”™è¯¯å¼•å‘的异常 + // 但这里是为了演示catchå—的结构 + std::cerr << __FUNCTION__<<"æ•èŽ·åˆ°å¼‚常: " << e.what() << std::endl; + } + catch (...) { + // 使用çœç•¥å·ï¼ˆ...）å¯ä»¥æ•èŽ·æ‰€æœ‰ç±»åž‹çš„异常，这是一ç§é€šç”¨çš„æ•èŽ·æ–¹å¼ + std::cerr << "æ•èŽ·åˆ°æœªçŸ¥ç±»åž‹çš„异常" << std::endl; } } void threadSendTCP::sendData(_TCPSendInfo* TCPSendInfo, int Num) { + std::string fileName = TCPSendInfo->pics_name; QDateTime ts_start = QDateTime::currentDateTime(); #if defined(__TCPServer) || defined(__TCPClient) mySocket->write(fileName.c_str()); char temp = num % 10; - mySocket->write((char*)&temp,sizeof(char)); + mySocket->write((char*)&temp, sizeof(char)); mySocket->write("\n"); mySocket->flush(); #endif #if defined(__ModebusServer) || defined(__ModebusClient) std::vector asciiVals = stringToAscii(fileName); - //mySocket->write(fileName.c_str()); - /*int temp = num % 2; + //mySocket->write(fileName.c_str()); + /*int temp = num % 2; if (temp == 1) { m_PLCDevice->write_bit_2_plc(10006, 1); @@ -116,7 +127,7 @@ void threadSendTCP::sendData(_TCPSendInfo* TCPSendInfo, int Num) { { m_PLCDevice->write_bit_2_plc(10006, 0); }*/ - + //mySocket->write((char*)&temp,sizeof(char)); //mySocket->write("\n"); //mySocket->flush(); @@ -131,12 +142,12 @@ void threadSendTCP::sendData(_TCPSendInfo* TCPSendInfo, int Num) { for (int i = 0; i < asciiVals.size(); i++) { if (i % 2 == 0) - { + { high[h] = asciiVals[i]; h++; } else - { + { low[l] = asciiVals[i]; l++; } @@ -150,17 +161,37 @@ void threadSendTCP::sendData(_TCPSendInfo* TCPSendInfo, int Num) { #endif #ifdef __ModebusClient - + for (int i = 0; i < sizeof(val) / sizeof(short); i++) { - val[i]= (static_cast(high[i]) << 8) | low[i];//组åˆé«˜ä½Žå­—节 + val[i] = (static_cast(high[i]) << 8) | low[i];//组åˆé«˜ä½Žå­—节 m_PLCTCPDevice->mapping->tab_registers[i] = val[i]; } - + + /*uint16_t da, dat, data, data_, data__; + da = m_PLCTCPDevice->mapping->tab_registers[13]; + dat = m_PLCTCPDevice->mapping->tab_registers[14]; + data = m_PLCTCPDevice->mapping->tab_registers[15]; + data_ = m_PLCTCPDevice->mapping->tab_registers[16]; + data__ = m_PLCTCPDevice->mapping->tab_registers[17]; + uint8_t da8[2], dat8[2], data8[2], data8_[2], data8__[2]; + Ui16ToUin8_P(da, da8); + Ui16ToUin8_P(dat, dat8); + Ui16ToUin8_P(data, data8); + Ui16ToUin8_P(data_, data8_); + Ui16ToUin8_P(data__, data8__); + string str[8]; + str[0] = std::to_string(data8[0]); + str[1] = std::to_string(data8[1]); + str[2] = std::to_string(data8_[0]); + str[3] = std::to_string(data8__[0]); + str[4] = std::to_string(dat8[0]); + str[7] = std::to_string(da8[1]); + cout << "tcp_send_times:" << num << endl; + cout << "data:" << str[7] << str[4] << "." << str[0] << str[1] << str[2] << "_" << str[3] << endl;*/ + #endif - //QDateTime ts_end = QDateTime::currentDateTime(); - //int time_process = ts_start.msecsTo(ts_end); - //qDebug() << "end-now_ts=" << time_process; + } //字符串转ASCII std::vector threadSendTCP::stringToAscii(const std::string& str) diff --git a/1280x800 TH/Cigarette/threadSendTCP.h b/1280x800-XH/Cigarette/threadSendTCP.h similarity index 100% rename from 1280x800 TH/Cigarette/threadSendTCP.h rename to 1280x800-XH/Cigarette/threadSendTCP.h diff --git a/1280x800 TH/Cigarette/three test.jpg b/1280x800-XH/Cigarette/three test.jpg similarity index 100% rename from 1280x800 TH/Cigarette/three test.jpg rename to 1280x800-XH/Cigarette/three test.jpg diff --git a/1280x800 TH/Cigarette/tinyxml2.cpp b/1280x800-XH/Cigarette/tinyxml2.cpp similarity index 100% rename from 1280x800 TH/Cigarette/tinyxml2.cpp rename to 1280x800-XH/Cigarette/tinyxml2.cpp diff --git a/1280x800 TH/Cigarette/tinyxml2.h b/1280x800-XH/Cigarette/tinyxml2.h similarity index 100% rename from 1280x800 TH/Cigarette/tinyxml2.h rename to 1280x800-XH/Cigarette/tinyxml2.h diff --git a/1280x800-XH/Cigarette/workthread.cpp b/1280x800-XH/Cigarette/workthread.cpp new file mode 100644 index 00000000..27805660 --- /dev/null +++ b/1280x800-XH/Cigarette/workthread.cpp @@ -0,0 +1,440 @@ +#include "workthread.h" +#include "alg_jd.h" +#include "common.h" +#include "balluffcamera.h" +#include "baslercamera.h" +#include "threadSend.h" +#include +#include "exportData.h" +#include + +extern AlgJd alg_jd[NumberOfSupportedCameras]; //检测胶点的AI算法 +extern ConfPath g_conf_path; +extern SysConf g_sys_conf; //系统é…ç½®å‚æ•° +extern DisplayLabelConf g_display_label_conf[NumberOfSupportedCameras]; + +extern int rotationAngle[NumberOfSupportedCameras]; //图片旋转角度 +extern bool isNeedRotate[NumberOfSupportedCameras]; + +extern SyncQueue >* g_save_queue; //图片ä¿å­˜é˜Ÿåˆ— +extern SyncQueue>* g_image_queue[NumberOfSupportedCameras]; //int表示一个目标æ‹äº†å‡ å¼  +#ifdef __UDPSend +extern SyncQueue<_UDPSendInfo>* UDP_Info_queue; +#endif +#ifdef __TCPSend +extern SyncQueue<_TCPSendInfo>* TCP_Info_queue; +#endif +#ifdef __ExportData +extern ExportDataThread exportDataThread; +#endif +extern PLCDevice* m_PLCDevice; +extern bool g_debug_mode; + +WorkThread::~WorkThread() +{ + stop(); + local_g_image_queue->put(std::make_pair(0, cv::Mat())); + quit(); + wait(); +} + +void WorkThread::init(SyncQueue>* image_ptr, ASyncQueue* result_ptr, int classid, int Num) +{ + local_camera_number = Num; + local_classid = classid; + local_g_image_queue = image_ptr; + local_g_result_queue = result_ptr; + b_quit = false; + frame_total = 0; +} +void WorkThread::start_work() +{ + start(HighestPriority); +} +void WorkThread::stop() +{ + b_quit = true; +} + +void WorkThread::run() +{ + try { + uint32_t result_index = 0; + while (!b_quit) { + {//ä¸è¦åˆ æŽ‰è¿™ä¸ªæ‹¬å·ï¼Œç”¨æ¥å®šä¹‰é”的作用域 + std::lock_guard locker(g_sys_conf.lock); + 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]; + +#ifdef DRAW_RECT + std::lock_guard locker2(g_display_label_conf[local_camera_number].lock); + local_DisplayLabelConf.leftButtonDownFlag = g_display_label_conf[local_camera_number].leftButtonDownFlag; + local_DisplayLabelConf.Flag[0] = g_display_label_conf[local_camera_number].Flag[0]; + local_DisplayLabelConf.Flag[1] = g_display_label_conf[local_camera_number].Flag[1]; + local_DisplayLabelConf.originalPoint = g_display_label_conf[local_camera_number].originalPoint; + local_DisplayLabelConf.processPoint = g_display_label_conf[local_camera_number].processPoint; + local_DisplayLabelConf.RectVet[0] = g_display_label_conf[local_camera_number].RectVet[0]; + local_DisplayLabelConf.RectVet[1] = g_display_label_conf[local_camera_number].RectVet[1]; +#endif + } + + QDateTime now_ts = QDateTime::currentDateTime(); + std::pair element; + local_g_image_queue->take(element); + int unit_count = element.first; + cv::Mat image = element.second; + +#ifdef __UDPSend + _UDPSendInfo UDPSendInfo; + UDPSendInfo.FrameID = info_frame; + UDPSendInfo.index = local_camera_number; +#endif + +#ifdef __TCPSend + _TCPSendInfo TCPSendInfo; +#endif + if (!image.data) + { + continue; //图åƒä¸ºç©ºï¼Œè·³è¿‡ + } + if (image.channels() == 1) + { + cv::cvtColor(image, image, CV_BGR2RGB); //ç°åº¦å›¾åƒè½¬ä¸ºå½©è‰²å›¾åƒ + } + if (local_camera_number == 1)//2å·ç›¸æœº + { + if (local_SysConf.shoot[local_camera_number] != unit_count) + { + if (!g_debug_mode) + { + if (local_SysConf.MisMatchAct == 1)//as ng + emit event_ng(local_camera_number); + else if (local_SysConf.MisMatchAct == 0)//as ok + emit event_ok(local_camera_number); + //emit display_check_total(local_camera_number, ++frame_total); + //qDebug() << local_camera_number << "#camera# " << now_ts.toString("yyyy-MM-dd_HH-mm-ss_zzz_") << "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx " << unit_count; + } + } + else + { + bool isok = false; + cv::Mat imagein, imageout; + imagein = image; + imageout = image; + std::vector Rect_points; + QDateTime ts_start = QDateTime::currentDateTime(); + alg_jd[local_camera_number].detect_Rect(imagein, imageout, Rect_points, isok); + QDateTime ts_angle = QDateTime::currentDateTime(); + int time_process = ts_start.msecsTo(ts_angle); + emit display_timecost(local_camera_number, time_process); + emit notify(local_camera_number, 0, imageout); + + if (Rect_points.empty()) { + // 没有检测到矩形，设置状æ€ä¸ºä¸åˆæ ¼ï¼Œé€šçŸ¥ç›¸å…³äº‹ä»¶ï¼Œå¹¶å¯èƒ½æ‰§è¡Œå…¶ä»–æ“作 + emit event_ng(local_camera_number); + local_g_result_queue->put(false); + + if ((local_SysConf.save == 2) || (local_SysConf.save == 1)) + { + for (int index = 0; index < unit_count; index++) + { + cv::Mat m = imagein.clone(); + QString file_name = "D:/image/" + + now_ts.toString("yyyy-MM-dd") + + "/" + QString::number(local_camera_number + 1) + + "/ng/" + QString::number(index + 1) + "/" + + now_ts.toString("yyyy-MM-dd_HH-mm-ss_zzz_") + QString::number(local_camera_number + 1) + + "#" + "_" + QString::number(index + 1) + ".jpg"; + g_save_queue->put(std::make_pair(file_name.toStdString(), m)); + + m = imageout.clone(); + file_name = "D:/image/" + + now_ts.toString("yyyy-MM-dd") + + "/" + QString::number( + local_camera_number + 1) + + "/ng_result/" + QString::number(index + 1) + "/" + + now_ts.toString("yyyy-MM-dd_HH-mm-ss_zzz_") + QString::number(local_camera_number + 1) + + "#" + "_" + QString::number(index + 1) + ".jpg"; + g_save_queue->put(std::make_pair(file_name.toStdString(), m)); + } + } + } + else { + cv::RotatedRect rRect = cv::RotatedRect(Rect_points[0], Rect_points[1], Rect_points[2]); + + /*QDateTime ts_start = QDateTime::currentDateTime(); + QDateTime ts_angle = QDateTime::currentDateTime(); + int time_process = ts_start.msecsTo(ts_angle); + emit display_timecost(local_camera_number, time_process); + emit notify(local_camera_number, 0, imageout);*/ + if (local_SysConf.ConfThreshold == 0) + { + isok = true; + } + if (isok) { + emit event_ok(local_camera_number); + local_g_result_queue->put(true); + } + else { + emit event_ng(local_camera_number); + local_g_result_queue->put(false); + + if ((local_SysConf.save == 2) || (local_SysConf.save == 1)) + { + for (int index = 0; index < unit_count; index++) + { + cv::Mat m = imagein.clone(); + QString file_name = "D:/image/" + + now_ts.toString("yyyy-MM-dd") + + "/" + QString::number(local_camera_number + 1) + + "/ng/" + QString::number(index + 1) + "/" + + now_ts.toString("yyyy-MM-dd_HH-mm-ss_zzz_") + QString::number(local_camera_number + 1) + + "#" + "_" + QString::number(index + 1) + ".jpg"; + g_save_queue->put(std::make_pair(file_name.toStdString(), m)); + + m = imageout.clone(); + file_name = "D:/image/" + + now_ts.toString("yyyy-MM-dd") + + "/" + QString::number( + local_camera_number + 1) + + "/ng_result/" + QString::number(index + 1) + "/" + + now_ts.toString("yyyy-MM-dd_HH-mm-ss_zzz_") + QString::number(local_camera_number + 1) + + "#" + "_" + QString::number(index + 1) + ".jpg"; + g_save_queue->put(std::make_pair(file_name.toStdString(), m)); + } + } + } + } + //emit display_check_total(local_camera_number, ++frame_total); + } + } + else { + if (local_SysConf.shoot[local_camera_number] == unit_count) + { + std::vector vec_in; + int w = image.cols; + int h = image.rows / unit_count; + for (int index = 0; index < unit_count; index++) { + cv::Rect temp_Rect(0, h * index, w, h); + cv::Mat temp_image = image(temp_Rect).clone(); + if (isNeedRotate[local_camera_number]) { + if (rotationAngle[local_camera_number] != (cv::ROTATE_90_COUNTERCLOCKWISE + 1)) + { + cv::rotate(temp_image, temp_image, rotationAngle[local_camera_number]); + } + } + vec_in.push_back(temp_image.clone()); + } + + std::vector vec_out; + std::vector > > vec_results; + QDateTime ts_start = QDateTime::currentDateTime(); + if (unit_count == 1) { + std::vector > results; + cv::Mat imagein, imageout; + imagein = vec_in[0]; + alg_jd[local_camera_number].detect(imagein, imageout, results); + vec_out.push_back(imageout.clone()); + vec_results.push_back(results); + } + else { + alg_jd[local_camera_number].detect_batch(vec_in, vec_out, vec_results); + } + QDateTime ts_jd = QDateTime::currentDateTime(); + int time_process = ts_start.msecsTo(ts_jd); +#ifndef SYNC_CAMERA + emit display_timecost(local_camera_number, time_process); +#endif + +#ifdef __UDPSend + UDPSendInfo.timecost = QString::number(time_process); +#endif + cv::Mat image1; + cv::Mat image2; + + QString jd_no; + for (int index = 0; index < unit_count; index++) { + jd_no += QString::number(vec_results[index].size()) + ","; + } + jd_no.chop(1); +#ifndef SYNC_CAMERA + emit display_jd_no(local_camera_number, jd_no); +#endif +#ifdef __UDPSend + UDPSendInfo.JD = jd_no; +#endif + bool IsNG = false; + int ngReason = 0; + QMap ng_reason_maps; + ng_reason_maps[0] = "1"; + ng_reason_maps[1] = "0"; + ng_reason_maps[2] = "0"; + ng_reason_maps[3] = "0"; + for (int index = 0; index < unit_count; index++) + { + if (vec_results[index].size() < local_SysConf.no[local_camera_number][index]) + { + IsNG |= true; + ngReason = 1; + } + //if (vec_results[index].size() != 1)IsNG |= true;//åå‘训练 + if (local_SysConf.ConfThreshold == 0) + { + IsNG = false; + ngReason = 0; + } + if (local_SysConf.save == 2)//三张照片分别存储 + { + cv::Mat m = vec_in[index].clone(); + QString file_name = g_conf_path.save_pics_path + "/ALL/" + + now_ts.toString("yyyy-MM-dd") + "/" + + QString::number(local_camera_number + 1) + "/" + QString::number(index + 1) + "/" + + now_ts.toString("yyyy-MM-dd_HH-mm-ss_zzz_") + QString::number(local_camera_number + 1) + + "#" + "_" + QString::number(index + 1) + ".jpg"; + std::string filename = file_name.toLocal8Bit().constData(); + g_save_queue->put(std::make_pair(filename, m)); + + QString sendName = now_ts.toString("yyyy-MM-dd_HH-mm-ss_zzz_") + QString::number(local_camera_number + 1) + + "#" + "_" + QString::number(index + 1) + ".jpg"; +#ifdef __TCPSend + TCPSendInfo.pics_name = sendName.toLocal8Bit().constData(); + TCP_Info_queue->put(TCPSendInfo); +#endif + } + } + + if (unit_count >= 2) { + image1 = vec_out[(result_index) % 2].clone(); +#ifdef DRAW_RECT + IsNG |= CheckSelectRects(image1, vec_results, (result_index) % 2, local_DisplayLabelConf, 0); + if (IsNG) { + ngReason = 2; + } +#endif + } + else { + image1 = vec_out[0].clone(); +#ifdef DRAW_RECT + IsNG |= CheckSelectRects(image1, vec_results, 0, local_DisplayLabelConf, 0); + if (IsNG) { + ngReason = 2; + } +#endif + } +#ifdef DRAW_RECT + DrawSelectRects(image1, local_DisplayLabelConf, 0); +#endif + + if (unit_count >= 3) { + image2 = vec_out[2].clone(); +#ifdef DRAW_RECT + DrawSelectRects(image2, local_DisplayLabelConf, 1); + IsNG |= CheckSelectRects(image1, vec_results, 2, local_DisplayLabelConf, 1); + if (IsNG) { + ngReason = 3; + } +#endif + } + result_index++; + + if (!IsNG) + { + if (!g_debug_mode) + { +#ifndef SYNC_CAMERA + emit event_ok(local_camera_number); +#endif + local_g_result_queue->put(true); + } + } + else + { + if (!g_debug_mode) + { +#ifndef SYNC_CAMERA + emit event_ng(local_camera_number); +#endif + local_g_result_queue->put(false); + } + + if ((local_SysConf.save == 2) || (local_SysConf.save == 1)) + { + for (int index = 0; index < unit_count; index++) + { + if (vec_results[index].size() < local_SysConf.no[local_camera_number][index]) + { + cv::Mat m = vec_in[index].clone(); + QString file_name = g_conf_path.save_pics_path + "/ng/" + + now_ts.toString("yyyy-MM-dd") + "/" + + QString::number(local_camera_number + 1) + "/" + QString::number(index + 1) + "/" + + now_ts.toString("yyyy-MM-dd_HH-mm-ss_zzz_") + QString::number(local_camera_number + 1) + + "#" + "_" + QString::number(index + 1) + "_" + ng_reason_maps[ngReason] + + ".jpg"; + g_save_queue->put(std::make_pair(file_name.toLocal8Bit().constData(), m)); + + m = vec_out[index].clone(); + file_name = g_conf_path.save_pics_path + "/ng_result/" + + now_ts.toString("yyyy-MM-dd") + "/" + + QString::number(local_camera_number + 1) + "/" + QString::number(index + 1) + "/" + + now_ts.toString("yyyy-MM-dd_HH-mm-ss_zzz_") + QString::number(local_camera_number + 1) + + "#" + "_" + QString::number(index + 1) + "_" + ng_reason_maps[ngReason] + + ".jpg"; + g_save_queue->put(std::make_pair(file_name.toLocal8Bit().constData(), m)); + } + + } + } + } +#ifndef SYNC_CAMERA + if (!g_debug_mode) + { + emit display_check_total(local_camera_number, ++frame_total); + emit display_check_total(1, ++frame_total); + //exportDataInfo.cameraTotal = frame_total; + + emit notify(local_camera_number, 0, image1); + if (unit_count >= 3) + emit notify(local_camera_number, 1, image2); + } +#endif + } +#ifndef SYNC_CAMERA + else + { + //ä¿è¯ä¸é”™ä½ + if (!g_debug_mode) + { + if (local_SysConf.MisMatchAct == 1)//as ng + emit event_ng(local_camera_number); + else if (local_SysConf.MisMatchAct == 0)//as ok + emit event_ok(local_camera_number); + emit display_check_total(local_camera_number, ++frame_total); + emit display_check_total(1, ++frame_total); + qDebug() << local_camera_number << "#camera# " << now_ts.toString("yyyy-MM-dd_HH-mm-ss_zzz_") << "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx " << unit_count; + } + } +#endif + QDateTime ts_jd = QDateTime::currentDateTime(); + int time_process = now_ts.msecsTo(ts_jd); +#ifndef SYNC_CAMERA + emit display_timecost(local_camera_number, time_process); +#endif +#ifdef __UDPSend + UDP_Info_queue->put(UDPSendInfo); +#endif + } + } + } + catch (const std::exception& e) { + // 注æ„：std::exception通常ä¸æ•èŽ·ç”±è¿è¡Œæ—¶é”™è¯¯å¼•å‘的异常 + // 但这里是为了演示catchå—的结构 + std::cerr << __FUNCTION__<<"æ•èŽ·åˆ°å¼‚常: " << e.what() << std::endl; + } + catch (...) { + // 使用çœç•¥å·ï¼ˆ...）å¯ä»¥æ•èŽ·æ‰€æœ‰ç±»åž‹çš„异常，这是一ç§é€šç”¨çš„æ•èŽ·æ–¹å¼ + std::cerr << "æ•èŽ·åˆ°æœªçŸ¥ç±»åž‹çš„异常" << std::endl; + } +} diff --git a/1280x800 TH/Cigarette/workthread.h b/1280x800-XH/Cigarette/workthread.h similarity index 92% rename from 1280x800 TH/Cigarette/workthread.h rename to 1280x800-XH/Cigarette/workthread.h index 50f901b8..ab2203fe 100644 --- a/1280x800 TH/Cigarette/workthread.h +++ b/1280x800-XH/Cigarette/workthread.h @@ -22,6 +22,11 @@ signals: void event_ng(int Num); #endif +#ifdef __TCPSend +signals: + void sendDataToCompress(QString filePath, bool Ng); +#endif + public: WorkThread(QObject* parent = 0) : QThread(parent) { diff --git a/1280x800 TH/Cigarette/x64/Release/Cigarette.vcxproj.FileListAbsolute.txt b/1280x800-XH/Cigarette/x64/Debug/Cigarette.Build.CppClean.log similarity index 100% rename from 1280x800 TH/Cigarette/x64/Release/Cigarette.vcxproj.FileListAbsolute.txt rename to 1280x800-XH/Cigarette/x64/Debug/Cigarette.Build.CppClean.log diff --git a/1280x800-XH/Cigarette/x64/Debug/Cigarette.log b/1280x800-XH/Cigarette/x64/Debug/Cigarette.log new file mode 100644 index 00000000..87019ecd --- /dev/null +++ b/1280x800-XH/Cigarette/x64/Debug/Cigarette.log @@ -0,0 +1,3 @@ + Qt/MSBuild: 3.3.1.1 +C:\Users\user\AppData\Local\QtMsBuild\qt_vars.targets(43,5): error : There's no Qt version assigned to project Cigarette.vcxproj for configuration Debug/x64. +C:\Users\user\AppData\Local\QtMsBuild\qt_vars.targets(43,5): error : Please set a Qt installation in 'Project|Properties|Configuration Properties|Qt Project Settings|Qt Installation'. diff --git a/1280x800-XH/Cigarette/x64/Debug/Cigarette.tlog/Cigarette.lastbuildstate b/1280x800-XH/Cigarette/x64/Debug/Cigarette.tlog/Cigarette.lastbuildstate new file mode 100644 index 00000000..2d39d5b3 --- /dev/null +++ b/1280x800-XH/Cigarette/x64/Debug/Cigarette.tlog/Cigarette.lastbuildstate @@ -0,0 +1,2 @@ +PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.41.34120:TargetPlatformVersion=10.0.26100.0: +Debug|x64|D:\aaa\ZB28-2相机-1280x800-å°ç›’\| diff --git a/1280x800-XH/Cigarette/x64/Debug/Cigarette.tlog/unsuccessfulbuild b/1280x800-XH/Cigarette/x64/Debug/Cigarette.tlog/unsuccessfulbuild new file mode 100644 index 00000000..e69de29b diff --git a/1280x800-XH/Cigarette/x64/Debug/Cigarette.vcxproj.FileListAbsolute.txt b/1280x800-XH/Cigarette/x64/Debug/Cigarette.vcxproj.FileListAbsolute.txt new file mode 100644 index 00000000..e69de29b diff --git a/1280x800-XH/Cigarette/x64/Debug/qmake/qtvars_x64_Debug.props b/1280x800-XH/Cigarette/x64/Debug/qmake/qtvars_x64_Debug.props new file mode 100644 index 00000000..837d24ae --- /dev/null +++ b/1280x800-XH/Cigarette/x64/Debug/qmake/qtvars_x64_Debug.props @@ -0,0 +1,59 @@ + + +_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_WIDGETS_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB +D:\CigaretteSH\240819-hangzhou-ZB416-2-1024x768-XH\Cigarette\x64\Debug\qmake\temp;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtWidgets;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtGui;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtANGLE;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtNetwork;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtCore;D:\CigaretteSH\240819-hangzhou-ZB416-2-1024x768-XH\Cigarette\x64\Debug\qmake\temp;/include;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\mkspecs\win32-msvc + +-Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus +C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Widgetsd.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Guid.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Networkd.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Cored.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\qtmaind.lib;shell32.lib +"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" + +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/Docs/Qt-5.15.0 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/include +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/lib +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/tests +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/plugins +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/imports +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/qml +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/translations + +C:/Qt/Qt5.15.0/Examples/Qt-5.15.0 +C:/Qt/Qt5.15.0/Examples/Qt-5.15.0 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/lib +win32-msvc +win32-msvc +3.1 +5.15.0 +$(Qt_INCLUDEPATH_);.\GeneratedFiles\Debug;.\GeneratedFiles + 5.15.0_msvc2019_64 + core;network;gui;widgets + bin + bin + + + DEFINES=/Project/ItemDefinitionGroup/ClCompile/PreprocessorDefinitions;INCLUDEPATH=/Project/ItemDefinitionGroup/ClCompile/AdditionalIncludeDirectories;STDCPP=/Project/ItemDefinitionGroup/ClCompile/LanguageStandard;CL_OPTIONS=/Project/ItemDefinitionGroup/ClCompile/AdditionalOptions;LIBS=/Project/ItemDefinitionGroup/Link/AdditionalDependencies;LINK_OPTIONS=/Project/ItemDefinitionGroup/Link/AdditionalOptions + + debug + 5.15.0 + 5 + 15 + 0 + + diff --git a/1280x800 TH/Cigarette/Cigarette/Debug/qmake/temp/.qmake.stash b/1280x800-XH/Cigarette/x64/Debug/qmake/temp/.qmake.stash similarity index 65% rename from 1280x800 TH/Cigarette/Cigarette/Debug/qmake/temp/.qmake.stash rename to 1280x800-XH/Cigarette/x64/Debug/qmake/temp/.qmake.stash index d5712c4a..4c71fd23 100644 --- a/1280x800 TH/Cigarette/Cigarette/Debug/qmake/temp/.qmake.stash +++ b/1280x800-XH/Cigarette/x64/Debug/qmake/temp/.qmake.stash @@ -1,6 +1,6 @@ QMAKE_CXX.QT_COMPILER_STDCXX = 199711L -QMAKE_CXX.QMAKE_MSC_VER = 1939 -QMAKE_CXX.QMAKE_MSC_FULL_VER = 193933523 +QMAKE_CXX.QMAKE_MSC_VER = 1941 +QMAKE_CXX.QMAKE_MSC_FULL_VER = 194134120 QMAKE_CXX.COMPILER_MACROS = \ QT_COMPILER_STDCXX \ QMAKE_MSC_VER \ diff --git a/1280x800-XH/Cigarette/x64/Debug/qmake/temp/B12702AD-ABFB-343A-A199-8E24837244A3.Cigarette.designtime.idx b/1280x800-XH/Cigarette/x64/Debug/qmake/temp/B12702AD-ABFB-343A-A199-8E24837244A3.Cigarette.designtime.idx new file mode 100644 index 00000000..95c39bc3 --- /dev/null +++ b/1280x800-XH/Cigarette/x64/Debug/qmake/temp/B12702AD-ABFB-343A-A199-8E24837244A3.Cigarette.designtime.idx @@ -0,0 +1 @@ +C:\Users\Administrator\AppData\Local\Temp\zupuuu02.dn3.designtime.props diff --git a/1280x800 TH/Cigarette/x64/Release/qmake/temp/moc_predefs.h.cbt b/1280x800-XH/Cigarette/x64/Debug/qmake/temp/moc_predefs.h.cbt similarity index 100% rename from 1280x800 TH/Cigarette/x64/Release/qmake/temp/moc_predefs.h.cbt rename to 1280x800-XH/Cigarette/x64/Debug/qmake/temp/moc_predefs.h.cbt diff --git a/1280x800-XH/Cigarette/x64/Debug/qmake/temp/props.txt b/1280x800-XH/Cigarette/x64/Debug/qmake/temp/props.txt new file mode 100644 index 00000000..21ebcf92 --- /dev/null +++ b/1280x800-XH/Cigarette/x64/Debug/qmake/temp/props.txt @@ -0,0 +1,25 @@ +QT_SYSROOT: +QT_INSTALL_PREFIX:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +QT_INSTALL_ARCHDATA:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +QT_INSTALL_DATA:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +QT_INSTALL_DOCS:C:/Qt/Qt5.15.0/Docs/Qt-5.15.0 +QT_INSTALL_HEADERS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/include +QT_INSTALL_LIBS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/lib +QT_INSTALL_LIBEXECS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +QT_INSTALL_BINS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +QT_INSTALL_TESTS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/tests +QT_INSTALL_PLUGINS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/plugins +QT_INSTALL_IMPORTS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/imports +QT_INSTALL_QML:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/qml +QT_INSTALL_TRANSLATIONS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/translations +QT_INSTALL_CONFIGURATION: +QT_INSTALL_EXAMPLES:C:/Qt/Qt5.15.0/Examples/Qt-5.15.0 +QT_INSTALL_DEMOS:C:/Qt/Qt5.15.0/Examples/Qt-5.15.0 +QT_HOST_PREFIX:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +QT_HOST_DATA:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +QT_HOST_BINS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +QT_HOST_LIBS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/lib +QMAKE_SPEC:win32-msvc +QMAKE_XSPEC:win32-msvc +QMAKE_VERSION:3.1 +QT_VERSION:5.15.0 diff --git a/1280x800-XH/Cigarette/x64/Debug/qmake/temp/qtvars.log b/1280x800-XH/Cigarette/x64/Debug/qmake/temp/qtvars.log new file mode 100644 index 00000000..7ec7bbce --- /dev/null +++ b/1280x800-XH/Cigarette/x64/Debug/qmake/temp/qtvars.log @@ -0,0 +1 @@ +Info: creating stash file D:\CigaretteSH\240819-hangzhou-ZB416-2-1024x768-XH\Cigarette\x64\Debug\qmake\temp\.qmake.stash diff --git a/1280x800-XH/Cigarette/x64/Debug/qmake/temp/qtvars.pro b/1280x800-XH/Cigarette/x64/Debug/qmake/temp/qtvars.pro new file mode 100644 index 00000000..ebc19c8d --- /dev/null +++ b/1280x800-XH/Cigarette/x64/Debug/qmake/temp/qtvars.pro @@ -0,0 +1,2 @@ +CONFIG += no_fixpath +QT += core network gui widgets diff --git a/1280x800 TH/Cigarette/x64/Debug/qt/qmake/qtvars.vcxproj b/1280x800-XH/Cigarette/x64/Debug/qmake/temp/qtvars.vcxproj similarity index 70% rename from 1280x800 TH/Cigarette/x64/Debug/qt/qmake/qtvars.vcxproj rename to 1280x800-XH/Cigarette/x64/Debug/qmake/temp/qtvars.vcxproj index f56d4315..a4c4e126 100644 --- a/1280x800 TH/Cigarette/x64/Debug/qt/qmake/qtvars.vcxproj +++ b/1280x800-XH/Cigarette/x64/Debug/qmake/temp/qtvars.vcxproj @@ -33,7 +33,7 @@ - D:\aaa\YB628\1280\Cigarette\x64\Debug\qt\qmake;C:\Qt5.15.2\5.15.2\msvc2019_64\include;C:\Qt5.15.2\5.15.2\msvc2019_64\include\QtNetwork;C:\Qt5.15.2\5.15.2\msvc2019_64\include\QtWidgets;C:\Qt5.15.2\5.15.2\msvc2019_64\include\QtGui;C:\Qt5.15.2\5.15.2\msvc2019_64\include\QtANGLE;C:\Qt5.15.2\5.15.2\msvc2019_64\include\QtCore;D:\aaa\YB628\1280\Cigarette\x64\Debug\qt\qmake;/include;C:\Qt5.15.2\5.15.2\msvc2019_64\mkspecs\win32-msvc;%(AdditionalIncludeDirectories) + D:\CigaretteSH\240819-hangzhou-ZB416-2-1024x768-XH\Cigarette\x64\Debug\qmake\temp;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtWidgets;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtGui;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtANGLE;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtNetwork;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtCore;D:\CigaretteSH\240819-hangzhou-ZB416-2-1024x768-XH\Cigarette\x64\Debug\qmake\temp;/include;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\mkspecs\win32-msvc;%(AdditionalIncludeDirectories) -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus %(AdditionalOptions) .\ false @@ -41,7 +41,7 @@ Sync .\ Disabled - _WINDOWS;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_NETWORK_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;%(PreprocessorDefinitions) + _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_WIDGETS_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB;%(PreprocessorDefinitions) false MultiThreadedDebugDLL true @@ -49,7 +49,7 @@ TurnOffAllWarnings - C:\Qt5.15.2\5.15.2\msvc2019_64\lib\Qt5Networkd.lib;C:\Qt5.15.2\5.15.2\msvc2019_64\lib\Qt5Widgetsd.lib;C:\Qt5.15.2\5.15.2\msvc2019_64\lib\Qt5Guid.lib;C:\Qt5.15.2\5.15.2\msvc2019_64\lib\Qt5Cored.lib;C:\Qt5.15.2\5.15.2\msvc2019_64\lib\qtmaind.lib;shell32.lib;%(AdditionalDependencies) + C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Widgetsd.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Guid.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Networkd.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Cored.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\qtmaind.lib;shell32.lib;%(AdditionalDependencies) C:\openssl\lib;C:\Utils\my_sql\mysql-5.7.25-winx64\lib;C:\Utils\postgresql\pgsql\lib;%(AdditionalLibraryDirectories) "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions) true @@ -66,14 +66,14 @@ 0 - _WINDOWS;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_NETWORK_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;_DEBUG;%(PreprocessorDefinitions) + _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_WIDGETS_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB;_DEBUG;%(PreprocessorDefinitions) Document - C:\Qt5.15.2\5.15.2\msvc2019_64\mkspecs\features\data\dummy.cpp;%(AdditionalInputs) - cl -BxC:\Qt5.15.2\5.15.2\msvc2019_64\bin\qmake.exe -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -Zi -MDd -W0 -E C:\Qt5.15.2\5.15.2\msvc2019_64\mkspecs\features\data\dummy.cpp 2>NUL >moc_predefs.h + C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\mkspecs\features\data\dummy.cpp;%(AdditionalInputs) + cl -BxC:\Qt\Qt5.15.0\5.15.0\msvc2019_64\bin\qmake.exe -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -Zi -MDd -W0 -E C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\mkspecs\features\data\dummy.cpp 2>NUL >moc_predefs.h Generate moc_predefs.h moc_predefs.h;%(Outputs) diff --git a/1280x800 TH/Cigarette/x64/Release/qmake/temp/qtvars.vcxproj.filters b/1280x800-XH/Cigarette/x64/Debug/qmake/temp/qtvars.vcxproj.filters similarity index 100% rename from 1280x800 TH/Cigarette/x64/Release/qmake/temp/qtvars.vcxproj.filters rename to 1280x800-XH/Cigarette/x64/Debug/qmake/temp/qtvars.vcxproj.filters diff --git a/1280x800-XH/Cigarette/x64/Debug/qmake/temp/qtvars_x64_Debug.props b/1280x800-XH/Cigarette/x64/Debug/qmake/temp/qtvars_x64_Debug.props new file mode 100644 index 00000000..837d24ae --- /dev/null +++ b/1280x800-XH/Cigarette/x64/Debug/qmake/temp/qtvars_x64_Debug.props @@ -0,0 +1,59 @@ + + +_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_WIDGETS_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB +D:\CigaretteSH\240819-hangzhou-ZB416-2-1024x768-XH\Cigarette\x64\Debug\qmake\temp;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtWidgets;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtGui;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtANGLE;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtNetwork;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtCore;D:\CigaretteSH\240819-hangzhou-ZB416-2-1024x768-XH\Cigarette\x64\Debug\qmake\temp;/include;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\mkspecs\win32-msvc + +-Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus +C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Widgetsd.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Guid.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Networkd.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Cored.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\qtmaind.lib;shell32.lib +"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" + +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/Docs/Qt-5.15.0 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/include +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/lib +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/tests +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/plugins +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/imports +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/qml +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/translations + +C:/Qt/Qt5.15.0/Examples/Qt-5.15.0 +C:/Qt/Qt5.15.0/Examples/Qt-5.15.0 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/lib +win32-msvc +win32-msvc +3.1 +5.15.0 +$(Qt_INCLUDEPATH_);.\GeneratedFiles\Debug;.\GeneratedFiles + 5.15.0_msvc2019_64 + core;network;gui;widgets + bin + bin + + + DEFINES=/Project/ItemDefinitionGroup/ClCompile/PreprocessorDefinitions;INCLUDEPATH=/Project/ItemDefinitionGroup/ClCompile/AdditionalIncludeDirectories;STDCPP=/Project/ItemDefinitionGroup/ClCompile/LanguageStandard;CL_OPTIONS=/Project/ItemDefinitionGroup/ClCompile/AdditionalOptions;LIBS=/Project/ItemDefinitionGroup/Link/AdditionalDependencies;LINK_OPTIONS=/Project/ItemDefinitionGroup/Link/AdditionalOptions + + debug + 5.15.0 + 5 + 15 + 0 + + diff --git a/1280x800 TH/Cigarette/x64/Debug/qt/qmake/import.qml b/1280x800-XH/Cigarette/x64/Debug/qt/qmake/import.qml similarity index 100% rename from 1280x800 TH/Cigarette/x64/Debug/qt/qmake/import.qml rename to 1280x800-XH/Cigarette/x64/Debug/qt/qmake/import.qml diff --git a/1280x800-XH/Cigarette/x64/Release/ASyncQueue.obj b/1280x800-XH/Cigarette/x64/Release/ASyncQueue.obj new file mode 100644 index 00000000..75b03e51 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/ASyncQueue.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/AlarmInfo.obj b/1280x800-XH/Cigarette/x64/Release/AlarmInfo.obj new file mode 100644 index 00000000..75a08274 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/AlarmInfo.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/CaptureThread.obj b/1280x800-XH/Cigarette/x64/Release/CaptureThread.obj new file mode 100644 index 00000000..288f75de Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/CaptureThread.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/CaptureThreadBasler.obj b/1280x800-XH/Cigarette/x64/Release/CaptureThreadBasler.obj new file mode 100644 index 00000000..c20f86ec Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/CaptureThreadBasler.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/CaptureThreadHIK.obj b/1280x800-XH/Cigarette/x64/Release/CaptureThreadHIK.obj new file mode 100644 index 00000000..408dd73d Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/CaptureThreadHIK.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/Cigarette.Build.CppClean.log b/1280x800-XH/Cigarette/x64/Release/Cigarette.Build.CppClean.log new file mode 100644 index 00000000..f9a94ac6 --- /dev/null +++ b/1280x800-XH/Cigarette/x64/Release/Cigarette.Build.CppClean.log @@ -0,0 +1,140 @@ +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\ui_cigarette.h +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\ui_dialogsetuppasswd.h +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\ui_dialogsetup.h +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\ui_plcsetup.h +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\ui_alarmdialog.h +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\ui_dialogin.h +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\ui_camera_glue.h +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\ui_change_shift.h +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\ui_output_statistic.h +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\qrc_cigarette.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\release\moc_cigarette.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\release\moc_syncworkthread.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\release\moc_threadreceive.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\release\moc_workthread.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\release\moc_alarmdialog.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\release\moc_capturethread.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\release\moc_capturethreadbasler.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\release\moc_capturethreadhik.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\release\moc_camera_glue.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\release\moc_change_shift.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\release\moc_cleanthread.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\release\moc_plcsetup.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\release\moc_db_label.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\release\moc_debugthread.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\release\moc_dialogin.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\release\moc_exportdata.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\release\moc_output_statistic.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\release\moc_logthread.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\release\moc_savethread.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\release\moc_dialogsetuppasswd.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\generatedfiles\release\moc_dialogsetup.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\vc143.pdb +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\qrc_cigarette.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\alg_jd.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\innerrect.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\threadsendtcp.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\balluffcamera.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\rotator.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\change_shift.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\plc_item.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\syncqueue.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\threadsend.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\camera_glue.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\plcsetup.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\capturethreadbasler.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\common.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\main.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\cigarette.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\capturethreadhik.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\capturethread.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\asyncqueue.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\debugthread.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\tinyxml2.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\workthread.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\cleanthread.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\logthread.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\syncworkthread.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\db_label.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\dialogsetup.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\basecamera.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\exportdata.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\baslercamera.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\output_statistic.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\alarmdialog.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\dialogsetuppasswd.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\plcdevice.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\alarminfo.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\dialogin.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\hikcamera.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\threadreceive.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\moc_plcsetup.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\moc_exportdata.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\moc_dialogin.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\moc_dialogsetuppasswd.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\moc_capturethread.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\moc_capturethreadbasler.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\moc_capturethreadhik.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\moc_db_label.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\moc_savethread.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\moc_change_shift.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\moc_logthread.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\moc_cigarette.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\moc_cleanthread.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\moc_output_statistic.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\moc_syncworkthread.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\moc_workthread.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\moc_alarmdialog.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\moc_dialogsetup.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\moc_debugthread.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\moc_threadreceive.obj +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\moc_camera_glue.obj +d:\aaa\diamabeifen\zb28-2-1280x800\x64\release\cigarette.exe +d:\aaa\diamabeifen\zb28-2-1280x800\x64\release\cigarette.pdb +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\release\moc_cigarette.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\release\moc_syncworkthread.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\release\moc_threadreceive.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\release\moc_workthread.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\release\moc_alarmdialog.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\release\moc_capturethread.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\release\moc_capturethreadbasler.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\release\moc_capturethreadhik.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\release\moc_camera_glue.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\release\moc_change_shift.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\release\moc_cleanthread.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\release\moc_plcsetup.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\release\moc_db_label.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\release\moc_debugthread.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\release\moc_dialogin.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\release\moc_exportdata.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\release\moc_output_statistic.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\release\moc_logthread.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\release\moc_savethread.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\release\moc_dialogsetuppasswd.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\release\moc_dialogsetup.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\qrc_cigarette.cpp +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\ui_cigarette.h +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\ui_dialogsetuppasswd.h +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\ui_dialogsetup.h +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\ui_plcsetup.h +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\ui_alarmdialog.h +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\ui_dialogin.h +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\ui_camera_glue.h +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\ui_change_shift.h +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\.\generatedfiles\ui_output_statistic.h +d:\aaa\diamabeifen\zb28-2-1280x800\x64\release\cigarette.ilk +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\cigarette.tlog\cigarette.write.1u.tlog +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\cigarette.tlog\cl.command.1.tlog +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\cigarette.tlog\cl.items.tlog +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\cigarette.tlog\cl.read.1.tlog +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\cigarette.tlog\cl.write.1.tlog +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\cigarette.tlog\link.command.1.tlog +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\cigarette.tlog\link.read.1.tlog +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\cigarette.tlog\link.secondary.1.tlog +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\cigarette.tlog\link.write.1.tlog +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\cigarette.tlog\moc.read.1u.tlog +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\cigarette.tlog\moc.write.1u.tlog +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\cigarette.tlog\rcc.read.1u.tlog +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\cigarette.tlog\rcc.write.1u.tlog +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\cigarette.tlog\uic.read.1u.tlog +d:\aaa\diamabeifen\zb28-2-1280x800\cigarette\x64\release\cigarette.tlog\uic.write.1u.tlog diff --git a/1280x800 TH/Cigarette/x64/Release/Cigarette.exe.recipe b/1280x800-XH/Cigarette/x64/Release/Cigarette.exe.recipe similarity index 66% rename from 1280x800 TH/Cigarette/x64/Release/Cigarette.exe.recipe rename to 1280x800-XH/Cigarette/x64/Release/Cigarette.exe.recipe index a9e4fd1c..ff7720c5 100644 --- a/1280x800 TH/Cigarette/x64/Release/Cigarette.exe.recipe +++ b/1280x800-XH/Cigarette/x64/Release/Cigarette.exe.recipe @@ -2,7 +2,7 @@ - D:\aaa\YB628\1280\x64\Release\Cigarette.exe + D:\aaa\diamabeifen\ZB28-2-1280x800\x64\Release\Cigarette.exe diff --git a/1280x800 TH/Cigarette/x64/Release/Cigarette.log b/1280x800-XH/Cigarette/x64/Release/Cigarette.log similarity index 68% rename from 1280x800 TH/Cigarette/x64/Release/Cigarette.log rename to 1280x800-XH/Cigarette/x64/Release/Cigarette.log index 573277b2..89c13e40 100644 --- a/1280x800 TH/Cigarette/x64/Release/Cigarette.log +++ b/1280x800-XH/Cigarette/x64/Release/Cigarette.log @@ -57,35 +57,36 @@ exportData.cpp hikcamera.cpp Automatically linking with mvDeviceManager.lib - Automatically linking with mvDeviceManager.lib + innerRect.cpp Logthread.cpp - main.cpp Automatically linking with mvDeviceManager.lib + Automatically linking with mvDeviceManager.lib + main.cpp output_statistic.cpp plcsetup.cpp PLCDevice.cpp plc_item.cpp + rotator.cpp Automatically linking with mvDeviceManager.lib SyncQueue.cpp SyncWorkThread.cpp threadReceive.cpp threadSend.cpp +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\dialogsetup.cpp(536,22): warning C4477: “sprintfâ€: æ ¼å¼å­—符串“%sâ€éœ€è¦ç±»åž‹â€œchar *â€çš„å‚数，但å¯å˜å‚æ•° 1 拥有了类型“std::string†+D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\cigarette.cpp(403,42): warning C4838: 从“intâ€è½¬æ¢åˆ°â€œuint16_tâ€éœ€è¦æ”¶ç¼©è½¬æ¢ threadSendTCP.cpp tinyxml2.cpp -D:\aaa\YB628\1280\Cigarette\dialogsetup.cpp(536,22): warning C4477: “sprintfâ€: æ ¼å¼å­—符串“%sâ€éœ€è¦ç±»åž‹â€œchar *â€çš„å‚数，但å¯å˜å‚æ•° 1 拥有了类型“std::string†- workthread.cpp -D:\aaa\YB628\1280\Cigarette\cigarette.cpp(399,42): warning C4838: 从“intâ€è½¬æ¢åˆ°â€œuint16_tâ€éœ€è¦æ”¶ç¼©è½¬æ¢ -D:\aaa\YB628\1280\Cigarette\cigarette.cpp(2803,22): warning C4477: “sprintfâ€: æ ¼å¼å­—符串“%sâ€éœ€è¦ç±»åž‹â€œchar *â€çš„å‚数，但å¯å˜å‚æ•° 1 拥有了类型“std::string†-D:\aaa\YB628\1280\Cigarette\cigarette.cpp(2803,22): warning C4477: “sprintfâ€: æ ¼å¼å­—符串“%sâ€éœ€è¦ç±»åž‹â€œchar *â€çš„å‚数，但å¯å˜å‚æ•° 2 拥有了类型“std::string†-D:\aaa\YB628\1280\Cigarette\cigarette.cpp(2803,22): warning C4477: “sprintfâ€: æ ¼å¼å­—符串“%sâ€éœ€è¦ç±»åž‹â€œchar *â€çš„å‚数，但å¯å˜å‚æ•° 3 拥有了类型“std::string†+D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\cigarette.cpp(2800,22): warning C4477: “sprintfâ€: æ ¼å¼å­—符串“%sâ€éœ€è¦ç±»åž‹â€œchar *â€çš„å‚数，但å¯å˜å‚æ•° 1 拥有了类型“std::string†+D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\cigarette.cpp(2800,22): warning C4477: “sprintfâ€: æ ¼å¼å­—符串“%sâ€éœ€è¦ç±»åž‹â€œchar *â€çš„å‚数，但å¯å˜å‚æ•° 2 拥有了类型“std::string†+D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\cigarette.cpp(2800,22): warning C4477: “sprintfâ€: æ ¼å¼å­—符串“%sâ€éœ€è¦ç±»åž‹â€œchar *â€çš„å‚数，但å¯å˜å‚æ•° 3 拥有了类型“std::string†Automatically linking with mvDeviceManager.lib + workthread.cpp Automatically linking with mvDeviceManager.lib Automatically linking with mvDeviceManager.lib Automatically linking with mvDeviceManager.lib Automatically linking with mvDeviceManager.lib Automatically linking with mvDeviceManager.lib -D:\aaa\YB628\1280\Cigarette\cigarette.cpp(3518,1): warning C4700: 使用了未åˆå§‹åŒ–的局部å˜é‡â€œYSXID2†-D:\aaa\YB628\1280\Cigarette\cigarette.cpp(603,1): warning C4722: “Cigarette::~Cigaretteâ€: æžæž„函数永远ä¸ä¼šè¿”回，å¯èƒ½ä¼šå‘ç”Ÿå†…å­˜æ³„æ¼ +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\cigarette.cpp(3515,1): warning C4700: 使用了未åˆå§‹åŒ–的局部å˜é‡â€œYSXID2†qrc_cigarette.cpp moc_cigarette.cpp moc_SyncWorkThread.cpp @@ -105,12 +106,11 @@ D:\aaa\YB628\1280\Cigarette\cigarette.cpp(603,1): warning C4722: “Cigarette::~ moc_exportData.cpp moc_output_statistic.cpp moc_Logthread.cpp - moc_savethread.cpp Automatically linking with mvDeviceManager.lib + moc_savethread.cpp moc_dialogsetuppasswd.cpp moc_dialogsetup.cpp Automatically linking with mvDeviceManager.lib Automatically linking with mvDeviceManager.lib Automatically linking with mvDeviceManager.lib - 正在创建库 D:\aaa\YB628\1280\x64\Release\Cigarette.lib 和对象 D:\aaa\YB628\1280\x64\Release\Cigarette.exp - Cigarette.vcxproj -> D:\aaa\YB628\1280\x64\Release\Cigarette.exe + Cigarette.vcxproj -> D:\aaa\diamabeifen\ZB28-2-1280x800\x64\Release\Cigarette.exe diff --git a/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/CL.command.1.tlog b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/CL.command.1.tlog new file mode 100644 index 00000000..553adb8d Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/CL.command.1.tlog differ diff --git a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/CL.read.1.tlog b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/CL.read.1.tlog similarity index 58% rename from 1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/CL.read.1.tlog rename to 1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/CL.read.1.tlog index 3bdb99ab..21c29b82 100644 Binary files a/1280x800 TH/Cigarette/x64/Release/Cigarette.tlog/CL.read.1.tlog and b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/CL.read.1.tlog differ diff --git a/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/CL.write.1.tlog b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/CL.write.1.tlog new file mode 100644 index 00000000..b97ac11c Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/CL.write.1.tlog differ diff --git a/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/Cigarette.lastbuildstate b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/Cigarette.lastbuildstate new file mode 100644 index 00000000..72a07296 --- /dev/null +++ b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/Cigarette.lastbuildstate @@ -0,0 +1,2 @@ +PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.41.34120:TargetPlatformVersion=10.0.26100.0: +Release|x64|D:\aaa\diamabeifen\ZB28-2-1280x800\| diff --git a/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/Cigarette.write.1u.tlog b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/Cigarette.write.1u.tlog new file mode 100644 index 00000000..34ca55f9 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/Cigarette.write.1u.tlog differ diff --git a/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/Cl.items.tlog b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/Cl.items.tlog new file mode 100644 index 00000000..11177e85 --- /dev/null +++ b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/Cl.items.tlog @@ -0,0 +1,59 @@ +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\alarmdialog.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\alarmdialog.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\AlarmInfo.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\AlarmInfo.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\alg_jd.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\alg_jd.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\ASyncQueue.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\ASyncQueue.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\balluffcamera.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\balluffcamera.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\basecamera.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\basecamera.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\baslercamera.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\baslercamera.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\camera_glue.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\camera_glue.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\CaptureThread.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\CaptureThread.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\CaptureThreadBasler.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\CaptureThreadBasler.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\CaptureThreadHIK.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\CaptureThreadHIK.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\change_shift.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\change_shift.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\cigarette.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\cigarette.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\Cleanthread.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\Cleanthread.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\common.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\common.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\db_label.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\db_label.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\debugthread.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\debugthread.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\dialogin.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\dialogin.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\dialogsetup.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\dialogsetup.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\dialogsetuppasswd.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\dialogsetuppasswd.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\exportData.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\exportData.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\hikcamera.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\hikcamera.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\innerRect.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\innerRect.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\Logthread.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\Logthread.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\main.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\main.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\output_statistic.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\output_statistic.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\plcsetup.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\plcsetup.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\PLC\PLCDevice.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\PLCDevice.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\plc_item.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\plc_item.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\rotator.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\rotator.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\SyncQueue.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\SyncQueue.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\SyncWorkThread.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\SyncWorkThread.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\threadReceive.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\threadReceive.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\threadSend.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\threadSend.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\threadSendTCP.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\threadSendTCP.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\tinyxml2.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\tinyxml2.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\workthread.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\workthread.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\GeneratedFiles\qrc_cigarette.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\qrc_cigarette.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\GeneratedFiles\Release\moc_cigarette.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\moc_cigarette.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\GeneratedFiles\Release\moc_SyncWorkThread.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\moc_SyncWorkThread.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\GeneratedFiles\Release\moc_threadReceive.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\moc_threadReceive.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\GeneratedFiles\Release\moc_workthread.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\moc_workthread.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\GeneratedFiles\Release\moc_alarmdialog.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\moc_alarmdialog.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\GeneratedFiles\Release\moc_CaptureThread.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\moc_CaptureThread.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\GeneratedFiles\Release\moc_CaptureThreadBasler.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\moc_CaptureThreadBasler.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\GeneratedFiles\Release\moc_CaptureThreadHIK.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\moc_CaptureThreadHIK.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\GeneratedFiles\Release\moc_camera_glue.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\moc_camera_glue.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\GeneratedFiles\Release\moc_change_shift.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\moc_change_shift.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\GeneratedFiles\Release\moc_Cleanthread.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\moc_Cleanthread.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\GeneratedFiles\Release\moc_plcsetup.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\moc_plcsetup.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\GeneratedFiles\Release\moc_db_label.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\moc_db_label.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\GeneratedFiles\Release\moc_debugthread.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\moc_debugthread.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\GeneratedFiles\Release\moc_dialogin.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\moc_dialogin.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\GeneratedFiles\Release\moc_exportData.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\moc_exportData.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\GeneratedFiles\Release\moc_output_statistic.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\moc_output_statistic.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\GeneratedFiles\Release\moc_Logthread.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\moc_Logthread.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\GeneratedFiles\Release\moc_savethread.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\moc_savethread.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\GeneratedFiles\Release\moc_dialogsetuppasswd.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\moc_dialogsetuppasswd.obj +D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\GeneratedFiles\Release\moc_dialogsetup.cpp;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\moc_dialogsetup.obj diff --git a/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/link.command.1.tlog b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/link.command.1.tlog new file mode 100644 index 00000000..daf6c6d7 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/link.command.1.tlog differ diff --git a/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/link.read.1.tlog b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/link.read.1.tlog new file mode 100644 index 00000000..b07e3d59 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/link.read.1.tlog differ diff --git a/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/link.secondary.1.tlog b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/link.secondary.1.tlog new file mode 100644 index 00000000..71b7bd58 --- /dev/null +++ b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/link.secondary.1.tlog @@ -0,0 +1,2 @@ +^D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\ALARMDIALOG.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\ALARMINFO.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\ALG_JD.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\ASYNCQUEUE.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\BALLUFFCAMERA.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\BASECAMERA.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\BASLERCAMERA.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\CAMERA_GLUE.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\CAPTURETHREAD.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\CAPTURETHREADBASLER.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\CAPTURETHREADHIK.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\CHANGE_SHIFT.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\CIGARETTE.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\CLEANTHREAD.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\COMMON.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\DB_LABEL.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\DEBUGTHREAD.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\DIALOGIN.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\DIALOGSETUP.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\DIALOGSETUPPASSWD.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\EXPORTDATA.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\HIKCAMERA.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\INNERRECT.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\LOGTHREAD.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\MAIN.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\MOC_ALARMDIALOG.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\MOC_CAMERA_GLUE.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\MOC_CAPTURETHREAD.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\MOC_CAPTURETHREADBASLER.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\MOC_CAPTURETHREADHIK.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\MOC_CHANGE_SHIFT.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\MOC_CIGARETTE.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\MOC_CLEANTHREAD.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\MOC_DB_LABEL.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\MOC_DEBUGTHREAD.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\MOC_DIALOGIN.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\MOC_DIALOGSETUP.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\MOC_DIALOGSETUPPASSWD.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\MOC_EXPORTDATA.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\MOC_LOGTHREAD.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\MOC_OUTPUT_STATISTIC.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\MOC_PLCSETUP.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\MOC_SAVETHREAD.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\MOC_SYNCWORKTHREAD.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\MOC_THREADRECEIVE.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\MOC_WORKTHREAD.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\OUTPUT_STATISTIC.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\PLCDEVICE.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\PLCSETUP.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\PLC_ITEM.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\QRC_CIGARETTE.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\ROTATOR.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\SYNCQUEUE.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\SYNCWORKTHREAD.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\THREADRECEIVE.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\THREADSEND.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\THREADSENDTCP.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\TINYXML2.OBJ|D:\AAA\DIAMABEIFEN\ZB28-2-1280X800\CIGARETTE\X64\RELEASE\WORKTHREAD.OBJ +D:\aaa\diamabeifen\ZB28-2-1280x800\x64\Release\Cigarette.ILK diff --git a/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/link.write.1.tlog b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/link.write.1.tlog new file mode 100644 index 00000000..8f610b8a Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/link.write.1.tlog differ diff --git a/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/moc.read.1u.tlog b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/moc.read.1u.tlog new file mode 100644 index 00000000..82192cfc Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/moc.read.1u.tlog differ diff --git a/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/moc.write.1u.tlog b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/moc.write.1u.tlog new file mode 100644 index 00000000..b664fed5 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/moc.write.1u.tlog differ diff --git a/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/rcc.read.1u.tlog b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/rcc.read.1u.tlog new file mode 100644 index 00000000..5d0c6c07 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/rcc.read.1u.tlog differ diff --git a/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/rcc.write.1u.tlog b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/rcc.write.1u.tlog new file mode 100644 index 00000000..efd6c3cc Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/rcc.write.1u.tlog differ diff --git a/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/uic.read.1u.tlog b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/uic.read.1u.tlog new file mode 100644 index 00000000..41baa532 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/uic.read.1u.tlog differ diff --git a/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/uic.write.1u.tlog b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/uic.write.1u.tlog new file mode 100644 index 00000000..dd87a4f8 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/Cigarette.tlog/uic.write.1u.tlog differ diff --git a/1280x800-XH/Cigarette/x64/Release/Cigarette.vcxproj.FileListAbsolute.txt b/1280x800-XH/Cigarette/x64/Release/Cigarette.vcxproj.FileListAbsolute.txt new file mode 100644 index 00000000..e69de29b diff --git a/1280x800-XH/Cigarette/x64/Release/Cleanthread.obj b/1280x800-XH/Cigarette/x64/Release/Cleanthread.obj new file mode 100644 index 00000000..52d1f85a Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/Cleanthread.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/Logthread.obj b/1280x800-XH/Cigarette/x64/Release/Logthread.obj new file mode 100644 index 00000000..f083b9d7 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/Logthread.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/PLCDevice.obj b/1280x800-XH/Cigarette/x64/Release/PLCDevice.obj new file mode 100644 index 00000000..022e598b Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/PLCDevice.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/SyncQueue.obj b/1280x800-XH/Cigarette/x64/Release/SyncQueue.obj new file mode 100644 index 00000000..01725cb8 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/SyncQueue.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/SyncWorkThread.obj b/1280x800-XH/Cigarette/x64/Release/SyncWorkThread.obj new file mode 100644 index 00000000..64562108 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/SyncWorkThread.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/alarmdialog.obj b/1280x800-XH/Cigarette/x64/Release/alarmdialog.obj new file mode 100644 index 00000000..7f6615cc Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/alarmdialog.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/alg_jd.obj b/1280x800-XH/Cigarette/x64/Release/alg_jd.obj new file mode 100644 index 00000000..6fd6899c Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/alg_jd.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/balluffcamera.obj b/1280x800-XH/Cigarette/x64/Release/balluffcamera.obj new file mode 100644 index 00000000..a089902d Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/balluffcamera.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/basecamera.obj b/1280x800-XH/Cigarette/x64/Release/basecamera.obj new file mode 100644 index 00000000..b3122d04 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/basecamera.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/baslercamera.obj b/1280x800-XH/Cigarette/x64/Release/baslercamera.obj new file mode 100644 index 00000000..f8beab27 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/baslercamera.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/camera_glue.obj b/1280x800-XH/Cigarette/x64/Release/camera_glue.obj new file mode 100644 index 00000000..cc5263b3 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/camera_glue.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/change_shift.obj b/1280x800-XH/Cigarette/x64/Release/change_shift.obj new file mode 100644 index 00000000..52688ed9 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/change_shift.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/cigarette.obj b/1280x800-XH/Cigarette/x64/Release/cigarette.obj new file mode 100644 index 00000000..bce0915d Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/cigarette.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/common.obj b/1280x800-XH/Cigarette/x64/Release/common.obj new file mode 100644 index 00000000..464c422f Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/common.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/db_label.obj b/1280x800-XH/Cigarette/x64/Release/db_label.obj new file mode 100644 index 00000000..2f1bb316 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/db_label.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/debugthread.obj b/1280x800-XH/Cigarette/x64/Release/debugthread.obj new file mode 100644 index 00000000..4a37ef71 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/debugthread.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/dialogin.obj b/1280x800-XH/Cigarette/x64/Release/dialogin.obj new file mode 100644 index 00000000..94cbbe57 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/dialogin.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/dialogsetup.obj b/1280x800-XH/Cigarette/x64/Release/dialogsetup.obj new file mode 100644 index 00000000..2137a425 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/dialogsetup.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/dialogsetuppasswd.obj b/1280x800-XH/Cigarette/x64/Release/dialogsetuppasswd.obj new file mode 100644 index 00000000..a66721fd Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/dialogsetuppasswd.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/exportData.obj b/1280x800-XH/Cigarette/x64/Release/exportData.obj new file mode 100644 index 00000000..63b10f90 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/exportData.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/hikcamera.obj b/1280x800-XH/Cigarette/x64/Release/hikcamera.obj new file mode 100644 index 00000000..408dbc49 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/hikcamera.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/innerRect.obj b/1280x800-XH/Cigarette/x64/Release/innerRect.obj new file mode 100644 index 00000000..62e68705 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/innerRect.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/main.obj b/1280x800-XH/Cigarette/x64/Release/main.obj new file mode 100644 index 00000000..98a7699d Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/main.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/moc_CaptureThread.obj b/1280x800-XH/Cigarette/x64/Release/moc_CaptureThread.obj new file mode 100644 index 00000000..114967f5 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/moc_CaptureThread.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/moc_CaptureThreadBasler.obj b/1280x800-XH/Cigarette/x64/Release/moc_CaptureThreadBasler.obj new file mode 100644 index 00000000..c70fdf8d Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/moc_CaptureThreadBasler.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/moc_CaptureThreadHIK.obj b/1280x800-XH/Cigarette/x64/Release/moc_CaptureThreadHIK.obj new file mode 100644 index 00000000..ca2c8979 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/moc_CaptureThreadHIK.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/moc_Cleanthread.obj b/1280x800-XH/Cigarette/x64/Release/moc_Cleanthread.obj new file mode 100644 index 00000000..51c1dce3 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/moc_Cleanthread.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/moc_Logthread.obj b/1280x800-XH/Cigarette/x64/Release/moc_Logthread.obj new file mode 100644 index 00000000..3c916f65 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/moc_Logthread.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/moc_SyncWorkThread.obj b/1280x800-XH/Cigarette/x64/Release/moc_SyncWorkThread.obj new file mode 100644 index 00000000..fbbf7979 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/moc_SyncWorkThread.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/moc_alarmdialog.obj b/1280x800-XH/Cigarette/x64/Release/moc_alarmdialog.obj new file mode 100644 index 00000000..57155373 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/moc_alarmdialog.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/moc_camera_glue.obj b/1280x800-XH/Cigarette/x64/Release/moc_camera_glue.obj new file mode 100644 index 00000000..fab2c55f Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/moc_camera_glue.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/moc_change_shift.obj b/1280x800-XH/Cigarette/x64/Release/moc_change_shift.obj new file mode 100644 index 00000000..71d0d2ab Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/moc_change_shift.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/moc_cigarette.obj b/1280x800-XH/Cigarette/x64/Release/moc_cigarette.obj new file mode 100644 index 00000000..2bba778f Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/moc_cigarette.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/moc_db_label.obj b/1280x800-XH/Cigarette/x64/Release/moc_db_label.obj new file mode 100644 index 00000000..ad6ab804 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/moc_db_label.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/moc_debugthread.obj b/1280x800-XH/Cigarette/x64/Release/moc_debugthread.obj new file mode 100644 index 00000000..af9a83d6 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/moc_debugthread.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/moc_dialogin.obj b/1280x800-XH/Cigarette/x64/Release/moc_dialogin.obj new file mode 100644 index 00000000..2cc44f84 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/moc_dialogin.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/moc_dialogsetup.obj b/1280x800-XH/Cigarette/x64/Release/moc_dialogsetup.obj new file mode 100644 index 00000000..de08abab Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/moc_dialogsetup.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/moc_dialogsetuppasswd.obj b/1280x800-XH/Cigarette/x64/Release/moc_dialogsetuppasswd.obj new file mode 100644 index 00000000..8271dcbb Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/moc_dialogsetuppasswd.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/moc_exportData.obj b/1280x800-XH/Cigarette/x64/Release/moc_exportData.obj new file mode 100644 index 00000000..5d69a420 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/moc_exportData.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/moc_output_statistic.obj b/1280x800-XH/Cigarette/x64/Release/moc_output_statistic.obj new file mode 100644 index 00000000..1ae3d0bb Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/moc_output_statistic.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/moc_plcsetup.obj b/1280x800-XH/Cigarette/x64/Release/moc_plcsetup.obj new file mode 100644 index 00000000..d44f1899 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/moc_plcsetup.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/moc_savethread.obj b/1280x800-XH/Cigarette/x64/Release/moc_savethread.obj new file mode 100644 index 00000000..b424b927 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/moc_savethread.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/moc_threadReceive.obj b/1280x800-XH/Cigarette/x64/Release/moc_threadReceive.obj new file mode 100644 index 00000000..9fda0f9d Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/moc_threadReceive.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/moc_workthread.obj b/1280x800-XH/Cigarette/x64/Release/moc_workthread.obj new file mode 100644 index 00000000..840067ae Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/moc_workthread.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/output_statistic.obj b/1280x800-XH/Cigarette/x64/Release/output_statistic.obj new file mode 100644 index 00000000..9ebb18d5 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/output_statistic.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/plc_item.obj b/1280x800-XH/Cigarette/x64/Release/plc_item.obj new file mode 100644 index 00000000..4b41589c Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/plc_item.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/plcsetup.obj b/1280x800-XH/Cigarette/x64/Release/plcsetup.obj new file mode 100644 index 00000000..aad83504 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/plcsetup.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/qmake/qtvars_x64_Release.props b/1280x800-XH/Cigarette/x64/Release/qmake/qtvars_x64_Release.props new file mode 100644 index 00000000..f45f3c10 --- /dev/null +++ b/1280x800-XH/Cigarette/x64/Release/qmake/qtvars_x64_Release.props @@ -0,0 +1,59 @@ + + +_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;NDEBUG;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB +D:\CigaretteSH\240820-ZB416TH+ZB28XH-1280x800\ZB416-2-1280x800-XH\Cigarette\x64\Release\qmake\temp;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtWidgets;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtGui;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtANGLE;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtNetwork;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtCore;D:\CigaretteSH\240820-ZB416TH+ZB28XH-1280x800\ZB416-2-1280x800-XH\Cigarette\x64\Release\qmake\temp;/include;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\mkspecs\win32-msvc + +-Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus +C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Widgets.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Gui.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Network.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Core.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\qtmain.lib;shell32.lib +"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" + +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/Docs/Qt-5.15.0 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/include +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/lib +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/tests +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/plugins +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/imports +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/qml +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/translations + +C:/Qt/Qt5.15.0/Examples/Qt-5.15.0 +C:/Qt/Qt5.15.0/Examples/Qt-5.15.0 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/lib +win32-msvc +win32-msvc +3.1 +5.15.0 +$(Qt_INCLUDEPATH_);.\GeneratedFiles\Release;.\GeneratedFiles + 5.15.0_msvc2019_64 + core;network;gui;widgets + bin + bin + + + DEFINES=/Project/ItemDefinitionGroup/ClCompile/PreprocessorDefinitions;INCLUDEPATH=/Project/ItemDefinitionGroup/ClCompile/AdditionalIncludeDirectories;STDCPP=/Project/ItemDefinitionGroup/ClCompile/LanguageStandard;CL_OPTIONS=/Project/ItemDefinitionGroup/ClCompile/AdditionalOptions;LIBS=/Project/ItemDefinitionGroup/Link/AdditionalDependencies;LINK_OPTIONS=/Project/ItemDefinitionGroup/Link/AdditionalOptions + + release + 5.15.0 + 5 + 15 + 0 + + diff --git a/1280x800-XH/Cigarette/x64/Release/qmake/temp/.qmake.stash b/1280x800-XH/Cigarette/x64/Release/qmake/temp/.qmake.stash new file mode 100644 index 00000000..bded241a --- /dev/null +++ b/1280x800-XH/Cigarette/x64/Release/qmake/temp/.qmake.stash @@ -0,0 +1,26 @@ +QMAKE_CXX.QT_COMPILER_STDCXX = 199711L +QMAKE_CXX.QMAKE_MSC_VER = 1941 +QMAKE_CXX.QMAKE_MSC_FULL_VER = 194134120 +QMAKE_CXX.COMPILER_MACROS = \ + QT_COMPILER_STDCXX \ + QMAKE_MSC_VER \ + QMAKE_MSC_FULL_VER +QMAKE_CXX.INCDIRS = \ + "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Tools\\MSVC\\14.41.34120\\include" \ + "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Tools\\MSVC\\14.41.34120\\atlmfc\\include" \ + "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\VS\\include" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\ucrt" \ + "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\VS\\UnitTest\\include" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\um" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\shared" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\winrt" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\cppwinrt" \ + "C:\\Program Files (x86)\\Windows Kits\\NETFXSDK\\4.8\\Include\\um" +QMAKE_CXX.LIBDIRS = \ + "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Tools\\MSVC\\14.41.34120\\lib\\x64" \ + "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Tools\\MSVC\\14.41.34120\\atlmfc\\lib\\x64" \ + "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\VS\\lib\\x64" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.22621.0\\ucrt\\x64" \ + "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\VS\\UnitTest\\lib" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.22621.0\\um\\x64" \ + "C:\\Program Files (x86)\\Windows Kits\\NETFXSDK\\4.8\\lib\\um\\x64" diff --git a/1280x800 TH/Cigarette/x64/Release/qt/qmake/moc_predefs.h.cbt b/1280x800-XH/Cigarette/x64/Release/qmake/temp/moc_predefs.h.cbt similarity index 100% rename from 1280x800 TH/Cigarette/x64/Release/qt/qmake/moc_predefs.h.cbt rename to 1280x800-XH/Cigarette/x64/Release/qmake/temp/moc_predefs.h.cbt diff --git a/1280x800-XH/Cigarette/x64/Release/qmake/temp/props.txt b/1280x800-XH/Cigarette/x64/Release/qmake/temp/props.txt new file mode 100644 index 00000000..21ebcf92 --- /dev/null +++ b/1280x800-XH/Cigarette/x64/Release/qmake/temp/props.txt @@ -0,0 +1,25 @@ +QT_SYSROOT: +QT_INSTALL_PREFIX:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +QT_INSTALL_ARCHDATA:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +QT_INSTALL_DATA:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +QT_INSTALL_DOCS:C:/Qt/Qt5.15.0/Docs/Qt-5.15.0 +QT_INSTALL_HEADERS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/include +QT_INSTALL_LIBS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/lib +QT_INSTALL_LIBEXECS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +QT_INSTALL_BINS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +QT_INSTALL_TESTS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/tests +QT_INSTALL_PLUGINS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/plugins +QT_INSTALL_IMPORTS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/imports +QT_INSTALL_QML:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/qml +QT_INSTALL_TRANSLATIONS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/translations +QT_INSTALL_CONFIGURATION: +QT_INSTALL_EXAMPLES:C:/Qt/Qt5.15.0/Examples/Qt-5.15.0 +QT_INSTALL_DEMOS:C:/Qt/Qt5.15.0/Examples/Qt-5.15.0 +QT_HOST_PREFIX:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +QT_HOST_DATA:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +QT_HOST_BINS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +QT_HOST_LIBS:C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/lib +QMAKE_SPEC:win32-msvc +QMAKE_XSPEC:win32-msvc +QMAKE_VERSION:3.1 +QT_VERSION:5.15.0 diff --git a/1280x800-XH/Cigarette/x64/Release/qmake/temp/qtvars.log b/1280x800-XH/Cigarette/x64/Release/qmake/temp/qtvars.log new file mode 100644 index 00000000..95fbf75d --- /dev/null +++ b/1280x800-XH/Cigarette/x64/Release/qmake/temp/qtvars.log @@ -0,0 +1 @@ +Info: creating stash file D:\CigaretteSH\240820-ZB416TH+ZB28XH-1280x800\ZB416-2-1280x800-XH\Cigarette\x64\Release\qmake\temp\.qmake.stash diff --git a/1280x800-XH/Cigarette/x64/Release/qmake/temp/qtvars.pro b/1280x800-XH/Cigarette/x64/Release/qmake/temp/qtvars.pro new file mode 100644 index 00000000..ebc19c8d --- /dev/null +++ b/1280x800-XH/Cigarette/x64/Release/qmake/temp/qtvars.pro @@ -0,0 +1,2 @@ +CONFIG += no_fixpath +QT += core network gui widgets diff --git a/1280x800-XH/Cigarette/x64/Release/qmake/temp/qtvars.vcxproj b/1280x800-XH/Cigarette/x64/Release/qmake/temp/qtvars.vcxproj new file mode 100644 index 00000000..cce635d2 --- /dev/null +++ b/1280x800-XH/Cigarette/x64/Release/qmake/temp/qtvars.vcxproj @@ -0,0 +1,87 @@ + + + + + Release + x64 + + + + + qtvars + Qt4VSv1.0 + + + + v142 + .\ + false + NotSet + Application + qtvars + + + + + + + + + .\ + qtvars + true + false + + + + D:\CigaretteSH\240820-ZB416TH+ZB28XH-1280x800\ZB416-2-1280x800-XH\Cigarette\x64\Release\qmake\temp;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtWidgets;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtGui;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtANGLE;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtNetwork;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtCore;D:\CigaretteSH\240820-ZB416TH+ZB28XH-1280x800\ZB416-2-1280x800-XH\Cigarette\x64\Release\qmake\temp;/include;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\mkspecs\win32-msvc;%(AdditionalIncludeDirectories) + -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus %(AdditionalOptions) + .\ + false + None + Sync + .\ + MaxSpeed + _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;NDEBUG;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB;%(PreprocessorDefinitions) + false + + MultiThreadedDLL + true + true + TurnOffAllWarnings + + + C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Widgets.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Gui.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Network.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Core.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\qtmain.lib;shell32.lib;%(AdditionalDependencies) + C:\openssl\lib;C:\Utils\my_sql\mysql-5.7.25-winx64\lib;C:\Utils\postgresql\pgsql\lib;%(AdditionalLibraryDirectories) + "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions) + true + false + true + false + true + $(OutDir)\qtvars.exe + true + Windows + true + + + Unsigned + None + 0 + + + _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;NDEBUG;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB;%(PreprocessorDefinitions) + + + + + Document + C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\mkspecs\features\data\dummy.cpp;%(AdditionalInputs) + cl -BxC:\Qt\Qt5.15.0\5.15.0\msvc2019_64\bin\qmake.exe -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -O2 -MD -W0 -E C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\mkspecs\features\data\dummy.cpp 2>NUL >moc_predefs.h + Generate moc_predefs.h + moc_predefs.h;%(Outputs) + + + + + \ No newline at end of file diff --git a/1280x800 TH/Cigarette/x64/Release/qt/qmake/qtvars.vcxproj.filters b/1280x800-XH/Cigarette/x64/Release/qmake/temp/qtvars.vcxproj.filters similarity index 100% rename from 1280x800 TH/Cigarette/x64/Release/qt/qmake/qtvars.vcxproj.filters rename to 1280x800-XH/Cigarette/x64/Release/qmake/temp/qtvars.vcxproj.filters diff --git a/1280x800-XH/Cigarette/x64/Release/qmake/temp/qtvars_x64_Release.props b/1280x800-XH/Cigarette/x64/Release/qmake/temp/qtvars_x64_Release.props new file mode 100644 index 00000000..f45f3c10 --- /dev/null +++ b/1280x800-XH/Cigarette/x64/Release/qmake/temp/qtvars_x64_Release.props @@ -0,0 +1,59 @@ + + +_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;NDEBUG;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB +D:\CigaretteSH\240820-ZB416TH+ZB28XH-1280x800\ZB416-2-1280x800-XH\Cigarette\x64\Release\qmake\temp;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtWidgets;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtGui;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtANGLE;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtNetwork;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\include\QtCore;D:\CigaretteSH\240820-ZB416TH+ZB28XH-1280x800\ZB416-2-1280x800-XH\Cigarette\x64\Release\qmake\temp;/include;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\mkspecs\win32-msvc + +-Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus +C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Widgets.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Gui.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Network.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\Qt5Core.lib;C:\Qt\Qt5.15.0\5.15.0\msvc2019_64\lib\qtmain.lib;shell32.lib +"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" + +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/Docs/Qt-5.15.0 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/include +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/lib +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/tests +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/plugins +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/imports +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/qml +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/translations + +C:/Qt/Qt5.15.0/Examples/Qt-5.15.0 +C:/Qt/Qt5.15.0/Examples/Qt-5.15.0 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64 +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/bin +C:/Qt/Qt5.15.0/5.15.0/msvc2019_64/lib +win32-msvc +win32-msvc +3.1 +5.15.0 +$(Qt_INCLUDEPATH_);.\GeneratedFiles\Release;.\GeneratedFiles + 5.15.0_msvc2019_64 + core;network;gui;widgets + bin + bin + + + DEFINES=/Project/ItemDefinitionGroup/ClCompile/PreprocessorDefinitions;INCLUDEPATH=/Project/ItemDefinitionGroup/ClCompile/AdditionalIncludeDirectories;STDCPP=/Project/ItemDefinitionGroup/ClCompile/LanguageStandard;CL_OPTIONS=/Project/ItemDefinitionGroup/ClCompile/AdditionalOptions;LIBS=/Project/ItemDefinitionGroup/Link/AdditionalDependencies;LINK_OPTIONS=/Project/ItemDefinitionGroup/Link/AdditionalOptions + + release + 5.15.0 + 5 + 15 + 0 + + diff --git a/1280x800 TH/Cigarette/x64/Release/qrc_cigarette.obj b/1280x800-XH/Cigarette/x64/Release/qrc_cigarette.obj similarity index 98% rename from 1280x800 TH/Cigarette/x64/Release/qrc_cigarette.obj rename to 1280x800-XH/Cigarette/x64/Release/qrc_cigarette.obj index 480e1257..4212d062 100644 Binary files a/1280x800 TH/Cigarette/x64/Release/qrc_cigarette.obj and b/1280x800-XH/Cigarette/x64/Release/qrc_cigarette.obj differ diff --git a/1280x800 TH/Cigarette/x64/Release/qt/qmake/.qmake.stash b/1280x800-XH/Cigarette/x64/Release/qt/qmake/.qmake.stash similarity index 70% rename from 1280x800 TH/Cigarette/x64/Release/qt/qmake/.qmake.stash rename to 1280x800-XH/Cigarette/x64/Release/qt/qmake/.qmake.stash index f5ecade5..b1af7f8a 100644 --- a/1280x800 TH/Cigarette/x64/Release/qt/qmake/.qmake.stash +++ b/1280x800-XH/Cigarette/x64/Release/qt/qmake/.qmake.stash @@ -9,18 +9,18 @@ QMAKE_CXX.INCDIRS = \ "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Tools\\MSVC\\14.41.34120\\include" \ "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Tools\\MSVC\\14.41.34120\\atlmfc\\include" \ "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Auxiliary\\VS\\include" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\ucrt" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.26100.0\\ucrt" \ "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Auxiliary\\VS\\UnitTest\\include" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\um" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\shared" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\winrt" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.22621.0\\cppwinrt" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.26100.0\\um" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.26100.0\\shared" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.26100.0\\winrt" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.26100.0\\cppwinrt" \ "C:\\Program Files (x86)\\Windows Kits\\NETFXSDK\\4.8.1\\Include\\um" QMAKE_CXX.LIBDIRS = \ "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Tools\\MSVC\\14.41.34120\\lib\\x64" \ "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Tools\\MSVC\\14.41.34120\\atlmfc\\lib\\x64" \ "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Auxiliary\\VS\\lib\\x64" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.22621.0\\ucrt\\x64" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.26100.0\\ucrt\\x64" \ "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Auxiliary\\VS\\UnitTest\\lib" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.22621.0\\um\\x64" \ + "C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.26100.0\\um\\x64" \ "C:\\Program Files (x86)\\Windows Kits\\NETFXSDK\\4.8.1\\lib\\um\\x64" diff --git a/1280x800 TH/Cigarette/x64/Release/qt/qmake/import.qml b/1280x800-XH/Cigarette/x64/Release/qt/qmake/import.qml similarity index 100% rename from 1280x800 TH/Cigarette/x64/Release/qt/qmake/import.qml rename to 1280x800-XH/Cigarette/x64/Release/qt/qmake/import.qml diff --git a/1280x800-XH/Cigarette/x64/Release/qt/qmake/moc_predefs.h.cbt b/1280x800-XH/Cigarette/x64/Release/qt/qmake/moc_predefs.h.cbt new file mode 100644 index 00000000..693383cc --- /dev/null +++ b/1280x800-XH/Cigarette/x64/Release/qt/qmake/moc_predefs.h.cbt @@ -0,0 +1 @@ +This is a dummy file needed to create ./moc_predefs.h diff --git a/1280x800 TH/Cigarette/x64/Debug/qt/qmake/props.txt b/1280x800-XH/Cigarette/x64/Release/qt/qmake/props.txt similarity index 100% rename from 1280x800 TH/Cigarette/x64/Debug/qt/qmake/props.txt rename to 1280x800-XH/Cigarette/x64/Release/qt/qmake/props.txt diff --git a/1280x800 TH/Cigarette/x64/Debug/qt/qmake/qtvars.log b/1280x800-XH/Cigarette/x64/Release/qt/qmake/qtvars.log similarity index 73% rename from 1280x800 TH/Cigarette/x64/Debug/qt/qmake/qtvars.log rename to 1280x800-XH/Cigarette/x64/Release/qt/qmake/qtvars.log index ed6c8cda..2e036057 100644 --- a/1280x800 TH/Cigarette/x64/Debug/qt/qmake/qtvars.log +++ b/1280x800-XH/Cigarette/x64/Release/qt/qmake/qtvars.log @@ -1,2 +1,3 @@ Cannot read D:/mqtt/qtmqtt-5.15.2/build/Desktop_Qt_5_15_2_MSVC2019_64bit-Debug/mkspecs/modules-inst/qt_lib_mqtt.pri: No such file or directory Cannot read D:/mqtt/qtmqtt-5.15.2/build/Desktop_Qt_5_15_2_MSVC2019_64bit-Debug/mkspecs/modules-inst/qt_lib_mqtt_private.pri: No such file or directory +Info: creating stash file D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\qt\qmake\.qmake.stash diff --git a/1280x800 TH/Cigarette/x64/Release/qt/qmake/qtvars.pro b/1280x800-XH/Cigarette/x64/Release/qt/qmake/qtvars.pro similarity index 100% rename from 1280x800 TH/Cigarette/x64/Release/qt/qmake/qtvars.pro rename to 1280x800-XH/Cigarette/x64/Release/qt/qmake/qtvars.pro diff --git a/1280x800 TH/Cigarette/x64/Release/qt/qmake/qtvars.vcxproj b/1280x800-XH/Cigarette/x64/Release/qt/qmake/qtvars.vcxproj similarity index 91% rename from 1280x800 TH/Cigarette/x64/Release/qt/qmake/qtvars.vcxproj rename to 1280x800-XH/Cigarette/x64/Release/qt/qmake/qtvars.vcxproj index f5410d0a..4788acf5 100644 --- a/1280x800 TH/Cigarette/x64/Release/qt/qmake/qtvars.vcxproj +++ b/1280x800-XH/Cigarette/x64/Release/qt/qmake/qtvars.vcxproj @@ -34,7 +34,7 @@ - D:\aaa\YB628\1280\Cigarette\x64\Release\qt\qmake;C:\Qt5.15.2\5.15.2\msvc2019_64\include;C:\Qt5.15.2\5.15.2\msvc2019_64\include\QtNetwork;C:\Qt5.15.2\5.15.2\msvc2019_64\include\QtWidgets;C:\Qt5.15.2\5.15.2\msvc2019_64\include\QtGui;C:\Qt5.15.2\5.15.2\msvc2019_64\include\QtANGLE;C:\Qt5.15.2\5.15.2\msvc2019_64\include\QtCore;D:\aaa\YB628\1280\Cigarette\x64\Release\qt\qmake;/include;C:\Qt5.15.2\5.15.2\msvc2019_64\mkspecs\win32-msvc;%(AdditionalIncludeDirectories) + D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\qt\qmake;C:\Qt5.15.2\5.15.2\msvc2019_64\include;C:\Qt5.15.2\5.15.2\msvc2019_64\include\QtNetwork;C:\Qt5.15.2\5.15.2\msvc2019_64\include\QtWidgets;C:\Qt5.15.2\5.15.2\msvc2019_64\include\QtGui;C:\Qt5.15.2\5.15.2\msvc2019_64\include\QtANGLE;C:\Qt5.15.2\5.15.2\msvc2019_64\include\QtCore;D:\aaa\diamabeifen\ZB28-2-1280x800\Cigarette\x64\Release\qt\qmake;/include;C:\Qt5.15.2\5.15.2\msvc2019_64\mkspecs\win32-msvc;%(AdditionalIncludeDirectories) -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus %(AdditionalOptions) .\ false diff --git a/1280x800-XH/Cigarette/x64/Release/qt/qmake/qtvars.vcxproj.filters b/1280x800-XH/Cigarette/x64/Release/qt/qmake/qtvars.vcxproj.filters new file mode 100644 index 00000000..a5e61b76 --- /dev/null +++ b/1280x800-XH/Cigarette/x64/Release/qt/qmake/qtvars.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11} + cpp;c;cxx;moc;h;def;odl;idl;res; + + + + + Generated Files + + + \ No newline at end of file diff --git a/1280x800 TH/Cigarette/x64/Release/qt/qmake/qtvars.xml b/1280x800-XH/Cigarette/x64/Release/qt/qmake/qtvars.xml similarity index 100% rename from 1280x800 TH/Cigarette/x64/Release/qt/qmake/qtvars.xml rename to 1280x800-XH/Cigarette/x64/Release/qt/qmake/qtvars.xml diff --git a/1280x800-XH/Cigarette/x64/Release/qt/qt_work.log b/1280x800-XH/Cigarette/x64/Release/qt/qt_work.log new file mode 100644 index 00000000..d33c0cf1 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/qt/qt_work.log differ diff --git a/1280x800 TH/Cigarette/x64/Release/qt/qtvars.xml b/1280x800-XH/Cigarette/x64/Release/qt/qtvars.xml similarity index 100% rename from 1280x800 TH/Cigarette/x64/Release/qt/qtvars.xml rename to 1280x800-XH/Cigarette/x64/Release/qt/qtvars.xml diff --git a/1280x800-XH/Cigarette/x64/Release/qt_work.log b/1280x800-XH/Cigarette/x64/Release/qt_work.log new file mode 100644 index 00000000..ac2bb1dd Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/qt_work.log differ diff --git a/1280x800-XH/Cigarette/x64/Release/rotator.obj b/1280x800-XH/Cigarette/x64/Release/rotator.obj new file mode 100644 index 00000000..21e58797 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/rotator.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/threadReceive.obj b/1280x800-XH/Cigarette/x64/Release/threadReceive.obj new file mode 100644 index 00000000..a0ffc67f Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/threadReceive.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/threadSend.obj b/1280x800-XH/Cigarette/x64/Release/threadSend.obj new file mode 100644 index 00000000..0aaba176 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/threadSend.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/threadSendTCP.obj b/1280x800-XH/Cigarette/x64/Release/threadSendTCP.obj new file mode 100644 index 00000000..04ec3889 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/threadSendTCP.obj differ diff --git a/1280x800-XH/Cigarette/x64/Release/tinyxml2.obj b/1280x800-XH/Cigarette/x64/Release/tinyxml2.obj new file mode 100644 index 00000000..510ec6b6 Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/tinyxml2.obj differ diff --git a/1280x800 TH/Cigarette/x64/Release/vc143.pdb b/1280x800-XH/Cigarette/x64/Release/vc143.pdb similarity index 58% rename from 1280x800 TH/Cigarette/x64/Release/vc143.pdb rename to 1280x800-XH/Cigarette/x64/Release/vc143.pdb index 16f787ca..0b979958 100644 Binary files a/1280x800 TH/Cigarette/x64/Release/vc143.pdb and b/1280x800-XH/Cigarette/x64/Release/vc143.pdb differ diff --git a/1280x800-XH/Cigarette/x64/Release/workthread.obj b/1280x800-XH/Cigarette/x64/Release/workthread.obj new file mode 100644 index 00000000..2f78dc7e Binary files /dev/null and b/1280x800-XH/Cigarette/x64/Release/workthread.obj differ