Commit ca0df4ec 几米阳光

修改二维码数量

1 个父辈 def34741
......@@ -187,6 +187,7 @@
this.cmbCount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbCount.FormattingEnabled = true;
this.cmbCount.Items.AddRange(new object[] {
"0",
"1",
"2",
"3",
......@@ -209,7 +210,7 @@
"20"});
this.cmbCount.Location = new System.Drawing.Point(334, 16);
this.cmbCount.Name = "cmbCount";
this.cmbCount.Size = new System.Drawing.Size(40, 25);
this.cmbCount.Size = new System.Drawing.Size(66, 25);
this.cmbCount.TabIndex = 16;
//
// lblCount
......@@ -378,7 +379,6 @@
this.Controls.Add(this.btnAn);
this.Controls.Add(this.btnLight);
this.Controls.Add(this.cmbCodeType);
this.Controls.Add(this.label3);
this.Controls.Add(this.cmbCamera);
this.Controls.Add(this.label2);
this.Controls.Add(this.btnExit);
......@@ -397,6 +397,7 @@
this.Controls.Add(this.btnSelImage);
this.Controls.Add(this.txtPath);
this.Controls.Add(this.label1);
this.Controls.Add(this.label3);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "FrmCodeDecode";
......
......@@ -35,6 +35,12 @@ namespace CodeLibrary
private void FrmMain_Load(object sender, EventArgs e)
{
Control.CheckForIllegalCrossThreadCalls = false;
cmbCount.Items.Clear();
for (int i = 1; i <= 300; i++)
{
cmbCount.Items.Add(i);
}
cmbCount.SelectedIndex = 0;
cmbCount.SelectedIndex = 0;
LoadCamera();
......@@ -140,7 +146,7 @@ namespace CodeLibrary
MessageBox.Show(selImage ,title, MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
int count = cmbCount.SelectedIndex + 1;
int count = cmbCount.SelectedIndex ;
txtResult.Text = "";
stopwatch.Restart();
HDCodeHelper.HalconWindow = this.hWindowControl1.HalconWindow;
......@@ -173,7 +179,7 @@ namespace CodeLibrary
MessageBox.Show(selImage ,title, MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
int count = cmbCount.SelectedIndex + 1;
int count = cmbCount.SelectedIndex ;
txtResult.Text = "";
stopwatch.Restart();
......@@ -312,7 +318,7 @@ namespace CodeLibrary
return;
}
int count = cmbCount.SelectedIndex + 1;
int count = cmbCount.SelectedIndex ;
txtResult.Text = "";
stopwatch.Restart();
testCount++;
......
......@@ -212,7 +212,7 @@
"20"});
this.cmbCount.Location = new System.Drawing.Point(441, 54);
this.cmbCount.Name = "cmbCount";
this.cmbCount.Size = new System.Drawing.Size(58, 25);
this.cmbCount.Size = new System.Drawing.Size(64, 25);
this.cmbCount.TabIndex = 14;
//
// richTextBox2
......@@ -242,7 +242,7 @@
this.chbTest.Checked = true;
this.chbTest.CheckState = System.Windows.Forms.CheckState.Checked;
this.chbTest.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbTest.Location = new System.Drawing.Point(525, 56);
this.chbTest.Location = new System.Drawing.Point(531, 56);
this.chbTest.Name = "chbTest";
this.chbTest.Size = new System.Drawing.Size(147, 21);
this.chbTest.TabIndex = 17;
......@@ -286,7 +286,7 @@
//
this.chbUseCamera.AutoSize = true;
this.chbUseCamera.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbUseCamera.Location = new System.Drawing.Point(525, 18);
this.chbUseCamera.Location = new System.Drawing.Point(531, 18);
this.chbUseCamera.Name = "chbUseCamera";
this.chbUseCamera.Size = new System.Drawing.Size(123, 21);
this.chbUseCamera.TabIndex = 21;
......
......@@ -161,6 +161,11 @@ namespace CodeLibrary
string filePath =HDCodeHelper.GetCodeParamFilePath(cmbCodeType.Text);
txtParamPath.Text = filePath;
cmbCount.Items.Clear();
for(int i = 1; i <= 300; i++)
{
cmbCount.Items.Add(i);
}
cmbCount.SelectedIndex = 0;
chbUseCamera.Checked = true;
timer1.Start();
......
......@@ -36,22 +36,6 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="AForge, Version=2.2.5.0, Culture=neutral, PublicKeyToken=c1db6ff4eaa06aeb, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\dll\AForge.NET\AForge.dll</HintPath>
</Reference>
<Reference Include="AForge.Controls, Version=2.2.5.0, Culture=neutral, PublicKeyToken=a8ac264d1dc6b9d9, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\dll\AForge.NET\AForge.Controls.dll</HintPath>
</Reference>
<Reference Include="AForge.Video, Version=2.2.5.0, Culture=neutral, PublicKeyToken=cbfb6e07d173c401, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\dll\AForge.NET\AForge.Video.dll</HintPath>
</Reference>
<Reference Include="AForge.Video.DirectShow, Version=2.2.5.0, Culture=neutral, PublicKeyToken=61ea4348d43881b7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\dll\AForge.NET\AForge.Video.DirectShow.dll</HintPath>
</Reference>
<Reference Include="Basler.Pylon, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e389355f398382ab, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\dll\Basler.Pylon.dll</HintPath>
......@@ -86,18 +70,8 @@
<ItemGroup>
<Compile Include="CodeCreater.cs" />
<Compile Include="CompressHelper.cs" />
<Compile Include="FrmTest.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmTest.Designer.cs">
<DependentUpon>FrmTest.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="VideoPlayer.cs" />
<EmbeddedResource Include="FrmTest.resx">
<DependentUpon>FrmTest.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
......
......@@ -19,11 +19,11 @@ namespace CodeTest
static void Main()
{
//CodeCreater.CreateCode(100);
//Application.EnableVisualStyles();
//Application.SetCompatibleTextRenderingDefault(false);
//HDCodeLearnHelper.LoadConfig(ConfigAppSettings.GetValue(Setting_Init.CameraName), ConfigAppSettings.GetValue(Setting_Init.CodeType));
//Application.Run(new FrmCodeDecode());
Application.Run(new FrmTest());
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
HDCodeLearnHelper.LoadConfig(ConfigAppSettings.GetValue(Setting_Init.CameraName), ConfigAppSettings.GetValue(Setting_Init.CodeType));
Application.Run(new FrmCodeDecode());
//Application.Run(new FrmTest());
}
}
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!