From dc18021539bdf4ee176ec9d9b88eb7d9ad581600 Mon Sep 17 00:00:00 2001
From: C3204 <zhengyabo@lanpucloud.cn>
Date: 星期五, 17 四月 2026 17:00:35 +0800
Subject: [PATCH] 新增心跳等常规信号配置&&修改相机轴读取配置等
---
LB_SmartVision/Forms/Pages/MotionControlPage/MotionControlForm.cs | 145 ------------------------------------------------
1 files changed, 0 insertions(+), 145 deletions(-)
diff --git a/LB_SmartVision/Forms/Pages/MotionControlPage/MotionControlForm.cs b/LB_SmartVision/Forms/Pages/MotionControlPage/MotionControlForm.cs
index ce15a19..6f017a5 100644
--- a/LB_SmartVision/Forms/Pages/MotionControlPage/MotionControlForm.cs
+++ b/LB_SmartVision/Forms/Pages/MotionControlPage/MotionControlForm.cs
@@ -54,151 +54,6 @@
}
}
Dictionary<string, RecordMotionControlData> concurrentDictionary = new Dictionary<string, RecordMotionControlData>();
- private void CameraForm_FormClosing(object sender, FormClosingEventArgs e)
- {
- if (camera == null)
- return;
-
- camera.StopGrabbing();
-
- camera.StartGrabbing();
- if (GlobalVar.dicMotionControlData.Keys.Contains(GlobalVar.strProductName))
- {
- concurrentDictionary = GlobalVar.dicMotionControlData[GlobalVar.strProductName];
- double xAxisDetectLocationValue, xAxisOriginalLocationValue, yAxisDetectLocationValue, yAxisOriginalLocationValue, zAxisDetectLocationValue, zAxisOriginalLocationValue, wAxisDetectLocationValue, wAxisOriginalLocationValue, pulseMotionSpeedValue, angularVelocityValue;
- xAxisDetectLocationValue = double.Parse(this.textBoxXDetectLocation.Text);
- xAxisOriginalLocationValue = double.Parse(this.textBoxXOriginalLocation.Text);
- yAxisDetectLocationValue = double.Parse(this.textBoxYDetectLocation.Text);
- yAxisOriginalLocationValue = double.Parse(this.textBoxYOriginalLocation.Text);
- zAxisDetectLocationValue = double.Parse(this.textBoxZDetectLocation.Text);
- zAxisOriginalLocationValue = double.Parse(this.textBoxZOriginalLocation.Text);
- wAxisDetectLocationValue = double.Parse(this.textBoxWDetectLocation.Text);
- wAxisOriginalLocationValue = double.Parse(this.textBoxWOriginalLocation.Text);
- pulseMotionSpeedValue = double.Parse(this.textBoxPointSpeed.Text);
- angularVelocityValue = double.Parse(this.textBoxPointSpeed.Text);
- if (concurrentDictionary.Keys.Contains(cameraSN))
- {
- RecordMotionControlData recordMotionControlData = new RecordMotionControlData
- {
- ProductName = GlobalVar.strProductName,
- CommunicatorsName = communicatorsName,
- CameraSN = cameraSN,
- XAxisAddress = this.textBoxXVarAddress.Text,
- XAxisDetectLocationValue = xAxisDetectLocationValue,
- XAxisOriginalLocationValue = xAxisOriginalLocationValue,
- YAxisAddress = this.textBoxYVarAddress.Text,
- YAxisDetectLocationValue = yAxisDetectLocationValue,
- YAxisOriginalLocationValue = yAxisOriginalLocationValue,
- ZAxisAddress = this.textBoxZVarAddress.Text,
- ZAxisDetectLocationValue = zAxisDetectLocationValue,
- ZAxisOriginalLocationValue = zAxisOriginalLocationValue,
- WAxisAddress = this.textBoxWVarAddress.Text,
- WAxisDetectLocationValue = wAxisDetectLocationValue,
- WAxisOriginalLocationValue = wAxisOriginalLocationValue,
- PulseMotionSpeedAddress = this.textBoxPulseMotionSpeedAddress.Text,
- PulseMotionSpeedValue = pulseMotionSpeedValue,
- AngularVelocityAddress = this.textBoxAngularVelocityAddress.Text,
- AngularVelocityValue = angularVelocityValue
- };
- concurrentDictionary.TryAdd(cameraSN, recordMotionControlData);
- }
- else
- {
- RecordMotionControlData recordMotionControlData = new RecordMotionControlData
- {
- ProductName = GlobalVar.strProductName,
- CommunicatorsName = communicatorsName,
- CameraSN = cameraSN,
- XAxisAddress = this.textBoxXVarAddress.Text,
- XAxisDetectLocationValue = xAxisDetectLocationValue,
- XAxisOriginalLocationValue = xAxisOriginalLocationValue,
- YAxisAddress = this.textBoxYVarAddress.Text,
- YAxisDetectLocationValue = yAxisDetectLocationValue,
- YAxisOriginalLocationValue = yAxisOriginalLocationValue,
- ZAxisAddress = this.textBoxZVarAddress.Text,
- ZAxisDetectLocationValue = zAxisDetectLocationValue,
- ZAxisOriginalLocationValue = zAxisOriginalLocationValue,
- WAxisAddress = this.textBoxWVarAddress.Text,
- WAxisDetectLocationValue = wAxisDetectLocationValue,
- WAxisOriginalLocationValue = wAxisOriginalLocationValue,
- PulseMotionSpeedAddress = this.textBoxPulseMotionSpeedAddress.Text,
- PulseMotionSpeedValue = pulseMotionSpeedValue,
- AngularVelocityAddress = this.textBoxAngularVelocityAddress.Text,
- AngularVelocityValue = angularVelocityValue
- };
- concurrentDictionary.TryAdd(cameraSN, recordMotionControlData);
- }
- }
- else
- {
- double xAxisDetectLocationValue, xAxisOriginalLocationValue, yAxisDetectLocationValue, yAxisOriginalLocationValue, zAxisDetectLocationValue, zAxisOriginalLocationValue, wAxisDetectLocationValue, wAxisOriginalLocationValue, pulseMotionSpeedValue, angularVelocityValue;
- xAxisDetectLocationValue = double.Parse(this.textBoxXDetectLocation.Text);
- xAxisOriginalLocationValue = double.Parse(this.textBoxXOriginalLocation.Text);
- yAxisDetectLocationValue = double.Parse(this.textBoxYDetectLocation.Text);
- yAxisOriginalLocationValue = double.Parse(this.textBoxYOriginalLocation.Text);
- zAxisDetectLocationValue = double.Parse(this.textBoxZDetectLocation.Text);
- zAxisOriginalLocationValue = double.Parse(this.textBoxZOriginalLocation.Text);
- wAxisDetectLocationValue = double.Parse(this.textBoxWDetectLocation.Text);
- wAxisOriginalLocationValue = double.Parse(this.textBoxWOriginalLocation.Text);
- pulseMotionSpeedValue = double.Parse(this.textBoxPointSpeed.Text);
- angularVelocityValue = double.Parse(this.textBoxPointSpeed.Text);
- if (concurrentDictionary.Keys.Contains(cameraSN))
- {
- RecordMotionControlData recordMotionControlData = new RecordMotionControlData
- {
- ProductName = GlobalVar.strProductName,
- CommunicatorsName = communicatorsName,
- CameraSN = cameraSN,
- XAxisAddress = this.textBoxXVarAddress.Text,
- XAxisDetectLocationValue = xAxisDetectLocationValue,
- XAxisOriginalLocationValue = xAxisOriginalLocationValue,
- YAxisAddress = this.textBoxYVarAddress.Text,
- YAxisDetectLocationValue = yAxisDetectLocationValue,
- YAxisOriginalLocationValue = yAxisOriginalLocationValue,
- ZAxisAddress = this.textBoxZVarAddress.Text,
- ZAxisDetectLocationValue = zAxisDetectLocationValue,
- ZAxisOriginalLocationValue = zAxisOriginalLocationValue,
- WAxisAddress = this.textBoxWVarAddress.Text,
- WAxisDetectLocationValue = wAxisDetectLocationValue,
- WAxisOriginalLocationValue = wAxisOriginalLocationValue,
- PulseMotionSpeedAddress = this.textBoxPulseMotionSpeedAddress.Text,
- PulseMotionSpeedValue = pulseMotionSpeedValue,
- AngularVelocityAddress = this.textBoxAngularVelocityAddress.Text,
- AngularVelocityValue = angularVelocityValue
- };
- concurrentDictionary.TryAdd(cameraSN, recordMotionControlData);
- }
- else
- {
- RecordMotionControlData recordMotionControlData = new RecordMotionControlData
- {
- ProductName = GlobalVar.strProductName,
- CommunicatorsName = communicatorsName,
- CameraSN = cameraSN,
- XAxisAddress = this.textBoxXVarAddress.Text,
- XAxisDetectLocationValue = xAxisDetectLocationValue,
- XAxisOriginalLocationValue = xAxisOriginalLocationValue,
- YAxisAddress = this.textBoxYVarAddress.Text,
- YAxisDetectLocationValue = yAxisDetectLocationValue,
- YAxisOriginalLocationValue = yAxisOriginalLocationValue,
- ZAxisAddress = this.textBoxZVarAddress.Text,
- ZAxisDetectLocationValue = zAxisDetectLocationValue,
- ZAxisOriginalLocationValue = zAxisOriginalLocationValue,
- WAxisAddress = this.textBoxWVarAddress.Text,
- WAxisDetectLocationValue = wAxisDetectLocationValue,
- WAxisOriginalLocationValue = wAxisOriginalLocationValue,
- PulseMotionSpeedAddress = this.textBoxPulseMotionSpeedAddress.Text,
- PulseMotionSpeedValue = pulseMotionSpeedValue,
- AngularVelocityAddress = this.textBoxAngularVelocityAddress.Text,
- AngularVelocityValue = angularVelocityValue
- };
- concurrentDictionary.TryAdd(cameraSN, recordMotionControlData);
- }
- }
- GlobalVar.dicMotionControlData.TryAdd(GlobalVar.strProductName, concurrentDictionary);
- ConfigManager<Dictionary<string, Dictionary<string, RecordMotionControlData>>>.SaveConfig<Dictionary<string, Dictionary<string, RecordMotionControlData>>>(GlobalVar.dicMotionControlData, GlobalVar.allMotionControlDataPath);
- Unsubscribe();
- }
public void Unsubscribe()
{
--
Gitblit v1.9.3