diff --git a/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp b/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp index d7e30670..601a5605 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp +++ b/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp @@ -468,7 +468,7 @@ general* ClassFlowCNNGeneral::GetGENERAL(string _name, bool _create = true) _ret->ROI.push_back(neuroi); - printf("GetGENERAL - GENERAL %s - roi %s\n", _analog.c_str(), _roi.c_str()); + printf("GetGENERAL - GENERAL %s - roi %s - CCW: %d\n", _analog.c_str(), _roi.c_str(), neuroi->CCW); return _ret; } @@ -687,7 +687,7 @@ bool ClassFlowCNNGeneral::doNeuralNetwork(string time) else GENERAL[_ana]->ROI[i]->result_float = result * 10; - printf("Result General(Analog)%i: %f\n", i, GENERAL[_ana]->ROI[i]->result_float); + printf("Result General(Analog)%i - CCW: %d - %f\n", i, GENERAL[_ana]->ROI[i]->CCW, GENERAL[_ana]->ROI[i]->result_float); if (isLogImage) LogImage(logPath, GENERAL[_ana]->ROI[i]->name, &GENERAL[_ana]->ROI[i]->result_float, NULL, time, GENERAL[_ana]->ROI[i]->image_org); } break; @@ -888,7 +888,8 @@ bool ClassFlowCNNGeneral::doNeuralNetwork(string time) GENERAL[_ana]->ROI[i]->isReject = false; - printf("Result General(Analog)%i: %f\n", i, GENERAL[_ana]->ROI[i]->result_float); + printf("Result General(Analog)%i - CCW: %d - %f\n", i, GENERAL[_ana]->ROI[i]->CCW, GENERAL[_ana]->ROI[i]->result_float); + //printf("Result General(Analog)%i: %f\n", i, GENERAL[_ana]->ROI[i]->result_float); if (isLogImage) { diff --git a/firmware/firmware.bin b/firmware/firmware.bin index ea4d470e..07828281 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ diff --git a/firmware/html.zip b/firmware/html.zip index ef3d6613..77c97398 100644 Binary files a/firmware/html.zip and b/firmware/html.zip differ diff --git a/sd-card/html/edit_analog.html b/sd-card/html/edit_analog.html index 91667e05..d719661b 100644 --- a/sd-card/html/edit_analog.html +++ b/sd-card/html/edit_analog.html @@ -205,9 +205,9 @@ function newROI(){ var _roinew = prompt("Please enter name of new ROI", "name"); if (ROIInfo.length > 0) - erg = CreateROI(_number, "analog", sel.selectedIndex, _roinew, 1, 1, ROIInfo[aktindex]["dx"], ROIInfo[aktindex]["dy"], ROIInfo[aktindex]["CCW"]); + erg = CreateROI(_number, "analog", sel.selectedIndex, _roinew, 1, 1, ROIInfo[aktindex]["dx"], ROIInfo[aktindex]["dy"], ROIInfo[aktindex]["CCW"]=="true"); else - erg = CreateROI(_number, "analog", sel.selectedIndex, _roinew, 1, 1, 30, 30, 0); + erg = CreateROI(_number, "analog", sel.selectedIndex, _roinew, 1, 1, 30, 30, false); if (erg != "") alert(erg); @@ -332,7 +332,7 @@ function UpdateROIs(_sel){ document.getElementById("refy").value = ROIInfo[aktindex]["y"]; document.getElementById("refdx").value = ROIInfo[aktindex]["dx"]; document.getElementById("refdy").value = ROIInfo[aktindex]["dy"]; - document.getElementById("CCW").checked = ROIInfo[aktindex]["CCW"]; + document.getElementById("CCW").checked = ROIInfo[aktindex]["CCW"] == "true"; rect.startX = ROIInfo[aktindex]["x"]; rect.startY = ROIInfo[aktindex]["y"];