无

eyemLib-Sharp/EyemLib.cs

@@ -1227,34 +1227,6 @@ namespace eyemLib_Sharp
             Stopwatch sw = new Stopwatch();
             Stopwatch sw = new Stopwatch();
             sw.Restart();
             sw.Restart();
             string file = fileName.Split(new string[] { "\\" }, StringSplitOptions.RemoveEmptyEntries)[2];
             string file = fileName.Split(new string[] { "\\" }, StringSplitOptions.RemoveEmptyEntries)[2];
-            //string[] fileNames = Directory.GetFiles(@"C:\Users\nzslw\PycharmProjects\pythonProject\venv\data\AntBee\test\ants", "*.jpg", SearchOption.AllDirectories);
-            //return;
-            //foreach (var item in fileNames)
-            //{
-            //    eyemBuildTrainFile(item, "D:\\标签识别\\" + item.Split(new string[] { "\\" }, StringSplitOptions.RemoveEmptyEntries)[4]);
-            //}
-            //return;
-
-            //for (int i = 0; i < fileNames.Length; i++)
-            //{
-            //    string item = fileNames[i];
-            //    string[] items = item.Split(new string[] { "\\" }, StringSplitOptions.RemoveEmptyEntries);
-            //    FileInfo fi = new FileInfo(item);
-            //    fi.MoveTo(@"D:\日志\" + (i+83).ToString() + ".png");
-            //}
-            //return;
-
-            //StreamWriter swr = new StreamWriter("D:\\val.txt", true);
-            //foreach (var item in random_shuffle)
-            //{
-            //    string[] items = item.Split(new string[] { "\\" }, StringSplitOptions.RemoveEmptyEntries);
-            //    swr.WriteLine("data/val_images/" + items[items.Length - 1]);
-            //    swr.Flush();
-            //}
-            //return;
-
-            //eyemRenameFile(@"D:\训练数据集\20211021");
-            //return;
 
 
             //flag = eyemInitNNDetector(".\\darknet\\cifar_resnet50.cfg", ".\\darknet\\cifar_resnet50.weights");
             //flag = eyemInitNNDetector(".\\darknet\\cifar_resnet50.cfg", ".\\darknet\\cifar_resnet50.weights");
             //if (flag == 0)
             //if (flag == 0)
@@ -1388,8 +1360,6 @@ namespace eyemLib_Sharp
             //eyemImageFree(ref search);
             //eyemImageFree(ref search);
             //return;
             //return;
 
 
-            //flag = eyemNormalize(ref image);
-
             //EyemImage image1 = new EyemImage(); EyemImage image2 = new EyemImage(); EyemImage image3 = new EyemImage();
             //EyemImage image1 = new EyemImage(); EyemImage image2 = new EyemImage(); EyemImage image3 = new EyemImage();
             //eyemDecompose(image, out image1, out image2, out image3);
             //eyemDecompose(image, out image1, out image2, out image3);
 
 
@@ -1655,12 +1625,12 @@ namespace eyemLib_Sharp
             int[] ipReelNum = new int[4];
             int[] ipReelNum = new int[4];
             //"IP_SMALL_PARTS","IP_LARGE_PARTS","IP_LONG_PARTS","IP_SQUARE_PARTS","IP_DYNAMIC_PARTS","","IP_DYNAMIC_SP1","IP_DYNAMIC_SP2"
             //"IP_SMALL_PARTS","IP_LARGE_PARTS","IP_LONG_PARTS","IP_SQUARE_PARTS","IP_DYNAMIC_PARTS","","IP_DYNAMIC_SP1","IP_DYNAMIC_SP2"
             //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_LARGE_PARTS", ipReelNum, out tpDstImg);
-            eyemCountObjectE(image, tpRoi, file.Replace(".png", ""), ipReelNum, out tpDstImg);
+            //eyemCountObjectIrregularParts(image, tpRoi, file.Replace(".png", ""), "IP_LONG_PARTS", ipReelNum, out tpDstImg);
+            //eyemCountObjectE(image, tpRoi, file.Replace(".png", ""), 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);
             //算法选项
             //算法选项
             //std::string sOptions[8] = { "IP_DEFAULT_PARTS","IP_SMALL_PARTS","IP_LARGE_PARTS","IP_LONG_PARTS","IP_SQUARE_PARTS","","IP_DYNAMIC_SP1","IP_DYNAMIC_SP2" };
             //std::string sOptions[8] = { "IP_DEFAULT_PARTS","IP_SMALL_PARTS","IP_LARGE_PARTS","IP_LONG_PARTS","IP_SQUARE_PARTS","","IP_DYNAMIC_SP1","IP_DYNAMIC_SP2" };
-            //eyemCountObjectIrregularPartsMultiopt(image, tpRoi, new int[] { 2, 2, 2, 2 }, ipReelNum, out tpDstImg);
+            eyemCountObjectIrregularPartsMultiopt(image, tpRoi, new int[] { 0, 0, 0, 0 }, ipReelNum, out tpDstImg);
 
 
             //移除模板
             //移除模板
             //flag = eyemRemoveModelByName(hModelID, "D:\\模板文件及图像\\df871193-6632-48f9-abfe-540c3fc49c3f.tpl");
             //flag = eyemRemoveModelByName(hModelID, "D:\\模板文件及图像\\df871193-6632-48f9-abfe-540c3fc49c3f.tpl");

eyemLib-Sharp/UnmanagedBitmap.cs

@@ -28,7 +28,7 @@ namespace eyemLib_Sharp
             eyemImageRead(fileName, -1, out image);
             eyemImageRead(fileName, -1, out image);
         }
         }
         /// <summary>
         /// <summary>
-        /// 从Bitmap初始化Unmanaged新实例（GDI不支持除8位以外深度的图像；若要加载不同深度图像请使用从文件名加载）
+        /// 从Bitmap初始化Unmanaged新实例（GDI不支持除8位以外深度的图像；若要加载不同深度图像请从文件名初始化）
         /// </summary>
         /// </summary>
         /// <param name="bitmap"></param>
         /// <param name="bitmap"></param>
         public UnmanagedBitmap(Bitmap bitmap)
         public UnmanagedBitmap(Bitmap bitmap)

eyemLib/eyemLib.h

@@ -8,7 +8,7 @@
 #include <opencv.hpp>
 #include <opencv.hpp>
 
 
 #ifndef FILEVERSION
 #ifndef FILEVERSION
-#define FILEVERSION "2.4.8.2"
+#define FILEVERSION "2.4.8.4"
 #endif
 #endif
 
 
 #ifndef COPYRIGHT
 #ifndef COPYRIGHT