|
@@ -3,6 +3,7 @@ using MvCameraControl;
|
|
|
using MvvmScaffoldFrame48.DLL.CameraTools;
|
|
using MvvmScaffoldFrame48.DLL.CameraTools;
|
|
|
using MvvmScaffoldFrame48.DLL.ConfigTools;
|
|
using MvvmScaffoldFrame48.DLL.ConfigTools;
|
|
|
using MvvmScaffoldFrame48.Model.ResultModel;
|
|
using MvvmScaffoldFrame48.Model.ResultModel;
|
|
|
|
|
+using MvvmScaffoldFrame48.Model.StorageModel.ImageAlgorithm.ShuLI;
|
|
|
using MvvmScaffoldFrame48.Model.StorageModel.ProcessingConfig;
|
|
using MvvmScaffoldFrame48.Model.StorageModel.ProcessingConfig;
|
|
|
using MvvmScaffoldFrame48.Model.StorageModel.SystemConfig;
|
|
using MvvmScaffoldFrame48.Model.StorageModel.SystemConfig;
|
|
|
using System;
|
|
using System;
|
|
@@ -220,6 +221,10 @@ namespace MvvmScaffoldFrame48.DLL.ThreadManager
|
|
|
FilterType = "FilterType"
|
|
FilterType = "FilterType"
|
|
|
});
|
|
});
|
|
|
break;
|
|
break;
|
|
|
|
|
+ case "ProcessingAlgorithm_CCDShuLi":
|
|
|
|
|
+ config.ProcessingAlgorithmName = "ProcessingAlgorithm_CCDShuLi";
|
|
|
|
|
+ config.AlgorithmParameters = XMLReadWrite.SerializeToString(new ShuLiConfigClassModel());
|
|
|
|
|
+ break;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return config;
|
|
return config;
|
|
@@ -259,9 +264,10 @@ namespace MvvmScaffoldFrame48.DLL.ThreadManager
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
|
{
|
|
{
|
|
|
|
|
+ //测试用代码,此处应为创建空配置,后续由图形界面控制新建配置
|
|
|
_cameraConfigurations = new List<CameraProcessConfigModel>()
|
|
_cameraConfigurations = new List<CameraProcessConfigModel>()
|
|
|
{
|
|
{
|
|
|
- CreateCameraConfiguration(0, "ProcessingAlgorithm"),
|
|
|
|
|
|
|
+ CreateCameraConfiguration(0, "ProcessingAlgorithm_CCDShuLi"),
|
|
|
};
|
|
};
|
|
|
}
|
|
}
|
|
|
//SaveCameraConfigurations();
|
|
//SaveCameraConfigurations();
|