Commit 24544381 张士柳

1 个父辈 210aab13
...@@ -513,6 +513,11 @@ namespace eyemLib_Sharp ...@@ -513,6 +513,11 @@ namespace eyemLib_Sharp
private static extern void setLogCallback(TCallBack cb); private static extern void setLogCallback(TCallBack cb);
#endregion #endregion
#region 滤波
[DllImport("eyemLib.dll", CharSet = CharSet.None, CallingConvention = CallingConvention.Cdecl)]
private static extern int eyemShockFilter(EyemImage tpImage, int kSize, double dSigma, double dBlend, int iIter, out EyemImage tpDstImg);
#endregion
#region 2 blob 分析 #region 2 blob 分析
/// <summary> /// <summary>
...@@ -1118,25 +1123,8 @@ namespace eyemLib_Sharp ...@@ -1118,25 +1123,8 @@ namespace eyemLib_Sharp
sw.Restart(); sw.Restart();
string file = fileName.Split(new string[] { "\\" }, StringSplitOptions.RemoveEmptyEntries)[2]; string file = fileName.Split(new string[] { "\\" }, StringSplitOptions.RemoveEmptyEntries)[2];
//flag = eyemInitNNDataCodeModel(".\\darknet\\detect-tiny.cfg", ".\\darknet\\detect-tiny.weights", "", "") & eyemInitNNDetector(".\\darknet\\detect-tiny-label.cfg", ".\\darknet\\detect-tiny-label.weights"); //flag = eyemInitNNDataCodeModel(".\\darknet\\detect-tiny.cfg", ".\\darknet\\detect-tiny.weights", "", "") & eyemInitNNDetector(".\\darknet\\detect-tiny-label.cfg", ".\\darknet\\detect-tiny-label.weights");
//EyemImage image1 = new EyemImage(); EyemImage image2 = new EyemImage();
//flag = eyemMatMalloc(512, 512, 1, "uint8_t", out image1);
//flag = eyemMatMalloc(512, 512, 1, "uint8_t", out image2);
//flag = eyemMatCopy(ref image2, image1);
//flag = eyemMatAdd(image1, image2, ref tpDstImg);
//flag = eyemMatSub(image1, image2, ref tpDstImg);
//flag = eyemMatAbs(ref tpDstImg);
//flag = eyemCvtType(tpDstImg, "uint16_t", 1.0, 128, ref tpDstImg);
//flag = eyemCvtColor(tpDstImg, ColorConversionCodes.COLOR_GRAY2BGR, ref tpDstImg);
////红色分割 ////红色分割
//EyemHSVModel tpHsvModel = new EyemHSVModel(); //EyemHSVModel tpHsvModel = new EyemHSVModel();
//tpHsvModel.dpRangeL = new double[] { 0, 43, 46 }; tpHsvModel.dpRangeU = new double[] { 10, 255, 255 }; //tpHsvModel.dpRangeL = new double[] { 0, 43, 46 }; tpHsvModel.dpRangeU = new double[] { 10, 255, 255 };
...@@ -1171,18 +1159,22 @@ namespace eyemLib_Sharp ...@@ -1171,18 +1159,22 @@ namespace eyemLib_Sharp
//EyemOcsFXYR tpCircle = new EyemOcsFXYR(); //EyemOcsFXYR tpCircle = new EyemOcsFXYR();
//flag = eyemMarkerTracing(image, tpHsvModel, ref tpCircle, out tpDstImg, false); //flag = eyemMarkerTracing(image, tpHsvModel, ref tpCircle, out tpDstImg, false);
//Bitmap bitmap = eyemCvtToBitmap(tpDstImg);
//if (bitmap != null)
//{
// bitmap.Save(System.Windows.Forms.Application.StartupPath + "\\ResOut\\" + file);
//}
//eyemImageFree(ref tpDstImg); //eyemImageFree(ref tpDstImg);
//sw.Stop(); //sw.Stop();
//Console.WriteLine("时间:" + sw.ElapsedMilliseconds.ToString()); //Console.WriteLine("时间:" + sw.ElapsedMilliseconds.ToString());
return;
//flag = eyemEdge1dRidgeDetection(image); //flag = eyemEdge1dRidgeDetection(image);
flag = eyemShockFilter(image, 9, 1.5, 0.5, 10, out tpDstImg);
Bitmap bitmap = eyemCvtToBitmap(tpDstImg);
if (bitmap != null)
{
bitmap.Save(System.Windows.Forms.Application.StartupPath + "\\ResOut\\" + file);
}
return;
#region Test Blob #region Test Blob
//sw.Restart(); //sw.Restart();
//int ipNum; //int ipNum;
...@@ -1199,7 +1191,6 @@ namespace eyemLib_Sharp ...@@ -1199,7 +1191,6 @@ namespace eyemLib_Sharp
//{ //{
// bitmap.Save(System.Windows.Forms.Application.StartupPath + "\\ResOut\\" + file); // bitmap.Save(System.Windows.Forms.Application.StartupPath + "\\ResOut\\" + file);
//} //}
//hObject.Dispose(); //hObject.Dispose();
//eyemImageFree(ref tpDstImg); //eyemImageFree(ref tpDstImg);
//eyemImageFree(ref image); //eyemImageFree(ref image);
...@@ -1357,7 +1348,6 @@ namespace eyemLib_Sharp ...@@ -1357,7 +1348,6 @@ namespace eyemLib_Sharp
//eyemImageFree(ref image); //eyemImageFree(ref image);
//return; //return;
//获取用于制作模板的图像 //获取用于制作模板的图像
//flag = eyemAchvTemplateImage(image, tpRoi, out tpDstImg); //flag = eyemAchvTemplateImage(image, tpRoi, out tpDstImg);
...@@ -1411,14 +1401,13 @@ namespace eyemLib_Sharp ...@@ -1411,14 +1401,13 @@ namespace eyemLib_Sharp
// bitmap.Save(System.Windows.Forms.Application.StartupPath + "\\ResOut\\" + file); // bitmap.Save(System.Windows.Forms.Application.StartupPath + "\\ResOut\\" + file);
//} //}
//最好释放掉,如果对象供其他接口使用要先释放 //如果对象供其他接口使用要先释放
//eyemImageFree(ref tpDstImg); //eyemImageFree(ref tpDstImg);
//"IP_SMALL_PARTS","IP_LARGE_PARTS","IP_LONG_PARTS","IP_LOWCONTRAST_PARTS" //"IP_SMALL_PARTS","IP_LARGE_PARTS","IP_LONG_PARTS","IP_LOWCONTRAST_PARTS"
//eyemCountObject(image, tpRoi, file.Replace(".png", ""), ipReelNum, out tpDstImg); //eyemCountObject(image, tpRoi, file.Replace(".png", ""), ipReelNum, out tpDstImg);
//eyemCountObjectIrregularParts(image, tpRoi, file.Replace(".png", ""), "IP_SQUARE_PARTS", ipReelNum, out tpDstImg); //eyemCountObjectIrregularParts(image, tpRoi, file.Replace(".png", ""), "IP_SQUARE_PARTS", ipReelNum, out tpDstImg);
//eyemCountObjectE(image, tpRoi, file.Replace(".png", ""), ipReelNum, out tpDstImg); //eyemCountObjectE(image, tpRoi, file.Replace(".png", ""), ipReelNum, out tpDstImg);
//eyemCountObjectIrregularPartsE(image, tpRoi, file.Replace(".png", ""), "20210825095751-1", hModelID, ipReelNum, out tpDstImg);
//eyemCountObjectIrregularPartsE(image, tpRoi, file.Replace(".png", ""), "D:\\模板文件\\" + "20210825095751-1.tpl", hModelID, ipReelNum, out tpDstImg); //eyemCountObjectIrregularPartsE(image, tpRoi, file.Replace(".png", ""), "D:\\模板文件\\" + "20210825095751-1.tpl", hModelID, ipReelNum, out tpDstImg);
//移除模板 //移除模板
...@@ -1445,10 +1434,10 @@ namespace eyemLib_Sharp ...@@ -1445,10 +1434,10 @@ namespace eyemLib_Sharp
//flag = eyemDetectAndDecodeBarcodeUseNN(image, tpRoi, out hObject, out tpResults, out ipNum, out tpDstImg); //flag = eyemDetectAndDecodeBarcodeUseNN(image, tpRoi, out hObject, out tpResults, out ipNum, out tpDstImg);
//return; //return;
string strReelNum = ""; string strReelNum = "";
//for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
//{ {
// strReelNum += ipReelNum[i].ToString() + ","; strReelNum += ipReelNum[i].ToString() + ",";
//} }
sw.Stop(); sw.Stop();
Console.WriteLine(file + "--->" + "耗时:" + sw.ElapsedMilliseconds.ToString() + "ms" + ",结果:" + strReelNum); Console.WriteLine(file + "--->" + "耗时:" + sw.ElapsedMilliseconds.ToString() + "ms" + ",结果:" + strReelNum);
...@@ -1463,7 +1452,6 @@ namespace eyemLib_Sharp ...@@ -1463,7 +1452,6 @@ namespace eyemLib_Sharp
// Marshal.FreeCoTaskMem(tpResults[i].hText); Marshal.FreeCoTaskMem(tpResults[i].hType); // Marshal.FreeCoTaskMem(tpResults[i].hText); Marshal.FreeCoTaskMem(tpResults[i].hType);
//} //}
//hObject.Dispose(); //hObject.Dispose();
//在关闭程序时释放 //在关闭程序时释放
//eyemReleaseModel(ref hModelID); //eyemReleaseModel(ref hModelID);
//free image //free image
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!