Skip to content

张士柳 / eyemLib

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 37fb9c9a 由 张士柳
选项

无

1 个父辈 592aab70
全部展开
内嵌 并排
正在显示 5 个修改的文件 包含 35 行增加 和 3 行删除
eyemLib-Sharp/EyemLib.cs
...@@ -911,10 +911,11 @@ namespace eyemLib_Sharp ...@@ -911,10 +911,11 @@ namespace eyemLib_Sharp
//"IP_SMALL_PARTS","IP_LARGE_PARTS","IP_LONG_PARTS","" //"IP_SMALL_PARTS","IP_LARGE_PARTS","IP_LONG_PARTS",""
//eyemCountObject(image, file.Replace(".png", ""), 35, 0, 100, 5, ref pNumObj, out tpDstImg); //eyemCountObject(image, file.Replace(".png", ""), 35, 0, 100, 5, ref pNumObj, out tpDstImg);
//eyemCountObjectIrregularParts(image, file.Replace(".png", ""), 0.1, "IP_LARGE_PARTS", 100, 7, ref pNumObj, out tpDstImg); //eyemCountObjectIrregularParts(image, file.Replace(".png", ""), 0.1, "IP_LARGE_PARTS", 100, 7, ref pNumObj, out tpDstImg);
//eyemCountObjectE(image, fileName, ref pNumObj, out tpDstImg);
eyemCountObjectIrregularPartsE(image, file.Replace(".png", ""), "IP_LARGE_PARTS", "D://批量测试图像2//template.png", 0.7, ref pNumObj, out tpDstImg); eyemCountObjectIrregularPartsE(image, file.Replace(".png", ""), "IP_LARGE_PARTS", "D://批量测试图像2//template.png", 0.7, ref pNumObj, out tpDstImg);
//int ipNum; EyemBarCode* tpResults; //int ipNum; EyemBarCode* tpResults;
//DataCodeHandle hObject; //DataCodeHandle hObject;
//int iRes = eyemDetectAndDecode(image, tpRoi, file.Replace(".png", ""), "QR_CODE|DATA_MATRIX|CODE_39|CODE_128", out hObject, out tpResults, out ipNum, false, 11, 5, 128, 256, 1d); //int iRes = eyemDetectAndDecode(image, tpRoi, file.Replace(".png", ""), "QR_CODE|DATA_MATRIX|CODE_39|CODE_128", out hObject, out tpResults, out ipNum, false, 11, 5, 128, 256, 0.5);
//for (int i = 0; i < ipNum; i++) //for (int i = 0; i < ipNum; i++)
//{ //{
// Console.WriteLine("类型：" + Marshal.PtrToStringAnsi(tpResults[i].hType) + "；坐标" + "[" + tpResults[i].iCenterX.ToString() + "," + tpResults[i].iCenterY.ToString() + "]" + "；角度：" + tpResults[i].dAngle.ToString("F4") + "," + "；内容：" + Marshal.PtrToStringAnsi(tpResults[i].hText) + ""); // Console.WriteLine("类型：" + Marshal.PtrToStringAnsi(tpResults[i].hType) + "；坐标" + "[" + tpResults[i].iCenterX.ToString() + "," + tpResults[i].iCenterY.ToString() + "]" + "；角度：" + tpResults[i].dAngle.ToString("F4") + "," + "；内容：" + Marshal.PtrToStringAnsi(tpResults[i].hText) + "");
......
eyemLib-Sharp/Program.cs
...@@ -23,7 +23,6 @@ namespace eyemLib_Sharp ...@@ -23,7 +23,6 @@ namespace eyemLib_Sharp
//} //}
//EyemLib.eyemTest2(fileNames); //EyemLib.eyemTest2(fileNames);
foreach (var item in fileNames) foreach (var item in fileNames)
{ {
EyemLib.eyemReadImageTool(item); EyemLib.eyemReadImageTool(item);
......
eyemLib/eyemBarCode.cpp
...@@ -355,6 +355,37 @@ static void decodeMul(std::vector<WaitArea> &waitAreas, std::vector<std::string> ...@@ -355,6 +355,37 @@ static void decodeMul(std::vector<WaitArea> &waitAreas, std::vector<std::string>
//优先当作DM来解码，因为它比较快 //优先当作DM来解码，因为它比较快
if (!waitAreas[i].oneD) if (!waitAreas[i].oneD)
{ {
//DmtxMessage *msg;
//DmtxRegion *reg;
//DmtxImage *img = NULL;
//img = dmtxImageCreate(waitAreas[i].waitArea.data, waitAreas[i].waitArea.cols, waitAreas[i].waitArea.rows, DmtxPack8bppK);
//DmtxDecode *dec = dmtxDecodeCreate(img, 1);
////超时
//DmtxTime beginTime = dmtxTimeNow();
//DmtxTime timeout = dmtxTimeAdd(beginTime, 15);
//reg = dmtxRegionFindNext(dec, &timeout);
//if (NULL != reg)
//{
// //解码
// msg = dmtxDecodeMatrixRegion(dec, reg, DmtxUndefined);
// if (NULL != msg)
// {
// bDecode = true;
// ptResult = waitAreas[i].Pt;
// strResultType = "DATA_MATRIX";
// strResult = std::string(reinterpret_cast<const char *>(msg->output));
// //销毁资源
// dmtxMessageDestroy(&msg);
// }
// //解码失败
// dmtxRegionDestroy(&reg);
//}
//dmtxDecodeDestroy(&dec);
//dmtxImageDestroy(&img);
#pragma region 有问题
for (int d = waitAreas[i].C - iRangeC; d <= waitAreas[i].C + 2 * iRangeC; d += (int)dMinorStep) for (int d = waitAreas[i].C - iRangeC; d <= waitAreas[i].C + 2 * iRangeC; d += (int)dMinorStep)
{ {
cv::Mat binary; cv::Mat binary;
...@@ -400,6 +431,8 @@ static void decodeMul(std::vector<WaitArea> &waitAreas, std::vector<std::string> ...@@ -400,6 +431,8 @@ static void decodeMul(std::vector<WaitArea> &waitAreas, std::vector<std::string>
if (bDecode) if (bDecode)
break; break;
} }
#pragma endregion
} }
//如果未解码，判断可能是QR或者一维码或者DATA_MATRIX //如果未解码，判断可能是QR或者一维码或者DATA_MATRIX
if (!bDecode) if (!bDecode)
......
eyemLib/eyemMisc.h
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
#include <io.h> #include <io.h>
#include <direct.h> #include <direct.h>
#include <fstream>
#include "eyemLib.h" #include "eyemLib.h"
constexpr double c = PI / 180.; constexpr double c = PI / 180.;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!