velelepie/uarep-ctl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	scenes/ЭМС.gd
#	scenes/ЭМС.tscn
This commit is contained in:
MaD_CaT
2023-08-10 11:34:08 +03:00
parent 87be1b42ae a4f9e435b6
commit fc1fe6ef3f
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scenes/ЭМС.gd
View File

@@ -73,14 +73,14 @@ func init_tbls_in():
$scrollin/tbl_in.set_columns_min_size(column_size)
$scrollin/tbl_in.connect('row_pressed', Callable(self, 'on_row_pressed_in'))
$scrollin/tbl_in.connect('selected_changed', Callable(self, 'on_selected_changed_in'))
header_text[0] = 'Вход'
$scrl_in_set/tbl_in_set.set_header(header_type)
$scrl_in_set/tbl_in_set.set_header_text(header_text)
$scrl_in_set/tbl_in_set.set_columns_alignments(yams_alligment_in)
$scrl_in_set/tbl_in_set.set_columns_min_size(column_size)
$scrl_in_set/tbl_in_set.connect('row_pressed', Callable(self, 'on_row_pressed_si'))
$scrl_in_set/tbl_in_set.connect('selected_changed', Callable(self, 'on_selected_changed_si'))
@@ -113,7 +113,7 @@ func on_selected_changed_si(i_row: int):
for i in range($scrollout/tbl_out.get_rows_count()):
var node = $scrollout/tbl_out.get_node2(0, i)
if dev_name == node.text:
on_row_pressed_out(i)
on_row_pressed_out(i)
func on_row_pressed_si(i_row: int):
@@ -145,7 +145,7 @@ func init_tbls_out():
$scrollout/tbl_out.set_columns_min_size([250, 100, 70, 70, 70, 100])
$scrollout/tbl_out.connect('row_pressed', Callable(self, 'on_row_pressed_out'))
$scrollout/tbl_out.connect('selected_changed', Callable(self, 'on_selected_changed_out'))
header_text[0] = 'Выход'
$scrl_out_set/tbl_out_set.set_header([TableHeader, TableHeader, TableHeader, TableHeader, TableHeader, TableHeader])
$scrl_out_set/tbl_out_set.set_header_text(header_text)
@@ -163,7 +163,7 @@ func on_selected_changed_so(i_row: int):
for i in range($scrollin/tbl_in.get_rows_count()):
var node = $scrollin/tbl_in.get_node2(0, i)
if dev_name == node.text:
on_row_pressed_in(i)
on_row_pressed_in(i)
func on_row_pressed_so(i_row: int):
@@ -189,7 +189,7 @@ func on_row_pressed_out(i_row: int):
func set_out_dev(_board, dev):
var row_type: Array = [CellLineEdit, CellLineEdit, CellLineEdit, CellLineEdit, CellState, CellOptBtn]
set_dev($scrl_out_set/tbl_out_set, dev, row_type, OUT_SET_ROW, 'Список соединённых входов :')
set_dev($scrl_out_set/tbl_out_set, dev, row_type, OUT_SET_ROW, 'Список соединённых входов :')
var mode = $scrl_out_set/tbl_out_set.get_node2(5, 0)
for opt in OUT_MODE:
mode.add_item(opt)
@@ -220,7 +220,7 @@ func set_dev(tbl, dev, row_type, row_type_conn, lbl_text):
for i in len(row_type_conn):
var le: LineEdit = tbl.get_node2(i, 1)
le.editable = false
for i in dev.connect_devs:
var dev_con = dev.connect_devs[i][0]
tbl.add_row(row_type_conn)
@@ -255,7 +255,7 @@ func add_connection_dev(tbl, dev1, dev2, set_row, user_data):
tbl.set_node_user_data(node_index[0], node_index[1], user_data)
dev2.connect_devs[dev1.dev_name] = user_data
func disable_edit(tbl, num_col: int, i_row: int):
for col in range(num_col):
var node: LineEdit = tbl.get_node2(col, i_row)