Merge pull request #4 from OwlHowlinMornSky/test

修正转移GUI后的问题
OwlHowlinMornSky · Dec 15, 2023 · a5ac8ff · a5ac8ff
2 parents 88f1460 + 85469ac
commit a5ac8ff
Show file tree

Hide file tree

Showing 31 changed files with 1,775 additions and 517 deletions.
diff --git a/CoreDll/Core.vcxproj b/CoreDll/Core.vcxproj
@@ -46,9 +46,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(SolutionDir)WinFormsGUI\bin\$(Platform)\$(Configuration)\net6.0-windows10.0.22000.0\</OutDir>
+    <TargetName>$(SolutionName)-Core</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(SolutionDir)WinFormsGUI\bin\$(Platform)\$(Configuration)\net6.0-windows10.0.22000.0\</OutDir>
+    <TargetName>$(SolutionName)-Core</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -65,7 +67,13 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(OHMS_LIB_DIR)\opencv\4.8.0\build\x64\vc16\lib;$(OHMS_LIB_DIR)\ohms\wgc\v1.2\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>windowsapp.lib;dwmapi.lib;opencv_world480d.lib;wgc-capture-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <Version>
+      </Version>
     </Link>
+    <Manifest>
+      <AssemblyIdentity>
+      </AssemblyIdentity>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -86,7 +94,13 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(OHMS_LIB_DIR)\opencv\4.8.0\build\x64\vc16\lib;$(OHMS_LIB_DIR)\ohms\wgc\v1.2\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>windowsapp.lib;dwmapi.lib;opencv_world480.lib;wgc-capture.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <Version>
+      </Version>
     </Link>
+    <Manifest>
+      <AssemblyIdentity>
+      </AssemblyIdentity>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="Clock.cpp" />
@@ -102,8 +116,12 @@
     <ClInclude Include="framework.h" />
     <ClInclude Include="Helper.h" />
     <ClInclude Include="IHelper.h" />
+    <ClInclude Include="resource.h" />
     <ClInclude Include="Time.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="CoreDll.rc" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/CoreDll/Core.vcxproj.filters b/CoreDll/Core.vcxproj.filters
@@ -53,5 +53,13 @@
     <ClInclude Include="API.h">
       <Filter>头文件</Filter>
     </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="CoreDll.rc">
+      <Filter>资源文件</Filter>
+    </ResourceCompile>
   </ItemGroup>
 </Project>
diff --git a/CoreDll/CoreDll.rc b/CoreDll/CoreDll.rc
diff --git a/CoreDll/Helper.cpp b/CoreDll/Helper.cpp
@@ -136,9 +136,8 @@ void Helper::mainwork() {
 	// 允许关闭屏幕和睡眠
 	SetThreadExecutionState(ES_CONTINUOUS);
 
-#ifdef OHMS_DDOA_SHOW
-	cv::destroyAllWindows(); // show mat的时候才需要销毁窗口
-#endif // OHMS_DDOA_SHOW
+	cv::destroyAllWindows(); // 销毁show窗口
+
 	m_running = false; // 清除标记
 	msgPush(HelperReturnMessage::BtnToStart); // 让主按钮变成start
 	msgPush(HelperReturnMessage::Stopped); // 通知已完全停止
@@ -151,4 +150,11 @@ void Helper::msgPush(unsigned long hrm) {
 	return;
 }
 
+void Helper::msgPush(unsigned long hrm, unsigned long code) {
+	std::lock_guard lg(m_hrm_mutex); // 上锁
+	m_hrm.push(hrm); // 压入
+	m_hrm.push(code); // 压入
+	return;
+}
+
 } // namespace ohms
diff --git a/CoreDll/Helper.h b/CoreDll/Helper.h
@@ -27,9 +27,11 @@ class Helper final :
 	*/
 	virtual void regForNew(bool forNew) override;
 
-
 	virtual void regForMouse(bool forMouse) override;
 
+	virtual void regShowCV(bool show) override;
+
+public:
 	/**
 	 * @brief 尝试开始任务。任务将运行在子线程，如果已经运行则无效。
 	 * @return true为成功
@@ -61,6 +63,7 @@ class Helper final :
 	 * @param hrm 消息
 	*/
 	void msgPush(unsigned long hrm);
+	void msgPush(unsigned long hrm, unsigned long code);
 
 // 子任务，返回 false 表示无法继续 （在 Helper.subworks.cpp 实现）
 protected:

