zhangjixing

2019-01-15 abd9036f024a77d22b47a108bc88b27b9732e3c5

 QiaoJiaSystem/StructureApp/PerStaticElement.cpp

@@ -16,7 +16,8 @@
m_sdkRule(rule),
m_triggerElement(0,0),
m_lTime(AppUtil::getCurrentUs()),
pManagerEsDB(nullptr)
pManagerEsDB(nullptr),
m_bIsMask(true)
{
   pManagerEsDB=new EsDBTool(appPref.getStringData("ipAdd"), appPref.getIntData("ipPort"));

@@ -54,7 +55,7 @@

            QRect rect(obj.rect.x,obj.rect.y,obj.rect.width,obj.rect.height);
            QPoint center = rect.center();
            if(mPolygon.containsPoint(center,Qt::OddEvenFill))
            if(mPolygon.containsPoint(center,Qt::OddEvenFill) || !m_bIsMask)
            {
                for(auto score:m_lastScoreRect)
                {
@@ -102,9 +103,10 @@
            //do temp memery

        }
        m_lastScoreRect = mObjs;
     //   m_lastScoreRect = mObjs;
        m_lTime =AppUtil::getCurrentUs();
    }

    m_lastScoreRect=mObjs;
    m_triggerElement.triggerOnce();

@@ -144,6 +146,7 @@
    QJsonArray arrayAreas = getJsonArrayFromQString(QString::fromStdString(mask));
    if(arrayAreas.isEmpty())
    {
        m_bIsMask=false;
        return;//do not detect
    }
    for(int i = 0;i < arrayAreas.size();++i)