|
@@ -101,6 +101,8 @@
|
|
|
this.panel3 = new System.Windows.Forms.Panel();
|
|
|
this.groupBox9 = new System.Windows.Forms.GroupBox();
|
|
|
this.label39 = new System.Windows.Forms.Label();
|
|
|
+ this.groupBZ = new System.Windows.Forms.GroupBox();
|
|
|
+ this.textBox_strBZ = new System.Windows.Forms.TextBox();
|
|
|
this.groupBox1.SuspendLayout();
|
|
|
this.groupBox4.SuspendLayout();
|
|
|
this.groupBox6.SuspendLayout();
|
|
@@ -116,48 +118,51 @@
|
|
|
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
|
|
|
this.panel3.SuspendLayout();
|
|
|
this.groupBox9.SuspendLayout();
|
|
|
+ this.groupBZ.SuspendLayout();
|
|
|
this.SuspendLayout();
|
|
|
//
|
|
|
// tb_FBT
|
|
|
//
|
|
|
- this.tb_FBT.Location = new System.Drawing.Point(7, 104);
|
|
|
- this.tb_FBT.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.tb_FBT.Location = new System.Drawing.Point(5, 83);
|
|
|
+ this.tb_FBT.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.tb_FBT.Name = "tb_FBT";
|
|
|
- this.tb_FBT.Size = new System.Drawing.Size(343, 25);
|
|
|
+ this.tb_FBT.Size = new System.Drawing.Size(258, 21);
|
|
|
this.tb_FBT.TabIndex = 20;
|
|
|
//
|
|
|
// tb_ZBT
|
|
|
//
|
|
|
- this.tb_ZBT.Location = new System.Drawing.Point(7, 44);
|
|
|
- this.tb_ZBT.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.tb_ZBT.Location = new System.Drawing.Point(5, 35);
|
|
|
+ this.tb_ZBT.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.tb_ZBT.Name = "tb_ZBT";
|
|
|
- this.tb_ZBT.Size = new System.Drawing.Size(343, 25);
|
|
|
+ this.tb_ZBT.Size = new System.Drawing.Size(258, 21);
|
|
|
this.tb_ZBT.TabIndex = 10;
|
|
|
//
|
|
|
// label5
|
|
|
//
|
|
|
this.label5.AutoSize = true;
|
|
|
- this.label5.Location = new System.Drawing.Point(7, 86);
|
|
|
+ this.label5.Location = new System.Drawing.Point(5, 69);
|
|
|
+ this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
|
|
this.label5.Name = "label5";
|
|
|
- this.label5.Size = new System.Drawing.Size(52, 15);
|
|
|
+ this.label5.Size = new System.Drawing.Size(41, 12);
|
|
|
this.label5.TabIndex = 0;
|
|
|
this.label5.Text = "副标题";
|
|
|
//
|
|
|
// label3
|
|
|
//
|
|
|
this.label3.AutoSize = true;
|
|
|
- this.label3.Location = new System.Drawing.Point(7, 26);
|
|
|
+ this.label3.Location = new System.Drawing.Point(5, 21);
|
|
|
+ this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
|
|
this.label3.Name = "label3";
|
|
|
- this.label3.Size = new System.Drawing.Size(52, 15);
|
|
|
+ this.label3.Size = new System.Drawing.Size(41, 12);
|
|
|
this.label3.TabIndex = 0;
|
|
|
this.label3.Text = "主标题";
|
|
|
//
|
|
|
// button1
|
|
|
//
|
|
|
- this.button1.Location = new System.Drawing.Point(1240, 59);
|
|
|
- this.button1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.button1.Location = new System.Drawing.Point(930, 47);
|
|
|
+ this.button1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.button1.Name = "button1";
|
|
|
- this.button1.Size = new System.Drawing.Size(95, 28);
|
|
|
+ this.button1.Size = new System.Drawing.Size(71, 22);
|
|
|
this.button1.TabIndex = 60;
|
|
|
this.button1.Text = "另存";
|
|
|
this.button1.UseVisualStyleBackColor = true;
|
|
@@ -165,10 +170,10 @@
|
|
|
//
|
|
|
// button2
|
|
|
//
|
|
|
- this.button2.Location = new System.Drawing.Point(1835, 810);
|
|
|
- this.button2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.button2.Location = new System.Drawing.Point(1376, 648);
|
|
|
+ this.button2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.button2.Name = "button2";
|
|
|
- this.button2.Size = new System.Drawing.Size(95, 28);
|
|
|
+ this.button2.Size = new System.Drawing.Size(71, 22);
|
|
|
this.button2.TabIndex = 70;
|
|
|
this.button2.Text = "返 回";
|
|
|
this.button2.UseVisualStyleBackColor = true;
|
|
@@ -177,125 +182,132 @@
|
|
|
// label1
|
|
|
//
|
|
|
this.label1.AutoSize = true;
|
|
|
- this.label1.Location = new System.Drawing.Point(7, 155);
|
|
|
+ this.label1.Location = new System.Drawing.Point(5, 124);
|
|
|
+ this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
|
|
this.label1.Name = "label1";
|
|
|
- this.label1.Size = new System.Drawing.Size(67, 15);
|
|
|
+ this.label1.Size = new System.Drawing.Size(53, 12);
|
|
|
this.label1.TabIndex = 0;
|
|
|
this.label1.Text = "样品编号";
|
|
|
//
|
|
|
// tb_YPBH
|
|
|
//
|
|
|
- this.tb_YPBH.Location = new System.Drawing.Point(7, 172);
|
|
|
- this.tb_YPBH.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.tb_YPBH.Location = new System.Drawing.Point(5, 138);
|
|
|
+ this.tb_YPBH.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.tb_YPBH.Name = "tb_YPBH";
|
|
|
- this.tb_YPBH.Size = new System.Drawing.Size(343, 25);
|
|
|
+ this.tb_YPBH.Size = new System.Drawing.Size(258, 21);
|
|
|
this.tb_YPBH.TabIndex = 30;
|
|
|
//
|
|
|
// label4
|
|
|
//
|
|
|
this.label4.AutoSize = true;
|
|
|
- this.label4.Location = new System.Drawing.Point(7, 219);
|
|
|
+ this.label4.Location = new System.Drawing.Point(5, 175);
|
|
|
+ this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
|
|
this.label4.Name = "label4";
|
|
|
- this.label4.Size = new System.Drawing.Size(67, 15);
|
|
|
+ this.label4.Size = new System.Drawing.Size(53, 12);
|
|
|
this.label4.TabIndex = 0;
|
|
|
this.label4.Text = "参考标准";
|
|
|
//
|
|
|
// tb_CKBZ
|
|
|
//
|
|
|
- this.tb_CKBZ.Location = new System.Drawing.Point(7, 236);
|
|
|
- this.tb_CKBZ.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.tb_CKBZ.Location = new System.Drawing.Point(5, 189);
|
|
|
+ this.tb_CKBZ.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.tb_CKBZ.Name = "tb_CKBZ";
|
|
|
- this.tb_CKBZ.Size = new System.Drawing.Size(343, 25);
|
|
|
+ this.tb_CKBZ.Size = new System.Drawing.Size(258, 21);
|
|
|
this.tb_CKBZ.TabIndex = 50;
|
|
|
//
|
|
|
// ck_jggk
|
|
|
//
|
|
|
this.ck_jggk.AutoSize = true;
|
|
|
- this.ck_jggk.Location = new System.Drawing.Point(299, 288);
|
|
|
- this.ck_jggk.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.ck_jggk.Location = new System.Drawing.Point(224, 230);
|
|
|
+ this.ck_jggk.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.ck_jggk.Name = "ck_jggk";
|
|
|
- this.ck_jggk.Size = new System.Drawing.Size(18, 17);
|
|
|
+ this.ck_jggk.Size = new System.Drawing.Size(15, 14);
|
|
|
this.ck_jggk.TabIndex = 51;
|
|
|
this.ck_jggk.UseVisualStyleBackColor = true;
|
|
|
//
|
|
|
// ck_ypsm
|
|
|
//
|
|
|
this.ck_ypsm.AutoSize = true;
|
|
|
- this.ck_ypsm.Location = new System.Drawing.Point(517, 199);
|
|
|
- this.ck_ypsm.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.ck_ypsm.Location = new System.Drawing.Point(388, 159);
|
|
|
+ this.ck_ypsm.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.ck_ypsm.Name = "ck_ypsm";
|
|
|
- this.ck_ypsm.Size = new System.Drawing.Size(18, 17);
|
|
|
+ this.ck_ypsm.Size = new System.Drawing.Size(15, 14);
|
|
|
this.ck_ypsm.TabIndex = 51;
|
|
|
this.ck_ypsm.UseVisualStyleBackColor = true;
|
|
|
//
|
|
|
// label7
|
|
|
//
|
|
|
this.label7.AutoSize = true;
|
|
|
- this.label7.Location = new System.Drawing.Point(7, 288);
|
|
|
+ this.label7.Location = new System.Drawing.Point(5, 230);
|
|
|
+ this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
|
|
this.label7.Name = "label7";
|
|
|
- this.label7.Size = new System.Drawing.Size(97, 15);
|
|
|
+ this.label7.Size = new System.Drawing.Size(77, 12);
|
|
|
this.label7.TabIndex = 0;
|
|
|
this.label7.Text = "显示结果概况";
|
|
|
//
|
|
|
// label6
|
|
|
//
|
|
|
this.label6.AutoSize = true;
|
|
|
- this.label6.Location = new System.Drawing.Point(403, 199);
|
|
|
+ this.label6.Location = new System.Drawing.Point(302, 159);
|
|
|
+ this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
|
|
this.label6.Name = "label6";
|
|
|
- this.label6.Size = new System.Drawing.Size(97, 15);
|
|
|
+ this.label6.Size = new System.Drawing.Size(77, 12);
|
|
|
this.label6.TabIndex = 0;
|
|
|
this.label6.Text = "显示样品说明";
|
|
|
//
|
|
|
// ck_ym
|
|
|
//
|
|
|
this.ck_ym.AutoSize = true;
|
|
|
- this.ck_ym.Location = new System.Drawing.Point(545, 111);
|
|
|
- this.ck_ym.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.ck_ym.Location = new System.Drawing.Point(409, 89);
|
|
|
+ this.ck_ym.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.ck_ym.Name = "ck_ym";
|
|
|
- this.ck_ym.Size = new System.Drawing.Size(18, 17);
|
|
|
+ this.ck_ym.Size = new System.Drawing.Size(15, 14);
|
|
|
this.ck_ym.TabIndex = 52;
|
|
|
this.ck_ym.UseVisualStyleBackColor = true;
|
|
|
//
|
|
|
// tb_yjwb
|
|
|
//
|
|
|
- this.tb_yjwb.Location = new System.Drawing.Point(9, 111);
|
|
|
- this.tb_yjwb.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.tb_yjwb.Location = new System.Drawing.Point(7, 89);
|
|
|
+ this.tb_yjwb.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.tb_yjwb.Name = "tb_yjwb";
|
|
|
- this.tb_yjwb.Size = new System.Drawing.Size(340, 25);
|
|
|
+ this.tb_yjwb.Size = new System.Drawing.Size(256, 21);
|
|
|
this.tb_yjwb.TabIndex = 42;
|
|
|
//
|
|
|
// label10
|
|
|
//
|
|
|
this.label10.AutoSize = true;
|
|
|
- this.label10.Location = new System.Drawing.Point(7, 94);
|
|
|
+ this.label10.Location = new System.Drawing.Point(5, 75);
|
|
|
+ this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
|
|
this.label10.Name = "label10";
|
|
|
- this.label10.Size = new System.Drawing.Size(67, 15);
|
|
|
+ this.label10.Size = new System.Drawing.Size(53, 12);
|
|
|
this.label10.TabIndex = 41;
|
|
|
this.label10.Text = "页脚文本";
|
|
|
//
|
|
|
// label9
|
|
|
//
|
|
|
this.label9.AutoSize = true;
|
|
|
- this.label9.Location = new System.Drawing.Point(480, 111);
|
|
|
+ this.label9.Location = new System.Drawing.Point(360, 89);
|
|
|
+ this.label9.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
|
|
this.label9.Name = "label9";
|
|
|
- this.label9.Size = new System.Drawing.Size(37, 15);
|
|
|
+ this.label9.Size = new System.Drawing.Size(29, 12);
|
|
|
this.label9.TabIndex = 41;
|
|
|
this.label9.Text = "页码";
|
|
|
//
|
|
|
// tb_khh
|
|
|
//
|
|
|
- this.tb_khh.Location = new System.Drawing.Point(9, 184);
|
|
|
- this.tb_khh.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.tb_khh.Location = new System.Drawing.Point(7, 147);
|
|
|
+ this.tb_khh.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.tb_khh.Name = "tb_khh";
|
|
|
- this.tb_khh.Size = new System.Drawing.Size(340, 25);
|
|
|
+ this.tb_khh.Size = new System.Drawing.Size(256, 21);
|
|
|
this.tb_khh.TabIndex = 42;
|
|
|
//
|
|
|
// label2
|
|
|
//
|
|
|
this.label2.AutoSize = true;
|
|
|
- this.label2.Location = new System.Drawing.Point(7, 166);
|
|
|
+ this.label2.Location = new System.Drawing.Point(5, 133);
|
|
|
+ this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
|
|
this.label2.Name = "label2";
|
|
|
- this.label2.Size = new System.Drawing.Size(52, 15);
|
|
|
+ this.label2.Size = new System.Drawing.Size(41, 12);
|
|
|
this.label2.TabIndex = 41;
|
|
|
this.label2.Text = "客户号";
|
|
|
//
|
|
@@ -309,29 +321,30 @@
|
|
|
this.groupBox1.Controls.Add(this.label2);
|
|
|
this.groupBox1.Controls.Add(this.label10);
|
|
|
this.groupBox1.Controls.Add(this.label8);
|
|
|
- this.groupBox1.Location = new System.Drawing.Point(4, 329);
|
|
|
- this.groupBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.groupBox1.Location = new System.Drawing.Point(3, 263);
|
|
|
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.groupBox1.Name = "groupBox1";
|
|
|
- this.groupBox1.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
- this.groupBox1.Size = new System.Drawing.Size(357, 226);
|
|
|
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
+ this.groupBox1.Size = new System.Drawing.Size(268, 181);
|
|
|
this.groupBox1.TabIndex = 0;
|
|
|
this.groupBox1.TabStop = false;
|
|
|
this.groupBox1.Text = "页眉页脚设置";
|
|
|
//
|
|
|
// tb_ymwb
|
|
|
//
|
|
|
- this.tb_ymwb.Location = new System.Drawing.Point(9, 41);
|
|
|
- this.tb_ymwb.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.tb_ymwb.Location = new System.Drawing.Point(7, 33);
|
|
|
+ this.tb_ymwb.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.tb_ymwb.Name = "tb_ymwb";
|
|
|
- this.tb_ymwb.Size = new System.Drawing.Size(340, 25);
|
|
|
+ this.tb_ymwb.Size = new System.Drawing.Size(256, 21);
|
|
|
this.tb_ymwb.TabIndex = 42;
|
|
|
//
|
|
|
// label8
|
|
|
//
|
|
|
this.label8.AutoSize = true;
|
|
|
- this.label8.Location = new System.Drawing.Point(7, 21);
|
|
|
+ this.label8.Location = new System.Drawing.Point(5, 17);
|
|
|
+ this.label8.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
|
|
this.label8.Name = "label8";
|
|
|
- this.label8.Size = new System.Drawing.Size(67, 15);
|
|
|
+ this.label8.Size = new System.Drawing.Size(53, 12);
|
|
|
this.label8.TabIndex = 41;
|
|
|
this.label8.Text = "页眉文本";
|
|
|
//
|
|
@@ -343,11 +356,11 @@
|
|
|
this.groupBox4.Controls.Add(this.cb_klcc_jsfs);
|
|
|
this.groupBox4.Controls.Add(this.label15);
|
|
|
this.groupBox4.Controls.Add(this.label14);
|
|
|
- this.groupBox4.Location = new System.Drawing.Point(4, 560);
|
|
|
- this.groupBox4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.groupBox4.Location = new System.Drawing.Point(3, 448);
|
|
|
+ this.groupBox4.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.groupBox4.Name = "groupBox4";
|
|
|
- this.groupBox4.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
- this.groupBox4.Size = new System.Drawing.Size(357, 198);
|
|
|
+ this.groupBox4.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
+ this.groupBox4.Size = new System.Drawing.Size(268, 158);
|
|
|
this.groupBox4.TabIndex = 2;
|
|
|
this.groupBox4.TabStop = false;
|
|
|
this.groupBox4.Text = "颗粒尺寸分析结果";
|
|
@@ -355,10 +368,10 @@
|
|
|
// ck_klcc_xsmk
|
|
|
//
|
|
|
this.ck_klcc_xsmk.AutoSize = true;
|
|
|
- this.ck_klcc_xsmk.Location = new System.Drawing.Point(299, 31);
|
|
|
- this.ck_klcc_xsmk.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.ck_klcc_xsmk.Location = new System.Drawing.Point(224, 25);
|
|
|
+ this.ck_klcc_xsmk.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.ck_klcc_xsmk.Name = "ck_klcc_xsmk";
|
|
|
- this.ck_klcc_xsmk.Size = new System.Drawing.Size(18, 17);
|
|
|
+ this.ck_klcc_xsmk.Size = new System.Drawing.Size(15, 14);
|
|
|
this.ck_klcc_xsmk.TabIndex = 53;
|
|
|
this.ck_klcc_xsmk.UseVisualStyleBackColor = true;
|
|
|
this.ck_klcc_xsmk.CheckedChanged += new System.EventHandler(this.ck_klcc_xsmk_CheckedChanged);
|
|
@@ -366,9 +379,10 @@
|
|
|
// label17
|
|
|
//
|
|
|
this.label17.AutoSize = true;
|
|
|
- this.label17.Location = new System.Drawing.Point(12, 31);
|
|
|
+ this.label17.Location = new System.Drawing.Point(9, 25);
|
|
|
+ this.label17.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
|
|
this.label17.Name = "label17";
|
|
|
- this.label17.Size = new System.Drawing.Size(82, 15);
|
|
|
+ this.label17.Size = new System.Drawing.Size(65, 12);
|
|
|
this.label17.TabIndex = 52;
|
|
|
this.label17.Text = "显示该模块";
|
|
|
//
|
|
@@ -376,37 +390,39 @@
|
|
|
//
|
|
|
this.cb_klcc_ljb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
|
|
this.cb_klcc_ljb.FormattingEnabled = true;
|
|
|
- this.cb_klcc_ljb.Location = new System.Drawing.Point(25, 140);
|
|
|
- this.cb_klcc_ljb.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.cb_klcc_ljb.Location = new System.Drawing.Point(19, 112);
|
|
|
+ this.cb_klcc_ljb.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.cb_klcc_ljb.Name = "cb_klcc_ljb";
|
|
|
- this.cb_klcc_ljb.Size = new System.Drawing.Size(287, 23);
|
|
|
+ this.cb_klcc_ljb.Size = new System.Drawing.Size(216, 20);
|
|
|
this.cb_klcc_ljb.TabIndex = 42;
|
|
|
//
|
|
|
// cb_klcc_jsfs
|
|
|
//
|
|
|
this.cb_klcc_jsfs.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
|
|
this.cb_klcc_jsfs.FormattingEnabled = true;
|
|
|
- this.cb_klcc_jsfs.Location = new System.Drawing.Point(25, 84);
|
|
|
- this.cb_klcc_jsfs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.cb_klcc_jsfs.Location = new System.Drawing.Point(19, 67);
|
|
|
+ this.cb_klcc_jsfs.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.cb_klcc_jsfs.Name = "cb_klcc_jsfs";
|
|
|
- this.cb_klcc_jsfs.Size = new System.Drawing.Size(287, 23);
|
|
|
+ this.cb_klcc_jsfs.Size = new System.Drawing.Size(216, 20);
|
|
|
this.cb_klcc_jsfs.TabIndex = 42;
|
|
|
//
|
|
|
// label15
|
|
|
//
|
|
|
this.label15.AutoSize = true;
|
|
|
- this.label15.Location = new System.Drawing.Point(25, 121);
|
|
|
+ this.label15.Location = new System.Drawing.Point(19, 97);
|
|
|
+ this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
|
|
this.label15.Name = "label15";
|
|
|
- this.label15.Size = new System.Drawing.Size(82, 15);
|
|
|
+ this.label15.Size = new System.Drawing.Size(65, 12);
|
|
|
this.label15.TabIndex = 41;
|
|
|
this.label15.Text = "粒级表信息";
|
|
|
//
|
|
|
// label14
|
|
|
//
|
|
|
this.label14.AutoSize = true;
|
|
|
- this.label14.Location = new System.Drawing.Point(23, 66);
|
|
|
+ this.label14.Location = new System.Drawing.Point(17, 53);
|
|
|
+ this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
|
|
this.label14.Name = "label14";
|
|
|
- this.label14.Size = new System.Drawing.Size(67, 15);
|
|
|
+ this.label14.Size = new System.Drawing.Size(53, 12);
|
|
|
this.label14.TabIndex = 41;
|
|
|
this.label14.Text = "计算方式";
|
|
|
//
|
|
@@ -418,21 +434,20 @@
|
|
|
this.groupBox6.Controls.Add(this.button4);
|
|
|
this.groupBox6.Controls.Add(this.ck_ysfx_xsmk);
|
|
|
this.groupBox6.Controls.Add(this.label25);
|
|
|
- this.groupBox6.Location = new System.Drawing.Point(4, 768);
|
|
|
- this.groupBox6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.groupBox6.Location = new System.Drawing.Point(3, 614);
|
|
|
+ this.groupBox6.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.groupBox6.Name = "groupBox6";
|
|
|
- this.groupBox6.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
- this.groupBox6.Size = new System.Drawing.Size(357, 168);
|
|
|
+ this.groupBox6.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
+ this.groupBox6.Size = new System.Drawing.Size(268, 134);
|
|
|
this.groupBox6.TabIndex = 4;
|
|
|
this.groupBox6.TabStop = false;
|
|
|
this.groupBox6.Text = "元素分析表";
|
|
|
//
|
|
|
// button3
|
|
|
//
|
|
|
- this.button3.Location = new System.Drawing.Point(269, 64);
|
|
|
- this.button3.Margin = new System.Windows.Forms.Padding(4);
|
|
|
+ this.button3.Location = new System.Drawing.Point(202, 51);
|
|
|
this.button3.Name = "button3";
|
|
|
- this.button3.Size = new System.Drawing.Size(73, 29);
|
|
|
+ this.button3.Size = new System.Drawing.Size(55, 23);
|
|
|
this.button3.TabIndex = 60;
|
|
|
this.button3.Text = "Delete";
|
|
|
this.button3.UseVisualStyleBackColor = true;
|
|
@@ -441,29 +456,28 @@
|
|
|
// comboBox_PeriodicTable
|
|
|
//
|
|
|
this.comboBox_PeriodicTable.FormattingEnabled = true;
|
|
|
- this.comboBox_PeriodicTable.Location = new System.Drawing.Point(21, 116);
|
|
|
- this.comboBox_PeriodicTable.Margin = new System.Windows.Forms.Padding(4);
|
|
|
+ this.comboBox_PeriodicTable.Location = new System.Drawing.Point(16, 93);
|
|
|
this.comboBox_PeriodicTable.Name = "comboBox_PeriodicTable";
|
|
|
- this.comboBox_PeriodicTable.Size = new System.Drawing.Size(187, 23);
|
|
|
+ this.comboBox_PeriodicTable.Size = new System.Drawing.Size(141, 20);
|
|
|
this.comboBox_PeriodicTable.TabIndex = 59;
|
|
|
this.comboBox_PeriodicTable.SelectedIndexChanged += new System.EventHandler(this.comboBox_PeriodicTable_SelectedIndexChanged);
|
|
|
this.comboBox_PeriodicTable.KeyDown += new System.Windows.Forms.KeyEventHandler(this.comboBox_PeriodicTable_KeyDown);
|
|
|
//
|
|
|
// tb_ysfx_xsys
|
|
|
//
|
|
|
- this.tb_ysfx_xsys.Location = new System.Drawing.Point(21, 64);
|
|
|
- this.tb_ysfx_xsys.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.tb_ysfx_xsys.Location = new System.Drawing.Point(16, 51);
|
|
|
+ this.tb_ysfx_xsys.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.tb_ysfx_xsys.Name = "tb_ysfx_xsys";
|
|
|
this.tb_ysfx_xsys.ReadOnly = true;
|
|
|
- this.tb_ysfx_xsys.Size = new System.Drawing.Size(240, 25);
|
|
|
+ this.tb_ysfx_xsys.Size = new System.Drawing.Size(181, 21);
|
|
|
this.tb_ysfx_xsys.TabIndex = 58;
|
|
|
//
|
|
|
// button4
|
|
|
//
|
|
|
- this.button4.Location = new System.Drawing.Point(223, 116);
|
|
|
- this.button4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.button4.Location = new System.Drawing.Point(167, 93);
|
|
|
+ this.button4.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.button4.Name = "button4";
|
|
|
- this.button4.Size = new System.Drawing.Size(96, 25);
|
|
|
+ this.button4.Size = new System.Drawing.Size(72, 20);
|
|
|
this.button4.TabIndex = 57;
|
|
|
this.button4.Text = "PeriodicTable";
|
|
|
this.button4.UseVisualStyleBackColor = true;
|
|
@@ -472,10 +486,10 @@
|
|
|
// ck_ysfx_xsmk
|
|
|
//
|
|
|
this.ck_ysfx_xsmk.AutoSize = true;
|
|
|
- this.ck_ysfx_xsmk.Location = new System.Drawing.Point(299, 31);
|
|
|
- this.ck_ysfx_xsmk.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.ck_ysfx_xsmk.Location = new System.Drawing.Point(224, 25);
|
|
|
+ this.ck_ysfx_xsmk.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.ck_ysfx_xsmk.Name = "ck_ysfx_xsmk";
|
|
|
- this.ck_ysfx_xsmk.Size = new System.Drawing.Size(18, 17);
|
|
|
+ this.ck_ysfx_xsmk.Size = new System.Drawing.Size(15, 14);
|
|
|
this.ck_ysfx_xsmk.TabIndex = 53;
|
|
|
this.ck_ysfx_xsmk.UseVisualStyleBackColor = true;
|
|
|
this.ck_ysfx_xsmk.CheckedChanged += new System.EventHandler(this.ck_ysfx_xsmk_CheckedChanged);
|
|
@@ -483,9 +497,10 @@
|
|
|
// label25
|
|
|
//
|
|
|
this.label25.AutoSize = true;
|
|
|
- this.label25.Location = new System.Drawing.Point(7, 34);
|
|
|
+ this.label25.Location = new System.Drawing.Point(5, 27);
|
|
|
+ this.label25.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
|
|
this.label25.Name = "label25";
|
|
|
- this.label25.Size = new System.Drawing.Size(82, 15);
|
|
|
+ this.label25.Size = new System.Drawing.Size(65, 12);
|
|
|
this.label25.TabIndex = 52;
|
|
|
this.label25.Text = "显示该模块";
|
|
|
//
|
|
@@ -499,11 +514,11 @@
|
|
|
this.groupBox7.Controls.Add(this.label38);
|
|
|
this.groupBox7.Controls.Add(this.label33);
|
|
|
this.groupBox7.Controls.Add(this.label42);
|
|
|
- this.groupBox7.Location = new System.Drawing.Point(1567, 152);
|
|
|
- this.groupBox7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.groupBox7.Location = new System.Drawing.Point(1175, 122);
|
|
|
+ this.groupBox7.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.groupBox7.Name = "groupBox7";
|
|
|
- this.groupBox7.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
- this.groupBox7.Size = new System.Drawing.Size(351, 589);
|
|
|
+ this.groupBox7.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
+ this.groupBox7.Size = new System.Drawing.Size(263, 471);
|
|
|
this.groupBox7.TabIndex = 7;
|
|
|
this.groupBox7.TabStop = false;
|
|
|
this.groupBox7.Text = "三元相图";
|
|
@@ -514,10 +529,10 @@
|
|
|
this.lbv_syxt_mblb.CheckBoxes = true;
|
|
|
this.lbv_syxt_mblb.FullRowSelect = true;
|
|
|
this.lbv_syxt_mblb.HideSelection = false;
|
|
|
- this.lbv_syxt_mblb.Location = new System.Drawing.Point(11, 249);
|
|
|
- this.lbv_syxt_mblb.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.lbv_syxt_mblb.Location = new System.Drawing.Point(8, 199);
|
|
|
+ this.lbv_syxt_mblb.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.lbv_syxt_mblb.Name = "lbv_syxt_mblb";
|
|
|
- this.lbv_syxt_mblb.Size = new System.Drawing.Size(331, 322);
|
|
|
+ this.lbv_syxt_mblb.Size = new System.Drawing.Size(249, 258);
|
|
|
this.lbv_syxt_mblb.TabIndex = 55;
|
|
|
this.lbv_syxt_mblb.UseCompatibleStateImageBehavior = false;
|
|
|
this.lbv_syxt_mblb.View = System.Windows.Forms.View.List;
|
|
@@ -525,10 +540,10 @@
|
|
|
// ck_syxt_xsmk
|
|
|
//
|
|
|
this.ck_syxt_xsmk.AutoSize = true;
|
|
|
- this.ck_syxt_xsmk.Location = new System.Drawing.Point(299, 26);
|
|
|
- this.ck_syxt_xsmk.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.ck_syxt_xsmk.Location = new System.Drawing.Point(224, 21);
|
|
|
+ this.ck_syxt_xsmk.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.ck_syxt_xsmk.Name = "ck_syxt_xsmk";
|
|
|
- this.ck_syxt_xsmk.Size = new System.Drawing.Size(18, 17);
|
|
|
+ this.ck_syxt_xsmk.Size = new System.Drawing.Size(15, 14);
|
|
|
this.ck_syxt_xsmk.TabIndex = 53;
|
|
|
this.ck_syxt_xsmk.UseVisualStyleBackColor = true;
|
|
|
this.ck_syxt_xsmk.CheckedChanged += new System.EventHandler(this.ck_syxt_xsmk_CheckedChanged);
|
|
@@ -536,9 +551,10 @@
|
|
|
// label40
|
|
|
//
|
|
|
this.label40.AutoSize = true;
|
|
|
- this.label40.Location = new System.Drawing.Point(5, 29);
|
|
|
+ this.label40.Location = new System.Drawing.Point(4, 23);
|
|
|
+ this.label40.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
|
|
this.label40.Name = "label40";
|
|
|
- this.label40.Size = new System.Drawing.Size(82, 15);
|
|
|
+ this.label40.Size = new System.Drawing.Size(65, 12);
|
|
|
this.label40.TabIndex = 52;
|
|
|
this.label40.Text = "显示该模块";
|
|
|
//
|
|
@@ -546,47 +562,50 @@
|
|
|
//
|
|
|
this.cb_syxt_ljb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
|
|
this.cb_syxt_ljb.FormattingEnabled = true;
|
|
|
- this.cb_syxt_ljb.Location = new System.Drawing.Point(19, 91);
|
|
|
- this.cb_syxt_ljb.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.cb_syxt_ljb.Location = new System.Drawing.Point(14, 73);
|
|
|
+ this.cb_syxt_ljb.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.cb_syxt_ljb.Name = "cb_syxt_ljb";
|
|
|
- this.cb_syxt_ljb.Size = new System.Drawing.Size(284, 23);
|
|
|
+ this.cb_syxt_ljb.Size = new System.Drawing.Size(214, 20);
|
|
|
this.cb_syxt_ljb.TabIndex = 42;
|
|
|
//
|
|
|
// cb_syxt_mhxssl
|
|
|
//
|
|
|
this.cb_syxt_mhxssl.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
|
|
this.cb_syxt_mhxssl.FormattingEnabled = true;
|
|
|
- this.cb_syxt_mhxssl.Location = new System.Drawing.Point(19, 161);
|
|
|
- this.cb_syxt_mhxssl.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.cb_syxt_mhxssl.Location = new System.Drawing.Point(14, 129);
|
|
|
+ this.cb_syxt_mhxssl.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.cb_syxt_mhxssl.Name = "cb_syxt_mhxssl";
|
|
|
- this.cb_syxt_mhxssl.Size = new System.Drawing.Size(284, 23);
|
|
|
+ this.cb_syxt_mhxssl.Size = new System.Drawing.Size(214, 20);
|
|
|
this.cb_syxt_mhxssl.TabIndex = 42;
|
|
|
this.cb_syxt_mhxssl.SelectedIndexChanged += new System.EventHandler(this.cb_syxt_mhxssl_SelectedIndexChanged);
|
|
|
//
|
|
|
// label38
|
|
|
//
|
|
|
this.label38.AutoSize = true;
|
|
|
- this.label38.Location = new System.Drawing.Point(16, 74);
|
|
|
+ this.label38.Location = new System.Drawing.Point(12, 59);
|
|
|
+ this.label38.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
|
|
this.label38.Name = "label38";
|
|
|
- this.label38.Size = new System.Drawing.Size(82, 15);
|
|
|
+ this.label38.Size = new System.Drawing.Size(65, 12);
|
|
|
this.label38.TabIndex = 41;
|
|
|
this.label38.Text = "粒级表信息";
|
|
|
//
|
|
|
// label33
|
|
|
//
|
|
|
this.label33.AutoSize = true;
|
|
|
- this.label33.Location = new System.Drawing.Point(18, 220);
|
|
|
+ this.label33.Location = new System.Drawing.Point(14, 176);
|
|
|
+ this.label33.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
|
|
this.label33.Name = "label33";
|
|
|
- this.label33.Size = new System.Drawing.Size(127, 15);
|
|
|
+ this.label33.Size = new System.Drawing.Size(101, 12);
|
|
|
this.label33.TabIndex = 41;
|
|
|
this.label33.Text = "三元相图模板列表";
|
|
|
//
|
|
|
// label42
|
|
|
//
|
|
|
this.label42.AutoSize = true;
|
|
|
- this.label42.Location = new System.Drawing.Point(16, 144);
|
|
|
+ this.label42.Location = new System.Drawing.Point(12, 115);
|
|
|
+ this.label42.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
|
|
this.label42.Name = "label42";
|
|
|
- this.label42.Size = new System.Drawing.Size(97, 15);
|
|
|
+ this.label42.Size = new System.Drawing.Size(77, 12);
|
|
|
this.label42.TabIndex = 41;
|
|
|
this.label42.Text = "每行显示数量";
|
|
|
//
|
|
@@ -600,11 +619,11 @@
|
|
|
this.groupBox8.Controls.Add(this.label31);
|
|
|
this.groupBox8.Controls.Add(this.label30);
|
|
|
this.groupBox8.Controls.Add(this.label34);
|
|
|
- this.groupBox8.Location = new System.Drawing.Point(3, 940);
|
|
|
- this.groupBox8.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.groupBox8.Location = new System.Drawing.Point(5, 752);
|
|
|
+ this.groupBox8.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.groupBox8.Name = "groupBox8";
|
|
|
- this.groupBox8.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
- this.groupBox8.Size = new System.Drawing.Size(351, 175);
|
|
|
+ this.groupBox8.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
+ this.groupBox8.Size = new System.Drawing.Size(263, 140);
|
|
|
this.groupBox8.TabIndex = 6;
|
|
|
this.groupBox8.TabStop = false;
|
|
|
this.groupBox8.Text = "颗粒列表";
|
|
@@ -612,10 +631,10 @@
|
|
|
// ck_kllb_npxx
|
|
|
//
|
|
|
this.ck_kllb_npxx.AutoSize = true;
|
|
|
- this.ck_kllb_npxx.Location = new System.Drawing.Point(299, 128);
|
|
|
- this.ck_kllb_npxx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.ck_kllb_npxx.Location = new System.Drawing.Point(224, 102);
|
|
|
+ this.ck_kllb_npxx.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.ck_kllb_npxx.Name = "ck_kllb_npxx";
|
|
|
- this.ck_kllb_npxx.Size = new System.Drawing.Size(18, 17);
|
|
|
+ this.ck_kllb_npxx.Size = new System.Drawing.Size(15, 14);
|
|
|
this.ck_kllb_npxx.TabIndex = 53;
|
|
|
this.ck_kllb_npxx.UseVisualStyleBackColor = true;
|
|
|
this.ck_kllb_npxx.CheckedChanged += new System.EventHandler(this.ck_kllb_npxx_CheckedChanged);
|
|
@@ -623,10 +642,10 @@
|
|
|
// ck_kllb_fdtx
|
|
|
//
|
|
|
this.ck_kllb_fdtx.AutoSize = true;
|
|
|
- this.ck_kllb_fdtx.Location = new System.Drawing.Point(299, 92);
|
|
|
- this.ck_kllb_fdtx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.ck_kllb_fdtx.Location = new System.Drawing.Point(224, 74);
|
|
|
+ this.ck_kllb_fdtx.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.ck_kllb_fdtx.Name = "ck_kllb_fdtx";
|
|
|
- this.ck_kllb_fdtx.Size = new System.Drawing.Size(18, 17);
|
|
|
+ this.ck_kllb_fdtx.Size = new System.Drawing.Size(15, 14);
|
|
|
this.ck_kllb_fdtx.TabIndex = 53;
|
|
|
this.ck_kllb_fdtx.UseVisualStyleBackColor = true;
|
|
|
this.ck_kllb_fdtx.CheckedChanged += new System.EventHandler(this.ck_kllb_fdtx_CheckedChanged);
|
|
@@ -634,10 +653,10 @@
|
|
|
// ck_kllb_ystx
|
|
|
//
|
|
|
this.ck_kllb_ystx.AutoSize = true;
|
|
|
- this.ck_kllb_ystx.Location = new System.Drawing.Point(299, 60);
|
|
|
- this.ck_kllb_ystx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.ck_kllb_ystx.Location = new System.Drawing.Point(224, 48);
|
|
|
+ this.ck_kllb_ystx.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.ck_kllb_ystx.Name = "ck_kllb_ystx";
|
|
|
- this.ck_kllb_ystx.Size = new System.Drawing.Size(18, 17);
|
|
|
+ this.ck_kllb_ystx.Size = new System.Drawing.Size(15, 14);
|
|
|
this.ck_kllb_ystx.TabIndex = 53;
|
|
|
this.ck_kllb_ystx.UseVisualStyleBackColor = true;
|
|
|
this.ck_kllb_ystx.CheckedChanged += new System.EventHandler(this.ck_kllb_ystx_CheckedChanged);
|
|
@@ -645,10 +664,10 @@
|
|
|
// ck_kllb_xsmk
|
|
|
//
|
|
|
this.ck_kllb_xsmk.AutoSize = true;
|
|
|
- this.ck_kllb_xsmk.Location = new System.Drawing.Point(299, 29);
|
|
|
- this.ck_kllb_xsmk.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.ck_kllb_xsmk.Location = new System.Drawing.Point(224, 23);
|
|
|
+ this.ck_kllb_xsmk.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.ck_kllb_xsmk.Name = "ck_kllb_xsmk";
|
|
|
- this.ck_kllb_xsmk.Size = new System.Drawing.Size(18, 17);
|
|
|
+ this.ck_kllb_xsmk.Size = new System.Drawing.Size(15, 14);
|
|
|
this.ck_kllb_xsmk.TabIndex = 53;
|
|
|
this.ck_kllb_xsmk.UseVisualStyleBackColor = true;
|
|
|
this.ck_kllb_xsmk.CheckedChanged += new System.EventHandler(this.ck_kllb_xsmk_CheckedChanged);
|
|
@@ -656,45 +675,49 @@
|
|
|
// label32
|
|
|
//
|
|
|
this.label32.AutoSize = true;
|
|
|
- this.label32.Location = new System.Drawing.Point(21, 128);
|
|
|
+ this.label32.Location = new System.Drawing.Point(16, 102);
|
|
|
+ this.label32.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
|
|
this.label32.Name = "label32";
|
|
|
- this.label32.Size = new System.Drawing.Size(67, 15);
|
|
|
+ this.label32.Size = new System.Drawing.Size(53, 12);
|
|
|
this.label32.TabIndex = 52;
|
|
|
this.label32.Text = "能谱信息";
|
|
|
//
|
|
|
// label31
|
|
|
//
|
|
|
this.label31.AutoSize = true;
|
|
|
- this.label31.Location = new System.Drawing.Point(19, 95);
|
|
|
+ this.label31.Location = new System.Drawing.Point(14, 76);
|
|
|
+ this.label31.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
|
|
this.label31.Name = "label31";
|
|
|
- this.label31.Size = new System.Drawing.Size(67, 15);
|
|
|
+ this.label31.Size = new System.Drawing.Size(53, 12);
|
|
|
this.label31.TabIndex = 52;
|
|
|
this.label31.Text = "放大图像";
|
|
|
//
|
|
|
// label30
|
|
|
//
|
|
|
this.label30.AutoSize = true;
|
|
|
- this.label30.Location = new System.Drawing.Point(19, 62);
|
|
|
+ this.label30.Location = new System.Drawing.Point(14, 50);
|
|
|
+ this.label30.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
|
|
this.label30.Name = "label30";
|
|
|
- this.label30.Size = new System.Drawing.Size(67, 15);
|
|
|
+ this.label30.Size = new System.Drawing.Size(53, 12);
|
|
|
this.label30.TabIndex = 52;
|
|
|
this.label30.Text = "原始图像";
|
|
|
//
|
|
|
// label34
|
|
|
//
|
|
|
this.label34.AutoSize = true;
|
|
|
- this.label34.Location = new System.Drawing.Point(5, 31);
|
|
|
+ this.label34.Location = new System.Drawing.Point(4, 25);
|
|
|
+ this.label34.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
|
|
this.label34.Name = "label34";
|
|
|
- this.label34.Size = new System.Drawing.Size(82, 15);
|
|
|
+ this.label34.Size = new System.Drawing.Size(65, 12);
|
|
|
this.label34.TabIndex = 52;
|
|
|
this.label34.Text = "显示该模块";
|
|
|
//
|
|
|
// button6
|
|
|
//
|
|
|
- this.button6.Location = new System.Drawing.Point(1140, 59);
|
|
|
- this.button6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.button6.Location = new System.Drawing.Point(855, 47);
|
|
|
+ this.button6.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.button6.Name = "button6";
|
|
|
- this.button6.Size = new System.Drawing.Size(95, 28);
|
|
|
+ this.button6.Size = new System.Drawing.Size(71, 22);
|
|
|
this.button6.TabIndex = 72;
|
|
|
this.button6.Text = "保存";
|
|
|
this.button6.UseVisualStyleBackColor = true;
|
|
@@ -717,49 +740,44 @@
|
|
|
this.panel2.Controls.Add(this.pictureBox3);
|
|
|
this.panel2.Controls.Add(this.pictureBox2);
|
|
|
this.panel2.Controls.Add(this.pictureBox1);
|
|
|
- this.panel2.Location = new System.Drawing.Point(16, 15);
|
|
|
- this.panel2.Margin = new System.Windows.Forms.Padding(4);
|
|
|
+ this.panel2.Location = new System.Drawing.Point(12, 12);
|
|
|
this.panel2.Name = "panel2";
|
|
|
- this.panel2.Size = new System.Drawing.Size(928, 882);
|
|
|
+ this.panel2.Size = new System.Drawing.Size(696, 706);
|
|
|
this.panel2.TabIndex = 73;
|
|
|
//
|
|
|
// label53
|
|
|
//
|
|
|
this.label53.AutoSize = true;
|
|
|
- this.label53.Location = new System.Drawing.Point(364, 435);
|
|
|
- this.label53.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
|
|
+ this.label53.Location = new System.Drawing.Point(273, 348);
|
|
|
this.label53.Name = "label53";
|
|
|
- this.label53.Size = new System.Drawing.Size(97, 15);
|
|
|
+ this.label53.Size = new System.Drawing.Size(77, 12);
|
|
|
this.label53.TabIndex = 105;
|
|
|
this.label53.Text = "检测结果文件";
|
|
|
//
|
|
|
// label52
|
|
|
//
|
|
|
this.label52.AutoSize = true;
|
|
|
- this.label52.Location = new System.Drawing.Point(364, 406);
|
|
|
- this.label52.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
|
|
+ this.label52.Location = new System.Drawing.Point(273, 325);
|
|
|
this.label52.Name = "label52";
|
|
|
- this.label52.Size = new System.Drawing.Size(67, 15);
|
|
|
+ this.label52.Size = new System.Drawing.Size(53, 12);
|
|
|
this.label52.TabIndex = 104;
|
|
|
this.label52.Text = "报告时间";
|
|
|
//
|
|
|
// label51
|
|
|
//
|
|
|
this.label51.AutoSize = true;
|
|
|
- this.label51.Location = new System.Drawing.Point(364, 464);
|
|
|
- this.label51.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
|
|
+ this.label51.Location = new System.Drawing.Point(273, 371);
|
|
|
this.label51.Name = "label51";
|
|
|
- this.label51.Size = new System.Drawing.Size(67, 15);
|
|
|
+ this.label51.Size = new System.Drawing.Size(53, 12);
|
|
|
this.label51.TabIndex = 103;
|
|
|
this.label51.Text = "参考标准";
|
|
|
//
|
|
|
// label50
|
|
|
//
|
|
|
this.label50.AutoSize = true;
|
|
|
- this.label50.Location = new System.Drawing.Point(364, 378);
|
|
|
- this.label50.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
|
|
+ this.label50.Location = new System.Drawing.Point(273, 302);
|
|
|
this.label50.Name = "label50";
|
|
|
- this.label50.Size = new System.Drawing.Size(67, 15);
|
|
|
+ this.label50.Size = new System.Drawing.Size(53, 12);
|
|
|
this.label50.TabIndex = 102;
|
|
|
this.label50.Text = "样品编号";
|
|
|
//
|
|
@@ -768,10 +786,9 @@
|
|
|
this.label49.AutoSize = true;
|
|
|
this.label49.BackColor = System.Drawing.Color.White;
|
|
|
this.label49.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.label49.Location = new System.Drawing.Point(363, 269);
|
|
|
- this.label49.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
|
|
+ this.label49.Location = new System.Drawing.Point(272, 215);
|
|
|
this.label49.Name = "label49";
|
|
|
- this.label49.Size = new System.Drawing.Size(141, 18);
|
|
|
+ this.label49.Size = new System.Drawing.Size(112, 14);
|
|
|
this.label49.TabIndex = 101;
|
|
|
this.label49.Text = "副标题有限公司";
|
|
|
//
|
|
@@ -780,95 +797,87 @@
|
|
|
this.label54.AutoSize = true;
|
|
|
this.label54.BackColor = System.Drawing.Color.White;
|
|
|
this.label54.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.label54.Location = new System.Drawing.Point(319, 230);
|
|
|
- this.label54.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
|
|
+ this.label54.Location = new System.Drawing.Point(239, 184);
|
|
|
this.label54.Name = "label54";
|
|
|
- this.label54.Size = new System.Drawing.Size(230, 30);
|
|
|
+ this.label54.Size = new System.Drawing.Size(185, 24);
|
|
|
this.label54.TabIndex = 100;
|
|
|
this.label54.Text = "主标题分析报告";
|
|
|
//
|
|
|
// pictureBox8
|
|
|
//
|
|
|
this.pictureBox8.Image = global::OTSIncAReportApp.Properties.Resources.颗粒列表;
|
|
|
- this.pictureBox8.Location = new System.Drawing.Point(4, 7161);
|
|
|
- this.pictureBox8.Margin = new System.Windows.Forms.Padding(4);
|
|
|
+ this.pictureBox8.Location = new System.Drawing.Point(3, 5729);
|
|
|
this.pictureBox8.Name = "pictureBox8";
|
|
|
- this.pictureBox8.Size = new System.Drawing.Size(897, 1192);
|
|
|
+ this.pictureBox8.Size = new System.Drawing.Size(673, 954);
|
|
|
this.pictureBox8.TabIndex = 8;
|
|
|
this.pictureBox8.TabStop = false;
|
|
|
//
|
|
|
// pictureBox6
|
|
|
//
|
|
|
this.pictureBox6.Image = global::OTSIncAReportApp.Properties.Resources.三元相图;
|
|
|
- this.pictureBox6.Location = new System.Drawing.Point(4, 5961);
|
|
|
- this.pictureBox6.Margin = new System.Windows.Forms.Padding(4);
|
|
|
+ this.pictureBox6.Location = new System.Drawing.Point(3, 4769);
|
|
|
this.pictureBox6.Name = "pictureBox6";
|
|
|
- this.pictureBox6.Size = new System.Drawing.Size(897, 1192);
|
|
|
+ this.pictureBox6.Size = new System.Drawing.Size(673, 954);
|
|
|
this.pictureBox6.TabIndex = 6;
|
|
|
this.pictureBox6.TabStop = false;
|
|
|
//
|
|
|
// pictureBox5
|
|
|
//
|
|
|
this.pictureBox5.Image = global::OTSIncAReportApp.Properties.Resources.元素成分图;
|
|
|
- this.pictureBox5.Location = new System.Drawing.Point(4, 4768);
|
|
|
- this.pictureBox5.Margin = new System.Windows.Forms.Padding(4);
|
|
|
+ this.pictureBox5.Location = new System.Drawing.Point(3, 3814);
|
|
|
this.pictureBox5.Name = "pictureBox5";
|
|
|
- this.pictureBox5.Size = new System.Drawing.Size(897, 1192);
|
|
|
+ this.pictureBox5.Size = new System.Drawing.Size(673, 954);
|
|
|
this.pictureBox5.TabIndex = 5;
|
|
|
this.pictureBox5.TabStop = false;
|
|
|
//
|
|
|
// pictureBox4
|
|
|
//
|
|
|
this.pictureBox4.Image = global::OTSIncAReportApp.Properties.Resources.元素分析表;
|
|
|
- this.pictureBox4.Location = new System.Drawing.Point(4, 3575);
|
|
|
- this.pictureBox4.Margin = new System.Windows.Forms.Padding(4);
|
|
|
+ this.pictureBox4.Location = new System.Drawing.Point(3, 2860);
|
|
|
this.pictureBox4.Name = "pictureBox4";
|
|
|
- this.pictureBox4.Size = new System.Drawing.Size(897, 1192);
|
|
|
+ this.pictureBox4.Size = new System.Drawing.Size(673, 954);
|
|
|
this.pictureBox4.TabIndex = 4;
|
|
|
this.pictureBox4.TabStop = false;
|
|
|
//
|
|
|
// pictureBox3
|
|
|
//
|
|
|
this.pictureBox3.Image = global::OTSIncAReportApp.Properties.Resources.颗粒成分图;
|
|
|
- this.pictureBox3.Location = new System.Drawing.Point(4, 2384);
|
|
|
- this.pictureBox3.Margin = new System.Windows.Forms.Padding(4);
|
|
|
+ this.pictureBox3.Location = new System.Drawing.Point(3, 1907);
|
|
|
this.pictureBox3.Name = "pictureBox3";
|
|
|
- this.pictureBox3.Size = new System.Drawing.Size(897, 1192);
|
|
|
+ this.pictureBox3.Size = new System.Drawing.Size(673, 954);
|
|
|
this.pictureBox3.TabIndex = 3;
|
|
|
this.pictureBox3.TabStop = false;
|
|
|
//
|
|
|
// pictureBox2
|
|
|
//
|
|
|
this.pictureBox2.Image = global::OTSIncAReportApp.Properties.Resources.颗粒尺寸分析结果;
|
|
|
- this.pictureBox2.Location = new System.Drawing.Point(4, 1191);
|
|
|
- this.pictureBox2.Margin = new System.Windows.Forms.Padding(4);
|
|
|
+ this.pictureBox2.Location = new System.Drawing.Point(3, 953);
|
|
|
this.pictureBox2.Name = "pictureBox2";
|
|
|
- this.pictureBox2.Size = new System.Drawing.Size(897, 1192);
|
|
|
+ this.pictureBox2.Size = new System.Drawing.Size(673, 954);
|
|
|
this.pictureBox2.TabIndex = 2;
|
|
|
this.pictureBox2.TabStop = false;
|
|
|
//
|
|
|
// pictureBox1
|
|
|
//
|
|
|
this.pictureBox1.Image = global::OTSIncAReportApp.Properties.Resources.报表首页加样品说明;
|
|
|
- this.pictureBox1.Location = new System.Drawing.Point(4, 4);
|
|
|
- this.pictureBox1.Margin = new System.Windows.Forms.Padding(4);
|
|
|
+ this.pictureBox1.Location = new System.Drawing.Point(3, 3);
|
|
|
this.pictureBox1.Name = "pictureBox1";
|
|
|
- this.pictureBox1.Size = new System.Drawing.Size(897, 1192);
|
|
|
+ this.pictureBox1.Size = new System.Drawing.Size(673, 954);
|
|
|
this.pictureBox1.TabIndex = 1;
|
|
|
this.pictureBox1.TabStop = false;
|
|
|
//
|
|
|
// panel3
|
|
|
//
|
|
|
this.panel3.AutoScroll = true;
|
|
|
+ this.panel3.Controls.Add(this.groupBZ);
|
|
|
this.panel3.Controls.Add(this.groupBox8);
|
|
|
this.panel3.Controls.Add(this.groupBox6);
|
|
|
this.panel3.Controls.Add(this.groupBox9);
|
|
|
this.panel3.Controls.Add(this.groupBox4);
|
|
|
this.panel3.Controls.Add(this.groupBox1);
|
|
|
- this.panel3.Location = new System.Drawing.Point(952, 92);
|
|
|
- this.panel3.Margin = new System.Windows.Forms.Padding(4);
|
|
|
+ this.panel3.Location = new System.Drawing.Point(714, 74);
|
|
|
this.panel3.Name = "panel3";
|
|
|
- this.panel3.Size = new System.Drawing.Size(383, 805);
|
|
|
+ this.panel3.Size = new System.Drawing.Size(287, 644);
|
|
|
this.panel3.TabIndex = 74;
|
|
|
//
|
|
|
// groupBox9
|
|
@@ -885,11 +894,9 @@
|
|
|
this.groupBox9.Controls.Add(this.tb_FBT);
|
|
|
this.groupBox9.Controls.Add(this.label1);
|
|
|
this.groupBox9.Controls.Add(this.label3);
|
|
|
- this.groupBox9.Location = new System.Drawing.Point(4, 4);
|
|
|
- this.groupBox9.Margin = new System.Windows.Forms.Padding(4);
|
|
|
+ this.groupBox9.Location = new System.Drawing.Point(3, 3);
|
|
|
this.groupBox9.Name = "groupBox9";
|
|
|
- this.groupBox9.Padding = new System.Windows.Forms.Padding(4);
|
|
|
- this.groupBox9.Size = new System.Drawing.Size(357, 319);
|
|
|
+ this.groupBox9.Size = new System.Drawing.Size(268, 255);
|
|
|
this.groupBox9.TabIndex = 1;
|
|
|
this.groupBox9.TabStop = false;
|
|
|
this.groupBox9.Text = "首页设置信息";
|
|
@@ -899,18 +906,36 @@
|
|
|
this.label39.AutoSize = true;
|
|
|
this.label39.BackColor = System.Drawing.Color.Transparent;
|
|
|
this.label39.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.label39.Location = new System.Drawing.Point(945, 11);
|
|
|
- this.label39.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
|
|
+ this.label39.Location = new System.Drawing.Point(709, 9);
|
|
|
this.label39.Name = "label39";
|
|
|
- this.label39.Size = new System.Drawing.Size(165, 37);
|
|
|
+ this.label39.Size = new System.Drawing.Size(129, 29);
|
|
|
this.label39.TabIndex = 75;
|
|
|
this.label39.Text = "模板设置";
|
|
|
//
|
|
|
+ // groupBZ
|
|
|
+ //
|
|
|
+ this.groupBZ.Controls.Add(this.textBox_strBZ);
|
|
|
+ this.groupBZ.Location = new System.Drawing.Point(5, 897);
|
|
|
+ this.groupBZ.Name = "groupBZ";
|
|
|
+ this.groupBZ.Size = new System.Drawing.Size(263, 139);
|
|
|
+ this.groupBZ.TabIndex = 7;
|
|
|
+ this.groupBZ.TabStop = false;
|
|
|
+ this.groupBZ.Text = "备注";
|
|
|
+ //
|
|
|
+ // textBox_strBZ
|
|
|
+ //
|
|
|
+ this.textBox_strBZ.Location = new System.Drawing.Point(5, 19);
|
|
|
+ this.textBox_strBZ.Margin = new System.Windows.Forms.Padding(2);
|
|
|
+ this.textBox_strBZ.Multiline = true;
|
|
|
+ this.textBox_strBZ.Name = "textBox_strBZ";
|
|
|
+ this.textBox_strBZ.Size = new System.Drawing.Size(252, 115);
|
|
|
+ this.textBox_strBZ.TabIndex = 11;
|
|
|
+ //
|
|
|
// OTSReport_TemplateDesignerRM
|
|
|
//
|
|
|
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
|
|
|
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
|
|
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
|
|
- this.ClientSize = new System.Drawing.Size(1348, 939);
|
|
|
+ this.ClientSize = new System.Drawing.Size(1011, 751);
|
|
|
this.Controls.Add(this.groupBox7);
|
|
|
this.Controls.Add(this.button6);
|
|
|
this.Controls.Add(this.button1);
|
|
@@ -919,7 +944,7 @@
|
|
|
this.Controls.Add(this.panel2);
|
|
|
this.Controls.Add(this.button2);
|
|
|
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
|
|
|
- this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
|
|
+ this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
|
|
this.MaximizeBox = false;
|
|
|
this.MinimizeBox = false;
|
|
|
this.Name = "OTSReport_TemplateDesignerRM";
|
|
@@ -949,6 +974,8 @@
|
|
|
this.panel3.ResumeLayout(false);
|
|
|
this.groupBox9.ResumeLayout(false);
|
|
|
this.groupBox9.PerformLayout();
|
|
|
+ this.groupBZ.ResumeLayout(false);
|
|
|
+ this.groupBZ.PerformLayout();
|
|
|
this.ResumeLayout(false);
|
|
|
this.PerformLayout();
|
|
|
|
|
@@ -1028,5 +1055,7 @@
|
|
|
private System.Windows.Forms.Button button4;
|
|
|
public System.Windows.Forms.ComboBox comboBox_PeriodicTable;
|
|
|
private System.Windows.Forms.Button button3;
|
|
|
+ private System.Windows.Forms.GroupBox groupBZ;
|
|
|
+ private System.Windows.Forms.TextBox textBox_strBZ;
|
|
|
}
|
|
|
}
|