From 4b10b804bc1678acc3f35e94174f66bf6d6b8da9 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-1VKMM8S>
Date: 星期日, 25 四月 2021 19:31:58 +0800
Subject: [PATCH] 1.merge
---
P066.Data/Form1.Designer.cs | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/P066.Data/Form1.Designer.cs b/P066.Data/Form1.Designer.cs
index f399a82..b2d91d7 100644
--- a/P066.Data/Form1.Designer.cs
+++ b/P066.Data/Form1.Designer.cs
@@ -32,6 +32,10 @@
this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
this.btnAnalyze = new System.Windows.Forms.Button();
this.btnLoadData2 = new System.Windows.Forms.Button();
+ this.btnLoadData3 = new System.Windows.Forms.Button();
+ this.butPictur = new System.Windows.Forms.Button();
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.SuspendLayout();
//
// btnLoadData1
@@ -41,7 +45,7 @@
this.btnLoadData1.Name = "btnLoadData1";
this.btnLoadData1.Size = new System.Drawing.Size(176, 29);
this.btnLoadData1.TabIndex = 0;
- this.btnLoadData1.Text = "鍔犺浇鏂囦欢澶�1";
+ this.btnLoadData1.Text = "鍔犺浇澶嶆鎶ヨ〃鏂囦欢澶�";
this.btnLoadData1.UseVisualStyleBackColor = true;
this.btnLoadData1.Click += new System.EventHandler(this.btnLoadData1_Click);
//
@@ -61,23 +65,55 @@
this.btnLoadData2.Location = new System.Drawing.Point(16, 51);
this.btnLoadData2.Margin = new System.Windows.Forms.Padding(4);
this.btnLoadData2.Name = "btnLoadData2";
- this.btnLoadData2.Size = new System.Drawing.Size(176, 29);
+ this.btnLoadData2.Size = new System.Drawing.Size(199, 29);
this.btnLoadData2.TabIndex = 1;
- this.btnLoadData2.Text = "鍔犺浇鏂囦欢澶�2";
+ this.btnLoadData2.Text = "鍒激銆侀晙鑶滅牬鎹熸枃浠跺す";
this.btnLoadData2.UseVisualStyleBackColor = true;
this.btnLoadData2.Click += new System.EventHandler(this.btnLoadData2_Click);
+ //
+ // btnLoadData3
+ //
+ this.btnLoadData3.Location = new System.Drawing.Point(276, 15);
+ this.btnLoadData3.Name = "btnLoadData3";
+ this.btnLoadData3.Size = new System.Drawing.Size(176, 29);
+ this.btnLoadData3.TabIndex = 2;
+ this.btnLoadData3.Text = "鍔犺浇鍒濇鎶ヨ〃鏂囦欢澶�";
+ this.btnLoadData3.UseVisualStyleBackColor = true;
+ this.btnLoadData3.Click += new System.EventHandler(this.btnLoadData3_Click);
+ //
+ // butPictur
+ //
+ this.butPictur.Location = new System.Drawing.Point(175, 216);
+ this.butPictur.Name = "butPictur";
+ this.butPictur.Size = new System.Drawing.Size(141, 35);
+ this.butPictur.TabIndex = 3;
+ this.butPictur.Text = "鍔犺浇鍥剧墖鏂囦欢澶�";
+ this.butPictur.UseVisualStyleBackColor = true;
+ this.butPictur.Click += new System.EventHandler(this.butPictur_Click);
+ //
+ // pictureBox1
+ //
+ this.pictureBox1.Location = new System.Drawing.Point(405, 134);
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.Size = new System.Drawing.Size(522, 245);
+ this.pictureBox1.TabIndex = 4;
+ this.pictureBox1.TabStop = false;
//
// Form1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1067, 562);
+ this.Controls.Add(this.pictureBox1);
+ this.Controls.Add(this.butPictur);
+ this.Controls.Add(this.btnLoadData3);
this.Controls.Add(this.btnAnalyze);
this.Controls.Add(this.btnLoadData2);
this.Controls.Add(this.btnLoadData1);
this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "Form1";
this.Text = "Form1";
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.ResumeLayout(false);
}
@@ -88,6 +124,9 @@
private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
private System.Windows.Forms.Button btnAnalyze;
private System.Windows.Forms.Button btnLoadData2;
+ private System.Windows.Forms.Button btnLoadData3;
+ private System.Windows.Forms.Button butPictur;
+ private System.Windows.Forms.PictureBox pictureBox1;
}
}
--
Gitblit v1.8.0