hubaoshun
/
Cigarette
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决标框重叠无法识别的问题

Browse Source
main
Jeffrey_Li 1 year ago
parent b9d04918b9
commit 1ba73b82f2
3 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File

2
Cigarette/Cleanthread.cpp
Unescape Escape View File

@ -92,8 +92,8 @@ void CleanWorkThread::CleanImageFile(const QString& path, const qint64& delDays)
QRegExpValidator v(rx, 0); QRegExpValidator v(rx, 0);
int pos = 0; int pos = 0;
int match; int match;
match = v.validate(fileInfo.fileName(), pos);
QString name = fileInfo.fileName(); QString name = fileInfo.fileName();
match = v.validate(name, pos);
if (match == 2) if (match == 2)
{ {
QDate delDate = QDate::currentDate(); QDate delDate = QDate::currentDate();

88
Cigarette/alg_jd.cpp
Unescape Escape View File

@ -3,17 +3,6 @@
extern SysConf g_sys_conf; extern SysConf g_sys_conf;
// Remove the bounding boxes with low confidence using non-maxima suppression
static void post_process(cv::Mat& frame, std::vector<cv::Mat>& outs, std::vector<std::pair<int, cv::Rect> > &results);
static void post_process_batch(std::vector<cv::Mat>& vec_frame, std::vector<cv::Mat>& outs, std::vector<std::vector<std::pair<int, cv::Rect> > > &vec_results);
// Get the names of the output layers
static std::vector<cv::String> getOutputsNames(const cv::dnn::Net& net);
// Draw the predicted bounding box
static void drawPred(int classId, float conf, int left, int top, int right, int bottom, cv::Mat& frame);
// Initialize the parameters // Initialize the parameters
static float confThreshold = g_sys_conf.ConfThreshold*0.01; // Confidence threshold static float confThreshold = g_sys_conf.ConfThreshold*0.01; // Confidence threshold
static float nmsThreshold = 0.4; // Non-maximum suppression threshold static float nmsThreshold = 0.4; // Non-maximum suppression threshold
@ -164,9 +153,9 @@ void AlgJd::analyse(cv::Mat vec_in, std::vector<std::pair<int, cv::Rect> >& vec_
} }
// Get the names of the output layers // Get the names of the output layers
static std::vector<cv::String> getOutputsNames(const cv::dnn::Net& net) std::vector<cv::String> AlgJd::getOutputsNames(const cv::dnn::Net& net)
{ {
static std::vector<cv::String> names; std::vector<cv::String> names;
if (names.empty()) if (names.empty())
{ {
//Get the indices of the output layers, i.e. the layers with unconnected outputs //Get the indices of the output layers, i.e. the layers with unconnected outputs
@ -183,12 +172,11 @@ static std::vector<cv::String> getOutputsNames(const cv::dnn::Net& net)
return names; return names;
} }
static void post_process(cv::Mat& frame, std::vector<cv::Mat>& outs, std::vector<std::pair<int, cv::Rect> > &results) void AlgJd::post_process(cv::Mat& frame, std::vector<cv::Mat>& outs, std::vector<std::pair<int, cv::Rect> > &results)
{ {
std::vector<int> classIds; std::vector < std::vector<int>> classIds(classes.size());
std::vector<float> confidences; std::vector < std::vector<float>> confidences(classes.size());
std::vector<cv::Rect> boxes; std::vector < std::vector<cv::Rect>> boxes(classes.size());
for (size_t i = 0; i < outs.size(); ++i) for (size_t i = 0; i < outs.size(); ++i)
{ {
// Scan through all the bounding boxes output from the network and keep only the // Scan through all the bounding boxes output from the network and keep only the
@ -212,9 +200,9 @@ static void post_process(cv::Mat& frame, std::vector<cv::Mat>& outs, std::vector
int left = centerX - width / 2; int left = centerX - width / 2;
int top = centerY - height / 2; int top = centerY - height / 2;
classIds.push_back(classIdPoint.x); classIds[classIdPoint.x].push_back(classIdPoint.x);
confidences.push_back((float)confidence); confidences[classIdPoint.x].push_back((float)confidence);
boxes.push_back(cv::Rect(left, top, width, height)); boxes[classIdPoint.x].push_back(cv::Rect(left, top, width, height));
} }
} }
} }
@ -222,21 +210,24 @@ static void post_process(cv::Mat& frame, std::vector<cv::Mat>& outs, std::vector
// Perform non maximum suppression to eliminate redundant overlapping boxes with // Perform non maximum suppression to eliminate redundant overlapping boxes with
// lower confidences // lower confidences
std::vector<int> indices;
cv::dnn::NMSBoxes(boxes, confidences, confThreshold, nmsThreshold, indices);
for (size_t i = 0; i < indices.size(); ++i) for (size_t i = 0; i < classes.size(); ++i)
{ {
int idx = indices[i]; std::vector<int> indices;
cv::Rect box = boxes[idx]; cv::dnn::NMSBoxes(boxes[i], confidences[i], confThreshold, nmsThreshold, indices);
drawPred(classIds[idx], confidences[idx], box.x, box.y, for (size_t j = 0; j < indices.size(); ++j)
{
int idx = indices[j];
cv::Rect box = boxes[i][idx];
drawPred(classIds[i][idx], confidences[i][idx], box.x, box.y,
box.x + box.width, box.y + box.height, frame); box.x + box.width, box.y + box.height, frame);
results.push_back(std::make_pair(classIds[idx], box)); results.push_back(std::make_pair(classIds[i][idx], box));
}
} }
} }
// Draw the predicted bounding box // Draw the predicted bounding box
static void drawPred(int classId, float conf, int left, int top, int right, int bottom, cv::Mat& frame) void AlgJd::drawPred(int classId, float conf, int left, int top, int right, int bottom, cv::Mat& frame)
{ {
cv::Scalar color; cv::Scalar color;
if(classId==0) if(classId==0)
@ -300,18 +291,18 @@ void AlgJd::detect_batch(std::vector<cv::Mat>& vec_in, std::vector<cv::Mat> &vec
} }
} }
static void post_process_batch(std::vector<cv::Mat>& vec_frame, std::vector<cv::Mat>& outs, std::vector<std::vector<std::pair<int, cv::Rect> > > &vec_results) void AlgJd::post_process_batch(std::vector<cv::Mat>& vec_frame, std::vector<cv::Mat>& outs, std::vector<std::vector<std::pair<int, cv::Rect> > > &vec_results)
{ {
int batch = vec_frame.size(); int batch = vec_frame.size();
double confidence;/// double confidence;///
for (int k = 0; k < batch; k++) for (int k = 0; k < batch; k++)
{ {
std::vector<int> classIds; std::vector < std::vector<int>> classIds(classes.size());
std::vector<float> confidences; std::vector < std::vector<float>> confidences(classes.size());
std::vector<cv::Rect> boxes; std::vector < std::vector<cv::Rect>> boxes(classes.size());
//std::cout << "outs.size()\t" << outs.size() << std::endl; //std::cout << "outs.size()\t" << outs.size() << std::endl;
//std::cout << "Type\t" << outs[0].type() << std::endl; //std::cout << "Type\t" << outs[0].type() << std::endl;
for (size_t i = 0; i < outs.size(); ++i) for (size_t i = 0; i < outs.size(); ++i)
{ {
//std::cout << "outs.dims\t" << outs[i].dims << std::endl; //std::cout << "outs.dims\t" << outs[i].dims << std::endl;
@ -341,34 +332,33 @@ static void post_process_batch(std::vector<cv::Mat>& vec_frame, std::vector<cv::
int left = centerX - width / 2; int left = centerX - width / 2;
int top = centerY - height / 2; int top = centerY - height / 2;
classIds.push_back(classIdPoint.x); classIds[classIdPoint.x].push_back(classIdPoint.x);
confidences.push_back((float)confidence); confidences[classIdPoint.x].push_back((float)confidence);
boxes.push_back(cv::Rect(left, top, width, height)); boxes[classIdPoint.x].push_back(cv::Rect(left, top, width, height));
} }
} }
} }
std::vector<std::pair<int, cv::Rect> > results;
// Perform non maximum suppression to eliminate redundant overlapping boxes with // Perform non maximum suppression to eliminate redundant overlapping boxes with
// lower confidences // lower confidences
for (size_t i = 0; i < classes.size(); ++i)
{
std::vector<int> indices; std::vector<int> indices;
cv::dnn::NMSBoxes(boxes, confidences, confThreshold, nmsThreshold, indices); cv::dnn::NMSBoxes(boxes[i], confidences[i], confThreshold, nmsThreshold, indices);
for (size_t j = 0; j < indices.size(); ++j)
std::vector<std::pair<int, cv::Rect> > results;
for (size_t i = 0; i < indices.size(); ++i)
{ {
int idx = indices[i]; int idx = indices[j];
cv::Rect box = boxes[idx]; cv::Rect box = boxes[i][idx];
if (confidences[i][idx] > g_sys_conf.ConfThreshold * 0.01)///ʶ±ð¶ÈµÍÓÚãÐÖµNG´¦Àí
if (confidences[idx] > g_sys_conf.ConfThreshold * 0.01)///ʶ±ð¶ÈµÍÓÚãÐÖµNG´¦Àí
{ {
if (box.width > 15) if (box.width > 15)
{//识别框宽度大于15显示识别，小于认为无胶点，NG处理 {//识别框宽度大于15显示识别，小于认为无胶点，NG处理
drawPred(classIds[idx], confidences[idx], box.x, box.y, drawPred(classIds[i][idx], confidences[i][idx], box.x, box.y,
box.x + box.width, box.y + box.height, vec_frame[k]); box.x + box.width, box.y + box.height, vec_frame[k]);
results.push_back(std::make_pair(classIds[idx], box)); results.push_back(std::make_pair(classIds[i][idx], box));
}
} }
} }
} }
vec_results.push_back(results); vec_results.push_back(results);
} }

