Skip to content

李娜 / AutoCountMachine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 114c7dc1 由 LN
选项

增加分页功能

1 个父辈 b2fb4069
内嵌 并排
正在显示 14 个修改的文件 包含 803 行增加 和 55 行删除
RC1266-AutoCountMachine/dll/X-Ray/Asa.CarerayImage.xml
...@@ -127,14 +127,14 @@ ...@@ -127,14 +127,14 @@
<param name="tpDstImg"></param> <param name="tpDstImg"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.API.eyemCountObjectIrregularParts(Asa.API.EyemImage,System.String,System.Double,System.Int32,System.Int32,System.Int32,System.IntPtr@,Asa.API.EyemImage@)"> <member name="M:Asa.API.eyemCountObjectIrregularParts(Asa.API.EyemImage,System.String,System.Double,System.String,System.Int32,System.Int32,System.IntPtr@,Asa.API.EyemImage@)">
<summary> <summary>
异型器件 异型器件
</summary> </summary>
<param name="tpSrcImg"></param> <param name="tpSrcImg"></param>
<param name="fileName"></param> <param name="fileName"></param>
<param name="dOffset"></param> <param name="dOffset"></param>
<param name="iType"></param> <param name="strType"></param>
<param name="iMaxArea"></param> <param name="iMaxArea"></param>
<param name="iWinSize"></param> <param name="iWinSize"></param>
<param name="pNumObj"></param> <param name="pNumObj"></param>
......
RC1266-AutoCountMachine/source/AutoCountClient/AutoCountClient.csproj
...@@ -192,6 +192,12 @@ ...@@ -192,6 +192,12 @@
<Compile Include="ManagerUtil.cs" /> <Compile Include="ManagerUtil.cs" />
<Compile Include="Program.cs" /> <Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="useControl\PageControl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="useControl\PageControl.Designer.cs">
<DependentUpon>PageControl.cs</DependentUpon>
</Compile>
<EmbeddedResource Include="agvtest\FrmAgvTest.resx"> <EmbeddedResource Include="agvtest\FrmAgvTest.resx">
<DependentUpon>FrmAgvTest.cs</DependentUpon> <DependentUpon>FrmAgvTest.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
...@@ -241,6 +247,9 @@ ...@@ -241,6 +247,9 @@
<DependentUpon>Resources.resx</DependentUpon> <DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime> <DesignTime>True</DesignTime>
</Compile> </Compile>
<EmbeddedResource Include="useControl\PageControl.resx">
<DependentUpon>PageControl.cs</DependentUpon>
</EmbeddedResource>
<None Include="data\DB.db3"> <None Include="data\DB.db3">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
......
RC1266-AutoCountMachine/source/AutoCountClient/FrmComponentList.Designer.cs
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmComponentList)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmComponentList));
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.pageControl1 = new OnlineStore.AutoCountClient.useControl.PageControl();
this.groupBox3 = new System.Windows.Forms.GroupBox(); this.groupBox3 = new System.Windows.Forms.GroupBox();
this.lblInfo = new System.Windows.Forms.Label(); this.lblInfo = new System.Windows.Forms.Label();
this.label9 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label();
...@@ -63,6 +64,9 @@ ...@@ -63,6 +64,9 @@
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.btnSave = new System.Windows.Forms.Button(); this.btnSave = new System.Windows.Forms.Button();
this.dgvList = new System.Windows.Forms.DataGridView(); this.dgvList = new System.Windows.Forms.DataGridView();
this.btnBack = new System.Windows.Forms.Button();
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
this.Column_Num = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_PN = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column_PN = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_F = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column_F = new System.Windows.Forms.DataGridViewTextBoxColumn();
...@@ -70,8 +74,6 @@ ...@@ -70,8 +74,6 @@
this.Column_suanfavalue = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column_suanfavalue = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Des = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column_Des = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Del = new System.Windows.Forms.DataGridViewLinkColumn(); this.Column_Del = new System.Windows.Forms.DataGridViewLinkColumn();
this.btnBack = new System.Windows.Forms.Button();
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
...@@ -84,6 +86,7 @@ ...@@ -84,6 +86,7 @@
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox1.Controls.Add(this.pageControl1);
this.groupBox1.Controls.Add(this.groupBox3); this.groupBox1.Controls.Add(this.groupBox3);
this.groupBox1.Controls.Add(this.groupBox2); this.groupBox1.Controls.Add(this.groupBox2);
this.groupBox1.Controls.Add(this.btnDownLoad); this.groupBox1.Controls.Add(this.btnDownLoad);
...@@ -98,6 +101,19 @@ ...@@ -98,6 +101,19 @@
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "元器件库管理"; this.groupBox1.Text = "元器件库管理";
// //
// pageControl1
//
this.pageControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.pageControl1.Location = new System.Drawing.Point(7, 681);
this.pageControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.pageControl1.Name = "pageControl1";
this.pageControl1.PageCount = 0;
this.pageControl1.PageIndex = 0;
this.pageControl1.PageSize = 1;
this.pageControl1.Size = new System.Drawing.Size(881, 23);
this.pageControl1.TabIndex = 76;
this.pageControl1.TotalCount = 0;
//
// groupBox3 // groupBox3
// //
this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
...@@ -480,6 +496,7 @@ ...@@ -480,6 +496,7 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.dgvList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgvList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.Column_Num,
this.Column_PN, this.Column_PN,
this.Column_Name, this.Column_Name,
this.Column_F, this.Column_F,
...@@ -494,11 +511,36 @@ ...@@ -494,11 +511,36 @@
this.dgvList.RowHeadersWidth = 10; this.dgvList.RowHeadersWidth = 10;
this.dgvList.RowTemplate.Height = 23; this.dgvList.RowTemplate.Height = 23;
this.dgvList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dgvList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dgvList.Size = new System.Drawing.Size(881, 594); this.dgvList.Size = new System.Drawing.Size(881, 560);
this.dgvList.TabIndex = 32; this.dgvList.TabIndex = 32;
this.dgvList.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvList_CellContentClick); this.dgvList.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvList_CellContentClick);
this.dgvList.SelectionChanged += new System.EventHandler(this.dgvList_SelectionChanged); this.dgvList.SelectionChanged += new System.EventHandler(this.dgvList_SelectionChanged);
// //
// btnBack
//
this.btnBack.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBack.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBack.Location = new System.Drawing.Point(1126, 621);
this.btnBack.Name = "btnBack";
this.btnBack.Size = new System.Drawing.Size(130, 45);
this.btnBack.TabIndex = 6;
this.btnBack.Text = "关闭";
this.btnBack.UseVisualStyleBackColor = true;
this.btnBack.Click += new System.EventHandler(this.btnBack_Click);
//
// openFileDialog1
//
this.openFileDialog1.FileName = "openFileDialog1";
//
// Column_Num
//
this.Column_Num.FillWeight = 80F;
this.Column_Num.HeaderText = "编号";
this.Column_Num.Name = "Column_Num";
this.Column_Num.ReadOnly = true;
this.Column_Num.Width = 60;
//
// Column_PN // Column_PN
// //
this.Column_PN.HeaderText = "元器件编号"; this.Column_PN.HeaderText = "元器件编号";
...@@ -518,13 +560,13 @@ ...@@ -518,13 +560,13 @@
this.Column_F.HeaderText = "封装"; this.Column_F.HeaderText = "封装";
this.Column_F.Name = "Column_F"; this.Column_F.Name = "Column_F";
this.Column_F.ReadOnly = true; this.Column_F.ReadOnly = true;
this.Column_F.Width = 150;
// //
// Column_Suanfa // Column_Suanfa
// //
this.Column_Suanfa.HeaderText = "算法"; this.Column_Suanfa.HeaderText = "算法";
this.Column_Suanfa.Name = "Column_Suanfa"; this.Column_Suanfa.Name = "Column_Suanfa";
this.Column_Suanfa.ReadOnly = true; this.Column_Suanfa.ReadOnly = true;
this.Column_Suanfa.Width = 90;
// //
// Column_suanfavalue // Column_suanfavalue
// //
...@@ -551,23 +593,6 @@ ...@@ -551,23 +593,6 @@
this.Column_Del.UseColumnTextForLinkValue = true; this.Column_Del.UseColumnTextForLinkValue = true;
this.Column_Del.Width = 80; this.Column_Del.Width = 80;
// //
// btnBack
//
this.btnBack.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBack.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBack.Location = new System.Drawing.Point(1126, 621);
this.btnBack.Name = "btnBack";
this.btnBack.Size = new System.Drawing.Size(130, 45);
this.btnBack.TabIndex = 6;
this.btnBack.Text = "关闭";
this.btnBack.UseVisualStyleBackColor = true;
this.btnBack.Click += new System.EventHandler(this.btnBack_Click);
//
// openFileDialog1
//
this.openFileDialog1.FileName = "openFileDialog1";
//
// FrmComponentList // FrmComponentList
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
...@@ -630,6 +655,9 @@ ...@@ -630,6 +655,9 @@
private System.Windows.Forms.Label lblInfo; private System.Windows.Forms.Label lblInfo;
private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label10;
private System.Windows.Forms.ComboBox cmbSuanfa; private System.Windows.Forms.ComboBox cmbSuanfa;
private System.Windows.Forms.Label lblTuijian;
private useControl.PageControl pageControl1;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_Num;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_PN; private System.Windows.Forms.DataGridViewTextBoxColumn Column_PN;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_Name; private System.Windows.Forms.DataGridViewTextBoxColumn Column_Name;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_F; private System.Windows.Forms.DataGridViewTextBoxColumn Column_F;
...@@ -637,6 +665,5 @@ ...@@ -637,6 +665,5 @@
private System.Windows.Forms.DataGridViewTextBoxColumn Column_suanfavalue; private System.Windows.Forms.DataGridViewTextBoxColumn Column_suanfavalue;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_Des; private System.Windows.Forms.DataGridViewTextBoxColumn Column_Des;
private System.Windows.Forms.DataGridViewLinkColumn Column_Del; private System.Windows.Forms.DataGridViewLinkColumn Column_Del;
private System.Windows.Forms.Label lblTuijian;
} }
} }
\ No newline at end of file \ No newline at end of file
RC1266-AutoCountMachine/source/AutoCountClient/FrmComponentList.cs
...@@ -25,7 +25,9 @@ namespace OnlineStore.AutoCountClient ...@@ -25,7 +25,9 @@ namespace OnlineStore.AutoCountClient
private void FrmPointType_Load(object sender, EventArgs e) private void FrmPointType_Load(object sender, EventArgs e)
{ {
cmbSType.SelectedIndex = 5; cmbSType.SelectedIndex = 5;
pageControl1.BindPageEvent += BindPage;
btnSearch_Click(null, null); btnSearch_Click(null, null);
} }
private DataGridViewRow SetRowInfo(DataGridViewRow view, ComponetInfo com) private DataGridViewRow SetRowInfo(DataGridViewRow view, ComponetInfo com)
...@@ -56,7 +58,7 @@ namespace OnlineStore.AutoCountClient ...@@ -56,7 +58,7 @@ namespace OnlineStore.AutoCountClient
{ {
obj.Sufan = cmbSuanfa.SelectedIndex; obj.Sufan = cmbSuanfa.SelectedIndex;
} }
return obj; return obj;
} }
...@@ -66,7 +68,7 @@ namespace OnlineStore.AutoCountClient ...@@ -66,7 +68,7 @@ namespace OnlineStore.AutoCountClient
if (groupInfo.Text.StartsWith("新增")) if (groupInfo.Text.StartsWith("新增"))
{ {
obj = GetFormCom(null); obj = GetFormCom(null);
if (obj.PartNum .Equals("")) if (obj.PartNum.Equals(""))
{ {
MessageBox.Show("请输入元器件编号"); MessageBox.Show("请输入元器件编号");
txtPartNum.Focus(); txtPartNum.Focus();
...@@ -74,7 +76,7 @@ namespace OnlineStore.AutoCountClient ...@@ -74,7 +76,7 @@ namespace OnlineStore.AutoCountClient
} }
if (CSVBomManager.allComMap.ContainsKey(obj.PartNum)) if (CSVBomManager.allComMap.ContainsKey(obj.PartNum))
{ {
MessageBox.Show("元器件编号【"+obj.PartNum+"】已存在，请重新输入"); MessageBox.Show("元器件编号【" + obj.PartNum + "】已存在，请重新输入");
txtPartNum.Focus(); txtPartNum.Focus();
return; return;
} }
...@@ -121,6 +123,13 @@ namespace OnlineStore.AutoCountClient ...@@ -121,6 +123,13 @@ namespace OnlineStore.AutoCountClient
CSVBomManager.SaveComponet(obj); CSVBomManager.SaveComponet(obj);
SetRowInfo(dgvList.Rows[rowIndex], obj); SetRowInfo(dgvList.Rows[rowIndex], obj);
for(int index = 0; index < CurrList.Count; index++)
{
if (CurrList[index].PartNum.Equals(obj.PartNum))
{
CurrList[index] = obj;
}
}
MessageBox.Show("元器件【" + obj.PartNum + "】保存成功！"); MessageBox.Show("元器件【" + obj.PartNum + "】保存成功！");
groupInfo.Text = "元器件【" + obj.PartNum + "】的基本信息"; groupInfo.Text = "元器件【" + obj.PartNum + "】的基本信息";
if (obj.Sufan >= 0) if (obj.Sufan >= 0)
...@@ -190,7 +199,7 @@ namespace OnlineStore.AutoCountClient ...@@ -190,7 +199,7 @@ namespace OnlineStore.AutoCountClient
{ {
cmbSuanfa.SelectedIndex = 5; cmbSuanfa.SelectedIndex = 5;
CountParam p = ParamManager.GetOptimalParamByPN(obj.PartNum); CountParam p = ParamManager.GetOptimalParamByPN(obj.PartNum);
if (p != null&&p.Sign>=0) if (p != null && p.Sign >= 0)
{ {
lblTuijian.Text = "推荐：" + ParamManager.GetSufanStr(p.Sign); lblTuijian.Text = "推荐：" + ParamManager.GetSufanStr(p.Sign);
} }
...@@ -339,13 +348,14 @@ namespace OnlineStore.AutoCountClient ...@@ -339,13 +348,14 @@ namespace OnlineStore.AutoCountClient
btnSearch_Click(null, null); btnSearch_Click(null, null);
} }
private List<ComponetInfo> CurrList = new List<ComponetInfo>();
private void btnSearch_Click(object sender, EventArgs e) private void btnSearch_Click(object sender, EventArgs e)
{ {
btnSearch.Enabled = false; btnSearch.Enabled = false;
this.Cursor = System.Windows.Forms.Cursors.WaitCursor; this.Cursor = System.Windows.Forms.Cursors.WaitCursor;
try try
{ {
CurrList = new List<ComponetInfo>();
string sPn = FormUtil.GetValue(txtSPn); string sPn = FormUtil.GetValue(txtSPn);
string sDes = FormUtil.GetValue(txtSDes); string sDes = FormUtil.GetValue(txtSDes);
string sFeng = FormUtil.GetValue(txtSFeng); string sFeng = FormUtil.GetValue(txtSFeng);
...@@ -394,7 +404,7 @@ namespace OnlineStore.AutoCountClient ...@@ -394,7 +404,7 @@ namespace OnlineStore.AutoCountClient
else if (!param.Sign.Equals(seleIndex)) else if (!param.Sign.Equals(seleIndex))
{ {
continue; continue;
} }
} }
else if (seleIndex.Equals(5)) else if (seleIndex.Equals(5))
{ {
...@@ -403,18 +413,65 @@ namespace OnlineStore.AutoCountClient ...@@ -403,18 +413,65 @@ namespace OnlineStore.AutoCountClient
continue; continue;
} }
} }
DataGridViewRow row = SetRowInfo(null, com); CurrList.Add(com);
dgvList.Rows.Add(row);
count++; count++;
} }
lblInfo.Text = "共" + AllList.Count + "条记录，当前查询到" + count + "条"; lblInfo.Text = "共" + AllList.Count + "条记录，当前查询到" + count + "条";
}catch(Exception ex) pageControl1.PageSize = 50;
pageControl1.PageIndex = 0;
pageControl1.TotalCount = count;
if (count % 50 == 0)
{
pageControl1.PageCount = count / pageControl1.PageSize;
}
else
{
pageControl1.PageCount = count / pageControl1.PageSize + 1;
}
pageControl1.SetPage();
}
catch (Exception ex)
{ {
LogUtil.error("查询数据出错：" + ex.ToString()); LogUtil.error("查询数据出错：" + ex.ToString());
} }
btnSearch.Enabled = true; btnSearch.Enabled = true;
this.Cursor = System.Windows.Forms.Cursors.Default ; this.Cursor = System.Windows.Forms.Cursors.Default;
}
/// <summary>
/// 绑定页
/// </summary>
/// <param name="pageSize">每页显示记录数</param>
/// <param name="pageIndex">页序号</param>
/// <param name="totalCount">总记录数</param>
private void BindPage(int pageSize, int pageIndex )
{
//totalCount = CurrList.Count;
int startIndex =(pageIndex-1) * pageSize;
int endIndex = pageIndex * pageSize ;
dgvList.Rows.Clear();
int index = 0;
foreach (ComponetInfo com in CurrList)
{
if (index >= startIndex && index < endIndex)
{
//totalCount++;
DataGridViewRow row = SetRowInfo(null, com);
row.Cells[Column_Num.Index].Value = (index+1);
dgvList.Rows.Add(row);
}
if (index > endIndex)
{
break;
}
index++;
}
} }
} }
......
RC1266-AutoCountMachine/source/AutoCountClient/FrmComponentList.resx
...@@ -117,6 +117,9 @@ ...@@ -117,6 +117,9 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="Column_Num.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_Name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column_Name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
......
RC1266-AutoCountMachine/source/AutoCountClient/FrmLearning.Designer.cs
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
this.btnTest.BackColor = System.Drawing.Color.White; this.btnTest.BackColor = System.Drawing.Color.White;
this.btnTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTest.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnTest.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTest.Location = new System.Drawing.Point(30, 354); this.btnTest.Location = new System.Drawing.Point(31, 337);
this.btnTest.Name = "btnTest"; this.btnTest.Name = "btnTest";
this.btnTest.Size = new System.Drawing.Size(235, 46); this.btnTest.Size = new System.Drawing.Size(235, 46);
this.btnTest.TabIndex = 285; this.btnTest.TabIndex = 285;
...@@ -167,14 +167,14 @@ ...@@ -167,14 +167,14 @@
// numWSize // numWSize
// //
this.numWSize.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.numWSize.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.numWSize.Location = new System.Drawing.Point(222, 47); this.numWSize.Location = new System.Drawing.Point(246, 47);
this.numWSize.Maximum = new decimal(new int[] { this.numWSize.Maximum = new decimal(new int[] {
1000, 1000,
0, 0,
0, 0,
0}); 0});
this.numWSize.Name = "numWSize"; this.numWSize.Name = "numWSize";
this.numWSize.Size = new System.Drawing.Size(80, 26); this.numWSize.Size = new System.Drawing.Size(56, 26);
this.numWSize.TabIndex = 297; this.numWSize.TabIndex = 297;
this.numWSize.Value = new decimal(new int[] { this.numWSize.Value = new decimal(new int[] {
3, 3,
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
// label3 // label3
// //
this.label3.AutoSize = true; this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(150, 50); this.label3.Location = new System.Drawing.Point(194, 50);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(68, 20); this.label3.Size = new System.Drawing.Size(68, 20);
this.label3.TabIndex = 296; this.label3.TabIndex = 296;
...@@ -196,9 +196,9 @@ ...@@ -196,9 +196,9 @@
// numTh // numTh
// //
this.numTh.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.numTh.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.numTh.Location = new System.Drawing.Point(222, 9); this.numTh.Location = new System.Drawing.Point(246, 9);
this.numTh.Name = "numTh"; this.numTh.Name = "numTh";
this.numTh.Size = new System.Drawing.Size(80, 26); this.numTh.Size = new System.Drawing.Size(56, 26);
this.numTh.TabIndex = 295; this.numTh.TabIndex = 295;
this.numTh.Value = new decimal(new int[] { this.numTh.Value = new decimal(new int[] {
30, 30,
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
// label1 // label1
// //
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(176, 12); this.label1.Location = new System.Drawing.Point(220, 12);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(40, 20); this.label1.Size = new System.Drawing.Size(40, 20);
this.label1.TabIndex = 294; this.label1.TabIndex = 294;
...@@ -249,9 +249,9 @@ ...@@ -249,9 +249,9 @@
this.groupBox4.Controls.Add(this.numWSize); this.groupBox4.Controls.Add(this.numWSize);
this.groupBox4.Controls.Add(this.label3); this.groupBox4.Controls.Add(this.label3);
this.groupBox4.Controls.Add(this.label1); this.groupBox4.Controls.Add(this.label1);
this.groupBox4.Location = new System.Drawing.Point(990, 175); this.groupBox4.Location = new System.Drawing.Point(990, 162);
this.groupBox4.Name = "groupBox4"; this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(308, 431); this.groupBox4.Size = new System.Drawing.Size(308, 401);
this.groupBox4.TabIndex = 295; this.groupBox4.TabIndex = 295;
this.groupBox4.TabStop = false; this.groupBox4.TabStop = false;
this.groupBox4.Text = "请选择参数"; this.groupBox4.Text = "请选择参数";
......
RC1266-AutoCountMachine/source/AutoCountClient/FrmLearning.cs
...@@ -56,14 +56,14 @@ namespace OnlineStore.AutoCountClient ...@@ -56,14 +56,14 @@ namespace OnlineStore.AutoCountClient
string[] fileList = Directory.GetFiles(ImagePath); string[] fileList = Directory.GetFiles(ImagePath);
lblFolder.Text = "当前文件夹：" + ImagePath; lblFolder.Text = "当前文件夹：" + ImagePath;
List<string> list = (from m in fileList orderby m ascending select m).ToList(); List<string> list = (from m in fileList orderby m ascending select m).ToList();
foreach (string f in list) foreach (string f in list)
{ {
string houzhui = Path.GetExtension(f); string houzhui = Path.GetExtension(f);
if (houzhui.Equals(".png")) if (houzhui.Equals(".png"))
{ {
ImageList.Add(f); ImageList.Add(f);
} }
} }
...@@ -77,7 +77,7 @@ namespace OnlineStore.AutoCountClient ...@@ -77,7 +77,7 @@ namespace OnlineStore.AutoCountClient
ShowNextImg(); ShowNextImg();
timer1_Tick(null, null); timer1_Tick(null, null);
} }
public void ShowNextImg() public void ShowNextImg()
{ {
currIndex++; currIndex++;
...@@ -209,7 +209,7 @@ namespace OnlineStore.AutoCountClient ...@@ -209,7 +209,7 @@ namespace OnlineStore.AutoCountClient
CountParam param = new CountParam("", th, wsize, CurrType); CountParam param = new CountParam("", th, wsize, CurrType);
int outCount = RobotManager.robot.XrayBean.GetCountResult(CurrFullFileName, param, out tpDstImg); int outCount = RobotManager.robot.XrayBean.GetCountResult(CurrFullFileName, param, out tpDstImg);
btnTest.Text +=" 结果："+ outCount.ToString(); btnTest.Text +=" 结果："+ outCount.ToString();
LogUtil.info( "用户点击 "+ btnTest.Text + "【" + CurrFullFileName + "】【" + th + "】【" + wsize + "】 结果：" + outCount); LogUtil.info( "用户点击 "+ btnTest.Text + "【" + CurrFullFileName + "】 参数 " + param.ToStr() + " 结果：" + outCount);
} }
catch (Exception ex) catch (Exception ex)
{ {
...@@ -258,10 +258,56 @@ namespace OnlineStore.AutoCountClient ...@@ -258,10 +258,56 @@ namespace OnlineStore.AutoCountClient
} }
} }
ParamManager.SaveMapToFile(); ParamManager.SaveMapToFile();
DialogResult result2 = MessageBox.Show("保存成功！是否自动清理已配置算法的图片？\r\n" +
"点击’确定‘：删除已配置算法的物料图片\r\n" +
"点击’取消‘：暂不删除", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Asterisk);
if (result2.Equals(DialogResult.OK))
{
ClearImage();
}
IsSave = true; IsSave = true;
this.Close(); this.Close();
} }
private void ClearImage()
{
try
{
if (!Directory.Exists(ImagePath))
{
return;
}
string targetPath = ImagePath + @"\back\";
if (!Directory.Exists(targetPath))
{
Directory.CreateDirectory(targetPath);
}
string[] fileList = Directory.GetFiles(ImagePath);
List<string> list = (from m in fileList orderby m ascending select m).ToList();
foreach (string f in list)
{
string houzhui = Path.GetExtension(f);
string filename = Path.GetFileNameWithoutExtension(f);
string[] array = filename.Split('-');
if (houzhui.Equals(".png") && array.Length >= 3)
{
string pn = array[0];
CountParam p = ParamManager.GetOptimalParamByPN(pn);
if (p != null&&p.Sign>=0)
{
string targetFile = targetPath + filename + houzhui;
File.Copy(f, targetPath + filename + houzhui, true);
File.Delete(f);
LogUtil.info("算法配置后清理：备份文件【" + f + "】到【" + targetFile + "】，并删除原文件");
}
}
}
}catch(Exception ex)
{
LogUtil.error("ClearImage 出错：" + ex.ToString());
}
}
private void btnNext_Click(object sender, EventArgs e) private void btnNext_Click(object sender, EventArgs e)
{ {
//btnNext.Enabled = false; //btnNext.Enabled = false;
......
RC1266-AutoCountMachine/source/AutoCountClient/useControl/PageControl.Designer.cs 0 → 100644
namespace OnlineStore.AutoCountClient.useControl
{
partial class PageControl
{
/// <summary>
/// 必需的设计器变量。
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// 清理所有正在使用的资源。
/// </summary>
/// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region 组件设计器生成的代码
/// <summary>
/// 设计器支持所需的方法 - 不要修改
/// 使用代码编辑器修改此方法的内容。
/// </summary>
private void InitializeComponent()
{
this.linkFirst = new System.Windows.Forms.LinkLabel();
this.linkPrev = new System.Windows.Forms.LinkLabel();
this.linkNext = new System.Windows.Forms.LinkLabel();
this.linkLast = new System.Windows.Forms.LinkLabel();
this.linkGo = new System.Windows.Forms.LinkLabel();
this.label1 = new System.Windows.Forms.Label();
this.txtCurrentPage = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.lblTotalPage = new System.Windows.Forms.Label();
this.lblPageSize = new System.Windows.Forms.Label();
this.txtPageSize = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// linkFirst
//
this.linkFirst.AutoSize = true;
this.linkFirst.Location = new System.Drawing.Point(22, 4);
this.linkFirst.Name = "linkFirst";
this.linkFirst.Size = new System.Drawing.Size(29, 12);
this.linkFirst.TabIndex = 0;
this.linkFirst.TabStop = true;
this.linkFirst.Text = "首页";
this.linkFirst.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkFirst_LinkClicked);
//
// linkPrev
//
this.linkPrev.AutoSize = true;
this.linkPrev.Location = new System.Drawing.Point(68, 4);
this.linkPrev.Name = "linkPrev";
this.linkPrev.Size = new System.Drawing.Size(41, 12);
this.linkPrev.TabIndex = 1;
this.linkPrev.TabStop = true;
this.linkPrev.Text = "上一页";
this.linkPrev.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkPrve_LinkClicked);
//
// linkNext
//
this.linkNext.AutoSize = true;
this.linkNext.Location = new System.Drawing.Point(126, 4);
this.linkNext.Name = "linkNext";
this.linkNext.Size = new System.Drawing.Size(41, 12);
this.linkNext.TabIndex = 2;
this.linkNext.TabStop = true;
this.linkNext.Text = "下一页";
this.linkNext.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkNext_LinkClicked);
//
// linkLast
//
this.linkLast.AutoSize = true;
this.linkLast.Location = new System.Drawing.Point(184, 4);
this.linkLast.Name = "linkLast";
this.linkLast.Size = new System.Drawing.Size(29, 12);
this.linkLast.TabIndex = 3;
this.linkLast.TabStop = true;
this.linkLast.Text = "末页";
this.linkLast.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLast_LinkClicked);
//
// linkGo
//
this.linkGo.AutoSize = true;
this.linkGo.Location = new System.Drawing.Point(498, 4);
this.linkGo.Name = "linkGo";
this.linkGo.Size = new System.Drawing.Size(29, 12);
this.linkGo.TabIndex = 4;
this.linkGo.TabStop = true;
this.linkGo.Text = "转到";
this.linkGo.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkGo_LinkClicked);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(395, 4);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(17, 12);
this.label1.TabIndex = 5;
this.label1.Text = "第";
//
// txtCurrentPage
//
this.txtCurrentPage.Location = new System.Drawing.Point(415, 0);
this.txtCurrentPage.MaxLength = 6;
this.txtCurrentPage.Name = "txtCurrentPage";
this.txtCurrentPage.Size = new System.Drawing.Size(54, 21);
this.txtCurrentPage.TabIndex = 6;
this.txtCurrentPage.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtCurrentPage_KeyPress);
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(472, 4);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(17, 12);
this.label2.TabIndex = 7;
this.label2.Text = "页";
//
// lblTotalPage
//
this.lblTotalPage.AutoSize = true;
this.lblTotalPage.Location = new System.Drawing.Point(568, 4);
this.lblTotalPage.Name = "lblTotalPage";
this.lblTotalPage.Size = new System.Drawing.Size(35, 12);
this.lblTotalPage.TabIndex = 8;
this.lblTotalPage.Text = "共0页";
//
// lblPageSize
//
this.lblPageSize.AutoSize = true;
this.lblPageSize.Location = new System.Drawing.Point(257, 4);
this.lblPageSize.Name = "lblPageSize";
this.lblPageSize.Size = new System.Drawing.Size(29, 12);
this.lblPageSize.TabIndex = 9;
this.lblPageSize.Text = "每页";
//
// txtPageSize
//
this.txtPageSize.Location = new System.Drawing.Point(289, 0);
this.txtPageSize.MaxLength = 3;
this.txtPageSize.Name = "txtPageSize";
this.txtPageSize.Size = new System.Drawing.Size(39, 21);
this.txtPageSize.TabIndex = 10;
this.txtPageSize.Text = "50";
this.txtPageSize.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtPageSize_KeyPress);
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(334, 4);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(17, 12);
this.label3.TabIndex = 11;
this.label3.Text = "条";
//
// PageControl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.Controls.Add(this.label3);
this.Controls.Add(this.txtPageSize);
this.Controls.Add(this.lblPageSize);
this.Controls.Add(this.lblTotalPage);
this.Controls.Add(this.label2);
this.Controls.Add(this.txtCurrentPage);
this.Controls.Add(this.label1);
this.Controls.Add(this.linkGo);
this.Controls.Add(this.linkLast);
this.Controls.Add(this.linkNext);
this.Controls.Add(this.linkPrev);
this.Controls.Add(this.linkFirst);
this.Name = "PageControl";
this.Size = new System.Drawing.Size(699, 21);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.LinkLabel linkFirst;
private System.Windows.Forms.LinkLabel linkPrev;
private System.Windows.Forms.LinkLabel linkNext;
private System.Windows.Forms.LinkLabel linkLast;
private System.Windows.Forms.LinkLabel linkGo;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.TextBox txtCurrentPage;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label lblTotalPage;
private System.Windows.Forms.Label lblPageSize;
private System.Windows.Forms.TextBox txtPageSize;
private System.Windows.Forms.Label label3;
}
}
RC1266-AutoCountMachine/source/AutoCountClient/useControl/PageControl.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Data;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using OnlineStore.Common;
namespace OnlineStore.AutoCountClient.useControl
{
public partial class PageControl : UserControl
{
//委托及事件
public delegate void BindPage(int pageSize, int pageIndex );
public event BindPage BindPageEvent;
//属性
public int PageSize { get; set; } = 1; //每页显示记录数
public int PageIndex { get; set; } //页序号
public int TotalCount { get; set; } //总记录数
public int PageCount { get; set; } //总页数
public PageControl()
{
InitializeComponent();
//取消下划线
linkFirst.LinkBehavior = LinkBehavior.NeverUnderline;
linkPrev.LinkBehavior = LinkBehavior.NeverUnderline;
linkNext.LinkBehavior = LinkBehavior.NeverUnderline;
linkLast.LinkBehavior = LinkBehavior.NeverUnderline;
linkGo.LinkBehavior = LinkBehavior.NeverUnderline;
}
/// <summary>
/// 设置页
/// </summary>
public void SetPage()
{
//总页数
if (TotalCount % PageSize == 0)
{
PageCount = TotalCount / PageSize;
}
else
{
PageCount = TotalCount / PageSize + 1;
}
if (PageIndex <= 0)
{
PageIndex = 1;
}else if (PageIndex >= PageCount)
{
PageIndex = PageCount ;
}
txtCurrentPage.Text = PageIndex.ToString();
lblTotalPage.Text = "共 " + PageCount.ToString() + " 页";
//lblPageSize.Text = "每页" + PageSize + "条";
txtPageSize.Text = PageSize.ToString();
BindPageEvent(PageSize, PageIndex );
}
/// <summary>
/// 首页
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void linkFirst_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
if (e.Button == MouseButtons.Left)
{
PageIndex = 0;
SetPage();
}
}
/// <summary>
/// 上一页
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void linkPrve_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
if (e.Button == MouseButtons.Left)
{
PageIndex--;
if (PageIndex < 0)
{
PageIndex = 0;
}
SetPage();
}
}
/// <summary>
/// 下一页
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void linkNext_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
if (e.Button == MouseButtons.Left)
{
PageIndex++;
if (PageIndex > PageCount - 1)
{
PageIndex = PageCount - 1;
}
SetPage();
}
}
/// <summary>
/// 末页
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void linkLast_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
if (e.Button == MouseButtons.Left)
{
PageIndex = PageCount - 1;
SetPage();
}
}
/// <summary>
/// 只能按0-9、Delete、Enter、Backspace键
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void txtSetPage_KeyPress(object sender, KeyPressEventArgs e)
{
if ((e.KeyChar >= 48 && e.KeyChar <= 57) || e.KeyChar == 8 || e.KeyChar == 13 || e.KeyChar == 127)
{
e.Handled = false;
if (e.KeyChar == 13)
{
Go();
}
}
else
{
e.Handled = true;
}
}
/// <summary>
/// 指定页
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void linkGo_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
if (e.Button == MouseButtons.Left)
{
Go();
}
}
private void Go()
{
//int pIndex = 0;
//try
//{
// pIndex = int.Parse(txtCurrentPage.Text) ;
//}
//catch (Exception ex)
//{
// MessageBox.Show("请输入正确的页数", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
// txtCurrentPage.Focus();
// return;
//}
//if (pIndex > PageCount || pIndex <= 0)
//{
// MessageBox.Show("输入的页数无效", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
// txtCurrentPage.Focus();
// return;
//}
PageSize = FormUtil.GetIntValue(txtPageSize);
if (PageSize <= 0)
{
PageSize = 50;
}
this.PageIndex = FormUtil.GetIntValue(txtCurrentPage);
SetPage();
}
/// <summary>
/// linkFirst鼠标移过颜色
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void linkFirst_MouseMove(object sender, MouseEventArgs e)
{
linkFirst.LinkColor = Color.Red;
}
/// <summary>
/// linkFirst鼠标离开颜色
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void linkFirst_MouseLeave(object sender, EventArgs e)
{
linkFirst.LinkColor = Color.Black;
}
/// <summary>
/// linkPrev鼠标移过颜色
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void linkPrev_MouseMove(object sender, MouseEventArgs e)
{
linkPrev.LinkColor = Color.Red;
}
/// <summary>
/// linkPrev鼠标离开颜色
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void linkPrev_MouseLeave(object sender, EventArgs e)
{
linkPrev.LinkColor = Color.Black;
}
/// <summary>
/// linkNext鼠标移过颜色
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void linkNext_MouseMove(object sender, MouseEventArgs e)
{
linkNext.LinkColor = Color.Red;
}
/// <summary>
/// linkNext鼠标离开颜色
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void linkNext_MouseLeave(object sender, EventArgs e)
{
linkNext.LinkColor = Color.Black;
}
/// <summary>
/// linkLast鼠标移过颜色
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void linkLast_MouseMove(object sender, MouseEventArgs e)
{
linkLast.LinkColor = Color.Red;
}
/// <summary>
/// linkLast鼠标离开颜色
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void linkLast_MouseLeave(object sender, EventArgs e)
{
linkLast.LinkColor = Color.Black;
}
/// <summary>
/// linkGo鼠标移过颜色
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void linkGo_MouseMove(object sender, MouseEventArgs e)
{
linkGo.LinkColor = Color.Red;
}
/// <summary>
/// linkGo鼠标离开颜色
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void linkGo_MouseLeave(object sender, EventArgs e)
{
linkGo.LinkColor = Color.Black;
}
private void txtCurrentPage_KeyPress(object sender, KeyPressEventArgs e)
{
//判断按键是不是要输入的类型。
if (((int)e.KeyChar < 48 || (int)e.KeyChar > 57) && (int)e.KeyChar != 8)
{ e.Handled = true; }
}
private void txtPageSize_KeyPress(object sender, KeyPressEventArgs e)
{
//判断按键是不是要输入的类型。
if (((int)e.KeyChar < 48 || (int)e.KeyChar > 57) && (int)e.KeyChar != 8)
{ e.Handled = true; }
}
}
}
RC1266-AutoCountMachine/source/AutoCountClient/useControl/PageControl.resx 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
\ No newline at end of file \ No newline at end of file
RC1266-AutoCountMachine/source/DeviceLibrary/bean/X_RAY_Equip_Partial.cs
...@@ -583,14 +583,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -583,14 +583,9 @@ namespace OnlineStore.DeviceLibrary
result = carerayImage.GetLocalCount(fileP, threshold, windowsize, out countStr, out tpDstImg); result = carerayImage.GetLocalCount(fileP, threshold, windowsize, out countStr, out tpDstImg);
LogUtil.info("GetCountResult " + type + " 调用 GetLocalCount 【" + fileP + "】【" + threshold + "】【" + windowsize + "】，返回【" + result + "】，结果【" + countStr + "】"); LogUtil.info("GetCountResult " + type + " 调用 GetLocalCount 【" + fileP + "】【" + threshold + "】【" + windowsize + "】，返回【" + result + "】，结果【" + countStr + "】");
} }
//else if (param.Sign.Equals(1))
//{
// result = carerayImage.GetLocalCountHuge(fileP, threshold, windowsize, out countStr, out tpDstImg);
// LogUtil.info("GetCountResult " + type + " 调用 GetLocalCount 【" + fileP + "】【" + threshold + "】【" + windowsize + "】，返回【" + result + "】，结果【" + countStr + "】");
//}
else else
{ {
int t = param.Sign - 1; int t = param.Sign ;
result = carerayImage.GetLocalCountIrregular(fileP, threshold, t, windowsize, out countStr, out tpDstImg); result = carerayImage.GetLocalCountIrregular(fileP, threshold, t, windowsize, out countStr, out tpDstImg);
LogUtil.info("GetCountResult " + type + " 调用 GetLocalCountIrregular 【" + fileP + "】【" + threshold + "】[" + t + "]【" + windowsize + "】，返回【" + result + "】，结果【" + countStr + "】"); LogUtil.info("GetCountResult " + type + " 调用 GetLocalCountIrregular 【" + fileP + "】【" + threshold + "】[" + t + "]【" + windowsize + "】，返回【" + result + "】，结果【" + countStr + "】");
} }
......
RC1266-AutoCountMachine/source/DeviceLibrary/manager/ParamManager.cs
...@@ -98,7 +98,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -98,7 +98,7 @@ namespace OnlineStore.DeviceLibrary
{ {
countParamMap.Add(param.PN, param); countParamMap.Add(param.PN, param);
} }
LogUtil.info("UpdateParam 【" + param.ToStr() + "】"); LogUtil.info("UpdateParam " + param.ToStr() + " ");
} }
catch (Exception ex) catch (Exception ex)
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!