diff --git a/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp b/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp
index b4407b0f..d7e30670 100644
--- a/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp
+++ b/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp
@@ -395,7 +395,7 @@ bool ClassFlowCNNGeneral::ReadParameter(FILE* pfile, string& aktparamgraph)
neuroi->posy = std::stoi(zerlegt[2]);
neuroi->deltax = std::stoi(zerlegt[3]);
neuroi->deltay = std::stoi(zerlegt[4]);
- neuroi->CCW = std::stoi(zerlegt[5]);
+ neuroi->CCW = toUpper(zerlegt[5]) == "TRUE";
neuroi->result_float = -1;
neuroi->image = NULL;
neuroi->image_org = NULL;
diff --git a/sd-card/html/edit_analog.html b/sd-card/html/edit_analog.html
index d9c11594..91667e05 100644
--- a/sd-card/html/edit_analog.html
+++ b/sd-card/html/edit_analog.html
@@ -121,14 +121,14 @@ th, td {
| y: |
dy: |
- |
+ |
@@ -147,7 +147,6 @@ th, td {
ROIInfo,
enhanceCon = false;
lockAR = true;
- CCW = false;
basepath = "http://192.168.178.26";
@@ -206,7 +205,7 @@ 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"]);
else
erg = CreateROI(_number, "analog", sel.selectedIndex, _roinew, 1, 1, 30, 30, 0);
@@ -237,7 +236,14 @@ function changelockAR(){
}
function changeCCW(){
- CCW = document.getElementById("CCW").checked;
+ var sel = document.getElementById("Numbers_value1");
+ var _number = sel.options[sel.selectedIndex].text;
+
+ ROIInfo = getROIInfo("analog", _number);
+ aktindex = parseInt(document.getElementById("index").value);
+
+ ROIInfo[aktindex]["CCW"] = document.getElementById("CCW").checked;
+ UpdateROIs();
}
function ChangeSelection(){
@@ -255,7 +261,7 @@ function SaveToConfig(){
}
-function UpdateROIs(){
+function UpdateROIs(_sel){
document.getElementById("Category_Analog_enabled").checked = true;
var sel = document.getElementById("Numbers_value1");
var _number = sel.options[sel.selectedIndex].text;
@@ -321,12 +327,13 @@ function UpdateROIs(){
}
document.getElementById("lockAR").checked = lockAR;
- document.getElementById("CCW").checked = CCW;
document.getElementById("refx").value = ROIInfo[aktindex]["x"];
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"];
+
rect.startX = ROIInfo[aktindex]["x"];
rect.startY = ROIInfo[aktindex]["y"];
rect.w = ROIInfo[aktindex]["dx"];