diff --git a/scenes/контроль/блок-а.tscn b/scenes/контроль/блок-а.tscn index 15ca8718..8b6a21b0 100644 --- a/scenes/контроль/блок-а.tscn +++ b/scenes/контроль/блок-а.tscn @@ -21,127 +21,96 @@ extends PanelContainer set(v): value0 = v $margin/vbox/grid1/indicator0.value = v - get: - return value0 @export var value1: float: set(v): value1 = v $margin/vbox/grid1/indicator1.value = v - get: - return value1 @export var min_value0: float: set(v): min_value0 = v $margin/vbox/grid1/indicator0.min_value = v - get: - return min_value0 @export var min_value1: float: set(v): min_value1 = v $margin/vbox/grid1/indicator1.min_value = v - get: - return min_value1 @export var max_value0: float: set(v): max_value0 = v $margin/vbox/grid1/indicator0.max_value = v - get: - return max_value0 @export var max_value1: float: set(v): max_value1 = v $margin/vbox/grid1/indicator1.max_value = v - get: - return max_value1 @export var step0: float: set(v): step0 = v $margin/vbox/grid1/indicator0.step = v - get: - return step0 @export var step1: float: set(v): step1 = v $margin/vbox/grid1/indicator1.step = v - get: - return step1 @export var value_name0: String: set(v): value_name0 = v $margin/vbox/grid1/indicator0.value_name = v - get: - return value_name0 @export var value_name1: String: set(v): value_name1 = v $margin/vbox/grid1/indicator1.value_name = v - get: - return value_name1 @export var name_min_size0: Vector2i: set(v): name_min_size0 = v $margin/vbox/grid1/indicator0.name_min_size = v - get: - return name_min_size0 @export var name_min_size1: Vector2i: set(v): name_min_size1 = v $margin/vbox/grid1/indicator1.name_min_size = v - get: - return name_min_size1 @export var fname: String: set(v): fname = v $margin/vbox/grid0/fname.text = v - get: - return fname + @export var rname: String: set(v): rname = v $margin/vbox/grid0/rname.text = v - get: - return rname @export var state: int: set(v): - state = 0 if v < 0 else v % textures.size() + state = tools.clip_value(v, 0, textures.size() - 1) $margin/vbox/grid0/state.texture = textures[state] - get: - return state @export var alignment: int: set(v): alignment = v $margin/vbox.alignment = v - get: - return alignment " [sub_resource type="GDScript" id="GDScript_45hqb"] diff --git a/scripts/interfer.gd b/scripts/interfer.gd index 55b1c869..f7a1f131 100644 --- a/scripts/interfer.gd +++ b/scripts/interfer.gd @@ -185,7 +185,7 @@ func on_interfer_rcv(interfer_params: Array, unit, ecms): param['width'] = interfer_params[5] if (param['width'] < WIDTH_MIN) and (param['width'] > WIDTH_MAX): err = true - var interfer_name: String + var interfer_name: String for key in ITERFER_MODE: if ITERFER_MODE[key][2] == mode: interfer_name = key diff --git a/scripts/tools.gd b/scripts/tools.gd index 3e5a485f..9db2b756 100644 --- a/scripts/tools.gd +++ b/scripts/tools.gd @@ -1,3 +1,4 @@ +@tool extends Node ## Простые часто используемые функции @@ -40,8 +41,11 @@ func _check_index(obj, index) -> bool: ## Возвращает значение поля хранящегося по указанному пути внутри объекта.[br] ## [param obj] - Объект в котором хранится поле, должен быть [b]Dictionary[/b].[br] ## [param paths] - Массив содержащий путь к полю значения, включая его имя[br] -## [param ret_val] - Массив из одного элемента. После вызова, содержит значение искомого поля.[br] -func get_value_by_path(obj, paths: Array, ret_val: Array) -> bool: +## [param ret_val] - Массив из двух элементов.[br] +## После вызова элемент [b]0[/b] содержит значение искомого поля. +## После вызова элемент [b]1[/b] содержит [b]true[/b], если поле найдено, +## и [b]false[/b], если иначе. +func get_value_by_path(obj, paths: Array, ret_val: Array): var index = paths.pop_at(0) if paths.size(): if _check_index(obj, index):