diff --git a/DeepTongue_feature_LabColor/feature_labColor/newcamera_deeplearning/Form_Display.Designer.cs b/DeepTongue_feature_LabColor/feature_labColor/newcamera_deeplearning/Form_Display.Designer.cs deleted file mode 100644 index cf9f50c..0000000 --- a/DeepTongue_feature_LabColor/feature_labColor/newcamera_deeplearning/Form_Display.Designer.cs +++ /dev/null @@ -1,393 +0,0 @@ -namespace OperateCamera -{ - partial class Form_Display - { - /// - /// 必要なデザイナー変数です。 - /// - private System.ComponentModel.IContainer components = null; - - /// - /// 使用中のリソースをすべてクリーンアップします。 - /// - /// マネージ リソースを破棄する場合は true を指定し、その他の場合は false を指定します。 - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows フォーム デザイナーで生成されたコード - - /// - /// デザイナー サポートに必要なメソッドです。このメソッドの内容を - /// コード エディターで変更しないでください。 - /// - private void InitializeComponent() - { - this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); - this.textBox5 = new System.Windows.Forms.TextBox(); - this.textBox4 = new System.Windows.Forms.TextBox(); - this.textBox3 = new System.Windows.Forms.TextBox(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.panel1 = new System.Windows.Forms.Panel(); - this.pictureBox3 = new System.Windows.Forms.PictureBox(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); - this.GuideBox = new System.Windows.Forms.TextBox(); - this.ShootingGuideBox = new System.Windows.Forms.TextBox(); - this.tabControl1 = new System.Windows.Forms.TabControl(); - this.tabPage1 = new System.Windows.Forms.TabPage(); - this.tabPage2 = new System.Windows.Forms.TabPage(); - this.tableLayoutPanel2.SuspendLayout(); - this.panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); - this.tableLayoutPanel3.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); - this.tabControl1.SuspendLayout(); - this.tabPage1.SuspendLayout(); - this.tabPage2.SuspendLayout(); - this.SuspendLayout(); - // - // tableLayoutPanel2 - // - this.tableLayoutPanel2.ColumnCount = 3; - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F)); - this.tableLayoutPanel2.Controls.Add(this.textBox5, 1, 4); - this.tableLayoutPanel2.Controls.Add(this.textBox4, 1, 3); - this.tableLayoutPanel2.Controls.Add(this.textBox3, 1, 2); - this.tableLayoutPanel2.Controls.Add(this.textBox2, 1, 1); - this.tableLayoutPanel2.Controls.Add(this.textBox1, 1, 0); - this.tableLayoutPanel2.Controls.Add(this.panel1, 2, 1); - this.tableLayoutPanel2.Controls.Add(this.label1, 0, 0); - this.tableLayoutPanel2.Controls.Add(this.label2, 0, 1); - this.tableLayoutPanel2.Controls.Add(this.label3, 0, 2); - this.tableLayoutPanel2.Controls.Add(this.label4, 0, 3); - this.tableLayoutPanel2.Controls.Add(this.label5, 0, 4); - this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 3); - this.tableLayoutPanel2.Name = "tableLayoutPanel2"; - this.tableLayoutPanel2.RowCount = 5; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(820, 529); - this.tableLayoutPanel2.TabIndex = 2; - // - // textBox5 - // - this.textBox5.BackColor = System.Drawing.Color.Gray; - this.textBox5.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.textBox5.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBox5.Font = new System.Drawing.Font("Arial", 50F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(0))); - this.textBox5.ForeColor = System.Drawing.Color.White; - this.textBox5.Location = new System.Drawing.Point(413, 423); - this.textBox5.Multiline = true; - this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(158, 103); - this.textBox5.TabIndex = 9; - this.textBox5.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - // - // textBox4 - // - this.textBox4.BackColor = System.Drawing.Color.PaleVioletRed; - this.textBox4.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.textBox4.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBox4.Font = new System.Drawing.Font("Arial", 50F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(0))); - this.textBox4.ForeColor = System.Drawing.Color.White; - this.textBox4.Location = new System.Drawing.Point(413, 318); - this.textBox4.Multiline = true; - this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(158, 99); - this.textBox4.TabIndex = 8; - this.textBox4.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - // - // textBox3 - // - this.textBox3.BackColor = System.Drawing.Color.Red; - this.textBox3.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.textBox3.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBox3.Font = new System.Drawing.Font("Arial", 50F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(0))); - this.textBox3.ForeColor = System.Drawing.Color.White; - this.textBox3.Location = new System.Drawing.Point(413, 213); - this.textBox3.Multiline = true; - this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(158, 99); - this.textBox3.TabIndex = 7; - this.textBox3.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - // - // textBox2 - // - this.textBox2.BackColor = System.Drawing.Color.DarkRed; - this.textBox2.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.textBox2.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBox2.Font = new System.Drawing.Font("Arial", 50F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(0))); - this.textBox2.ForeColor = System.Drawing.Color.White; - this.textBox2.Location = new System.Drawing.Point(413, 108); - this.textBox2.Multiline = true; - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(158, 99); - this.textBox2.TabIndex = 6; - this.textBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - // - // textBox1 - // - this.textBox1.BackColor = System.Drawing.Color.Purple; - this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.textBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBox1.Font = new System.Drawing.Font("Arial", 50F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(0))); - this.textBox1.ForeColor = System.Drawing.Color.White; - this.textBox1.Location = new System.Drawing.Point(413, 3); - this.textBox1.Multiline = true; - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(158, 99); - this.textBox1.TabIndex = 4; - this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - // - // panel1 - // - this.panel1.Controls.Add(this.pictureBox3); - this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel1.Location = new System.Drawing.Point(577, 108); - this.panel1.Name = "panel1"; - this.tableLayoutPanel2.SetRowSpan(this.panel1, 3); - this.panel1.Size = new System.Drawing.Size(240, 309); - this.panel1.TabIndex = 0; - // - // pictureBox3 - // - this.pictureBox3.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureBox3.Location = new System.Drawing.Point(0, 0); - this.pictureBox3.Name = "pictureBox3"; - this.pictureBox3.Size = new System.Drawing.Size(240, 309); - this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureBox3.TabIndex = 0; - this.pictureBox3.TabStop = false; - // - // label1 - // - this.label1.BackColor = System.Drawing.Color.Purple; - this.label1.Dock = System.Windows.Forms.DockStyle.Fill; - this.label1.Font = new System.Drawing.Font("Arial", 35F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(0))); - this.label1.ForeColor = System.Drawing.Color.White; - this.label1.Location = new System.Drawing.Point(3, 0); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(404, 105); - this.label1.TabIndex = 1; - this.label1.Text = "Purple (Blood blocked)"; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // label2 - // - this.label2.BackColor = System.Drawing.Color.DarkRed; - this.label2.Dock = System.Windows.Forms.DockStyle.Fill; - this.label2.Font = new System.Drawing.Font("Arial", 35F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(0))); - this.label2.ForeColor = System.Drawing.Color.White; - this.label2.Location = new System.Drawing.Point(3, 105); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(404, 105); - this.label2.TabIndex = 2; - this.label2.Text = "Dark Red (Blood barrier)"; - this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // label3 - // - this.label3.BackColor = System.Drawing.Color.Red; - this.label3.Dock = System.Windows.Forms.DockStyle.Fill; - this.label3.Font = new System.Drawing.Font("Arial", 35F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(0))); - this.label3.ForeColor = System.Drawing.Color.White; - this.label3.Location = new System.Drawing.Point(3, 210); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(404, 105); - this.label3.TabIndex = 3; - this.label3.Text = "Red (Inflame)"; - this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // label4 - // - this.label4.BackColor = System.Drawing.Color.PaleVioletRed; - this.label4.Dock = System.Windows.Forms.DockStyle.Fill; - this.label4.Font = new System.Drawing.Font("Arial", 35F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(0))); - this.label4.ForeColor = System.Drawing.Color.White; - this.label4.Location = new System.Drawing.Point(3, 315); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(404, 105); - this.label4.TabIndex = 4; - this.label4.Text = "Pink (Normal)"; - this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // label5 - // - this.label5.BackColor = System.Drawing.Color.Gray; - this.label5.Dock = System.Windows.Forms.DockStyle.Fill; - this.label5.Font = new System.Drawing.Font("Arial", 35F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(0))); - this.label5.ForeColor = System.Drawing.Color.White; - this.label5.Location = new System.Drawing.Point(3, 420); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(404, 109); - this.label5.TabIndex = 5; - this.label5.Text = "Pale White (Anemia)"; - this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // tableLayoutPanel3 - // - this.tableLayoutPanel3.ColumnCount = 2; - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel3.Controls.Add(this.pictureBox1, 0, 0); - this.tableLayoutPanel3.Controls.Add(this.pictureBox2, 1, 0); - this.tableLayoutPanel3.Controls.Add(this.GuideBox, 0, 1); - this.tableLayoutPanel3.Controls.Add(this.ShootingGuideBox, 0, 2); - this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 3); - this.tableLayoutPanel3.Name = "tableLayoutPanel3"; - this.tableLayoutPanel3.RowCount = 3; - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 80F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(820, 529); - this.tableLayoutPanel3.TabIndex = 3; - // - // pictureBox1 - // - this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureBox1.Location = new System.Drawing.Point(3, 3); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(404, 417); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureBox1.TabIndex = 0; - this.pictureBox1.TabStop = false; - this.pictureBox1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pictureBox1_MouseDown); - // - // pictureBox2 - // - this.pictureBox2.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureBox2.Location = new System.Drawing.Point(413, 3); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(404, 417); - this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureBox2.TabIndex = 1; - this.pictureBox2.TabStop = false; - // - // GuideBox - // - this.tableLayoutPanel3.SetColumnSpan(this.GuideBox, 2); - this.GuideBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.GuideBox.Font = new System.Drawing.Font("Arial", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(128))); - this.GuideBox.ForeColor = System.Drawing.Color.Red; - this.GuideBox.Location = new System.Drawing.Point(3, 426); - this.GuideBox.Multiline = true; - this.GuideBox.Name = "GuideBox"; - this.GuideBox.Size = new System.Drawing.Size(814, 46); - this.GuideBox.TabIndex = 2; - this.GuideBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // ShootingGuideBox - // - this.tableLayoutPanel3.SetColumnSpan(this.ShootingGuideBox, 2); - this.ShootingGuideBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.ShootingGuideBox.Font = new System.Drawing.Font("Arial", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(128))); - this.ShootingGuideBox.ForeColor = System.Drawing.Color.Red; - this.ShootingGuideBox.Location = new System.Drawing.Point(3, 478); - this.ShootingGuideBox.Multiline = true; - this.ShootingGuideBox.Name = "ShootingGuideBox"; - this.ShootingGuideBox.Size = new System.Drawing.Size(814, 48); - this.ShootingGuideBox.TabIndex = 3; - this.ShootingGuideBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // tabControl1 - // - this.tabControl1.Controls.Add(this.tabPage1); - this.tabControl1.Controls.Add(this.tabPage2); - this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControl1.Location = new System.Drawing.Point(0, 0); - this.tabControl1.Name = "tabControl1"; - this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(834, 561); - this.tabControl1.TabIndex = 4; - // - // tabPage1 - // - this.tabPage1.Controls.Add(this.tableLayoutPanel3); - this.tabPage1.Location = new System.Drawing.Point(4, 22); - this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(826, 535); - this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "Real-time guidance"; - this.tabPage1.UseVisualStyleBackColor = true; - // - // tabPage2 - // - this.tabPage2.Controls.Add(this.tableLayoutPanel2); - this.tabPage2.Location = new System.Drawing.Point(4, 22); - this.tabPage2.Name = "tabPage2"; - this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(826, 535); - this.tabPage2.TabIndex = 1; - this.tabPage2.Text = "Diagnostic results"; - this.tabPage2.UseVisualStyleBackColor = true; - // - // Form_Display - // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(834, 561); - this.Controls.Add(this.tabControl1); - this.Name = "Form_Display"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "TIAS User Interface"; - this.tableLayoutPanel2.ResumeLayout(false); - this.tableLayoutPanel2.PerformLayout(); - this.panel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); - this.tableLayoutPanel3.ResumeLayout(false); - this.tableLayoutPanel3.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); - this.tabControl1.ResumeLayout(false); - this.tabPage1.ResumeLayout(false); - this.tabPage2.ResumeLayout(false); - this.ResumeLayout(false); - - } - - #endregion - public System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.Panel panel1; - public System.Windows.Forms.PictureBox pictureBox3; - public System.Windows.Forms.Label label1; - public System.Windows.Forms.Label label2; - public System.Windows.Forms.Label label3; - public System.Windows.Forms.Label label4; - public System.Windows.Forms.Label label5; - public System.Windows.Forms.TextBox textBox2; - public System.Windows.Forms.TextBox textBox3; - public System.Windows.Forms.TextBox textBox4; - public System.Windows.Forms.TextBox textBox5; - public System.Windows.Forms.PictureBox pictureBox1; - public System.Windows.Forms.PictureBox pictureBox2; - public System.Windows.Forms.TextBox GuideBox; - public System.Windows.Forms.TextBox ShootingGuideBox; - public System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; - public System.Windows.Forms.TableLayoutPanel tableLayoutPanel3; - private System.Windows.Forms.TabControl tabControl1; - private System.Windows.Forms.TabPage tabPage1; - private System.Windows.Forms.TabPage tabPage2; - } -} - diff --git a/DeepTongue_feature_LabColor/feature_labColor/newcamera_deeplearning/Form_Display.cs b/DeepTongue_feature_LabColor/feature_labColor/newcamera_deeplearning/Form_Display.cs deleted file mode 100644 index 88f46d3..0000000 --- a/DeepTongue_feature_LabColor/feature_labColor/newcamera_deeplearning/Form_Display.cs +++ /dev/null @@ -1,136 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Windows.Forms; -using System.Media; - -namespace OperateCamera -{ - public partial class Form_Display : Form - { - SoundPlayer player6 = new SoundPlayer("result.wav"); - - public Form_Display() - { - InitializeComponent(); - } - - void DrawPoint() - { - OpenCvSharp.Mat tempCalib = Form_TIASAutomaticShootingSystem.m_CalibFrame.Clone(); - - //とってくる点の描画 - //tempDrawに書き込んでいるので,degree.bmpは無事.とってくるのは - //この画像のRGBにする. - //tempDrawにとってくる点を全て描画し,pointcheck.bmpで確認できるようにする. - //オッケーなら校正ボタンを再度押す感じで. - - //以降取ってきた点の描画.座標(実際値) - //1 - Form_TIASAutomaticShootingSystem.getRGBpoint[0].X = pictureBox1.Location.X * 300; - Form_TIASAutomaticShootingSystem.getRGBpoint[0].Y = pictureBox1.Location.Y * 145; - //2 - Form_TIASAutomaticShootingSystem.getRGBpoint[1].X = pictureBox1.Location.X * 300; - Form_TIASAutomaticShootingSystem.getRGBpoint[1].Y = pictureBox1.Location.Y * 208; - //3 - Form_TIASAutomaticShootingSystem.getRGBpoint[2].X = pictureBox1.Location.X * 300; - Form_TIASAutomaticShootingSystem.getRGBpoint[2].Y = pictureBox1.Location.Y * 275; - //4 - Form_TIASAutomaticShootingSystem.getRGBpoint[3].X = pictureBox1.Location.X * 300; - Form_TIASAutomaticShootingSystem.getRGBpoint[3].Y = pictureBox1.Location.Y * 345; - //5 - Form_TIASAutomaticShootingSystem.getRGBpoint[4].X = pictureBox1.Location.X * 300; - Form_TIASAutomaticShootingSystem.getRGBpoint[4].Y = pictureBox1.Location.Y * 410; - //6 - Form_TIASAutomaticShootingSystem.getRGBpoint[5].X = pictureBox1.Location.X * 300; - Form_TIASAutomaticShootingSystem.getRGBpoint[5].Y = pictureBox1.Location.Y * 478; - //7 - Form_TIASAutomaticShootingSystem.getRGBpoint[6].X = pictureBox1.Location.X * 233; - Form_TIASAutomaticShootingSystem.getRGBpoint[6].Y = pictureBox1.Location.Y * 145; - //8 - Form_TIASAutomaticShootingSystem.getRGBpoint[7].X = pictureBox1.Location.X * 233; - Form_TIASAutomaticShootingSystem.getRGBpoint[7].Y = pictureBox1.Location.Y * 208; - //9 - Form_TIASAutomaticShootingSystem.getRGBpoint[8].X = pictureBox1.Location.X * 233; - Form_TIASAutomaticShootingSystem.getRGBpoint[8].Y = pictureBox1.Location.Y * 275; - //10 - Form_TIASAutomaticShootingSystem.getRGBpoint[9].X = pictureBox1.Location.X * 233; - Form_TIASAutomaticShootingSystem.getRGBpoint[9].Y = pictureBox1.Location.Y * 345; - //11 - Form_TIASAutomaticShootingSystem.getRGBpoint[10].X = pictureBox1.Location.X * 233; - Form_TIASAutomaticShootingSystem.getRGBpoint[10].Y = pictureBox1.Location.Y * 410; - //12 - Form_TIASAutomaticShootingSystem.getRGBpoint[11].X = pictureBox1.Location.X * 233; - Form_TIASAutomaticShootingSystem.getRGBpoint[11].Y = pictureBox1.Location.Y * 478; - //13 - Form_TIASAutomaticShootingSystem.getRGBpoint[12].X = pictureBox1.Location.X * 170; - Form_TIASAutomaticShootingSystem.getRGBpoint[12].Y = pictureBox1.Location.Y * 145; - //14 - Form_TIASAutomaticShootingSystem.getRGBpoint[13].X = pictureBox1.Location.X * 170; - Form_TIASAutomaticShootingSystem.getRGBpoint[13].Y = pictureBox1.Location.Y * 208; - //15 - Form_TIASAutomaticShootingSystem.getRGBpoint[14].X = pictureBox1.Location.X * 170; - Form_TIASAutomaticShootingSystem.getRGBpoint[14].Y = pictureBox1.Location.Y * 275; - //16 - Form_TIASAutomaticShootingSystem.getRGBpoint[15].X = pictureBox1.Location.X * 170; - Form_TIASAutomaticShootingSystem.getRGBpoint[15].Y = pictureBox1.Location.Y * 345; - //17 - Form_TIASAutomaticShootingSystem.getRGBpoint[16].X = pictureBox1.Location.X * 170; - Form_TIASAutomaticShootingSystem.getRGBpoint[16].Y = pictureBox1.Location.Y * 410; - //18 - Form_TIASAutomaticShootingSystem.getRGBpoint[17].X = pictureBox1.Location.X * 170; - Form_TIASAutomaticShootingSystem.getRGBpoint[17].Y = pictureBox1.Location.Y * 478; - //19 - Form_TIASAutomaticShootingSystem.getRGBpoint[18].X = pictureBox1.Location.X * 105; - Form_TIASAutomaticShootingSystem.getRGBpoint[18].Y = pictureBox1.Location.Y * 145; - //20 - Form_TIASAutomaticShootingSystem.getRGBpoint[19].X = pictureBox1.Location.X * 105; - Form_TIASAutomaticShootingSystem.getRGBpoint[19].Y = pictureBox1.Location.Y * 208; - //21 - Form_TIASAutomaticShootingSystem.getRGBpoint[20].X = pictureBox1.Location.X * 105; - Form_TIASAutomaticShootingSystem.getRGBpoint[20].Y = pictureBox1.Location.Y * 275; - //22 - Form_TIASAutomaticShootingSystem.getRGBpoint[21].X = pictureBox1.Location.X * 105; - Form_TIASAutomaticShootingSystem.getRGBpoint[21].Y = pictureBox1.Location.Y * 345; - //23 - Form_TIASAutomaticShootingSystem.getRGBpoint[22].X = pictureBox1.Location.X * 105; - Form_TIASAutomaticShootingSystem.getRGBpoint[22].Y = pictureBox1.Location.Y * 410; - //24 - Form_TIASAutomaticShootingSystem.getRGBpoint[23].X = pictureBox1.Location.X * 105; - Form_TIASAutomaticShootingSystem.getRGBpoint[23].Y = pictureBox1.Location.Y * 478; - - for (int i = 0; i < 24; i++) - { - OpenCvSharp.Cv2.Circle(tempCalib, Form_TIASAutomaticShootingSystem.getRGBpoint[i].X, Form_TIASAutomaticShootingSystem.getRGBpoint[i].Y, 10, new OpenCvSharp.Scalar(0, 255, 0), -1, OpenCvSharp.LineTypes.Link8, 0); - } - - Form_TIASAutomaticShootingSystem.bitmap = OpenCvSharp.Extensions.BitmapConverter.ToBitmap(tempCalib); - this.pictureBox1.Image = Form_TIASAutomaticShootingSystem.bitmap; - this.pictureBox1.Refresh(); - Form_TIASAutomaticShootingSystem.m_getColor = true; - } - - private void pictureBox1_MouseDown(object sender, MouseEventArgs e) - { - if (Form_TIASAutomaticShootingSystem.m_bCalib)//キャリブレーション時しか必要ないので - { - Form_TIASAutomaticShootingSystem.pt.X = e.X; - Form_TIASAutomaticShootingSystem.pt.Y = e.Y; - - //2点クリックすんでいたら - if (Form_TIASAutomaticShootingSystem.pt.X != 0) - { - if (Form_TIASAutomaticShootingSystem.pt.Y != 0) - { - System.Threading.Thread.Sleep(500); - //描画用関数に飛ぶ - DrawPoint(); - this.GuideBox.Text = ""; - this.GuideBox.Text = "Please click Color Correction Button again!"; - this.ShootingGuideBox.Text = ""; - this.ShootingGuideBox.Text = "DON'T enlarge the window!"; - } - } - } - } - } -} diff --git a/DeepTongue_feature_LabColor/feature_labColor/newcamera_deeplearning/Form_Display.resx b/DeepTongue_feature_LabColor/feature_labColor/newcamera_deeplearning/Form_Display.resx deleted file mode 100644 index 1af7de1..0000000 --- a/DeepTongue_feature_LabColor/feature_labColor/newcamera_deeplearning/Form_Display.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/DeepTongue_feature_LabColor/feature_labColor/newcamera_deeplearning/Form_TIASAutomaticShootingSystem.Designer.cs b/DeepTongue_feature_LabColor/feature_labColor/newcamera_deeplearning/Form_TIASAutomaticShootingSystem.Designer.cs index ab9f8d6..ccc69e5 100644 --- a/DeepTongue_feature_LabColor/feature_labColor/newcamera_deeplearning/Form_TIASAutomaticShootingSystem.Designer.cs +++ b/DeepTongue_feature_LabColor/feature_labColor/newcamera_deeplearning/Form_TIASAutomaticShootingSystem.Designer.cs @@ -60,6 +60,7 @@ this.panel4 = new System.Windows.Forms.Panel(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.serialPort1 = new System.IO.Ports.SerialPort(this.components); + this.button1 = new System.Windows.Forms.Button(); this.tableLayoutPanel1.SuspendLayout(); this.panel7.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); @@ -103,6 +104,7 @@ this.tableLayoutPanel1.Controls.Add(this.label11, 2, 7); this.tableLayoutPanel1.Controls.Add(this.label12, 3, 7); this.tableLayoutPanel1.Controls.Add(this.panel4, 2, 2); + this.tableLayoutPanel1.Controls.Add(this.button1, 1, 2); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; @@ -474,6 +476,16 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click); // + // button1 + // + this.button1.Location = new System.Drawing.Point(211, 77); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.TabIndex = 34; + this.button1.Text = "button1"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // // Form_TIASAutomaticShootingSystem // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -536,5 +548,6 @@ private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.TextBox textBox5; private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.Button button1; } } \ No newline at end of file diff --git a/DeepTongue_feature_LabColor/feature_labColor/newcamera_deeplearning/Form_TIASAutomaticShootingSystem.cs b/DeepTongue_feature_LabColor/feature_labColor/newcamera_deeplearning/Form_TIASAutomaticShootingSystem.cs index e111da5..2ea2bac 100644 --- a/DeepTongue_feature_LabColor/feature_labColor/newcamera_deeplearning/Form_TIASAutomaticShootingSystem.cs +++ b/DeepTongue_feature_LabColor/feature_labColor/newcamera_deeplearning/Form_TIASAutomaticShootingSystem.cs @@ -10,9 +10,6 @@ { public partial class Form_TIASAutomaticShootingSystem : Form { - //Set user display window - Form_Display Form_Display = new Form_Display(); - // Config const int RADIUS_COLORAREA = 10; @@ -48,13 +45,13 @@ private void button_ConnectTIAS_Click(object sender, EventArgs e) { // GetImage() - var path_oriImg = @"data_lab\g\Shot0001.bmp"; - var path_calibCsv = @"data_lab\g\Calib.csv"; + var path_oriImg = @"data_lab\h\Shot0001.bmp"; + var path_calibCsv = @"data_lab\h\Calib.csv"; var path_colorMatrixXYZ = "xyz.txt"; using (Mat mat_oriImg = Cv2.ImRead(path_oriImg, ImreadModes.Color)) { // Process_DeepTIAS() - var path_mask = @"data_lab\g\Shot0001_mask.bmp"; + var path_mask = @"data_lab\h\Shot0001_mask.bmp"; Mat mat_finalMask = Cv2.ImRead(path_mask, ImreadModes.Grayscale); Cv2.Threshold(mat_finalMask, mat_finalMask, 128, 255, ThresholdTypes.Binary); @@ -64,6 +61,7 @@ // 5点クリック法(2010石川) List list_5points = Get5points(mat_finalMask); + Show5point(mat_oriImg.Clone(), list_5points); // 8領域の取得 List list_8area = Get8area(list_5points); @@ -142,8 +140,8 @@ // 表示してみる //Cv2.Circle(mat_dst, p_top, 20, new Scalar(255, 255, 0), -1); //Cv2.Circle(mat_dst, p_bottom, 20, new Scalar(255, 255, 0), -1); - //Cv2.Circle(mat_dst, p_left, 20, new Scalar(255, 255, 0), -1); - //Cv2.Circle(mat_dst, p_right, 20, new Scalar(255, 255, 0), -1); + Cv2.Circle(mat_dst, p_left, 20, new Scalar(255, 255, 0), -1); + Cv2.Circle(mat_dst, p_right, 20, new Scalar(255, 255, 0), -1); //Cv2.Circle(mat_dst, p_apex_left, 20, new Scalar(255, 255, 0), -1); //Cv2.Circle(mat_dst, p_apex_right, 20, new Scalar(255, 255, 0), -1); @@ -209,8 +207,8 @@ // 舌尖領域を示すy座標を取得(割合を今回は決め打ち) var y_top_avg_ = (p_left_2.Y + p_right_2.Y) / 2.0; var y_apex_2 = (int)(y_top_avg_ + ((p_bottom_2.Y - y_top_avg_) * 0.53)); - //var p_apex_left_2 = mat_nonZeroCoordinates.At(IndexOfAll(list_Y, y_apex_2).Min()); - //var p_apex_right_2 = mat_nonZeroCoordinates.At(IndexOfAll(list_Y, y_apex_2).Max()); + var p_apex_left_2 = mat_nonZeroCoordinates.At(IndexOfAll(list_Y, y_apex_2).Min()); + var p_apex_right_2 = mat_nonZeroCoordinates.At(IndexOfAll(list_Y, y_apex_2).Max()); // 表示 Cv2.Circle(mat_dst, p_left_2, 20, new Scalar(255, 0, 0), -1); @@ -272,7 +270,7 @@ Cv2.ImShow("dst", mat_dst.Resize(new OpenCvSharp.Size((int)mat_dst.Width * 0.5, (int)mat_dst.Height * 0.5))); // 出力 - li_dst = new List { p_left, p_apex_left, p_bottom, p_apex_right, p_right }; + li_dst = new List { p_left_2, p_apex_left, p_bottom, p_apex_right, p_right_2 }; //li_dst = new List { p_left_2, p_apex_left_2, p_bottom_2, p_apex_right_2, p_right_2 }; // 破棄 @@ -395,6 +393,17 @@ return li_dst; } + private void Show5point(Mat oriImg, List list_5point) + { + Cv2.Circle(oriImg, list_5point[0], 10, new Scalar(255, 0, 0), -1); + Cv2.Circle(oriImg, list_5point[1], 10, new Scalar(255, 0, 0), -1); + Cv2.Circle(oriImg, list_5point[2], 10, new Scalar(255, 0, 0), -1); + Cv2.Circle(oriImg, list_5point[3], 10, new Scalar(255, 0, 0), -1); + Cv2.Circle(oriImg, list_5point[4], 10, new Scalar(255, 0, 0), -1); + Cv2.NamedWindow("dst_point", WindowMode.AutoSize); + Cv2.ImShow("dst_point", oriImg.Resize(new OpenCvSharp.Size((int)oriImg.Width * 0.5, (int)oriImg.Height * 0.5))); + } + private void Show8area(Mat oriImg, List list_8area) { Cv2.Circle(oriImg, list_8area[0], 10, new Scalar(0, 255, 0), -1); @@ -405,7 +414,7 @@ Cv2.Circle(oriImg, list_8area[5], 10, new Scalar(255, 255, 0), -1); Cv2.Circle(oriImg, list_8area[6], 10, new Scalar(255, 0, 0), -1); Cv2.Circle(oriImg, list_8area[7], 10, new Scalar(255, 0, 0), -1); - Cv2.NamedWindow("dst_", WindowMode.KeepRatio ^ WindowMode.Normal); + Cv2.NamedWindow("dst_", WindowMode.AutoSize); Cv2.ImShow("dst_", oriImg.Resize(new OpenCvSharp.Size((int)oriImg.Width * 0.5, (int)oriImg.Height * 0.5))); } @@ -759,7 +768,6 @@ private void Form_TIASAutomaticShootingSystem_Load(object sender, EventArgs e) { - Form_Display.Show(); } private void textBox5_TextChanged(object sender, EventArgs e) @@ -906,5 +914,46 @@ { } + + private void button1_Click(object sender, EventArgs e) + { + var path_csv = @"D:\kei2\Study\Tongue\TongueColorAnalysis\automaze5click\Nakaguchi_clicked.csv"; + var path_out = @"D:\kei2\Study\Tongue\TongueColorAnalysis\automaze5click\Nakaguchi_area.csv"; + var sr = new StreamReader(path_csv); + var sw = new StreamWriter(path_out); + + // skip header + var head = sr.ReadLine(); + + // + for (int i = 0; i < 101; i++) + { + var line = sr.ReadLine(); + var words = line.Split(','); + sw.Write(words[0] + "," + words[1] + ","); + var list_point = new List(); + + for (int j = 2; j < words.Length; j = j + 2) + { + var p = new OpenCvSharp.Point(int.Parse(words[j]), int.Parse(words[j + 1])); + list_point.Add(p); + } + var list_Psorted = list_point.OrderBy(n => n.X).ToList(); + var list_area = Get8area(list_Psorted); + foreach (var n in list_Psorted) + { + sw.Write(n.X + "," + n.Y + ","); + } + foreach (var n in list_area) + { + sw.Write(n.X + "," + n.Y + ","); + } + sw.WriteLine(); + } + + // dispose + sw.Close(); + sr.Close(); + } } } \ No newline at end of file diff --git a/DeepTongue_feature_LabColor/feature_labColor/newcamera_deeplearning/deepTIAS_feature_labColor.csproj b/DeepTongue_feature_LabColor/feature_labColor/newcamera_deeplearning/deepTIAS_feature_labColor.csproj index 8c74de6..8b969e5 100644 --- a/DeepTongue_feature_LabColor/feature_labColor/newcamera_deeplearning/deepTIAS_feature_labColor.csproj +++ b/DeepTongue_feature_LabColor/feature_labColor/newcamera_deeplearning/deepTIAS_feature_labColor.csproj @@ -74,12 +74,6 @@ true - - Form - - - Form_Display.cs - Form @@ -88,9 +82,6 @@ - - Form_Display.cs - Form_TIASAutomaticShootingSystem.cs diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/ColorExtractor.cs b/Tongue extraction_cropresizemethod/Tongue extraction/ColorExtractor.cs index 1545988..9fe8d4d 100644 --- a/Tongue extraction_cropresizemethod/Tongue extraction/ColorExtractor.cs +++ b/Tongue extraction_cropresizemethod/Tongue extraction/ColorExtractor.cs @@ -388,6 +388,7 @@ public void Show8area(Mat oriImg, List list_8area) { + Cv2.Circle(oriImg, list_8area[0], 10, new Scalar(0, 255, 0), -1); Cv2.Circle(oriImg, list_8area[1], 10, new Scalar(0, 255, 0), -1); Cv2.Circle(oriImg, list_8area[2], 10, new Scalar(255, 255, 255), -1); @@ -400,6 +401,32 @@ Cv2.ImShow("dst_", oriImg.Resize(new OpenCvSharp.Size((int)oriImg.Width * 0.5, (int)oriImg.Height * 0.5))); } + public Mat ShowResult(Mat oriImg, List list_5point, List list_8area) + { + Cv2.Circle(oriImg, list_5point[0], 3, new Scalar(255, 0, 0), -1); + Cv2.Circle(oriImg, list_5point[1], 3, new Scalar(255, 0, 0), -1); + Cv2.Circle(oriImg, list_5point[2], 3, new Scalar(255, 0, 0), -1); + Cv2.Circle(oriImg, list_5point[3], 3, new Scalar(255, 0, 0), -1); + Cv2.Circle(oriImg, list_5point[4], 3, new Scalar(255, 0, 0), -1); + + Cv2.Circle(oriImg, list_8area[0], 10, new Scalar(0, 255, 0), -1); + Cv2.Circle(oriImg, list_8area[1], 10, new Scalar(0, 255, 0), -1); + Cv2.Circle(oriImg, list_8area[2], 10, new Scalar(0, 255, 255), -1); + Cv2.Circle(oriImg, list_8area[3], 10, new Scalar(0, 255, 255), -1); + Cv2.Circle(oriImg, list_8area[4], 10, new Scalar(255, 255, 0), -1); + Cv2.Circle(oriImg, list_8area[5], 10, new Scalar(255, 255, 0), -1); + Cv2.Circle(oriImg, list_8area[6], 10, new Scalar(255, 0, 255), -1); + Cv2.Circle(oriImg, list_8area[7], 10, new Scalar(255, 0, 255), -1); + + Cv2.Line(oriImg, list_5point[0], list_5point[1], new Scalar(255, 100, 100)); + Cv2.Line(oriImg, list_5point[1], list_5point[2], new Scalar(255, 100, 100)); + Cv2.Line(oriImg, list_5point[2], list_5point[3], new Scalar(255, 100, 100)); + Cv2.Line(oriImg, list_5point[3], list_5point[4], new Scalar(255, 100, 100)); + Cv2.Line(oriImg, list_5point[4], list_5point[0], new Scalar(255, 100, 100)); + + return oriImg; + } + public List Calc8Lab(List list_8colors, string path_calibCsv, string path_colorMatrixXYZ) { GetColorMatrixRGB(path_calibCsv); diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/Form1.Designer.cs b/Tongue extraction_cropresizemethod/Tongue extraction/Form1.Designer.cs index 04f5071..6a7aa09 100644 --- a/Tongue extraction_cropresizemethod/Tongue extraction/Form1.Designer.cs +++ b/Tongue extraction_cropresizemethod/Tongue extraction/Form1.Designer.cs @@ -316,7 +316,7 @@ this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(246, 20); this.label8.TabIndex = 14; - this.label8.Text = "Gloss"; + this.label8.Text = "Color Extraction"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // pictureBox_cropResized diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/Form1.cs b/Tongue extraction_cropresizemethod/Tongue extraction/Form1.cs index 5072afb..b154d98 100644 --- a/Tongue extraction_cropresizemethod/Tongue extraction/Form1.cs +++ b/Tongue extraction_cropresizemethod/Tongue extraction/Form1.cs @@ -1072,9 +1072,15 @@ var y_mask = 0; for (int y = P1.Y; y < P2.Y; y++) { + if (y_mask >= mat_outputChanged.Height) + break; + var x_mask = 0; for (int x = P1.X; x < P2.X; x++) { + if (x_mask >= mat_outputChanged.Width) + break; + int pix = mat_outputChanged.At(y_mask, x_mask); mat_mask.Set(y, x, pix); x_mask++; @@ -1145,7 +1151,6 @@ }); label6.BackColor = Color.White; - /// 5点クリックによる色抽出処理 var path_colorMatrixXYZ = "xyz.txt"; @@ -1168,6 +1173,9 @@ List list_8area_3 = ce.Get8area(list_5points_3); //ce.Show8area(mat_oriImg.Clone(), list_8area); + // 領域の表示 + var mat_areaDicision = ce.ShowResult(mat_input.Clone(), list_5points_3, list_8area_3); + //// 色抽出 //List list_8Bgr = ce.Get8colors(mat_maskedImg, list_8area); @@ -1182,13 +1190,15 @@ mat_maskedImg.Dispose(); GC.Collect(); System.Threading.Thread.Sleep(100); - //bitmap_bitch = OpenCvSharp.Extensions.BitmapConverter.ToBitmap(mat_gloss); - //Invoke((MethodInvoker)delegate - //{ - // pictureBox_last.Image = bitmap_bitch; - // pictureBox_last.Refresh(); - //}); - //label7.BackColor = Color.White; + + mat_extraction.SaveImage(path_base + "\\autoAreaDecision" + "\\" + name_dir + ".bmp"); + bitmap_bitch = OpenCvSharp.Extensions.BitmapConverter.ToBitmap(mat_areaDicision); + Invoke((MethodInvoker)delegate + { + pictureBox_last.Image = bitmap_bitch; + pictureBox_last.Refresh(); + }); + label7.BackColor = Color.White; // 処理log label8.BackColor = Color.Red;