diff --git a/CoreDll/Helper.steps.cpp b/CoreDll/Helper.steps.cpp
@@ -7,6 +7,10 @@ namespace {
 constexpr int g_nMatchMethod = cv::TM_SQDIFF_NORMED; // opencv match时用的方法。
 constexpr bool g_useColorDiff = false; // check函数用的选项。
 
+bool g_showcv = false;
+bool g_showopened = false;
+std::mutex g_showcvMutex;
+
 /**
  * @brief 比较两个mat，按超过阈值的像素数。
  * @param matSample 输入
@@ -108,21 +112,33 @@ inline bool find(const cv::Mat& matSample, const cv::Mat& matTemplate, cv::Rect&
 	bool res = check(matSample(r), matTemplate, thres);
 	if (res) rect = r; // 保存到rect
 
-#ifdef OHMS_DDOA_SHOW
-	matSample.copyTo(srcImage); // 复制原始输入
-	cv::rectangle(srcImage, oldRect, cv::Scalar(255, 0, 0), 2, 8, 0); // 蓝线画寻找范围框
-	cv::rectangle(srcImage, r, res ? cv::Scalar(0, 255, 0) : cv::Scalar(0, 0, 255), 2, 8, 0); // 画最佳匹配框（满足阈值为绿，否则为红）
-	cv::resize(srcImage, srcImage, srcImage.size() / 2, 0.0, 0.0, cv::InterpolationFlags::INTER_LINEAR); // 缩小到一般
-	cv::imshow("show", srcImage); // show
-#endif // OHMS_DDOA_SHOW
+	std::lock_guard lg(g_showcvMutex);
+	if (g_showcv) {
+		matSample.copyTo(srcImage); // 复制原始输入
+		cv::rectangle(srcImage, oldRect, cv::Scalar(255, 0, 0), 2, 8, 0); // 蓝线画寻找范围框
+		cv::rectangle(srcImage, r, res ? cv::Scalar(0, 255, 0) : cv::Scalar(0, 0, 255), 2, 8, 0); // 画最佳匹配框（满足阈值为绿，否则为红）
+		cv::resize(srcImage, srcImage, srcImage.size() / 2, 0.0, 0.0, cv::InterpolationFlags::INTER_LINEAR); // 缩小到一般
+		g_showopened = true;
+		cv::imshow("show", srcImage); // show
+	}
+#ifndef _DEBUG
+	else if (g_showopened) { // Release 时自动关闭 OpenCV 窗口
+		cv::destroyAllWindows();
+	}
+#endif
 	return res;
 }
 
 }
 
 namespace ohms {
 
-bool ohms::Helper::step_copyMat(cv::Mat& target) {
+void Helper::regShowCV(bool show) {
+	std::lock_guard lg(g_showcvMutex);
+	g_showcv = show;
+}
+
+bool Helper::step_copyMat(cv::Mat& target) {
 	if (r_capture->isRefreshed()) { // refresh过再处理画面才有意义
 		if (r_capture->copyMatTo(target, true)) { // 要求转换为BGR
 			if (target.size().width != 960 || target.size().height != 540) { // 确保大小满足要求
@@ -272,8 +288,7 @@ bool Helper::step_keepClickingUntil(
 }
 
 void Helper::step_subtaskError(unsigned long type) {
-	msgPush(HelperReturnMessage::Log_ErrorInTask);
-	msgPush(type);
+	msgPush(HelperReturnMessage::Log_ErrorInTask, type);
 	throw 0; // 要求停止
 }
 

diff --git a/CoreDll/Helper.subworks.cpp b/CoreDll/Helper.subworks.cpp
@@ -14,8 +14,7 @@ bool Helper::subwork_challenge() {
 begin_point:
 	try {
 		++i;
-		msgPush(HelperReturnMessage::Log_Challenge_BeginNum);
-		msgPush(i);
+		msgPush(HelperReturnMessage::Log_Challenge_BeginNum, i);
 
 		// 查找目标。
 		if (!step_waitFor(forNew ? mat_ChaGameNew : mat_ChaGameLast, rect_ChaGame, rect, seconds(15.0f)))

diff --git a/CoreDll/IHelper.h b/CoreDll/IHelper.h
@@ -37,6 +37,7 @@ enum CORE_API HelperReturnMessage : unsigned long {
 	Log_Task_Stop,
 	Log_Task_Exception,
 
+	// 以下都是 Log_ErrorInTask 指定参数
 	Log_Task_Challenge_NoNew,
 	Log_Task_Challenge_NoLast,
 	Log_Task_Challenge_NoEnter,
@@ -67,6 +68,9 @@ class CORE_API IHelper {
 
 	virtual void regForMouse(bool forMouse) = 0;
 
+	virtual void regShowCV(bool show) = 0;
+
+public:
 	/**
 	 * @brief 尝试开始任务。任务将运行在子线程，如果已经运行则无效。
 	 * @return true为成功

diff --git a/CoreDll/resource.h b/CoreDll/resource.h
@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by CoreDll.rc
+
+// 新对象的下一组默认值
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/CoreWrapper/CoreWrapper.rc b/CoreWrapper/CoreWrapper.rc
diff --git a/CoreWrapper/HelperWrapper.cpp b/CoreWrapper/HelperWrapper.cpp
@@ -14,12 +14,18 @@ HelperWrapper::~HelperWrapper() {
 	m_helper = nullptr;
 }
 
-void HelperWrapper::regForNew(bool forNew) {
-	m_helper->regForNew(forNew);
-}
-
-void HelperWrapper::regForMouse(bool forMouse) {
-	m_helper->regForMouse(forMouse);
+void HelperWrapper::set(HelprSet type, System::Int32 val) {
+	switch (type) {
+	case HelprSet::Cha_New:
+		m_helper->regForNew(val);
+		break;
+	case HelprSet::Ctrl_MouseInput:
+		m_helper->regForMouse(val);
+		break;
+	case HelprSet::ShowCV:
+		m_helper->regShowCV(val);
+		break;
+	}
 }
 
 bool HelperWrapper::start() {
@@ -44,4 +50,9 @@ System::UInt32 HelperWrapper::codePop() {
 	return res;
 }
 
+void HelperWrapper::drop() {
+	ohms::IHelper::drop();
+	m_helper = nullptr;
+}
+
 }
diff --git a/CoreWrapper/HelperWrapper.h b/CoreWrapper/HelperWrapper.h
@@ -2,6 +2,7 @@
 
 #include <IHelper.h>
 #include "ReturnMessages.h"
+#include "SettingsEnum.h"
 
 namespace Wrapper {
 
@@ -11,8 +12,7 @@ public ref class HelperWrapper {
 	~HelperWrapper();
 
 public:
-	void regForNew(bool forNew);
-	void regForMouse(bool forMouse);
+	void set(HelprSet type, System::Int32 val);
 
 	bool start();
 	void askForStop();
@@ -21,6 +21,8 @@ public ref class HelperWrapper {
 	ReturnMessage msgPop();
 	System::UInt32 codePop();
 
+	void drop();
+
 private:
 	ohms::IHelper* m_helper;
 };

diff --git a/CoreWrapper/SettingsEnum.h b/CoreWrapper/SettingsEnum.h
@@ -0,0 +1,15 @@
+#pragma once
+
+namespace Wrapper {
+
+public enum class HelprSet {
+	None = 0,
+
+	Cha_New,
+
+	Ctrl_MouseInput,
+
+	ShowCV, 
+};
+
+}
diff --git a/CoreWrapper/Wrapper.vcxproj b/CoreWrapper/Wrapper.vcxproj
@@ -50,9 +50,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(SolutionDir)WinFormsGUI\bin\$(Platform)\$(Configuration)\net6.0-windows10.0.22000.0\</OutDir>
+    <TargetName>$(SolutionName)-Core-Wrapper</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(SolutionDir)WinFormsGUI\bin\$(Platform)\$(Configuration)\net6.0-windows10.0.22000.0\</OutDir>
+    <TargetName>$(SolutionName)-Core-Wrapper</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -63,9 +65,15 @@
       <LanguageStandard_C>stdc17</LanguageStandard_C>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CoreDll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(SolutionName)-Core.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutputPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <Version>
+      </Version>
     </Link>
+    <Manifest>
+      <AssemblyIdentity>
+      </AssemblyIdentity>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -76,17 +84,28 @@
       <LanguageStandard_C>stdc17</LanguageStandard_C>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CoreDll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(SolutionName)-Core.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutputPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <Version>
+      </Version>
     </Link>
+    <Manifest>
+      <AssemblyIdentity>
+      </AssemblyIdentity>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="HelperWrapper.h" />
+    <ClInclude Include="resource.h" />
     <ClInclude Include="ReturnMessages.h" />
+    <ClInclude Include="SettingsEnum.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="HelperWrapper.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="CoreWrapper.rc" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/CoreWrapper/Wrapper.vcxproj.filters b/CoreWrapper/Wrapper.vcxproj.filters
@@ -21,10 +21,21 @@
     <ClInclude Include="ReturnMessages.h">
       <Filter>头文件</Filter>
     </ClInclude>
+    <ClInclude Include="SettingsEnum.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="HelperWrapper.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="CoreWrapper.rc">
+      <Filter>资源文件</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>
diff --git a/CoreWrapper/resource.h b/CoreWrapper/resource.h
@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by CoreWrapper.rc
+
+// 新对象的下一组默认值
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif