mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2026-02-02 15:50:39 +03:00
Rolling 20210913
This commit is contained in:
@@ -600,13 +600,20 @@ std::vector<HTMLInfo*> ClassFlowCNNGeneral::GetHTMLInfo()
|
||||
zw->filename_org = GENERAL[_ana]->name + "_" + GENERAL[_ana]->ROI[i]->name + ".jpg";
|
||||
}
|
||||
|
||||
zw->val = GENERAL[_ana]->ROI[i]->result;
|
||||
if (CNNType == Analogue)
|
||||
zw->val = GENERAL[_ana]->ROI[i]->resultklasse;
|
||||
else
|
||||
zw->val = GENERAL[_ana]->ROI[i]->result;
|
||||
zw->image = GENERAL[_ana]->ROI[i]->image;
|
||||
zw->image_org = GENERAL[_ana]->ROI[i]->image_org;
|
||||
|
||||
printf("Push %s\n", zw->filename.c_str());
|
||||
|
||||
result.push_back(zw);
|
||||
}
|
||||
|
||||
printf("größe: %d\n", result.size());
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
@@ -83,7 +83,10 @@ std::vector<HTMLInfo*> ClassFlowControll::GetAllDigital()
|
||||
*/
|
||||
|
||||
if (flowdigit)
|
||||
flowdigit->GetHTMLInfo();
|
||||
{
|
||||
printf("ClassFlowControll::GetAllDigital - flowdigit != NULL\n");
|
||||
return flowdigit->GetHTMLInfo();
|
||||
}
|
||||
|
||||
std::vector<HTMLInfo*> empty;
|
||||
return empty;
|
||||
@@ -91,17 +94,8 @@ std::vector<HTMLInfo*> ClassFlowControll::GetAllDigital()
|
||||
|
||||
std::vector<HTMLInfo*> ClassFlowControll::GetAllAnalog()
|
||||
{
|
||||
/*
|
||||
for (int i = 0; i < FlowControll.size(); ++i)
|
||||
if (FlowControll[i]->name().compare("ClassFlowAnalog") == 0)
|
||||
return ((ClassFlowAnalog*) (FlowControll[i]))->GetHTMLInfo();
|
||||
|
||||
std::vector<HTMLInfo*> empty;
|
||||
return empty;
|
||||
*/
|
||||
|
||||
if (flowanalog)
|
||||
flowanalog->GetHTMLInfo();
|
||||
return flowanalog->GetHTMLInfo();
|
||||
|
||||
std::vector<HTMLInfo*> empty;
|
||||
return empty;
|
||||
|
||||
Reference in New Issue
Block a user