|
|
@@ -21,14 +21,12 @@ namespace CCDCount.Forms
|
|
|
List<MainThreadClass> LoadLsMainThread = null;
|
|
|
List<MainThreadClass> NowLoadLsMianThread = new List<MainThreadClass>();
|
|
|
MainThreadClass LoadMainThread = null;
|
|
|
- (CameraConfig CameraConfigValue, ShuLiConfigClass ShuLiConfigValue) NowLoadConfig = (null, null);
|
|
|
+ SaveConfigModel NowLoadConfig = null;
|
|
|
//从外部加载的信息
|
|
|
- List<(CameraConfig CameraConfigValue, ShuLiConfigClass ShuLiConfigValue)> LoadConfigs =
|
|
|
- new List<(CameraConfig CameraConfigValue, ShuLiConfigClass ShuLiConfigValue)>();
|
|
|
+ List<SaveConfigModel> LoadConfigs = new List<SaveConfigModel>();
|
|
|
|
|
|
//将要保存的信息
|
|
|
- List<(CameraConfig CameraConfigValue, ShuLiConfigClass ShuLiConfigValue)> Configs =
|
|
|
- new List<(CameraConfig CameraConfigValue, ShuLiConfigClass ShuLiConfigValue)>();
|
|
|
+ List<SaveConfigModel> Configs = new List<SaveConfigModel>();
|
|
|
|
|
|
CameraClass CameraClass = new CameraClass();
|
|
|
|
|
|
@@ -56,8 +54,11 @@ namespace CCDCount.Forms
|
|
|
ShuLiConfigClass shuLiConfig = null;
|
|
|
for (int i = 0; i < LoadLsMainThread.Count; i++)
|
|
|
{
|
|
|
- LoadLsMainThread[i].GetConfigValue(out cameraConfig, out shuLiConfig);
|
|
|
- LoadConfigs.Add((cameraConfig,shuLiConfig));
|
|
|
+ LoadLsMainThread[i].GetAllConfigValue(out cameraConfig, out shuLiConfig);
|
|
|
+ LoadConfigs.Add(new SaveConfigModel() {
|
|
|
+ CameraConfig = cameraConfig,
|
|
|
+ ShuLiConfigClass = shuLiConfig
|
|
|
+ });
|
|
|
}
|
|
|
InitIdentifyCountCobBox();
|
|
|
InitCameraCobox();
|
|
|
@@ -102,24 +103,22 @@ namespace CCDCount.Forms
|
|
|
//创建一个按钮,加载与此相机绑定的配置
|
|
|
if (i <= LoadConfigs.Count())
|
|
|
{
|
|
|
- string camername = LoadConfigs[i - 1].CameraConfigValue.CameraName;
|
|
|
+ string camername = LoadConfigs[i - 1].CameraConfig.CameraName;
|
|
|
if(camername == string.Empty) camername = "数粒" + i;
|
|
|
ButtonText = camername;
|
|
|
//重新的CameraNo排序
|
|
|
- LoadConfigs[i-1].CameraConfigValue.CamerNo = i-1;
|
|
|
+ LoadConfigs[i-1].CameraConfig.CamerNo = i-1;
|
|
|
//将从外加载的配置文件复制进当前加载的配置文件
|
|
|
Configs.Add(LoadConfigs[i-1]);
|
|
|
}
|
|
|
//没有与此相机绑定的配置文件,创建一个配置实例
|
|
|
else
|
|
|
{
|
|
|
- Configs.Add((
|
|
|
- new CameraConfig()
|
|
|
- {
|
|
|
- CamerNo = i-1
|
|
|
- },
|
|
|
- new ShuLiConfigClass()
|
|
|
- ));
|
|
|
+ Configs.Add(new SaveConfigModel()
|
|
|
+ {
|
|
|
+ CameraConfig = new CameraConfig() { CamerNo = i - 1 },
|
|
|
+ ShuLiConfigClass = new ShuLiConfigClass()
|
|
|
+ });
|
|
|
}
|
|
|
if (i <= LoadLsMainThread.Count())
|
|
|
{
|
|
|
@@ -128,8 +127,8 @@ namespace CCDCount.Forms
|
|
|
else
|
|
|
{
|
|
|
NowLoadLsMianThread.Add(new MainThreadClass(
|
|
|
- Configs[i - 1].ShuLiConfigValue,
|
|
|
- Configs[i - 1].CameraConfigValue
|
|
|
+ Configs[i - 1].ShuLiConfigClass,
|
|
|
+ Configs[i - 1].CameraConfig
|
|
|
));
|
|
|
}
|
|
|
Button button = new Button()
|
|
|
@@ -167,30 +166,30 @@ namespace CCDCount.Forms
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private void LoadConfigToForm((CameraConfig,ShuLiConfigClass) LoadConfig)
|
|
|
+ private void LoadConfigToForm(SaveConfigModel LoadConfig)
|
|
|
{
|
|
|
if(LoadMainThread != null)
|
|
|
{
|
|
|
//判断是否已经绑定相机
|
|
|
- if(LoadMainThread.ThisCameraSN!=string.Empty)
|
|
|
+ if(LoadMainThread.cameraConfig.CameraSNNum!=string.Empty)
|
|
|
{
|
|
|
//相机选择框尝试选择绑定的相机
|
|
|
- CameraConbox.SelectedItem = LoadMainThread.ThisCameraDevice + "_" + LoadMainThread.ThisCameraSN;
|
|
|
+ CameraConbox.SelectedItem = LoadMainThread.cameraConfig.DeviceName + "_" + LoadMainThread.cameraConfig.CameraSNNum;
|
|
|
}
|
|
|
if(CameraConbox.SelectedItem.ToString()!=string.Empty&&CameraConbox.SelectedItem.ToString()!= "请选择相机")
|
|
|
{
|
|
|
- ExposureTimeTbx.Text = NowLoadConfig.CameraConfigValue.ExposureTimeValue.ToString();
|
|
|
- AcquistionLineRateLabTbx.Text = NowLoadConfig.CameraConfigValue.AcquistionLineRateValue.ToString();
|
|
|
- ImageWidthTbx.Text = NowLoadConfig.CameraConfigValue.Width.ToString();
|
|
|
- ImageHeightTbx.Text = NowLoadConfig.CameraConfigValue.Height.ToString();
|
|
|
- CamUserNameTbx.Text = NowLoadConfig.CameraConfigValue.CameraName;
|
|
|
- CamOffsetXTbx.Text = NowLoadConfig.CameraConfigValue.OffsetX.ToString();
|
|
|
+ ExposureTimeTbx.Text = NowLoadConfig.CameraConfig.ExposureTimeValue.ToString();
|
|
|
+ AcquistionLineRateLabTbx.Text = NowLoadConfig.CameraConfig.AcquistionLineRateValue.ToString();
|
|
|
+ ImageWidthTbx.Text = NowLoadConfig.CameraConfig.Width.ToString();
|
|
|
+ ImageHeightTbx.Text = NowLoadConfig.CameraConfig.Height.ToString();
|
|
|
+ CamUserNameTbx.Text = NowLoadConfig.CameraConfig.CameraName;
|
|
|
+ CamOffsetXTbx.Text = NowLoadConfig.CameraConfig.OffsetX.ToString();
|
|
|
}
|
|
|
- RegionThresholdTbx.Text = NowLoadConfig.ShuLiConfigValue.RegionThreshold.ToString();
|
|
|
- ChannelTbx.Text = NowLoadConfig.ShuLiConfigValue.Channel.ToString();
|
|
|
- NoiseFilterTbx.Text = NowLoadConfig.ShuLiConfigValue.NoiseFilter_Threshold.ToString();
|
|
|
+ RegionThresholdTbx.Text = NowLoadConfig.ShuLiConfigClass.RegionThreshold.ToString();
|
|
|
+ ChannelTbx.Text = NowLoadConfig.ShuLiConfigClass.Channel.ToString();
|
|
|
+ NoiseFilterTbx.Text = NowLoadConfig.ShuLiConfigClass.NoiseFilter_Threshold.ToString();
|
|
|
//切换识别模式
|
|
|
- switch(NowLoadConfig.ShuLiConfigValue.PandingCode)
|
|
|
+ switch(NowLoadConfig.ShuLiConfigClass.PandingCode)
|
|
|
{
|
|
|
case -1:
|
|
|
radioButton1.Checked = true;
|
|
|
@@ -219,8 +218,8 @@ namespace CCDCount.Forms
|
|
|
{
|
|
|
PanDuanParaPanel.Controls.Clear();
|
|
|
PanDuanParaPanel.Height = 10;
|
|
|
- if(NowLoadConfig == (null,null)) return;
|
|
|
- NowLoadConfig.ShuLiConfigValue.PandingCode = -1;
|
|
|
+ if(NowLoadConfig == null) return;
|
|
|
+ NowLoadConfig.ShuLiConfigClass.PandingCode = -1;
|
|
|
Configs[Nowindex] = NowLoadConfig;
|
|
|
}
|
|
|
}
|
|
|
@@ -231,7 +230,7 @@ namespace CCDCount.Forms
|
|
|
{
|
|
|
PanDuanParaPanel.Controls.Clear();
|
|
|
PanDuanParaPanel.Height = 150;
|
|
|
- if (NowLoadConfig == (null, null)) return;
|
|
|
+ if (NowLoadConfig == null) return;
|
|
|
Label label5 = new Label()
|
|
|
{
|
|
|
Text = "合格粒宽范围:",
|
|
|
@@ -245,7 +244,7 @@ namespace CCDCount.Forms
|
|
|
Location = new Point(10, 30),
|
|
|
Name = "MIN_OBJECT_WIDTH_TBX",
|
|
|
Width = 50,
|
|
|
- Text = NowLoadConfig.ShuLiConfigValue.MIN_OBJECT_WIDTH.ToString(),
|
|
|
+ Text = NowLoadConfig.ShuLiConfigClass.MIN_OBJECT_WIDTH.ToString(),
|
|
|
};
|
|
|
PanDuanParaPanel.Controls.Add(textBox1);
|
|
|
|
|
|
@@ -262,7 +261,7 @@ namespace CCDCount.Forms
|
|
|
Name = "MAX_OBJECT_WIDTH_TBX",
|
|
|
Location = new Point(100, 30),
|
|
|
Width = 50,
|
|
|
- Text = NowLoadConfig.ShuLiConfigValue.MAX_OBJECT_WIDTH.ToString(),
|
|
|
+ Text = NowLoadConfig.ShuLiConfigClass.MAX_OBJECT_WIDTH.ToString(),
|
|
|
};
|
|
|
PanDuanParaPanel.Controls.Add(textBox2);
|
|
|
|
|
|
@@ -279,7 +278,7 @@ namespace CCDCount.Forms
|
|
|
Location = new Point(10, 80),
|
|
|
Name = "MIN_OBJECT_HEIGHT_TBX",
|
|
|
Width = 50,
|
|
|
- Text = NowLoadConfig.ShuLiConfigValue.MIN_OBJECT_HEIGHT.ToString(),
|
|
|
+ Text = NowLoadConfig.ShuLiConfigClass.MIN_OBJECT_HEIGHT.ToString(),
|
|
|
};
|
|
|
PanDuanParaPanel.Controls.Add(textBox3);
|
|
|
|
|
|
@@ -296,11 +295,11 @@ namespace CCDCount.Forms
|
|
|
Location = new Point(100, 80),
|
|
|
Name = "MAX_OBJECT_HEIGHT_TBX",
|
|
|
Width = 50,
|
|
|
- Text = NowLoadConfig.ShuLiConfigValue.MAX_OBJECT_HEIGHT.ToString(),
|
|
|
+ Text = NowLoadConfig.ShuLiConfigClass.MAX_OBJECT_HEIGHT.ToString(),
|
|
|
};
|
|
|
PanDuanParaPanel.Controls.Add(textBox4);
|
|
|
|
|
|
- NowLoadConfig.ShuLiConfigValue.PandingCode = 1;
|
|
|
+ NowLoadConfig.ShuLiConfigClass.PandingCode = 1;
|
|
|
Configs[Nowindex] = NowLoadConfig;
|
|
|
}
|
|
|
}
|
|
|
@@ -311,7 +310,7 @@ namespace CCDCount.Forms
|
|
|
{
|
|
|
PanDuanParaPanel.Controls.Clear();
|
|
|
PanDuanParaPanel.Height = 100;
|
|
|
- if (NowLoadConfig == (null, null)) return;
|
|
|
+ if (NowLoadConfig == null) return;
|
|
|
Label label5 = new Label()
|
|
|
{
|
|
|
Text = "合格粒面积范围:",
|
|
|
@@ -325,7 +324,7 @@ namespace CCDCount.Forms
|
|
|
Location = new Point(100, 30),
|
|
|
Name = "MaxArea_TBX",
|
|
|
Width = 50,
|
|
|
- Text = NowLoadConfig.ShuLiConfigValue.MaxArea.ToString(),
|
|
|
+ Text = NowLoadConfig.ShuLiConfigClass.MaxArea.ToString(),
|
|
|
};
|
|
|
PanDuanParaPanel.Controls.Add(textBox1);
|
|
|
|
|
|
@@ -342,11 +341,11 @@ namespace CCDCount.Forms
|
|
|
Name = "MinArea_TBX",
|
|
|
Location = new Point(10, 30),
|
|
|
Width = 50,
|
|
|
- Text = NowLoadConfig.ShuLiConfigValue.MinArea.ToString(),
|
|
|
+ Text = NowLoadConfig.ShuLiConfigClass.MinArea.ToString(),
|
|
|
};
|
|
|
PanDuanParaPanel.Controls.Add(textBox2);
|
|
|
|
|
|
- NowLoadConfig.ShuLiConfigValue.PandingCode = 2;
|
|
|
+ NowLoadConfig.ShuLiConfigClass.PandingCode = 2;
|
|
|
Configs[Nowindex] = NowLoadConfig;
|
|
|
}
|
|
|
}
|
|
|
@@ -357,7 +356,7 @@ namespace CCDCount.Forms
|
|
|
{
|
|
|
PanDuanParaPanel.Controls.Clear();
|
|
|
PanDuanParaPanel.Height = 160;
|
|
|
- if (NowLoadConfig == (null, null)) return;
|
|
|
+ if (NowLoadConfig == null) return;
|
|
|
|
|
|
Label label5 = new Label()
|
|
|
{
|
|
|
@@ -372,7 +371,7 @@ namespace CCDCount.Forms
|
|
|
Location = new Point(10, 30),
|
|
|
Name = "MIN_OBJECT_WIDTH_TBX",
|
|
|
Width = 50,
|
|
|
- Text = NowLoadConfig.ShuLiConfigValue.MIN_OBJECT_WIDTH.ToString(),
|
|
|
+ Text = NowLoadConfig.ShuLiConfigClass.MIN_OBJECT_WIDTH.ToString(),
|
|
|
};
|
|
|
PanDuanParaPanel.Controls.Add(textBox1);
|
|
|
|
|
|
@@ -389,7 +388,7 @@ namespace CCDCount.Forms
|
|
|
Name = "MAX_OBJECT_WIDTH_TBX",
|
|
|
Location = new Point(100, 30),
|
|
|
Width = 50,
|
|
|
- Text = NowLoadConfig.ShuLiConfigValue.MAX_OBJECT_WIDTH.ToString(),
|
|
|
+ Text = NowLoadConfig.ShuLiConfigClass.MAX_OBJECT_WIDTH.ToString(),
|
|
|
};
|
|
|
PanDuanParaPanel.Controls.Add(textBox2);
|
|
|
|
|
|
@@ -406,7 +405,7 @@ namespace CCDCount.Forms
|
|
|
Location = new Point(10, 80),
|
|
|
Name = "MIN_OBJECT_HEIGHT_TBX",
|
|
|
Width = 50,
|
|
|
- Text = NowLoadConfig.ShuLiConfigValue.MIN_OBJECT_HEIGHT.ToString(),
|
|
|
+ Text = NowLoadConfig.ShuLiConfigClass.MIN_OBJECT_HEIGHT.ToString(),
|
|
|
};
|
|
|
PanDuanParaPanel.Controls.Add(textBox3);
|
|
|
|
|
|
@@ -423,7 +422,7 @@ namespace CCDCount.Forms
|
|
|
Location = new Point(100, 80),
|
|
|
Name = "MAX_OBJECT_HEIGHT_TBX",
|
|
|
Width = 50,
|
|
|
- Text = NowLoadConfig.ShuLiConfigValue.MAX_OBJECT_HEIGHT.ToString(),
|
|
|
+ Text = NowLoadConfig.ShuLiConfigClass.MAX_OBJECT_HEIGHT.ToString(),
|
|
|
};
|
|
|
PanDuanParaPanel.Controls.Add(textBox4);
|
|
|
|
|
|
@@ -440,7 +439,7 @@ namespace CCDCount.Forms
|
|
|
Location = new Point(10, 130),
|
|
|
Name = "MinArea_TBX",
|
|
|
Width = 50,
|
|
|
- Text = NowLoadConfig.ShuLiConfigValue.MinArea.ToString(),
|
|
|
+ Text = NowLoadConfig.ShuLiConfigClass.MinArea.ToString(),
|
|
|
};
|
|
|
PanDuanParaPanel.Controls.Add(textBox5);
|
|
|
|
|
|
@@ -457,11 +456,11 @@ namespace CCDCount.Forms
|
|
|
Name = "MaxArea_TBX",
|
|
|
Location = new Point(100, 130),
|
|
|
Width = 50,
|
|
|
- Text = NowLoadConfig.ShuLiConfigValue.MaxArea.ToString(),
|
|
|
+ Text = NowLoadConfig.ShuLiConfigClass.MaxArea.ToString(),
|
|
|
};
|
|
|
PanDuanParaPanel.Controls.Add(textBox6);
|
|
|
|
|
|
- NowLoadConfig.ShuLiConfigValue.PandingCode = 3;
|
|
|
+ NowLoadConfig.ShuLiConfigClass.PandingCode = 3;
|
|
|
Configs[Nowindex] = NowLoadConfig;
|
|
|
}
|
|
|
}
|
|
|
@@ -469,7 +468,7 @@ namespace CCDCount.Forms
|
|
|
private void CameraConbox_SelectedIndexChanged(object sender, EventArgs e)
|
|
|
{
|
|
|
string ThisItemSN = CameraConbox.SelectedItem.ToString();
|
|
|
- if(LoadMainThread == null || ThisItemSN == LoadMainThread.ThisCameraDevice + "_" + LoadMainThread.ThisCameraSN) return;
|
|
|
+ if(LoadMainThread == null || ThisItemSN == LoadMainThread.cameraConfig.DeviceName + "_" + LoadMainThread.cameraConfig.CameraSNNum) return;
|
|
|
if (ThisItemSN != string.Empty && ThisItemSN != "请选择相机")
|
|
|
{
|
|
|
try
|
|
|
@@ -487,39 +486,39 @@ namespace CCDCount.Forms
|
|
|
"切换确认", MessageBoxButtons.YesNo);
|
|
|
if (confirmResult == DialogResult.No)
|
|
|
{
|
|
|
- CameraConbox.SelectedItem = LoadMainThread.ThisCameraDevice + "_" + LoadMainThread.ThisCameraSN;
|
|
|
+ CameraConbox.SelectedItem = LoadMainThread.cameraConfig.DeviceName + "_" + LoadMainThread.cameraConfig.CameraSNNum;
|
|
|
return;
|
|
|
}
|
|
|
LoadMainThread.StopMianThread();
|
|
|
}
|
|
|
if (LoadMainThread.ReLoadCamera(ThisItemSN))
|
|
|
{
|
|
|
- LoadMainThread.GetCameraConfig(out CameraConfig CameraConfig);
|
|
|
+ CameraConfig CameraConfig = LoadMainThread.GetCameraConfig();
|
|
|
if (CameraConfig != null)
|
|
|
{
|
|
|
ExposureTimeTbx.Text = CameraConfig.ExposureTimeValue.ToString();
|
|
|
- NowLoadConfig.CameraConfigValue.ExposureTimeValue = CameraConfig.ExposureTimeValue;
|
|
|
+ NowLoadConfig.CameraConfig.ExposureTimeValue = CameraConfig.ExposureTimeValue;
|
|
|
AcquistionLineRateLabTbx.Text = CameraConfig.AcquistionLineRateValue.ToString();
|
|
|
- NowLoadConfig.CameraConfigValue.AcquistionLineRateValue = CameraConfig.AcquistionLineRateValue;
|
|
|
+ NowLoadConfig.CameraConfig.AcquistionLineRateValue = CameraConfig.AcquistionLineRateValue;
|
|
|
ImageWidthTbx.Text = CameraConfig.Width.ToString();
|
|
|
- NowLoadConfig.CameraConfigValue.Width = CameraConfig.Width;
|
|
|
+ NowLoadConfig.CameraConfig.Width = CameraConfig.Width;
|
|
|
ImageHeightTbx.Text = CameraConfig.Height.ToString();
|
|
|
- NowLoadConfig.CameraConfigValue.Height = CameraConfig.Height;
|
|
|
+ NowLoadConfig.CameraConfig.Height = CameraConfig.Height;
|
|
|
CamUserNameTbx.Text = CameraConfig.CameraName;
|
|
|
- NowLoadConfig.CameraConfigValue.CameraName = CameraConfig.CameraName;
|
|
|
+ NowLoadConfig.CameraConfig.CameraName = CameraConfig.CameraName;
|
|
|
CamOffsetXTbx.Text = CameraConfig.OffsetX.ToString();
|
|
|
- NowLoadConfig.CameraConfigValue.OffsetX = CameraConfig.OffsetX;
|
|
|
- NowLoadConfig.CameraConfigValue.CameraSNNum = CameraConfig.CameraSNNum;
|
|
|
- NowLoadConfig.CameraConfigValue.CameraName = CameraConfig.CameraName;
|
|
|
- NowLoadConfig.CameraConfigValue.DeviceName = CameraConfig.DeviceName;
|
|
|
- NowLoadConfig.ShuLiConfigValue.CameraSN = CameraConfig.CameraSNNum;
|
|
|
+ NowLoadConfig.CameraConfig.OffsetX = CameraConfig.OffsetX;
|
|
|
+ NowLoadConfig.CameraConfig.CameraSNNum = CameraConfig.CameraSNNum;
|
|
|
+ NowLoadConfig.CameraConfig.CameraName = CameraConfig.CameraName;
|
|
|
+ NowLoadConfig.CameraConfig.DeviceName = CameraConfig.DeviceName;
|
|
|
+ NowLoadConfig.ShuLiConfigClass.CameraSN = CameraConfig.CameraSNNum;
|
|
|
Configs[Nowindex] = NowLoadConfig;
|
|
|
}
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
MessageBox.Show("切换相机失败!");
|
|
|
- CameraConbox.SelectedItem = LoadMainThread.ThisCameraDevice + "_" + LoadMainThread.ThisCameraSN;
|
|
|
+ CameraConbox.SelectedItem = LoadMainThread.cameraConfig.DeviceName + "_" + LoadMainThread.cameraConfig.CameraSNNum;
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
@@ -531,7 +530,7 @@ namespace CCDCount.Forms
|
|
|
"切换确认", MessageBoxButtons.YesNo);
|
|
|
if (confirmResult == DialogResult.No)
|
|
|
{
|
|
|
- CameraConbox.SelectedItem = LoadMainThread.ThisCameraDevice + "_" + LoadMainThread.ThisCameraSN;
|
|
|
+ CameraConbox.SelectedItem = LoadMainThread.cameraConfig.DeviceName + "_" + LoadMainThread.cameraConfig.CameraSNNum;
|
|
|
return;
|
|
|
}
|
|
|
LoadMainThread.StopMianThread();
|
|
|
@@ -541,21 +540,21 @@ namespace CCDCount.Forms
|
|
|
LoadMainThread.DisposeCamera();
|
|
|
}
|
|
|
ExposureTimeTbx.Text = string.Empty;
|
|
|
- NowLoadConfig.CameraConfigValue.ExposureTimeValue = 0;
|
|
|
+ NowLoadConfig.CameraConfig.ExposureTimeValue = 0;
|
|
|
AcquistionLineRateLabTbx.Text = string.Empty;
|
|
|
- NowLoadConfig.CameraConfigValue.AcquistionLineRateValue = 0;
|
|
|
+ NowLoadConfig.CameraConfig.AcquistionLineRateValue = 0;
|
|
|
ImageWidthTbx.Text = string.Empty;
|
|
|
- NowLoadConfig.CameraConfigValue.Width = 0;
|
|
|
+ NowLoadConfig.CameraConfig.Width = 0;
|
|
|
ImageHeightTbx.Text = string.Empty;
|
|
|
- NowLoadConfig.CameraConfigValue.Height = 0;
|
|
|
+ NowLoadConfig.CameraConfig.Height = 0;
|
|
|
CamUserNameTbx.Text = string.Empty;
|
|
|
- NowLoadConfig.CameraConfigValue.CameraName = string.Empty;
|
|
|
+ NowLoadConfig.CameraConfig.CameraName = string.Empty;
|
|
|
CamOffsetXTbx.Text = string.Empty;
|
|
|
- NowLoadConfig.CameraConfigValue.OffsetX = 0;
|
|
|
- NowLoadConfig.CameraConfigValue.CameraSNNum = string.Empty;
|
|
|
- NowLoadConfig.CameraConfigValue.CameraName = string.Empty;
|
|
|
- NowLoadConfig.CameraConfigValue.DeviceName = string.Empty;
|
|
|
- NowLoadConfig.ShuLiConfigValue.CameraSN = string.Empty;
|
|
|
+ NowLoadConfig.CameraConfig.OffsetX = 0;
|
|
|
+ NowLoadConfig.CameraConfig.CameraSNNum = string.Empty;
|
|
|
+ NowLoadConfig.CameraConfig.CameraName = string.Empty;
|
|
|
+ NowLoadConfig.CameraConfig.DeviceName = string.Empty;
|
|
|
+ NowLoadConfig.ShuLiConfigClass.CameraSN = string.Empty;
|
|
|
Configs[Nowindex] = NowLoadConfig;
|
|
|
}
|
|
|
}
|