Rolling 20210913

This commit is contained in:
jomjol
2021-09-13 20:05:54 +02:00
parent 19ca0d7dd7
commit 1e6eddca04
28 changed files with 3012 additions and 45 deletions

View File

@@ -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;
}

View File

@@ -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;