diff --git a/.gitignore b/.gitignore
index 387ac1d..5b008b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,4 @@
*.xml
*.config
*.pb
+*.jpg
diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/DeepTongue1.7.csproj b/Tongue extraction_cropresizemethod/Tongue extraction/DeepTongue1.7.csproj
index d0f0360..82f5be0 100644
--- a/Tongue extraction_cropresizemethod/Tongue extraction/DeepTongue1.7.csproj
+++ b/Tongue extraction_cropresizemethod/Tongue extraction/DeepTongue1.7.csproj
@@ -107,10 +107,6 @@
-
-
-
-
diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/Form1.Designer.cs b/Tongue extraction_cropresizemethod/Tongue extraction/Form1.Designer.cs
index 822cbd3..b0b92db 100644
--- a/Tongue extraction_cropresizemethod/Tongue extraction/Form1.Designer.cs
+++ b/Tongue extraction_cropresizemethod/Tongue extraction/Form1.Designer.cs
@@ -36,6 +36,7 @@
this.pictureBox_extraction = new System.Windows.Forms.PictureBox();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.panel1 = new System.Windows.Forms.Panel();
+ this.textBox1 = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
@@ -167,6 +168,7 @@
// panel1
//
this.tableLayoutPanel1.SetColumnSpan(this.panel1, 3);
+ this.panel1.Controls.Add(this.textBox1);
this.panel1.Controls.Add(this.button_start);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(3, 478);
@@ -175,6 +177,14 @@
this.panel1.Size = new System.Drawing.Size(758, 49);
this.panel1.TabIndex = 6;
//
+ // textBox1
+ //
+ this.textBox1.Location = new System.Drawing.Point(196, 1);
+ this.textBox1.Multiline = true;
+ this.textBox1.Name = "textBox1";
+ this.textBox1.Size = new System.Drawing.Size(562, 51);
+ this.textBox1.TabIndex = 1;
+ //
// label1
//
this.label1.AutoSize = true;
@@ -380,6 +390,7 @@
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
this.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox_output)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox_outputSRG)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox_maskSRG)).EndInit();
@@ -415,6 +426,7 @@
private System.Windows.Forms.Label label_totalProgress;
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.Button button_pause;
+ private System.Windows.Forms.TextBox textBox1;
}
}
diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/Form1.cs b/Tongue extraction_cropresizemethod/Tongue extraction/Form1.cs
index 227758c..b6a92ab 100644
--- a/Tongue extraction_cropresizemethod/Tongue extraction/Form1.cs
+++ b/Tongue extraction_cropresizemethod/Tongue extraction/Form1.cs
@@ -334,11 +334,10 @@
mat_input = Cv2.ImRead(basepath + "\\data" + imageFile);
bitmap_bitch = OpenCvSharp.Extensions.BitmapConverter.ToBitmap(mat_input);
- pictureBox_input.Image = bitmap_bitch;
Invoke((MethodInvoker)delegate
{
+ pictureBox_input.Image = bitmap_bitch;
pictureBox_input.Refresh();
-
});
label8.BackColor = Color.White;
@@ -365,8 +364,8 @@
var output = runner.Run();
var boxes = (float[,,])output[0].GetValue();
var scores = (float[,])output[1].GetValue();
- //var classes = (float[,])output[2].GetValue();
- //var detections = (float[])output[3].GetValue();
+ var classes = (float[,])output[2].GetValue();
+ var detections = (float[])output[3].GetValue();
check_detection = 0;
max_score = 0;
@@ -393,6 +392,13 @@
check_detection = 1;
}
}
+ Invoke((MethodInvoker)delegate
+ {
+ textBox1.Text = P1.ToString() + ", ";
+ textBox1.Text += P2.ToString() + ", ";
+ textBox1.Text += max_score.ToString() + ", ";
+ });
+
}
}
if (check_detection == 1)
diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/mask/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/mask/20180419045627.jpg
index e9b4341..c3ec308 100644
--- a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/mask/20180419045627.jpg
+++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/mask/20180419045627.jpg
Binary files differ
diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/mask_changed1/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/mask_changed1/20180419045627.jpg
deleted file mode 100644
index 96e7356..0000000
--- a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/mask_changed1/20180419045627.jpg
+++ /dev/null
Binary files differ
diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/mask_changed2/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/mask_changed2/20180419045627.jpg
index 52fa307..aefb6c3 100644
--- a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/mask_changed2/20180419045627.jpg
+++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/mask_changed2/20180419045627.jpg
Binary files differ