generated from zhangwei/Train_Identify
parent
d02a50a6c2
commit
3dabfe2bf6
|
@ -2,6 +2,22 @@
|
|||
|
||||
using namespace ai_matrix;
|
||||
|
||||
namespace
|
||||
{
|
||||
std::map<std::string, std::string> mapLoad = {
|
||||
{"C62", "60"},
|
||||
{"C62B", "61"},
|
||||
{"C63", "61"},
|
||||
{"C64", "61"},
|
||||
{"C65", "60"},
|
||||
{"C70", "70"},
|
||||
{"C80", "80"},
|
||||
{"KM70", "70"},
|
||||
{"KM81", "81"},
|
||||
{"KM98", "98"}
|
||||
};
|
||||
}
|
||||
|
||||
MergerAllEngine::MergerAllEngine() {}
|
||||
|
||||
MergerAllEngine::~MergerAllEngine() {}
|
||||
|
@ -318,6 +334,18 @@ APP_ERROR MergerAllEngine::Process()
|
|||
<< " num:" << pTrain->trainNum.strTrainNum;
|
||||
pTrain->trainNum.iTrainTypeId = 0;
|
||||
}
|
||||
|
||||
// 修正载重
|
||||
for (std::map<std::string, std::string>::iterator it =
|
||||
mapLoad.begin();
|
||||
it != mapLoad.end(); ++it) {
|
||||
|
||||
if (pTrain->trainNum.strTrainType.find(it->first) !=
|
||||
std::string::npos) {
|
||||
pTrain->trainPro.strLoad = it->second;
|
||||
}
|
||||
}
|
||||
|
||||
PushData(pTrain);
|
||||
|
||||
//最后一节处理后,初始化参数
|
||||
|
|
|
@ -298,7 +298,7 @@ void SaveStepOneResultEngine::DealTrainSpaceInfo(std::shared_ptr<ProcessData> pP
|
|||
PartionInfo parationInfo;
|
||||
MakeParationInfo(parationInfo, pProcessData, jvStep1Space);
|
||||
//该条件是防止第一个XXX帧满足小于画面1/3后切割,后一帧XXX+1的中心点大于画面1/3导致的加入vec中出现的多切分现象。(向右增加30px的浮动)
|
||||
if (!(bDealCenterFlag_ && !bIntervalFlag && (iCenterCur < (pProcessData->iWidth / 3 + 30))))
|
||||
if (!(bDealCenterFlag_ && !bIntervalFlag && (iCenterCur < (pProcessData->iWidth / 3 + 80))))
|
||||
{
|
||||
vecParationInfo_.push_back(parationInfo);
|
||||
}
|
||||
|
@ -340,7 +340,7 @@ void SaveStepOneResultEngine::DealTrainSpaceInfo(std::shared_ptr<ProcessData> pP
|
|||
PartionInfo parationInfo;
|
||||
MakeParationInfo(parationInfo, pProcessData, jvStep1Space);
|
||||
//该条件是防止第一个XXX帧满足大于画面2/3后切割,后一帧XXX+1的中心点小于画面2/3导致的加入vec中出现的多切分现象。(向左增加30px的浮动)
|
||||
if (!(bDealCenterFlag_ && !bIntervalFlag && (iCenterCur > (pProcessData->iWidth / 3 * 2 - 30))))
|
||||
if (!(bDealCenterFlag_ && !bIntervalFlag && (iCenterCur > (pProcessData->iWidth / 3 * 2 - 80))))
|
||||
{
|
||||
vecParationInfo_.push_back(parationInfo);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue