更新菌落计数 和UI错误部分 还有泳道算法

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
             // 

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、蛋白归一化
             };
         }

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;

src/PBAnaly/Properties/Resources.en-US.resx

@@ -117,10 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="Black_Blue_1" type="System.Resources.ResXNullRef, System.Windows.Forms">
-    <value />
-  </data>
   <data name="btn_back" xml:space="preserve">
     <value>Back</value>
   </data>
@@ -232,9 +228,6 @@
   <data name="materialButton_miniAnalyze" xml:space="preserve">
     <value>MiniAnalyze</value>
   </data>
-  <data name="materialButton_dotcounts" xml:space="preserve">
-    <value>Dotcounts</value>
-  </data>
   <data name="materialButton_correction" xml:space="preserve">
     <value>Correction</value>
   </data>
@@ -325,4 +318,7 @@
   <data name="label_Language" xml:space="preserve">
     <value>Language:</value>
   </data>
+  <data name="mb_colonyCount" xml:space="preserve">
+    <value>Colony</value>
+  </data>
 </root>

src/PBAnaly/Properties/Resources.resx

@@ -163,9 +163,6 @@
   <data name="波形设置-未选中" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\波形设置-未选中.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Black_Blue_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Black_Blue_1.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="添加用户" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\添加用户.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -202,9 +199,6 @@
   <data name="控制窗口" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\控制窗口.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Black_Yley_0" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Black_Yley_0.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="窗口最大化_操作_jurassic" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\窗口最大化_操作_jurassic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -382,9 +376,6 @@
   <data name="materialButton_miniAnalyze" xml:space="preserve">
     <value>微孔版分析</value>
   </data>
-  <data name="materialButton_dotcounts" xml:space="preserve">
-    <value>菌落技术</value>
-  </data>
   <data name="materialButton_correction" xml:space="preserve">
     <value>蛋白归一化</value>
   </data>
@@ -475,4 +466,7 @@
   <data name="label_Language" xml:space="preserve">
     <value>语言</value>
   </data>
+  <data name="mb_colonyCount" xml:space="preserve">
+    <value>菌落计数</value>
+  </data>
 </root>

src/PBAnaly/Properties/Resources.zh-CN.resx

@@ -117,10 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="Black_Yley_0" type="System.Resources.ResXNullRef, System.Windows.Forms">
-    <value />
-  </data>
   <data name="btn_back" xml:space="preserve">
     <value>返回</value>
   </data>
@@ -232,9 +228,6 @@
   <data name="materialButton_miniAnalyze" xml:space="preserve">
     <value>微孔版分析</value>
   </data>
-  <data name="materialButton_dotcounts" xml:space="preserve">
-    <value>菌落技术</value>
-  </data>
   <data name="materialButton_correction" xml:space="preserve">
     <value>蛋白归一化</value>
   </data>
@@ -325,4 +318,8 @@
   <data name="label_Language" xml:space="preserve">
     <value>语言</value>
   </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="mb_colonyCount" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
 </root>

src/PBBiology/include/PBLane.h

@@ -22,7 +22,7 @@ private:
 
 	std::vector<int> checkArray(std::vector<int>& processX, Mat src, int start_y, int end_y, int meanW);
 
-	vector<std::array<int, 3>> get_top_point(vector<unsigned char> rbuf, int range);
+	vector<std::array<int, 3>> get_top_point(vector<unsigned short> rbuf, int range);
 
 	static bool myCompare(const int& a, const int& b);
 	static bool myCompare2(const std::array<int, 4>& a, const std::array<int, 4>& b);

src/PBBiology/src/PBLane.cpp

@@ -867,7 +867,7 @@ std::vector<BandInfo> PBLane::adjustBands(std::vector<BandInfo> 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<cv::Rect> lanes, std::vector<BandInfo>& bands)

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<cv::Rect> rects = pblane->getProteinRect(src);
+        std::vector<cv::Rect> rects = pblane->getProteinRect(src,(int*)width, (int*)height,1);
 
         List<RectVC^>^ results = gcnew List<RectVC^>();
         for (const auto& rect : rects) {