Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,27 @@ struct ButtonViewDescriptor: ViewDescriptor, Equatable {
mappingCode + " else {v = \"\(localizedLabel)\";}" +
" var valueNumber = document.getElementById(\"element\(id)\").getElementsByClassName(\"valueNumber\")[0];" +
" valueNumber.textContent = v;" +
" \(setVisiblity(id))" +
"}"

}

func setVisiblity(_ id: Int) -> String {

guard let visibilityLabel = visibilityBuffer?.name else {
return ""
}

return """
if (data.hasOwnProperty(\"\(visibilityLabel)\")) {"
var elementVisibilityIndicator = data[\"\(visibilityLabel)\"][\"data\"][data[\"\(visibilityLabel)\"][\"data\"].length-1];
var buttonElement = document.getElementById(\"element\(id)\");
if (elementVisibilityIndicator <= 0.0 || elementVisibilityIndicator.length == 0) {
buttonElement.style.display = \"none\";
} else {
buttonElement.style.display = \"block\";
}
}
"""
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,23 @@ struct CameraViewDescriptor: ViewDescriptor, Equatable {
let warningText = localize("remoteCameraWarning").replacingOccurrences(of: "\"", with: "\\\"")
return "<div style=\"font-size: 105%;\" class=\"graphElement\" id=\"element\(id)\"><span class=\"label\" onclick=\"toggleExclusive(\(id));\">\(localizedLabel)</span><div class=\"warningIcon\" onclick=\"alert('\(warningText)')\"></div></div>"
}

func setDataHTMLWithID(_ id: Int) -> String {
guard let visibilityLabel = visibilityBuffer?.name else {
return ""
}

return """
function (data) {
if (data.hasOwnProperty(\"\(visibilityLabel)\")) {
var x = data[\"\(visibilityLabel)\"][\"data\"][data[\"\(visibilityLabel)\"][\"data\"].length-1];
var cameraElement = document.getElementById(\"element\(id)\");
if (x <= 0.0 || x.length == 0) {
cameraElement.style.display = \"none\";
} else {
cameraElement.style.display = \"block\";
}
}
"""
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,23 @@ struct DepthGUIViewDescriptor: ViewDescriptor, Equatable {
let warningText = localize("remoteDepthGUIWarning").replacingOccurrences(of: "\"", with: "\\\"")
return "<div style=\"font-size: 105%;\" class=\"graphElement\" id=\"element\(id)\"><span class=\"label\" onclick=\"toggleExclusive(\(id));\">\(localizedLabel)</span><div class=\"warningIcon\" onclick=\"alert('\(warningText)')\"></div></div>"
}

func setDataHTMLWithID(_ id: Int) -> String {
guard let visibilityLabel = visibilityBuffer?.name else {
return ""
}

return """
function (data) {
if (data.hasOwnProperty(\"\(visibilityLabel)\")) {
var x = data[\"\(visibilityLabel)\"][\"data\"][data[\"\(visibilityLabel)\"][\"data\"].length-1];
var depthGuiElement = document.getElementById(\"element\(id)\");
if (x <= 0.0 || x.length == 0) {
depthGuiElement.style.display = \"none\";
} else {
depthGuiElement.style.display = \"block\";
}
}
"""
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,31 @@ struct DropdownViewDescriptor: ViewDescriptor, Equatable {
dropdownElement.selectedIndex = 0
}

\(setVisiblity(id))


}

"""
}

func setVisiblity(_ id: Int) -> String {

guard let visibilityLabel = visibilityBuffer?.name else { return "" }

return """
if (data.hasOwnProperty(\"\(visibilityLabel)\")) {
var elementVisibilityIndicator = data[\"\(visibilityLabel)\"][\"data\"][data[\"\(visibilityLabel)\"][\"data\"].length-1];
var dropDownElement = document.getElementById(\"element\(id)\");
if (elementVisibilityIndicator <= 0.0 || elementVisibilityIndicator.length == 0) {
dropDownElement.style.display = \"none\";
} else {
dropDownElement.style.display = \"block\";
}
}

"""
}


}
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,39 @@ struct EditViewDescriptor: ViewDescriptor, Equatable {

func setDataHTMLWithID(_ id: Int) -> String {
let bufferName = buffer.name.replacingOccurrences(of: "\"", with: "\\\"")


return "function (data) {" +
"var valueElement = document.getElementById(\"element\(id)\").getElementsByClassName(\"value\")[0];" +
"if (!data.hasOwnProperty(\"\(bufferName)\"))" +
" return;" +
"var x = data[\"\(bufferName)\"][\"data\"][data[\"\(bufferName)\"][\"data\"].length-1];" +
"console.log(\"editElement buffer value is \" +x);" +

"if (valueElement !== document.activeElement)" +
" valueElement.value = (x*\(factor))" +

"\(setVisiblity(id))" +
"}"
}

func setVisiblity(_ id: Int) -> String {

guard let visibilityLabel = visibilityBuffer?.name else {
return ""
}

return """
if (data.hasOwnProperty(\"\(visibilityLabel)\")) {
var editElement = document.getElementById(\"element\(id)\");
var elementVisibilityIndicator = data[\"\(visibilityLabel)\"][\"data\"][data[\"\(visibilityLabel)\"][\"data\"].length-1];

if (elementVisibilityIndicator <= 0.0 || elementVisibilityIndicator.length == 0) {
editElement.style.display = \"none\";
} else {
editElement.style.display = \"block\";
}
}
"""
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -584,9 +584,32 @@ struct GraphViewDescriptor: ViewDescriptor, Equatable {
code += "elementData[\(id)][\"datasets\"][\(i)] = data[\"\(bufferName)\"];"
}
}

code += setVisiblity(id)

code += "}"

return code
}

func setVisiblity(_ id: Int) -> String {

guard let visibilityLabel = visibilityBuffer?.name else { return "" }

return """
if (data.hasOwnProperty(\"\(visibilityLabel)\")) {
var elementVisibilityIndicator = data[\"\(visibilityLabel)\"][\"data\"][data[\"\(visibilityLabel)\"][\"data\"].length-1];
var graphElement = document.getElementById(\"element\(id)\");
if (elementVisibilityIndicator <= 0.0 || elementVisibilityIndicator.length == 0) {
graphElement.style.display = \"none\";
if ((graphElement.classList && graphElement.classList.contains(\"exclusive\")) || (graphElement.className.indexOf(\"exclusive\") > -1)) {
leaveExclusive();
}
} else {
graphElement.style.display = \"block\";
}
}
"""
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,23 @@ struct ImageViewDescriptor: ResourceViewDescriptor, Equatable {
return "<div class=\"imageElement\" id=\"element\(id)\"><img style=\"width: \(scale*100.0)% \" class=\"lightFilter_\(lightFilter.rawValue) darkFilter_\(darkFilter.rawValue)\" src=\"res?src=\(src)\"></p></div>"
}

func setDataHTMLWithID(_ id: Int) -> String {
guard let visibilityLabel = visibilityBuffer?.name else {
return ""
}

return """
function (data) {
if (data.hasOwnProperty(\"\(visibilityLabel)\")) {
var x = data[\"\(visibilityLabel)\"][\"data\"][data[\"\(visibilityLabel)\"][\"data\"].length-1];
var imageElement = document.getElementById(\"element\(id)\");
if (x <= 0.0 || x.length == 0) {
imageElement.style.display = \"none\";
} else {
imageElement.style.display = \"block\";
}
}
"""
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,24 @@ struct InfoViewDescriptor: ViewDescriptor, Equatable {
func generateViewHTMLWithID(_ id: Int) -> String {
return "<div style=\"font-size:90%;color:#\(color.hexStringValue!)\" class=\"infoElement adjustableColor\" id=\"element\(id)\"><p>\(localizedLabel)</p></div>"
}

func setDataHTMLWithID(_ id: Int) -> String {
guard let visibilityLabel = visibilityBuffer?.name else {
return ""
}

return """
function (data) {
if (data.hasOwnProperty(\"\(visibilityLabel)\")) {
var x = data[\"\(visibilityLabel)\"][\"data\"][data[\"\(visibilityLabel)\"][\"data\"].length-1];
var infoElement = document.getElementById(\"element\(id)\");
if (x <= 0.0) {
infoElement.style.display = \"none\";
} else {
infoElement.style.display = \"block\";
}
}
}
"""
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ struct SliderViewDescriptor: ViewDescriptor, Equatable {

let minValueFormatted = numberFormatter(for: minValue)
let maxValueFormatted = numberFormatter(for: maxValue)
let defaultValueFormatted = numberFormatter(for: defaultValue ?? 0.0)
let defaultValueFormatted = numberFormatter(for: defaultValue)

let bufferName = outputBuffers[.Empty]?.name ?? ""

Expand All @@ -73,7 +73,7 @@ struct SliderViewDescriptor: ViewDescriptor, Equatable {
private func generateTwoSlidersHTML(_ id: Int) -> String{
let minValueFormatted = numberFormatter(for: minValue)
let maxValueFormatted = numberFormatter(for: maxValue)
let defaultValueFormatted = numberFormatter(for: defaultValue ?? 0.0)
let defaultValueFormatted = numberFormatter(for: defaultValue)

let valueTag = showValue ? "<span class=\"label\">\(localizedLabel)</span>" +
"<span class=\"value\" id=\"value\(id)\">\(defaultValueFormatted)</span>" : ""
Expand Down Expand Up @@ -160,6 +160,8 @@ struct SliderViewDescriptor: ViewDescriptor, Equatable {
sliderElement.classList.remove(\"isSliderUpdating\");
}
});

\(setVisiblity(id))

}

Expand Down Expand Up @@ -259,4 +261,22 @@ struct SliderViewDescriptor: ViewDescriptor, Equatable {
}


func setVisiblity(_ id: Int) -> String {

guard let visibilityLabel = visibilityBuffer?.name else { return "" }

return """
if (data.hasOwnProperty(\"\(visibilityLabel)\")) {
var elementVisibilityIndicator = data[\"\(visibilityLabel)\"][\"data\"][data[\"\(visibilityLabel)\"][\"data\"].length-1];
var sliderElement = document.getElementById(\"element\(visibilityLabel)\");
if (elementVisibilityIndicator <= 0.0 || elementVisibilityIndicator.length == 0) {
sliderElement.style.display = \"none\";
} else {
sliderElement.style.display = \"block\";
}
}

"""
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,28 @@ struct SwitchViewDescriptor: ViewDescriptor, Equatable {
var value = radioButton.checked ? 1.0 : 0.0;
ajax('control?cmd=set&buffer=\(buffer.name)&value='+value);
};
}

\(setVisiblity(id))
}

"""
}

func setVisiblity(_ id: Int) -> String {

guard let visibilityLabel = visibilityBuffer?.name else { return "" }

return """
if (data.hasOwnProperty(\"\(visibilityLabel)\")) {"
var elementVisibilityIndicator = data[\"\(visibilityLabel)\"][\"data\"][data[\"\(visibilityLabel)\"][\"data\"].length-1];
var toggleElement = document.getElementById(\"element\(id)\");
if (elementVisibilityIndicator <= 0.0 || elementVisibilityIndicator.length == 0) {
toggleElement.style.display = \"none\";
} else {
toggleElement.style.display = \"block\";
}
}
"""
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -125,30 +125,36 @@ struct ValueViewDescriptor: ViewDescriptor, Equatable {
}
}

return "function (data) {" +
" if (!data.hasOwnProperty(\"\(bufferName)\"))" +
" return;" +
" var x = data[\"\(bufferName)\"][\"data\"][data[\"\(bufferName)\"][\"data\"].length-1];" +
" var v = null;" +
mappingCode +
let unitCode = setUnit()
let formatCode = setFormatedCoordinate()
let asciiCode = setAsciiFormat(bufferName: bufferName)
let visibilityCode = setVisibility(id, visibilityBuffer?.name ?? "")

"\(setUnit())" +

"\(setFormatedCoordinate())" +
let dataSetupFunction = """
function (data) {
if (!data.hasOwnProperty(\"\(bufferName)\"))
return;
var x = data[\"\(bufferName)\"][\"data\"][data[\"\(bufferName)\"][\"data\"].length-1];
var v = null;
\(mappingCode)
\(unitCode)
\(formatCode)
\(asciiCode)
var valueElement = document.getElementById(\"element\(id)\").getElementsByClassName(\"value\")[0];
var valueNumber = valueElement.getElementsByClassName(\"valueNumber\")[0];
var valueUnit = valueElement.getElementsByClassName(\"valueUnit\")[0];
if (v == null) {
v = x;
valueUnit.textContent = unitLabel;
} else {
valueUnit.textContent = \"\";
}
valueNumber.textContent = v;
\(visibilityCode)
}
"""

"\(setAsciiFormat(bufferName: bufferName))" +

" var valueElement = document.getElementById(\"element\(id)\").getElementsByClassName(\"value\")[0];" +
" var valueNumber = valueElement.getElementsByClassName(\"valueNumber\")[0];" +
" var valueUnit = valueElement.getElementsByClassName(\"valueUnit\")[0];" +
" if (v == null) {" +
" v = x;" +
" valueUnit.textContent = unitLabel;" +
" } else { " +
" valueUnit.textContent = \"\";" +
" } " +
" valueNumber.textContent = v;" +
"}"
return dataSetupFunction
}

func setUnit() -> String {
Expand Down Expand Up @@ -208,4 +214,20 @@ struct ValueViewDescriptor: ViewDescriptor, Equatable {
}
"""
}

func setVisibility(_ id: Int, _ visibilityLabel: String) -> String {
if visibilityLabel.isEmpty { return "" }
return """
if (data.hasOwnProperty(\"\(visibilityLabel)\")) {
var elementVisibilityIndicator = data[\"\(visibilityLabel)\"][\"data\"][data[\"\(visibilityLabel)\"][\"data\"].length-1];
var valueMainElement = document.getElementById(\"element\(id)\");
if (elementVisibilityIndicator <= 0.0 || elementVisibilityIndicator.length == 0) {
valueMainElement.style.display = "none";
} else {
valueMainElement.style.display = "block";
}
}
"""
}
}

Loading