v0.1.16 抓取、切割识别结果大于0则返回正常

ReadMe.txt

@@ -13,4 +13,5 @@ v0.1.11
 v0.1.12 优化抓取角度，提高效率，提高准确率
 v0.1.13 优化抓取角度;优化切割位置
 v0.1.14 优化抓取角度效率: thinning采用降采样再放大，提高效率；只做一次thinning，记录目标点坐标备用
-v0.1.15 优化切割位置识别精度: 初步识别点在目标内时用识别点；否则垂线方向搜索最近点作为切割点（适用于苗弯曲）
+v0.1.15 优化切割位置识别精度: 初步识别点在目标内时用识别点；否则垂线方向搜索最近点作为切割点（适用于苗弯曲）
+v0.1.16 抓取、切割识别结果大于0则返回正常

tea_cv_api.cpp

@@ -18,7 +18,7 @@ extern CRITICAL_SECTION g_cs;
 namespace graft_cv
 {
 
-	char *g_version_str = "0.1.15";
+	char *g_version_str = "0.1.16";
 
 	//configure
 	string g_conf_file = "./tcv_conf.yml";	

tea_sorter.cpp

@@ -351,7 +351,7 @@ int CTeaSort::detect(
 		}
 	}
 	//ÅÄÕÕÎÞÃç, ·µ»Øʶ±ð½á¹û-1
-	if (valid_cnt != 2) { return -1; }
+	if (valid_cnt == 0) { return -1; }
 	return 0;
 }
 
@@ -453,8 +453,8 @@ int CTeaSort::load_data(
 	if (imginfo) {
 		if (m_pLogger) {
 			stringstream buff;
-			buff << m_imgId << m_dtype_str << "image, width=" << imginfo->width
-				<< "\theight=" << imginfo->height;
+			buff << "raw image stream: " << m_imgId << m_dtype_str << "image, width=" << imginfo->width
+				<< "\theight=" << imginfo->height << "\tchannels=" << imginfo->channel;
 			m_pLogger->INFO(buff.str());
 		}
 		if (!isvalid(imginfo) || (imginfo->channel!=1 && imginfo->channel!=3)) {
@@ -474,6 +474,12 @@ int CTeaSort::load_data(
 		else {
 			m_raw_img = imginfo2mat(imginfo);
 		}
+		if (m_pLogger) {
+			stringstream buff;
+			buff << "load image stream: " << m_imgId << m_dtype_str << "image, width=" << m_raw_img.cols
+				<< "\theight=" << m_raw_img.rows << "\tchannels=" << m_raw_img.channels();
+			m_pLogger->INFO(buff.str());
+		}
 		
 	}
 	else {
@@ -487,8 +493,8 @@ int CTeaSort::load_data(
 		}
 		if (m_pLogger) {
 			stringstream buff;
-			buff << m_imgId << m_dtype_str << "image, width=" << img.cols
-				<< "\theight=" << img.rows;
+			buff <<"read image file: "<< m_imgId << m_dtype_str << "image, width=" << img.cols
+				<< "\theight=" << img.rows << "\tchannels=" << img.channels();
 			m_pLogger->INFO(buff.str());
 		}
 
@@ -497,6 +503,12 @@ int CTeaSort::load_data(
 	//image saver
 	if (m_ppImgSaver && *m_ppImgSaver) {
 		(*m_ppImgSaver)->saveImage(m_raw_img, m_imgId);
+		if (m_pLogger) {
+			stringstream buff;
+			buff <<"saved: "<< m_imgId << m_dtype_str << "image, width=" << m_raw_img.cols
+				<< "\theight=" << m_raw_img.rows<<"\tchannels="<< m_raw_img.channels();
+			m_pLogger->INFO(buff.str());
+		}
 	}
 	return rst;
 }