Commit 091debb2 刘韬

1

1 个父辈 014e287e
...@@ -26,10 +26,11 @@ namespace Asa ...@@ -26,10 +26,11 @@ namespace Asa
static XrayImage() static XrayImage()
{ {
if (!Directory.Exists("CountTemplate")) if (!Directory.Exists("CountTemplate"))
Directory.CreateDirectory("CountTemplate"); Directory.CreateDirectory("CountTemplate");
var flag = eyemInitModel("CountTemplate", out hModelIDs); var flag = eyemInitModel("CountTemplate", out hModelIDs);
if (flag != 0) {
throw new Exception("eyemInitModel:"+flag+","+hModelIDs);
}
AlgoIndex.Add("NONE", -1); AlgoIndex.Add("NONE", -1);
for (int i = 0; i < sOptions.Length; i++) for (int i = 0; i < sOptions.Length; i++)
{ {
...@@ -413,7 +414,9 @@ namespace Asa ...@@ -413,7 +414,9 @@ namespace Asa
string file = "CountTemplate_temp\\" + filename + ".tpl"; string file = "CountTemplate_temp\\" + filename + ".tpl";
flag = eyemCreateTemplateModel(tpDstImg, tpRoi2, matchDeg, file); flag = eyemCreateTemplateModel(tpDstImg, tpRoi2, matchDeg, file);
//测试插入模板 //测试插入模板
eyemInsertModel(hModelIDs, file); flag = eyemInsertModel(hModelIDs, file);
if (flag != 0)
throw new Exception("eyemInsertModel return :"+flag);
//可以选择使用自动匹配或者指定模板文件 //可以选择使用自动匹配或者指定模板文件
selectModel = file; selectModel = file;
......
...@@ -159,23 +159,35 @@ namespace Asa ...@@ -159,23 +159,35 @@ namespace Asa
{ {
WaitstopToken = new CancellationTokenSource(); WaitstopToken = new CancellationTokenSource();
buffer = null; buffer = null;
/*
//FPD_AQC_MODE stMode = new FPD_AQC_MODE();
//stMode.aqc_mode = EnumIMAGE_ACQ_MODE.STATIC_ACQ_DEFAULT_MODE;
//stMode.ndiscard = 0;
//stMode.nframeid = stMode.nframesum = stMode.ngroupno = 0;
//int ret = HBI_FPD_DLL.HBI_SingleAcquisition(HBI_FPD_DLL._handel, stMode); //6
//if (ret != 0) WriteLog("HBI_SingleAcquisition" + ret.ToString());
//else WriteLog("0x03 SingleAcquisition成功");
//if (m_pLastRegCfg.m_SysCfgInfo.m_byWorkMode != 0x01)
//{
// LOG.Error("需要将触发模式改成software mode才能上图");
// return false;
//}
WriteLog("GetImage start========================");
buffgetted = false;
//int ret = HBI_FPD_DLL.HBI_Prepare(HBI_FPD_DLL._handel); //5
//if (ret != 0) WriteLog("HBI_Prepare" + ret.ToString());
//else WriteLog("0x02 prepare成功");
FPD_AQC_MODE stMode = new FPD_AQC_MODE(); FPD_AQC_MODE stMode = new FPD_AQC_MODE();
stMode.aqc_mode = EnumIMAGE_ACQ_MODE.STATIC_ACQ_DEFAULT_MODE; stMode.aqc_mode = EnumIMAGE_ACQ_MODE.STATIC_ACQ_DEFAULT_MODE;
stMode.ndiscard = 0; stMode.ndiscard = 0;
stMode.nframeid = stMode.nframesum = stMode.ngroupno = 0; stMode.nframeid = 0;
int ret = HBI_FPD_DLL.HBI_SingleAcquisition(HBI_FPD_DLL._handel, stMode); //6 stMode.nframesum = _MaxFrameCount; // 0-表示一直采图,20表示采集20帧图结束
if (ret != 0) WriteLog("HBI_SingleAcquisition" + ret.ToString()); stMode.ngroupno = 0;
else WriteLog("0x03 SingleAcquisition成功"); int ret = HBI_FPD_DLL.HBI_LiveAcquisition(HBI_FPD_DLL._handel, stMode); //6
if (m_pLastRegCfg.m_SysCfgInfo.m_byWorkMode != 0x01) if (ret != 0) WriteLog("HBI_LiveAcquisition" + ret.ToString());
{
LOG.Error("需要将触发模式改成software mode才能上图");
return false;
}*/
buffgetted = false;
int ret = HBI_FPD_DLL.HBI_Prepare(HBI_FPD_DLL._handel); //5
if (ret != 0) WriteLog("HBI_Prepare" + ret.ToString());
else WriteLog("0x02 prepare成功");
Task a = Task.Delay(MaxDelay); Task a = Task.Delay(MaxDelay);
Task b = Task.Run(()=> { Task b = Task.Run(()=> {
while (true) while (true)
...@@ -198,7 +210,6 @@ namespace Asa ...@@ -198,7 +210,6 @@ namespace Asa
fileStream.Dispose(); fileStream.Dispose();
} }
}*/ }*/
return buffer != null; return buffer != null;
} }
IntPtr BufferPtr; IntPtr BufferPtr;
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!