|
|
@@ -2499,7 +2499,7 @@ namespace TeamAAS_VP.Services
|
|
|
{
|
|
|
if (i == 1)
|
|
|
{
|
|
|
- bool isSucceed = false;
|
|
|
+ //bool isSucceed = false;
|
|
|
//isSucceed = await _lightManagerService.SetGlobalChannelBrightnessAsync(0, procedure.Photo1Light1);
|
|
|
//if (!isSucceed)
|
|
|
//{
|
|
|
@@ -2520,11 +2520,13 @@ namespace TeamAAS_VP.Services
|
|
|
{
|
|
|
SendTaskMessage($"相机曝光设置失败！", MessageLevel.Error);
|
|
|
}
|
|
|
+ SendTaskMessage($"设置曝光:{procedure.ExposureTime}",MessageLevel.Info);
|
|
|
succed = camera.SetGain(procedure.Gain);
|
|
|
if (!succed)
|
|
|
{
|
|
|
SendTaskMessage($"相机增益设置失败！", MessageLevel.Error);
|
|
|
}
|
|
|
+ SendTaskMessage($"设置增益:{procedure.Gain}", MessageLevel.Info);
|
|
|
image = camera.Grab();
|
|
|
//isSucceed = await _lightManagerService.TurnOffGlobalChannelAsync(0);
|
|
|
//if (!isSucceed)
|
|
|
@@ -2545,7 +2547,7 @@ namespace TeamAAS_VP.Services
|
|
|
}
|
|
|
else if (i == 2)
|
|
|
{
|
|
|
- bool isSucceed = false;
|
|
|
+ //bool isSucceed = false;
|
|
|
//isSucceed = await _lightManagerService.SetGlobalChannelBrightnessAsync(0, procedure.Photo2Light1);
|
|
|
//if (!isSucceed)
|
|
|
//{
|
|
|
@@ -2561,35 +2563,35 @@ namespace TeamAAS_VP.Services
|
|
|
//{
|
|
|
// LogHelper.WriteLogInfo($"设置光源通道3亮度{procedure.Photo2Light3}失败！");
|
|
|
//}
|
|
|
- SendTaskMessage($"开始设置相机曝光！", MessageLevel.Info);
|
|
|
bool succed = camera.SetExposureTime(procedure.ExposureTime2);
|
|
|
if (!succed)
|
|
|
{
|
|
|
SendTaskMessage($"相机曝光设置失败！", MessageLevel.Error);
|
|
|
}
|
|
|
- SendTaskMessage($"开始设置相机增益！", MessageLevel.Info);
|
|
|
+ SendTaskMessage($"设置曝光2:{procedure.ExposureTime2}", MessageLevel.Info);
|
|
|
succed = camera.SetGain(procedure.Gain2);
|
|
|
if (!succed)
|
|
|
{
|
|
|
SendTaskMessage($"相机增益设置失败！", MessageLevel.Error);
|
|
|
}
|
|
|
+ SendTaskMessage($"设置增益2:{procedure.Gain2}", MessageLevel.Info);
|
|
|
image2 = camera.Grab();
|
|
|
|
|
|
- isSucceed = await _lightManagerService.TurnOffGlobalChannelAsync(0);
|
|
|
- if (!isSucceed)
|
|
|
- {
|
|
|
- LogHelper.WriteLogInfo($"设置光源通道0关闭失败！");
|
|
|
- }
|
|
|
- isSucceed = await _lightManagerService.TurnOffGlobalChannelAsync(1);
|
|
|
- if (!isSucceed)
|
|
|
- {
|
|
|
- LogHelper.WriteLogInfo($"设置光源通道1关闭失败！");
|
|
|
- }
|
|
|
- isSucceed = await _lightManagerService.TurnOffGlobalChannelAsync(2);
|
|
|
- if (!isSucceed)
|
|
|
- {
|
|
|
- LogHelper.WriteLogInfo($"设置光源通道2关闭失败！");
|
|
|
- }
|
|
|
+ //isSucceed = await _lightManagerService.TurnOffGlobalChannelAsync(0);
|
|
|
+ //if (!isSucceed)
|
|
|
+ //{
|
|
|
+ // LogHelper.WriteLogInfo($"设置光源通道0关闭失败！");
|
|
|
+ //}
|
|
|
+ //isSucceed = await _lightManagerService.TurnOffGlobalChannelAsync(1);
|
|
|
+ //if (!isSucceed)
|
|
|
+ //{
|
|
|
+ // LogHelper.WriteLogInfo($"设置光源通道1关闭失败！");
|
|
|
+ //}
|
|
|
+ //isSucceed = await _lightManagerService.TurnOffGlobalChannelAsync(2);
|
|
|
+ //if (!isSucceed)
|
|
|
+ //{
|
|
|
+ // LogHelper.WriteLogInfo($"设置光源通道2关闭失败！");
|
|
|
+ //}
|
|
|
}
|
|
|
|
|
|
}
|
|
|
@@ -2638,34 +2640,55 @@ namespace TeamAAS_VP.Services
|
|
|
{
|
|
|
// 1. 采集图像
|
|
|
var camera = _cameraService.GetCamera(procedure.CameraId);
|
|
|
- if (TempExposureTime != procedure.ExposureTime)
|
|
|
+ //if (TempExposureTime != procedure.ExposureTime)
|
|
|
+ //{
|
|
|
+ // bool succed1 = camera.SetExposureTime(procedure.ExposureTime);
|
|
|
+ // if (!succed1)
|
|
|
+ // {
|
|
|
+ // SendTaskMessage($"相机曝光设置失败！", MessageLevel.Error);
|
|
|
+ // }
|
|
|
+ // else
|
|
|
+ // {
|
|
|
+ // TempExposureTime = procedure.ExposureTime;
|
|
|
+ // }
|
|
|
+ //}
|
|
|
+ bool succed1 = camera.SetExposureTime(procedure.ExposureTime);
|
|
|
+ if (!succed1)
|
|
|
{
|
|
|
- bool succed1 = camera.SetExposureTime(procedure.ExposureTime);
|
|
|
- if (!succed1)
|
|
|
- {
|
|
|
- SendTaskMessage($"相机曝光设置失败！", MessageLevel.Error);
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- TempExposureTime = procedure.ExposureTime;
|
|
|
- }
|
|
|
+ SendTaskMessage($"相机曝光设置失败！", MessageLevel.Error);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ TempExposureTime = procedure.ExposureTime;
|
|
|
+ SendTaskMessage($"设置相机曝光:{procedure.ExposureTime}", MessageLevel.Info);
|
|
|
}
|
|
|
//else
|
|
|
//{
|
|
|
// SendTaskMessage($"相机曝光重复", MessageLevel.Error);
|
|
|
//}
|
|
|
- if (TempGain != procedure.Gain)
|
|
|
+ //if (TempGain != procedure.Gain)
|
|
|
+ //{
|
|
|
+ // bool succed2 = camera.SetGain(procedure.Gain);
|
|
|
+ // if (!succed2)
|
|
|
+ // {
|
|
|
+ // SendTaskMessage($"相机增益设置失败！", MessageLevel.Error);
|
|
|
+ // }
|
|
|
+ // else
|
|
|
+ // {
|
|
|
+ // TempGain = procedure.Gain;
|
|
|
+ // }
|
|
|
+ //}
|
|
|
+ bool succed2 = camera.SetGain(procedure.Gain);
|
|
|
+ if (!succed2)
|
|
|
{
|
|
|
- bool succed2 = camera.SetGain(procedure.Gain);
|
|
|
- if (!succed2)
|
|
|
- {
|
|
|
- SendTaskMessage($"相机增益设置失败！", MessageLevel.Error);
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- TempGain = procedure.Gain;
|
|
|
- }
|
|
|
+ SendTaskMessage($"相机增益设置失败！", MessageLevel.Error);
|
|
|
}
|
|
|
+ else
|
|
|
+ {
|
|
|
+ TempGain = procedure.Gain;
|
|
|
+ SendTaskMessage($"设置相机增益:{TempGain}",MessageLevel.Info);
|
|
|
+ }
|
|
|
+
|
|
|
//else
|
|
|
//{
|
|
|
// SendTaskMessage($"相机增益重复", MessageLevel.Error);
|