10
Cigarette/alg_jd.h
Unescape Escape View File

@ -16,10 +16,20 @@ class AlgJd
bool test_detect(); bool test_detect();
bool test_detect_batcht(int shoot); bool test_detect_batcht(int shoot);
int detect(cv::Mat& in, cv::Mat &out, std::vector<std::pair<int, cv::Rect> > &results); int detect(cv::Mat& in, cv::Mat &out, std::vector<std::pair<int, cv::Rect> > &results);
// Remove the bounding boxes with low confidence using non-maxima suppression
void post_process(cv::Mat& frame, std::vector<cv::Mat>& outs, std::vector<std::pair<int, cv::Rect> > &results);
void CircleImagePro(cv::Mat src, cv::Mat dst, std::vector<float> radius);
void detect_batch(std::vector<cv::Mat>& vec_in, std::vector<cv::Mat> &vec_out, std::vector<std::vector<std::pair<int, cv::Rect> > > &vec_results); void detect_batch(std::vector<cv::Mat>& vec_in, std::vector<cv::Mat> &vec_out, std::vector<std::vector<std::pair<int, cv::Rect> > > &vec_results);
// Remove the bounding boxes with low confidence using non-maxima suppression
void post_process_batch(std::vector<cv::Mat>& vec_frame, std::vector<cv::Mat>& outs, std::vector<std::vector<std::pair<int, cv::Rect> > > &vec_results);
void analyse(cv::Mat vec_in, std::vector<std::pair<int, cv::Rect> > & vec_results); void analyse(cv::Mat vec_in, std::vector<std::pair<int, cv::Rect> > & vec_results);
// Get the names of the output layers
std::vector<cv::String> getOutputsNames(const cv::dnn::Net& net);
// Draw the predicted bounding box
void drawPred(int classId, float conf, int left, int top, int right, int bottom, cv::Mat& frame);
private: private:
cv::dnn::Net net; cv::dnn::Net net;
std::vector<std::string> classes;
}; };
#endif //end of _CIGARETTE_JD #endif //end of _CIGARETTE_JD

Write Preview
Loading…
Cancel
Save