mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-08 04:26:58 +03:00
V14.1 backport to rolling (#2058)
* Migrate parameters to v14.1 branch (#2023) * Migrated parameters * - * . * . * . * . * . * Remove unneeded checkboxes for true/false * Remove ";" * Correct MaintTopic * Added missing parameters to UI: FlipImageSize, InitialMirror Removed checkbox in UI for ErrorMessage Added migration of pboolean parameters: enable them if they where disabled, set them to their default value, then enable them Switch SetRetainFlag internally to a boolean * . * CamImages -> RawImages * CamImages -> RawImages * catch error on unknown parameter * fix missing case insensitivity * fix typo * fixmissing rename * fix migration of ExtendedResolution * Delete ClassFlowMakeImage.cpp * Delete ClassFlowMakeImage.h --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * Update Changelog.md --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com>
This commit is contained in:
CaCO3
@@ -53,8 +53,8 @@ table {
|
||||
<td style="padding-top: 10px"><label for="mirror" id="labelmirror">Mirror Image:</label></td>
|
||||
<td style="padding-top: 10px"><input type="checkbox" id="mirror" name="mirror" value="1" onchange="drawRotated()"></td>
|
||||
<td>
|
||||
<class id="MakeImage_LEDIntensity_text" style="color:black;">LEDIntensity: </class>
|
||||
<input type="number" id="MakeImage_LEDIntensity_value1" size="13" value=0 min="0" max="100" style="float: right; clear: both;">
|
||||
<class id="TakeImage_LEDIntensity_text" style="color:black;">LEDIntensity: </class>
|
||||
<input type="number" id="TakeImage_LEDIntensity_value1" size="13" value=0 min="0" max="100" style="float: right; clear: both;">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -62,8 +62,8 @@ table {
|
||||
<td><label for="flip" id="labelflip">Flip Image Size:</label></td>
|
||||
<td><input type="checkbox" id="flip" name="flip" value="1" onchange="drawRotated()"></td>
|
||||
<td>
|
||||
<class id="MakeImage_Brightness_text" style="color:black;">Brightness: </class>
|
||||
<input type="number" id="MakeImage_Brightness_value1" size="13" value=0 min="-2" max="2" style="float: right; clear: both;">
|
||||
<class id="TakeImage_Brightness_text" style="color:black;">Brightness: </class>
|
||||
<input type="number" id="TakeImage_Brightness_value1" size="13" value=0 min="-2" max="2" style="float: right; clear: both;">
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
@@ -71,16 +71,16 @@ table {
|
||||
<td><label for="mirror">Pre-rotate Angle:</label></td>
|
||||
<td><input type="number" id="prerotateangle" name="prerotateangle" value="0" min="-360" max="360" onchange="drawRotated()">Degrees</td>
|
||||
<td>
|
||||
<class id="MakeImage_Contrast_text" style="color:black;">Contrast</class>
|
||||
<input type="number" id="MakeImage_Contrast_value1" size="13" value=0 min="-2" max="2" style="float: right; clear: both;">
|
||||
<class id="TakeImage_Contrast_text" style="color:black;">Contrast</class>
|
||||
<input type="number" id="TakeImage_Contrast_value1" size="13" value=0 min="-2" max="2" style="float: right; clear: both;">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><label for="mirror">Fine Alignment:</label></td>
|
||||
<td><input type="number" id="finerotate" name="finerotate" value=0.0 min="-1" max="1" step="0.2" onchange="drawRotated()">Degrees</td>
|
||||
<td>
|
||||
<class id="MakeImage_Saturation_text" style="color:black;">Saturation</class>
|
||||
<input type="number" id="MakeImage_Saturation_value1" size="13" value=0 min="-2" max="2" style="float: right; clear: both;">
|
||||
<class id="TakeImage_Saturation_text" style="color:black;">Saturation</class>
|
||||
<input type="number" id="TakeImage_Saturation_value1" size="13" value=0 min="-2" max="2" style="float: right; clear: both;">
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
@@ -123,13 +123,13 @@ table {
|
||||
|
||||
function doTake(){
|
||||
var xhttp = new XMLHttpRequest();
|
||||
if (param["MakeImage"]["Brightness"].found && param["MakeImage"]["Brightness"].enabled)
|
||||
if (param["TakeImage"]["Brightness"].found && param["TakeImage"]["Brightness"].enabled)
|
||||
{
|
||||
_intensity = document.getElementById("MakeImage_LEDIntensity_value1").value;
|
||||
_intensity = document.getElementById("TakeImage_LEDIntensity_value1").value;
|
||||
if (_intensity == "") _intensity = "50";
|
||||
_brightness = document.getElementById("MakeImage_Brightness_value1").value;
|
||||
_contrast = document.getElementById("MakeImage_Contrast_value1").value;
|
||||
_saturation = document.getElementById("MakeImage_Saturation_value1").value;
|
||||
_brightness = document.getElementById("TakeImage_Brightness_value1").value;
|
||||
_contrast = document.getElementById("TakeImage_Contrast_value1").value;
|
||||
_saturation = document.getElementById("TakeImage_Saturation_value1").value;
|
||||
url = getDomainname() + "/editflow?task=test_take&bri=" + _brightness;
|
||||
url = url + "&con=" + _contrast + "&sat=" + _saturation + "&int=" + _intensity;
|
||||
}
|
||||
@@ -168,24 +168,24 @@ table {
|
||||
document.getElementById("labelflip").style = "color:lightgrey;";
|
||||
}
|
||||
|
||||
if (param["MakeImage"]["Brightness"].found && param["MakeImage"]["Brightness"].enabled)
|
||||
if (param["TakeImage"]["Brightness"].found && param["TakeImage"]["Brightness"].enabled)
|
||||
{
|
||||
document.getElementById("MakeImage_Brightness_value1").disabled = false;
|
||||
document.getElementById("MakeImage_Contrast_value1").disabled = false;
|
||||
document.getElementById("MakeImage_Saturation_value1").disabled = false;
|
||||
document.getElementById("MakeImage_LEDIntensity_value1").disabled = false;
|
||||
document.getElementById("TakeImage_Brightness_value1").disabled = false;
|
||||
document.getElementById("TakeImage_Contrast_value1").disabled = false;
|
||||
document.getElementById("TakeImage_Saturation_value1").disabled = false;
|
||||
document.getElementById("TakeImage_LEDIntensity_value1").disabled = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
document.getElementById("MakeImage_Brightness_value1").type = "hidden";
|
||||
document.getElementById("MakeImage_Brightness_text").style.visibility = "hidden";
|
||||
document.getElementById("TakeImage_Brightness_value1").type = "hidden";
|
||||
document.getElementById("TakeImage_Brightness_text").style.visibility = "hidden";
|
||||
|
||||
}
|
||||
|
||||
// if (param["MakeImage"]["Saturation"].found)
|
||||
// document.getElementById("MakeImage_Saturation_value1").disabled = false;
|
||||
// if (param["MakeImage"]["Contrast"].found)
|
||||
// document.getElementById("MakeImage_Contrast_value1").disabled = false;
|
||||
// if (param["TakeImage"]["Saturation"].found)
|
||||
// document.getElementById("TakeImage_Saturation_value1").disabled = false;
|
||||
// if (param["TakeImage"]["Contrast"].found)
|
||||
// document.getElementById("TakeImage_Contrast_value1").disabled = false;
|
||||
|
||||
isActReference = false;
|
||||
loadCanvas(url);
|
||||
@@ -207,16 +207,16 @@ table {
|
||||
document.getElementById("prerotateangle").disabled = true;
|
||||
document.getElementById("updatereferenceimage").disabled = true;
|
||||
document.getElementById("take").disabled = true;
|
||||
document.getElementById("MakeImage_Brightness_value1").disabled = true;
|
||||
document.getElementById("MakeImage_Saturation_value1").disabled = true;
|
||||
document.getElementById("MakeImage_Contrast_value1").disabled = true;
|
||||
document.getElementById("MakeImage_LEDIntensity_value1").disabled = true;
|
||||
document.getElementById("TakeImage_Brightness_value1").disabled = true;
|
||||
document.getElementById("TakeImage_Saturation_value1").disabled = true;
|
||||
document.getElementById("TakeImage_Contrast_value1").disabled = true;
|
||||
document.getElementById("TakeImage_LEDIntensity_value1").disabled = true;
|
||||
document.getElementById("mirror").disabled = false;
|
||||
document.getElementById("flip").disabled = false;
|
||||
if (!(param["MakeImage"]["Brightness"].found))
|
||||
if (!(param["TakeImage"]["Brightness"].found))
|
||||
{
|
||||
document.getElementById("MakeImage_Brightness_value1").type = "hidden";
|
||||
document.getElementById("MakeImage_Brightness_text").style.visibility = "hidden";
|
||||
document.getElementById("TakeImage_Brightness_value1").type = "hidden";
|
||||
document.getElementById("TakeImage_Brightness_text").style.visibility = "hidden";
|
||||
}
|
||||
|
||||
|
||||
@@ -255,12 +255,12 @@ table {
|
||||
else
|
||||
param["Alignment"]["FlipImageSize"].value1 = "false";
|
||||
|
||||
if (param["MakeImage"]["Brightness"].found && param["MakeImage"]["Brightness"].enabled)
|
||||
if (param["TakeImage"]["Brightness"].found && param["TakeImage"]["Brightness"].enabled)
|
||||
{
|
||||
ReadParameter(param, "MakeImage", "Brightness", false);
|
||||
ReadParameter(param, "MakeImage", "Contrast", false);
|
||||
ReadParameter(param, "MakeImage", "Saturation", false);
|
||||
ReadParameter(param, "MakeImage", "LEDIntensity", false);
|
||||
ReadParameter(param, "TakeImage", "Brightness", false);
|
||||
ReadParameter(param, "TakeImage", "Contrast", false);
|
||||
ReadParameter(param, "TakeImage", "Saturation", false);
|
||||
ReadParameter(param, "TakeImage", "LEDIntensity", false);
|
||||
}
|
||||
|
||||
var canvas = document.getElementById("canvas");
|
||||
@@ -309,30 +309,30 @@ table {
|
||||
ParseConfig();
|
||||
param = getConfigParameters();
|
||||
|
||||
param["MakeImage"]["LEDIntensity"]["enabled"] = true;
|
||||
param["MakeImage"]["Brightness"]["enabled"] = true;
|
||||
param["MakeImage"]["Contrast"]["enabled"] = true;
|
||||
param["MakeImage"]["Saturation"]["enabled"] = true;
|
||||
param["TakeImage"]["LEDIntensity"]["enabled"] = true;
|
||||
param["TakeImage"]["Brightness"]["enabled"] = true;
|
||||
param["TakeImage"]["Contrast"]["enabled"] = true;
|
||||
param["TakeImage"]["Saturation"]["enabled"] = true;
|
||||
|
||||
if (!param["MakeImage"]["LEDIntensity"]["found"])
|
||||
if (!param["TakeImage"]["LEDIntensity"]["found"])
|
||||
{
|
||||
param["MakeImage"]["LEDIntensity"]["found"] = true;
|
||||
param["MakeImage"]["LEDIntensity"]["value1"] = "50";
|
||||
param["TakeImage"]["LEDIntensity"]["found"] = true;
|
||||
param["TakeImage"]["LEDIntensity"]["value1"] = "50";
|
||||
}
|
||||
if (!param["MakeImage"]["Brightness"]["found"])
|
||||
if (!param["TakeImage"]["Brightness"]["found"])
|
||||
{
|
||||
param["MakeImage"]["Brightness"]["found"] = true;
|
||||
param["MakeImage"]["Brightness"]["value1"] = "0";
|
||||
param["TakeImage"]["Brightness"]["found"] = true;
|
||||
param["TakeImage"]["Brightness"]["value1"] = "0";
|
||||
}
|
||||
if (!param["MakeImage"]["Contrast"]["found"])
|
||||
if (!param["TakeImage"]["Contrast"]["found"])
|
||||
{
|
||||
param["MakeImage"]["Contrast"]["found"] = true;
|
||||
param["MakeImage"]["Contrast"]["value1"] = "0";
|
||||
param["TakeImage"]["Contrast"]["found"] = true;
|
||||
param["TakeImage"]["Contrast"]["value1"] = "0";
|
||||
}
|
||||
if (!param["MakeImage"]["Saturation"]["found"])
|
||||
if (!param["TakeImage"]["Saturation"]["found"])
|
||||
{
|
||||
param["MakeImage"]["Saturation"]["found"] = true;
|
||||
param["MakeImage"]["Saturation"]["value1"] = "0";
|
||||
param["TakeImage"]["Saturation"]["found"] = true;
|
||||
param["TakeImage"]["Saturation"]["value1"] = "0";
|
||||
}
|
||||
|
||||
UpdateInput();
|
||||
@@ -340,10 +340,10 @@ table {
|
||||
}
|
||||
|
||||
function UpdateInput() {
|
||||
WriteParameter(param, category, "MakeImage", "Brightness", false);
|
||||
WriteParameter(param, category, "MakeImage", "Contrast", false);
|
||||
WriteParameter(param, category, "MakeImage", "Saturation", false);
|
||||
WriteParameter(param, category, "MakeImage", "LEDIntensity", false);
|
||||
WriteParameter(param, category, "TakeImage", "Brightness", false);
|
||||
WriteParameter(param, category, "TakeImage", "Contrast", false);
|
||||
WriteParameter(param, category, "TakeImage", "Saturation", false);
|
||||
WriteParameter(param, category, "TakeImage", "LEDIntensity", false);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user