Rolling 20210611

sd-card/html/readconfigparam.js

@@ -7,6 +7,8 @@ var config_split;
 var param;
 var category;
 var ref = new Array(2);
+var NUMBERS = new Array(0);
+var REFERENCES = new Array(0);
 
 function ParseConfig() {
      config_split = config_gesamt.split("\n");
@@ -68,7 +70,7 @@ function ParseConfig() {
      category[catname]["enabled"] = false;
      category[catname]["found"] = false;
      param[catname] = new Object();
-     ParamAddValue(param, catname, "DecimalShift");
+     ParamAddValue(param, catname, "DecimalShift", 1, true);
      ParamAddValue(param, catname, "PreValueUse");
      ParamAddValue(param, catname, "PreValueAgeStartup");
      ParamAddValue(param, catname, "AllowNegativeRates");
@@ -115,8 +117,9 @@ function ParseConfig() {
      ParamAddValue(param, catname, "TimeServer");         
      ParamAddValue(param, catname, "AutoAdjustSummertime");
      ParamAddValue(param, catname, "Hostname");   
-     ParamAddValue(param, catname, "SetupMode");   
-
+     ParamAddValue(param, catname, "SetupMode"); 
+     
+     
      while (aktline < config_split.length){
           for (var cat in category) {
                zw = cat.toUpperCase();
@@ -136,16 +139,15 @@ function ParseConfig() {
      }
 }
 
-function ParamAddValue(param, _cat, _param, _anzParam = 1){
+function ParamAddValue(param, _cat, _param, _anzParam = 1, _isIndividual = false){
      param[_cat][_param] = new Object(); 
      param[_cat][_param]["found"] = false;
      param[_cat][_param]["enabled"] = false;
      param[_cat][_param]["line"] = -1; 
      param[_cat][_param]["anzParam"] = _anzParam;    
+     param[_cat][_param]["Numbers"] = _isIndividual;
 };
 
-
-
 function ParseConfigParamAll(_aktline, _catname){
      ++_aktline;
 
@@ -156,6 +158,18 @@ function ParseConfigParamAll(_aktline, _catname){
           let [isCom, input] = isCommented(_input);
           var linesplit = ZerlegeZeile(input);
           ParamExtractValueAll(param, linesplit, _catname, _aktline, isCom);
+          if (!isCom && (linesplit.length == 5) && (_catname == 'Digits'))
+               ExtractROIs(input, "digit");
+          if (!isCom && (linesplit.length == 5) && (_catname == 'Analog'))
+               ExtractROIs(input, "analog");
+          if (!isCom && (linesplit.length == 3) && (_catname == 'Alignment'))
+          {
+               _newref = new Object();
+               _newref["name"] = linesplit[0];
+               _newref["x"] = linesplit[1];
+               _newref["y"] = linesplit[2];
+               REFERENCES.push(_newref);
+          }
 
           ++_aktline;
      }    
@@ -182,9 +196,44 @@ function ParamExtractValueAll(_param, _linesplit, _catname, _aktline, _iscom){
                _param[_catname][paramname]["found"] = true;
                _param[_catname][paramname]["enabled"] = !_iscom;
                _param[_catname][paramname]["line"] = _aktline;
-               for (var j = 1; j <= _param[_catname][paramname]["anzParam"]; ++j) {
-                    _param[_catname][paramname]["value"+j] = _linesplit[j];
+               if (_param[_catname][paramname]["Numbers"] == true)         // möglicher Multiusage
+               {
+                    abc = getNUMBERS(_linesplit[0]);
+                    abc[_catname][paramname] = new Object;
+                    abc[_catname][paramname]["found"] = true;
+                    abc[_catname][paramname]["enabled"] = !_iscom;
+     
+                    for (var j = 1; j <= _param[_catname][paramname]["anzParam"]; ++j) {
+                         abc[_catname][paramname]["value"+j] = _linesplit[j];
+                         }
+                    if (abc["name"] == "default")
+                    {
+                         _param[_catname][paramname]["found"] = true;
+                         _param[_catname][paramname]["enabled"] = !_iscom;
+                         _param[_catname][paramname]["line"] = _aktline;
+                         for (var j = 1; j <= _param[_catname][paramname]["anzParam"]; ++j) {
+                              _param[_catname][paramname]["value"+j] = _linesplit[j];
+                              }
+                         for (_num in NUMBERS)         // wert mit Default belegen
+                              {
+                                   NUMBERS[_num][_catname][paramname]["found"] = true;
+                                   NUMBERS[_num][_catname][paramname]["enabled"] = !_iscom;
+                                   NUMBERS[_num][_catname][paramname]["line"] = _aktline;
+                                   for (var j = 1; j <= _param[_catname][paramname]["anzParam"]; ++j) {
+                                        NUMBERS[_num][_catname][paramname]["value"+j] = _linesplit[j];
+                                        }
+                                   }
                     }
+               }
+               else
+               {
+                    _param[_catname][paramname]["found"] = true;
+                    _param[_catname][paramname]["enabled"] = !_iscom;
+                    _param[_catname][paramname]["line"] = _aktline;
+                         for (var j = 1; j <= _param[_catname][paramname]["anzParam"]; ++j) {
+                         _param[_catname][paramname]["value"+j] = _linesplit[j];
+                         }
+               }
           }
      }
 }
@@ -193,6 +242,112 @@ function getConfigParameters() {
      return param;
 }
 
+function WriteConfigININew()
+{
+     config_split = new Array(0);
+
+     for (var cat in param) {
+          text = "[" + cat + "]";
+          if (!category[cat]["enabled"]) {
+               text = ";" + text;
+          }
+          config_split.push(text);
+
+          for (var name in param[cat]) {
+               if (param[cat][name]["Numbers"])
+               {
+                    for (_num in NUMBERS)
+                    {
+                         if (NUMBERS[_num][cat][name]["found"]) {
+                              if (NUMBERS[_num]["name"] == "default")
+                                   text = name;
+                              else
+                                   text = name + "." + NUMBERS[_num]["name"];
+
+                              var text = text + " =" 
+                              
+                              for (var j = 1; j <= param[cat][name]["anzParam"]; ++j) {
+                                   text = text + " " + NUMBERS[_num][cat][name]["value"+j];
+                                   }
+                              if (!NUMBERS[_num][cat][name]["enabled"]) {
+                                   text = ";" + text;
+                              }
+                              config_split.push(text);
+                         }
+                    }
+               }
+               else
+               {
+                    if (param[cat][name]["found"]) {
+                         var text = name + " =" 
+                         
+                         for (var j = 1; j <= param[cat][name]["anzParam"]; ++j) {
+                              text = text + " " + param[cat][name]["value"+j];
+                              }
+                         if (!param[cat][name]["enabled"]) {
+                              text = ";" + text;
+                         }
+                         config_split.push(text);
+                    }
+                    }
+          }
+          if (cat == "Digits")
+          {
+               for (var _roi in NUMBERS)
+               {
+                    if (NUMBERS[_roi]["digit"].length > 0)
+                    {
+                         for (var _roiddet in NUMBERS[_roi]["digit"])
+                         {
+                              if (NUMBERS[_roi]["name"] == "default")
+                                   text = NUMBERS[_roi]["digit"][_roiddet]["name"];
+                              else
+                                   text = NUMBERS[_roi]["name"] + "." + NUMBERS[_roi]["digit"][_roiddet]["name"];
+                              text = text + " " + NUMBERS[_roi]["digit"][_roiddet]["x"];
+                              text = text + " " + NUMBERS[_roi]["digit"][_roiddet]["y"];
+                              text = text + " " + NUMBERS[_roi]["digit"][_roiddet]["dx"];
+                              text = text + " " + NUMBERS[_roi]["digit"][_roiddet]["dy"];
+                              config_split.push(text);
+                         }
+                    }
+               }
+          }
+          if (cat == "Analog")
+          {
+               for (var _roi in NUMBERS)
+               {
+                    if (NUMBERS[_roi]["analog"].length > 0)
+                    {
+                         for (var _roiddet in NUMBERS[_roi]["analog"])
+                         {
+                              if (NUMBERS[_roi]["name"] == "default")
+                                   text = NUMBERS[_roi]["analog"][_roiddet]["name"];
+                              else
+                                   text = NUMBERS[_roi]["name"] + "." + NUMBERS[_roi]["analog"][_roiddet]["name"];
+                              text = text + " " + NUMBERS[_roi]["analog"][_roiddet]["x"];
+                              text = text + " " + NUMBERS[_roi]["analog"][_roiddet]["y"];
+                              text = text + " " + NUMBERS[_roi]["analog"][_roiddet]["dx"];
+                              text = text + " " + NUMBERS[_roi]["analog"][_roiddet]["dy"];
+                              config_split.push(text);
+                         }
+                    }
+               }
+          }
+          if (cat == "Alignment")
+          {
+               for (var _roi in REFERENCES)
+               {
+                    text = REFERENCES[_roi]["name"];
+                    text = text + " " + REFERENCES[_roi]["x"];
+                    text = text + " " + REFERENCES[_roi]["y"];
+                    config_split.push(text);
+               }
+          }
+
+          config_split.push("");
+     }
+}
+
 function setConfigParameters(_param, _category = "") {
      for (var cat in _param) {
           for (var name in _param[cat]) {
@@ -275,6 +430,255 @@ function getConfig() {
 function getConfigCategory() {
      return category;
 }
+
+
+
+function ExtractROIs(_aktline, _type){
+     var linesplit = ZerlegeZeile(_aktline);
+     abc = getNUMBERS(linesplit[0], _type);
+     abc["pos_ref"] = _aktline;
+     abc["x"] = linesplit[1];
+     abc["y"] = linesplit[2];
+     abc["dx"] = linesplit[3];
+     abc["dy"] = linesplit[4];
+     abc["ar"] = parseFloat(linesplit[3]) / parseFloat(linesplit[4]);
+}
+
+
+function getNUMBERS(_name, _type, _create = true)
+{
+     _pospunkt = _name.indexOf (".");
+     if (_pospunkt > -1)
+     {
+          _digit = _name.substring(0, _pospunkt);
+          _roi = _name.substring(_pospunkt+1);
+     }
+     else
+     {
+          _digit = "default";
+          _roi = _name;
+     }
+
+     _ret = -1;
+
+     for (i = 0; i < NUMBERS.length; ++i)
+     {
+          if (NUMBERS[i]["name"] == _digit)
+               _ret = NUMBERS[i];
+     }
+
+     if (!_create)         // nicht gefunden und soll auch nicht erzeugt werden, ggf. geht eine NULL zurück
+          return _ret;
+
+     if (_ret == -1)
+     {
+          _ret = new Object();
+          _ret["name"] = _digit;
+          _ret['digit'] = new Array();
+          _ret['analog'] = new Array();
+
+          for (_cat in param)
+               for (_param in param[_cat])
+                    if (param[_cat][_param]["Numbers"] == true){
+                         _ret[_cat] = new Object();
+                         _ret[_cat][_param] = new Object();
+                         _ret[_cat][_param]["found"] = false;
+                         _ret[_cat][_param]["enabled"] = false;
+                         _ret[_cat][_param]["anzParam"] = param[_cat][_param]["anzParam"]; 
+
+                    }
+
+          NUMBERS.push(_ret);
+     }
+
+     if (typeof _type == 'undefined')             // muss schon existieren !!! - also erst nach Digits / Analog aufrufen
+          return _ret;
+
+     neuroi = new Object();
+     neuroi["name"] = _roi;
+     _ret[_type].push(neuroi);
+
+
+     return neuroi;
+
+}
+
+ 
+
+function CopyReferenceToImgTmp(_basepath)
+{
+     for (index = 0; index < 2; ++index)
+     {
+          _filenamevon = REFERENCES[index]["name"];
+          _filenamenach = _filenamevon.replace("/config/", "/img_tmp/");
+          FileDeleteOnServer(_filenamenach, _basepath);
+          FileCopyOnServer(_filenamevon, _filenamenach, _basepath);
+     
+          _filenamevon = _filenamevon.replace(".jpg", "_org.jpg");
+          _filenamenach = _filenamenach.replace(".jpg", "_org.jpg");
+          FileDeleteOnServer(_filenamenach, _basepath);
+          FileCopyOnServer(_filenamevon, _filenamenach, _basepath);
+     }
+}
+
+function GetReferencesInfo(){
+     return REFERENCES;
+}
+
+
+function UpdateConfigReference(_basepath){
+     for (var index = 0; index < 2; ++index)
+     {
+          _filenamenach = REFERENCES[index]["name"];
+          _filenamevon = _filenamenach.replace("/config/", "/img_tmp/");
+          FileDeleteOnServer(_filenamenach, _basepath);
+          FileCopyOnServer(_filenamevon, _filenamenach, _basepath);
+     
+          _filenamenach = _filenamenach.replace(".jpg", "_org.jpg");
+          _filenamevon = _filenamevon.replace(".jpg", "_org.jpg");
+          FileDeleteOnServer(_filenamenach, _basepath);
+          FileCopyOnServer(_filenamevon, _filenamenach, _basepath);
+
+     }
+}
+
+
+function getNUMBERInfo(){
+     return NUMBERS;
+}
+
+function RenameNUMBER(_alt, _neu){
+     index = -1;
+     found = false;
+     for (i = 0; i < NUMBERS.length; ++i) {
+          if (NUMBERS[i]["name"] == _alt)
+               index = i;
+          if (NUMBERS[i]["name"] == _neu)
+               found = true;
+     }
+
+     if (found)
+          return "Name is already existing - please use another name";
+
+     NUMBERS[index]["name"] = _neu;
+     
+     return "";
+}
+
+function DeleteNUMBER(_delte){
+     if (NUMBERS.length == 1)
+          return "The last number cannot be deleted."
      
 
+     index = -1;
+     for (i = 0; i < NUMBERS.length; ++i) {
+          if (NUMBERS[i]["name"] == _delte)
+               index = i;
+     }
 
+     if (index > -1) {
+          NUMBERS.splice(index, 1);
+     }
+
+     return "";
+}
+
+function CreateNUMBER(_numbernew){
+     found = false;
+     for (i = 0; i < NUMBERS.length; ++i) {
+          if (NUMBERS[i]["name"] == _numbernew)
+               found = true;
+     }
+
+     if (found)
+          return "Name does already exist, please choose another one!";
+
+     _ret = new Object();
+     _ret["name"] = _numbernew;
+     _ret['digit'] = new Array();
+     _ret['analog'] = new Array();
+     NUMBERS.push(_ret);
+
+     return "";
+}
+
+
+function getROIInfo(_typeROI, _number){
+     index = 0;
+     for (var i = 0; i < NUMBERS.length; ++i)
+          if (NUMBERS[i]["name"] == _number)
+               index = i;
+
+     return NUMBERS[index][_typeROI];         
+}
+
+
+function RenameROI(_number, _type, _alt, _neu){
+     index = -1;
+     found = false;
+     _indexnumber = -1;
+     for (j = 0; j < NUMBERS.length; ++j)
+          if (NUMBERS[j]["name"] == _number)
+               _indexnumber = j;
+
+     for (i = 0; i < NUMBERS[_indexnumber][_type].length; ++i) {
+          if (NUMBERS[_indexnumber][_type][i]["name"] == _alt)
+               index = i;
+          if (NUMBERS[_indexnumber][_type][i]["name"] == _neu)
+               found = true;
+     }
+
+     if (found)
+          return "Name is already existing - please use another name";
+
+     NUMBERS[_indexnumber][_type][index]["name"] = _neu;
+     
+     return "";
+}
+
+function DeleteNUMBER(_delte){
+     if (NUMBERS.length == 1)
+          return "The last number cannot be deleted."
+     
+
+     index = -1;
+     for (i = 0; i < NUMBERS.length; ++i) {
+          if (NUMBERS[i]["name"] == _delte)
+               index = i;
+     }
+
+     if (index > -1) {
+          NUMBERS.splice(index, 1);
+     }
+
+     return "";
+}
+
+function CreateROI(_number, _type, _pos, _roinew, _x, _y, _dx, _dy){
+     _indexnumber = -1;
+     for (j = 0; j < NUMBERS.length; ++j)
+          if (NUMBERS[j]["name"] == _number)
+               _indexnumber = j;
+
+
+     found = false;
+     for (i = 0; i < NUMBERS.length; ++i) {
+          if (NUMBERS[_indexnumber][_type]["name"] == _roinew)
+               found = true;
+     }
+
+     if (found)
+          return "ROI does already exist, please choose another name!";
+
+     _ret = new Object();
+     _ret["name"] = _roinew;
+     _ret["x"] = _x;
+     _ret["y"] = _y;
+     _ret["dx"] = _dx;
+     _ret["dy"] = _dy;
+     _ret["ar"] = _dx / _dy;
+
+     NUMBERS[_indexnumber][_type].splice(_pos+1, 0, _ret);
+
+     return "";
+}