|
|
@@ -3,10 +3,12 @@ using MvCameraControl;
|
|
|
using MvvmScaffoldFrame48.DLL.CameraTools;
|
|
|
using MvvmScaffoldFrame48.DLL.ConfigTools;
|
|
|
using MvvmScaffoldFrame48.Model.ResultModel;
|
|
|
+using MvvmScaffoldFrame48.Model.StorageModel.ProcessingConfig;
|
|
|
using MvvmScaffoldFrame48.Model.StorageModel.SystemConfig;
|
|
|
using System;
|
|
|
using System.Collections.Concurrent;
|
|
|
using System.Collections.Generic;
|
|
|
+using System.IO;
|
|
|
using System.Linq;
|
|
|
using System.Threading;
|
|
|
using System.Threading.Tasks;
|
|
|
@@ -206,12 +208,13 @@ namespace MvvmScaffoldFrame48.DLL.ThreadManager
|
|
|
{
|
|
|
case "ProcessingAlgorithm":
|
|
|
config.ProcessingAlgorithmName = "ProcessingAlgorithm";
|
|
|
- config.AlgorithmParameters = new Dictionary<string, object>
|
|
|
+ config.AlgorithmParameters = XMLReadWrite.SerializeToString(new ProcessingAlgorithmConfigModel()
|
|
|
{
|
|
|
- { "Threshold", 150.0 },
|
|
|
- { "MinArea", 200 },
|
|
|
- { "EnableFiltering", true }
|
|
|
- };
|
|
|
+ Threshold = 0.5,
|
|
|
+ MinArea = 100,
|
|
|
+ EnableFiltering = true,
|
|
|
+ FilterType = "FilterType"
|
|
|
+ });
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
@@ -221,7 +224,7 @@ namespace MvvmScaffoldFrame48.DLL.ThreadManager
|
|
|
/// <summary>
|
|
|
/// 动态更新相机算法参数
|
|
|
/// </summary>
|
|
|
- public void UpdateCameraParameters(int cameraId, Dictionary<string, object> newParameters)
|
|
|
+ public void UpdateCameraParameters(int cameraId, object newParameters)
|
|
|
{
|
|
|
if (cameraId >= 0 && cameraId < _cameraGroups.Count())
|
|
|
{
|
|
|
@@ -242,11 +245,19 @@ namespace MvvmScaffoldFrame48.DLL.ThreadManager
|
|
|
private void LoadCameraConfigurations()
|
|
|
{
|
|
|
// 这里可以从XML文件、数据库或其他配置源加载配置
|
|
|
- _cameraConfigurations = new List<CameraProcessConfigModel>()
|
|
|
+ if (File.Exists("TestConfig.xml"))
|
|
|
{
|
|
|
- CreateCameraConfiguration(0, "ProcessingAlgorithm"),
|
|
|
- };
|
|
|
- XMLReadWrite.SerializeToXml(_cameraConfigurations, "TestConfig.xml");
|
|
|
+ _cameraConfigurations = XMLReadWrite.DeserializeFromXml<List<CameraProcessConfigModel>>("TestConfig.xml");
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ _cameraConfigurations = new List<CameraProcessConfigModel>()
|
|
|
+ {
|
|
|
+ CreateCameraConfiguration(0, "ProcessingAlgorithm"),
|
|
|
+ };
|
|
|
+ }
|
|
|
+
|
|
|
+ //XMLReadWrite.SerializeToXml(_cameraConfigurations, "TestConfig.xml");
|
|
|
}
|
|
|
|
|
|
/// <summary>
|