diff --git a/scenes/pribor-rtr/bort-rtr.tscn b/scenes/pribor-rtr/bort-rtr.tscn index 9df313fd..0e36cbb5 100644 --- a/scenes/pribor-rtr/bort-rtr.tscn +++ b/scenes/pribor-rtr/bort-rtr.tscn @@ -71,6 +71,7 @@ fname = "Канал 1" metadata/value0 = "SelfTest[1].DevList[1].DevList[0]['CurrentValue']" metadata/value1 = "SelfTest[2].DevList[1].DevList[0]['CurrentValue']" metadata/value2 = "SelfTest[0].DevList[1].DevList[0]['ErCode']" +metadata/state = ["SelfTest[0].DevList[1].DevList[0]['ErCode']", "SelfTest[1].DevList[1].DevList[0]['ErCode']", "SelfTest[2].DevList[1].DevList[0]['ErCode']"] [node name="kanal2" parent="konverter/grid" instance=ExtResource("2_dmhrm")] layout_mode = 2 @@ -92,6 +93,7 @@ fname = "Канал 2" metadata/value0 = "SelfTest[1].DevList[1].DevList[1]['CurrentValue']" metadata/value1 = "SelfTest[2].DevList[1].DevList[1]['CurrentValue']" metadata/value2 = "SelfTest[0].DevList[1].DevList[1]['ErCode']" +metadata/state = ["SelfTest[0].DevList[1].DevList[1]['ErCode']", "SelfTest[1].DevList[1].DevList[1]['ErCode']", "SelfTest[2].DevList[1].DevList[1]['ErCode']"] [node name="kanal3" parent="konverter/grid" instance=ExtResource("2_dmhrm")] layout_mode = 2 @@ -113,6 +115,7 @@ fname = "Канал 3" metadata/value0 = "SelfTest[1].DevList[1].DevList[2]['CurrentValue']" metadata/value1 = "SelfTest[2].DevList[1].DevList[2]['CurrentValue']" metadata/value2 = "SelfTest[0].DevList[1].DevList[2]['ErCode']" +metadata/state = ["SelfTest[0].DevList[1].DevList[2]['ErCode']", "SelfTest[1].DevList[1].DevList[2]['ErCode']", "SelfTest[2].DevList[1].DevList[2]['ErCode']"] [node name="kanal4" parent="konverter/grid" instance=ExtResource("2_dmhrm")] layout_mode = 2 @@ -134,6 +137,7 @@ fname = "Канал 4" metadata/value0 = "SelfTest[1].DevList[1].DevList[3]['CurrentValue']" metadata/value1 = "SelfTest[2].DevList[1].DevList[3]['CurrentValue']" metadata/value2 = "SelfTest[0].DevList[1].DevList[3]['ErCode']" +metadata/state = ["SelfTest[0].DevList[1].DevList[3]['ErCode']", "SelfTest[1].DevList[1].DevList[3]['ErCode']", "SelfTest[2].DevList[1].DevList[3]['ErCode']"] [node name="kanal5" parent="konverter/grid" instance=ExtResource("2_dmhrm")] layout_mode = 2 @@ -155,6 +159,7 @@ fname = "Канал 5" metadata/value0 = "SelfTest[1].DevList[1].DevList[4]['CurrentValue']" metadata/value1 = "SelfTest[2].DevList[1].DevList[4]['CurrentValue']" metadata/value2 = "SelfTest[0].DevList[1].DevList[4]['ErCode']" +metadata/state = ["SelfTest[0].DevList[1].DevList[4]['ErCode']", "SelfTest[1].DevList[1].DevList[4]['ErCode']", "SelfTest[2].DevList[1].DevList[4]['ErCode']"] [node name="kanal6" parent="konverter/grid" instance=ExtResource("2_dmhrm")] layout_mode = 2 @@ -176,6 +181,7 @@ fname = "Канал 6" metadata/value0 = "SelfTest[1].DevList[1].DevList[5]['CurrentValue']" metadata/value1 = "SelfTest[2].DevList[1].DevList[5]['CurrentValue']" metadata/value2 = "SelfTest[0].DevList[1].DevList[5]['ErCode']" +metadata/state = ["SelfTest[0].DevList[1].DevList[5]['ErCode']", "SelfTest[1].DevList[1].DevList[5]['ErCode']", "SelfTest[2].DevList[1].DevList[5]['ErCode']"] [node name="kanal7" parent="konverter/grid" instance=ExtResource("2_dmhrm")] layout_mode = 2 @@ -197,6 +203,7 @@ fname = "Канал 7" metadata/value0 = "SelfTest[1].DevList[1].DevList[6]['CurrentValue']" metadata/value1 = "SelfTest[2].DevList[1].DevList[6]['CurrentValue']" metadata/value2 = "SelfTest[0].DevList[1].DevList[6]['ErCode']" +metadata/state = ["SelfTest[0].DevList[1].DevList[6]['ErCode']", "SelfTest[1].DevList[1].DevList[6]['ErCode']", "SelfTest[2].DevList[1].DevList[6]['ErCode']"] [node name="kanal8" parent="konverter/grid" instance=ExtResource("2_dmhrm")] layout_mode = 2 @@ -218,6 +225,7 @@ fname = "Канал 8" metadata/value0 = "SelfTest[1].DevList[1].DevList[7]['CurrentValue']" metadata/value1 = "SelfTest[2].DevList[1].DevList[7]['CurrentValue']" metadata/value2 = "SelfTest[0].DevList[1].DevList[7]['ErCode']" +metadata/state = ["SelfTest[0].DevList[1].DevList[7]['ErCode']", "SelfTest[1].DevList[1].DevList[7]['ErCode']", "SelfTest[2].DevList[1].DevList[7]['ErCode']"] [node name="antenna1" type="NinePatchRect" parent="."] layout_mode = 0 @@ -258,6 +266,7 @@ value_name1 = "φ" fname = "Элемент 1" metadata/value0 = "SelfTest[3].DevList[0].DevList[0].DevList[0]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[0].DevList[0]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[0].DevList[0]['ErCode']", "SelfTest[4].DevList[0].DevList[0].DevList[0]['ErCode']"] [node name="yelement2" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -268,6 +277,7 @@ value_name1 = "φ" fname = "Элемент 2" metadata/value0 = "SelfTest[3].DevList[0].DevList[0].DevList[1]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[0].DevList[1]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[0].DevList[1]['ErCode']", "SelfTest[4].DevList[0].DevList[0].DevList[1]['ErCode']"] [node name="yelement3" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -278,6 +288,7 @@ value_name1 = "φ" fname = "Элемент 3" metadata/value0 = "SelfTest[3].DevList[0].DevList[0].DevList[2]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[0].DevList[2]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[0].DevList[2]['ErCode']", "SelfTest[4].DevList[0].DevList[0].DevList[2]['ErCode']"] [node name="yelement4" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -288,6 +299,7 @@ value_name1 = "φ" fname = "Элемент 4" metadata/value0 = "SelfTest[3].DevList[0].DevList[0].DevList[3]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[0].DevList[3]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[0].DevList[3]['ErCode']", "SelfTest[4].DevList[0].DevList[0].DevList[3]['ErCode']"] [node name="yelement5" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -298,6 +310,7 @@ value_name1 = "φ" fname = "Элемент 5" metadata/value0 = "SelfTest[3].DevList[0].DevList[0].DevList[4]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[0].DevList[4]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[0].DevList[4]['ErCode']", "SelfTest[4].DevList[0].DevList[0].DevList[4]['ErCode']"] [node name="yelement6" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -308,6 +321,7 @@ value_name1 = "φ" fname = "Элемент 6" metadata/value0 = "SelfTest[3].DevList[0].DevList[0].DevList[5]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[0].DevList[5]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[0].DevList[5]['ErCode']", "SelfTest[4].DevList[0].DevList[0].DevList[5]['ErCode']"] [node name="yelement7" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -318,6 +332,7 @@ value_name1 = "φ" fname = "Элемент 7" metadata/value0 = "SelfTest[3].DevList[0].DevList[0].DevList[6]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[0].DevList[6]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[0].DevList[6]['ErCode']", "SelfTest[4].DevList[0].DevList[0].DevList[6]['ErCode']"] [node name="yelement8" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -328,6 +343,7 @@ value_name1 = "φ" fname = "Элемент 8" metadata/value0 = "SelfTest[3].DevList[0].DevList[0].DevList[7]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[0].DevList[7]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[0].DevList[7]['ErCode']", "SelfTest[4].DevList[0].DevList[0].DevList[7]['ErCode']"] [node name="yelement9" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -338,6 +354,7 @@ value_name1 = "φ" fname = "Элемент 9" metadata/value0 = "SelfTest[3].DevList[0].DevList[0].DevList[8]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[0].DevList[8]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[0].DevList[8]['ErCode']", "SelfTest[4].DevList[0].DevList[0].DevList[8]['ErCode']"] [node name="yelement10" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -348,6 +365,7 @@ value_name1 = "φ" fname = "Элемент 10" metadata/value0 = "SelfTest[3].DevList[0].DevList[0].DevList[9]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[0].DevList[9]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[0].DevList[9]['ErCode']", "SelfTest[4].DevList[0].DevList[0].DevList[9]['ErCode']"] [node name="yelement11" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -358,6 +376,7 @@ value_name1 = "φ" fname = "Элемент 11" metadata/value0 = "SelfTest[3].DevList[0].DevList[0].DevList[10]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[0].DevList[10]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[0].DevList[10]['ErCode']", "SelfTest[4].DevList[0].DevList[0].DevList[10]['ErCode']"] [node name="yelement12" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -368,6 +387,7 @@ value_name1 = "φ" fname = "Элемент 12" metadata/value0 = "SelfTest[3].DevList[0].DevList[0].DevList[11]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[0].DevList[11]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[0].DevList[11]['ErCode']", "SelfTest[4].DevList[0].DevList[0].DevList[11]['ErCode']"] [node name="yelement13" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -378,6 +398,7 @@ value_name1 = "φ" fname = "Элемент 13" metadata/value0 = "SelfTest[3].DevList[0].DevList[0].DevList[12]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[0].DevList[12]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[0].DevList[12]['ErCode']", "SelfTest[4].DevList[0].DevList[0].DevList[12]['ErCode']"] [node name="yelement14" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -388,6 +409,7 @@ value_name1 = "φ" fname = "Элемент 14" metadata/value0 = "SelfTest[3].DevList[0].DevList[0].DevList[13]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[0].DevList[13]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[0].DevList[13]['ErCode']", "SelfTest[4].DevList[0].DevList[0].DevList[13]['ErCode']"] [node name="yelement15" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -398,6 +420,7 @@ value_name1 = "φ" fname = "Элемент 15" metadata/value0 = "SelfTest[3].DevList[0].DevList[0].DevList[14]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[0].DevList[14]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[0].DevList[14]['ErCode']", "SelfTest[4].DevList[0].DevList[0].DevList[14]['ErCode']"] [node name="yelement16" parent="antenna1/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -408,6 +431,7 @@ value_name1 = "φ" fname = "Элемент 16" metadata/value0 = "SelfTest[3].DevList[0].DevList[0].DevList[15]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[0].DevList[15]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[0].DevList[15]['ErCode']", "SelfTest[4].DevList[0].DevList[0].DevList[15]['ErCode']"] [node name="antenna2" type="NinePatchRect" parent="."] layout_mode = 0 @@ -448,6 +472,7 @@ value_name1 = "φ" fname = "Элемент 1" metadata/value0 = "SelfTest[3].DevList[0].DevList[1].DevList[0]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[1].DevList[0]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[1].DevList[0]['ErCode']", "SelfTest[3].DevList[0].DevList[1].DevList[0]['ErCode']"] [node name="yelement2" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -458,6 +483,7 @@ value_name1 = "φ" fname = "Элемент 2" metadata/value0 = "SelfTest[3].DevList[0].DevList[1].DevList[1]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[1].DevList[1]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[1].DevList[1]['ErCode']", "SelfTest[3].DevList[0].DevList[1].DevList[1]['ErCode']"] [node name="yelement3" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -468,6 +494,7 @@ value_name1 = "φ" fname = "Элемент 3" metadata/value0 = "SelfTest[3].DevList[0].DevList[1].DevList[2]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[1].DevList[2]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[1].DevList[2]['ErCode']", "SelfTest[3].DevList[0].DevList[1].DevList[2]['ErCode']"] [node name="yelement4" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -478,6 +505,7 @@ value_name1 = "φ" fname = "Элемент 4" metadata/value0 = "SelfTest[3].DevList[0].DevList[1].DevList[3]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[1].DevList[3]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[1].DevList[3]['ErCode']", "SelfTest[3].DevList[0].DevList[1].DevList[3]['ErCode']"] [node name="yelement5" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -488,6 +516,7 @@ value_name1 = "φ" fname = "Элемент 5" metadata/value0 = "SelfTest[3].DevList[0].DevList[1].DevList[4]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[1].DevList[4]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[1].DevList[4]['ErCode']", "SelfTest[3].DevList[0].DevList[1].DevList[4]['ErCode']"] [node name="yelement6" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -498,6 +527,7 @@ value_name1 = "φ" fname = "Элемент 6" metadata/value0 = "SelfTest[3].DevList[0].DevList[1].DevList[5]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[1].DevList[5]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[1].DevList[5]['ErCode']", "SelfTest[3].DevList[0].DevList[1].DevList[5]['ErCode']"] [node name="yelement7" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -508,6 +538,7 @@ value_name1 = "φ" fname = "Элемент 7" metadata/value0 = "SelfTest[3].DevList[0].DevList[1].DevList[6]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[1].DevList[6]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[1].DevList[6]['ErCode']", "SelfTest[3].DevList[0].DevList[1].DevList[6]['ErCode']"] [node name="yelement8" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -518,6 +549,7 @@ value_name1 = "φ" fname = "Элемент 8" metadata/value0 = "SelfTest[3].DevList[0].DevList[1].DevList[7]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[1].DevList[7]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[1].DevList[7]['ErCode']", "SelfTest[3].DevList[0].DevList[1].DevList[7]['ErCode']"] [node name="yelement9" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -528,6 +560,7 @@ value_name1 = "φ" fname = "Элемент 9" metadata/value0 = "SelfTest[3].DevList[0].DevList[1].DevList[8]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[1].DevList[8]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[1].DevList[8]['ErCode']", "SelfTest[3].DevList[0].DevList[1].DevList[8]['ErCode']"] [node name="yelement10" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -538,6 +571,7 @@ value_name1 = "φ" fname = "Элемент 10" metadata/value0 = "SelfTest[3].DevList[0].DevList[1].DevList[9]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[1].DevList[9]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[1].DevList[9]['ErCode']", "SelfTest[3].DevList[0].DevList[1].DevList[9]['ErCode']"] [node name="yelement11" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -548,6 +582,7 @@ value_name1 = "φ" fname = "Элемент 11" metadata/value0 = "SelfTest[3].DevList[0].DevList[1].DevList[10]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[1].DevList[10]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[1].DevList[10]['ErCode']", "SelfTest[3].DevList[0].DevList[1].DevList[10]['ErCode']"] [node name="yelement12" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -558,6 +593,7 @@ value_name1 = "φ" fname = "Элемент 12" metadata/value0 = "SelfTest[3].DevList[0].DevList[1].DevList[11]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[1].DevList[11]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[1].DevList[11]['ErCode']", "SelfTest[3].DevList[0].DevList[1].DevList[11]['ErCode']"] [node name="yelement13" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -568,6 +604,7 @@ value_name1 = "φ" fname = "Элемент 13" metadata/value0 = "SelfTest[3].DevList[0].DevList[1].DevList[12]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[1].DevList[12]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[1].DevList[12]['ErCode']", "SelfTest[3].DevList[0].DevList[1].DevList[12]['ErCode']"] [node name="yelement14" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -578,6 +615,7 @@ value_name1 = "φ" fname = "Элемент 14" metadata/value0 = "SelfTest[3].DevList[0].DevList[1].DevList[13]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[1].DevList[13]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[1].DevList[13]['ErCode']", "SelfTest[3].DevList[0].DevList[1].DevList[13]['ErCode']"] [node name="yelement15" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -588,6 +626,7 @@ value_name1 = "φ" fname = "Элемент 15" metadata/value0 = "SelfTest[3].DevList[0].DevList[1].DevList[14]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[1].DevList[14]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[1].DevList[14]['ErCode']", "SelfTest[3].DevList[0].DevList[1].DevList[14]['ErCode']"] [node name="yelement16" parent="antenna2/grid" instance=ExtResource("3_5ikxk")] layout_mode = 2 @@ -598,6 +637,7 @@ value_name1 = "φ" fname = "Элемент 16" metadata/value0 = "SelfTest[3].DevList[0].DevList[1].DevList[15]['CurrentValue']" metadata/value1 = "SelfTest[4].DevList[0].DevList[1].DevList[15]['CurrentValue']" +metadata/state = ["SelfTest[3].DevList[0].DevList[1].DevList[15]['ErCode']", "SelfTest[3].DevList[0].DevList[1].DevList[15]['ErCode']"] [node name="adc" parent="." instance=ExtResource("4_mtf2n")] layout_mode = 0 diff --git a/scenes/pribor-rtr/pribor-rtr.gd b/scenes/pribor-rtr/pribor-rtr.gd index cd03fd33..28dbb7a8 100644 --- a/scenes/pribor-rtr/pribor-rtr.gd +++ b/scenes/pribor-rtr/pribor-rtr.gd @@ -3,13 +3,18 @@ extends "res://scenes/контроль/прибор.gd" static var json_parser: JSON = JSON.new() -func get_path_from_meta(meta: String, paths: Array, tokens: Array = ['[', ']', '.']): +## Преобразует путь в виде целой строки в массив отдельных элементов пути.[br] +## [param solid] - Входная строка содержащая путь, которая имеет следующий примерный вид:[br] +## [code]SelfTest[1].DevList[2]['CurrentValue'][/code][br] +## [param paths] - Массив содержащий отдельные элементы пути.[br] +## [param tokens] - Разделители используемые во входной строке для разделения элементов пути.[br] +func map_solid_to_array(solid: String, paths: Array, tokens: Array = ['[', ']', '.']) -> void: paths.clear() var i_chs = [] for sep in tokens: var i = 0 while i != -1: - i = meta.find(sep, i + 1) + i = solid.find(sep, i + 1) i_chs.append(i) i_chs.pop_back() i_chs.sort() @@ -17,7 +22,7 @@ func get_path_from_meta(meta: String, paths: Array, tokens: Array = ['[', ']', ' var i0 = 0 for i1 in i_chs: var ss: = [String()] - tools.get_string_slice(meta, ss, i0, i1) + tools.get_string_slice(solid, ss, i0, i1) if ss[0].is_valid_int(): paths.append(ss[0].to_int()) else: @@ -59,65 +64,71 @@ func _on_request_rtr_request_completed(result, _response_code, headers, body: Pa var bort_rtr = bb[ret_val[0]] for child in bort_rtr.get_node('konverter/grid').get_children(): - map_data_to_item(json_parser.data, child, 'value0') - map_data_to_item(json_parser.data, child, 'value1') - map_data_to_item(json_parser.data, child, 'value2') + map_value_to_item(json_parser.data, child, 'value0') + map_value_to_item(json_parser.data, child, 'value1') + map_value_to_item(json_parser.data, child, 'value2') + map_error_codes_to_item(json_parser.data, child, 'state') for child in bort_rtr.get_node('antenna1/grid').get_children(): - map_data_to_item(json_parser.data, child, 'value0') - map_data_to_item(json_parser.data, child, 'value1') + map_value_to_item(json_parser.data, child, 'value0') + map_value_to_item(json_parser.data, child, 'value1') + map_error_codes_to_item(json_parser.data, child, 'state') for child in bort_rtr.get_node('antenna2/grid').get_children(): - map_data_to_item(json_parser.data, child, 'value0') - map_data_to_item(json_parser.data, child, 'value1') + map_value_to_item(json_parser.data, child, 'value0') + map_value_to_item(json_parser.data, child, 'value1') + map_error_codes_to_item(json_parser.data, child, 'state') for child in bort_rtr.get_children(): - map_data_to_item(json_parser.data, child, 'value0') - map_data_to_item(json_parser.data, child, 'value1') + map_value_to_item(json_parser.data, child, 'value0') + map_value_to_item(json_parser.data, child, 'value1') + map_error_codes_to_item(json_parser.data, child, 'state') -func map_data_to_item(data, item, value_name: StringName): +func map_value_to_item(data, item, value_name: StringName): var meta = item.get_meta(value_name, '') if meta == '': return if not (meta is String): return var paths: = Array() - get_path_from_meta(meta, paths) + map_solid_to_array(meta, paths) var ret_val: = [null, false] var paths_copy = paths.duplicate(true) tools.get_value_by_path(data, paths, ret_val) if ret_val[1]: item.set(value_name, ret_val[0]) else: - push_error('ошибка: поле по пути %s для $%s.%s не найдено' % [paths_copy, item.name, value_name]) + push_error('ошибка: путь %s для $%s.%s не найден' % [paths_copy, item.name, value_name]) ## 1. Поле [b]'ErCode'[/b] содержит [b]0[/b] - если нет ошибки, и другое значение - если есть ошибка.[br] ## 2. Для каждого проверяемого параметра устройства есть своё поле [b]'ErCode'[/b].[br] ## 3. Индикатор исправности у устройства один.[br] -## 4. [i]Нет результата порверки[/i] - поле [param state] принимает значение [b]0[/b], [i]всё исправно[/i] - [b]1[/b], [i]хотябы один[/i] параметр с ошибкой - [b]2[/b].[br] +## 4. [i]Нет результата порверки[/i] - поле [param state] принимает значение [b]0[/b], [i]всё +## исправно[/i] - [b]1[/b], [i]хотябы один[/i] параметр с ошибкой - [b]2[/b].[br] func map_error_codes_to_item(data, item, value_name: StringName): var metas = item.get_meta(value_name, '') - if metas == '': - return if not (metas is Array): return var paths: = Array() var values: = Array() for meta in metas: - get_path_from_meta(meta, paths) + map_solid_to_array(meta, paths) var ret_val: = [null, false] var paths_copy = paths.duplicate(true) tools.get_value_by_path(data, paths, ret_val) if ret_val[1]: - values.append(ret_val[0]) + values.append(int(ret_val[0])) else: - push_error('ошибка: поле по пути %s для $%s.%s не найдено' % [paths_copy, item.name, value_name]) - item.set(value_name, 1 if values.count(0) == values.size() else 2) + + push_error('ошибка: путь %s для $%s.%s не найден' % [paths_copy, item.name, value_name]) + var test_res = 1 if values.count(int(0)) == values.size() else 2 + item.set(value_name, test_res) -func _on_item_pressed(block_a): +## Вызывается при клике мыши на элементе контроля +## [param block_a] - Кликнутый элемент контроля +func _on_item_pressed(block_a: Control): var metas = block_a.get_meta_list() - print(block_a) + print_debug(block_a) for n in metas: var v = block_a.get_meta(n) print('%s:%s' % [n, v]) - print('--------------------') diff --git a/scenes/контроль/блок-б.tscn b/scenes/контроль/блок-б.tscn index 82f671fa..a28a12c0 100644 --- a/scenes/контроль/блок-б.tscn +++ b/scenes/контроль/блок-б.tscn @@ -127,12 +127,7 @@ signal pressed(control: PanelContainer) @export var state: int: set(v): state = tools.clip_value(v, 0, textures.size() - 1) - if v == 0: - $margin/vbox/grid0/state.texture = textures[1] - elif v == -1: - $margin/vbox/grid0/state.texture = textures[0] - else: - $margin/vbox/grid0/state.texture = textures[2] + $margin/vbox/grid0/state.texture = textures[v] @export var alignment: int: