From d1c84a4e180c42431cfe93997ab8629833928188 Mon Sep 17 00:00:00 2001 From: moco Date: Wed, 8 Jan 2025 23:37:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=8F=8C=E8=90=BD=E8=AE=A1?= =?UTF-8?q?=E6=95=B0=20=E5=92=8CUI=E9=94=99=E8=AF=AF=E9=83=A8=E5=88=86=20?= =?UTF-8?q?=20=E8=BF=98=E6=9C=89=E6=B3=B3=E9=81=93=E7=AE=97=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/PBAnaly/MainForm.Designer.cs | 44 +-------------------- src/PBAnaly/MainForm.cs | 2 +- src/PBAnaly/Program.cs | 2 +- src/PBAnaly/Properties/Resources.en-US.resx | 10 ++--- src/PBAnaly/Properties/Resources.resx | 12 ++---- src/PBAnaly/Properties/Resources.zh-CN.resx | 11 ++---- src/PBBiology/include/PBLane.h | 2 +- src/PBBiology/src/PBLane.cpp | 2 +- src/PBBiologyVC/PBBiologyVC.cpp | 2 +- 9 files changed, 17 insertions(+), 70 deletions(-) diff --git a/src/PBAnaly/MainForm.Designer.cs b/src/PBAnaly/MainForm.Designer.cs index a11def0..b05e522 100644 --- a/src/PBAnaly/MainForm.Designer.cs +++ b/src/PBAnaly/MainForm.Designer.cs @@ -47,7 +47,7 @@ this.materialButton_acidAnalyze = new MaterialSkin.Controls.MaterialButton(); this.materialButton_roiAnalyze = new MaterialSkin.Controls.MaterialButton(); this.materialButton_miniAnalyze = new MaterialSkin.Controls.MaterialButton(); - this.materialButton_dotcounts = new MaterialSkin.Controls.MaterialButton(); + this.mb_colonyCount = new MaterialSkin.Controls.MaterialButton(); this.materialButton_correction = new MaterialSkin.Controls.MaterialButton(); this.flowLayoutPanel2 = new AntdUI.In.FlowLayoutPanel(); this.materialButton_changeFormSize = new MaterialSkin.Controls.MaterialButton(); @@ -593,47 +593,7 @@ this.materialButton_save.UseAccentColor = false; this.materialButton_save.UseVisualStyleBackColor = true; this.materialButton_save.MouseMove += new System.Windows.Forms.MouseEventHandler(this.materialButton_save_MouseMove); - // - // materialButton_forward - // - this.materialButton_forward.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.materialButton_forward.Density = MaterialSkin.Controls.MaterialButton.MaterialButtonDensity.Default; - this.materialButton_forward.Depth = 0; - this.materialButton_forward.HighEmphasis = true; - this.materialButton_forward.Icon = ((System.Drawing.Image)(resources.GetObject("materialButton_forward.Icon"))); - this.materialButton_forward.Location = new System.Drawing.Point(448, 0); - this.materialButton_forward.Margin = new System.Windows.Forms.Padding(0); - this.materialButton_forward.MouseState = MaterialSkin.MouseState.HOVER; - this.materialButton_forward.Name = "materialButton_forward"; - this.materialButton_forward.NoAccentTextColor = System.Drawing.Color.Empty; - this.materialButton_forward.Size = new System.Drawing.Size(64, 36); - this.materialButton_forward.TabIndex = 23; - this.materialButton_forward.Text = " "; - this.materialButton_forward.Type = MaterialSkin.Controls.MaterialButton.MaterialButtonType.Text; - this.materialButton_forward.UseAccentColor = false; - this.materialButton_forward.UseVisualStyleBackColor = true; - this.materialButton_forward.MouseMove += new System.Windows.Forms.MouseEventHandler(this.materialButton_forward_MouseMove); - // - // materialButton_return - // - this.materialButton_return.Anchor = System.Windows.Forms.AnchorStyles.None; - this.materialButton_return.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.materialButton_return.Density = MaterialSkin.Controls.MaterialButton.MaterialButtonDensity.Default; - this.materialButton_return.Depth = 0; - this.materialButton_return.HighEmphasis = true; - this.materialButton_return.Icon = ((System.Drawing.Image)(resources.GetObject("materialButton_return.Icon"))); - this.materialButton_return.Location = new System.Drawing.Point(0, 36); - this.materialButton_return.Margin = new System.Windows.Forms.Padding(0); - this.materialButton_return.MouseState = MaterialSkin.MouseState.HOVER; - this.materialButton_return.Name = "materialButton_return"; - this.materialButton_return.NoAccentTextColor = System.Drawing.Color.Empty; - this.materialButton_return.Size = new System.Drawing.Size(64, 36); - this.materialButton_return.TabIndex = 22; - this.materialButton_return.Text = " "; - this.materialButton_return.Type = MaterialSkin.Controls.MaterialButton.MaterialButtonType.Text; - this.materialButton_return.UseAccentColor = false; - this.materialButton_return.UseVisualStyleBackColor = true; - this.materialButton_return.MouseMove += new System.Windows.Forms.MouseEventHandler(this.materialButton_return_MouseMove); + // // pl_right // diff --git a/src/PBAnaly/MainForm.cs b/src/PBAnaly/MainForm.cs index d463b2b..8bc9df1 100644 --- a/src/PBAnaly/MainForm.cs +++ b/src/PBAnaly/MainForm.cs @@ -196,7 +196,7 @@ namespace PBAnaly materialButton_acidAnalyze, //6、泳道分析 materialButton_roiAnalyze, //7、ROIs分析 materialButton_miniAnalyze, //8、微孔版分析 - materialButton_dotcounts, //9、菌落计数 + mb_colonyCount, //9、菌落计数 materialButton_correction //10、蛋白归一化 }; } diff --git a/src/PBAnaly/Program.cs b/src/PBAnaly/Program.cs index 7cb1500..d65a0d1 100644 --- a/src/PBAnaly/Program.cs +++ b/src/PBAnaly/Program.cs @@ -64,7 +64,7 @@ namespace PBAnaly } - if (Util.ViKeySoft.Instance.CheckViKey() == true) + if (Util.ViKeySoft.Instance.CheckViKey() == false) { MessageBox.Show("你没有权限，请检查加密狗是否插入","警告"); return; diff --git a/src/PBAnaly/Properties/Resources.en-US.resx b/src/PBAnaly/Properties/Resources.en-US.resx index 599f241..c0d8346 100644 --- a/src/PBAnaly/Properties/Resources.en-US.resx +++ b/src/PBAnaly/Properties/Resources.en-US.resx @@ -117,10 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - Back @@ -232,9 +228,6 @@ MiniAnalyze - - Dotcounts - Correction @@ -325,4 +318,7 @@ Language: + + Colony + \ No newline at end of file diff --git a/src/PBAnaly/Properties/Resources.resx b/src/PBAnaly/Properties/Resources.resx index 4aa8e68..345040a 100644 --- a/src/PBAnaly/Properties/Resources.resx +++ b/src/PBAnaly/Properties/Resources.resx @@ -163,9 +163,6 @@ ..\Resources\波形设置-未选中.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Black_Blue_1.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\添加用户.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -202,9 +199,6 @@ ..\Resources\控制窗口.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Black_Yley_0.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\窗口最大化_操作_jurassic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -382,9 +376,6 @@ 微孔版分析 - - 菌落技术 - 蛋白归一化 @@ -475,4 +466,7 @@ 语言 + + 菌落计数 + \ No newline at end of file diff --git a/src/PBAnaly/Properties/Resources.zh-CN.resx b/src/PBAnaly/Properties/Resources.zh-CN.resx index 5e8f7d4..280f039 100644 --- a/src/PBAnaly/Properties/Resources.zh-CN.resx +++ b/src/PBAnaly/Properties/Resources.zh-CN.resx @@ -117,10 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - 返回 @@ -232,9 +228,6 @@ 微孔版分析 - - 菌落技术 - 蛋白归一化 @@ -325,4 +318,8 @@ 语言 + + + + \ No newline at end of file diff --git a/src/PBBiology/include/PBLane.h b/src/PBBiology/include/PBLane.h index bd5896a..9680ecd 100644 --- a/src/PBBiology/include/PBLane.h +++ b/src/PBBiology/include/PBLane.h @@ -22,7 +22,7 @@ private: std::vector checkArray(std::vector& processX, Mat src, int start_y, int end_y, int meanW); - vector> get_top_point(vector rbuf, int range); + vector> get_top_point(vector rbuf, int range); static bool myCompare(const int& a, const int& b); static bool myCompare2(const std::array& a, const std::array& b); diff --git a/src/PBBiology/src/PBLane.cpp b/src/PBBiology/src/PBLane.cpp index 35d0175..917a2f3 100644 --- a/src/PBBiology/src/PBLane.cpp +++ b/src/PBBiology/src/PBLane.cpp @@ -867,7 +867,7 @@ std::vector PBLane::adjustBands(std::vector unadjustbands, i bands[vec[i][3]].band_point[columnIndex - 1] = { vec[i][0],vec[i][1],vec[i][2] }; } } - return; + return bands; } void PBLane::molecularWeightResult(std::vector lanes, std::vector& bands) diff --git a/src/PBBiologyVC/PBBiologyVC.cpp b/src/PBBiologyVC/PBBiologyVC.cpp index c4218c4..b5031a1 100644 --- a/src/PBBiologyVC/PBBiologyVC.cpp +++ b/src/PBBiologyVC/PBBiologyVC.cpp @@ -68,7 +68,7 @@ namespace PBBiologyVC cv::Mat src(height, width, CV_8UC1,mat); cv::Mat edges; cv::Canny(src, edges, 50, 150); - std::vector rects = pblane->getProteinRect(src); + std::vector rects = pblane->getProteinRect(src,(int*)width, (int*)height,1); List^ results = gcnew List(); for (const auto& rect : rects) {