update

app.py

@@ -364,7 +364,7 @@ with gr.Blocks() as demo:
 	# +========================================================================================+
 	# |                                    step transition                                     |
 	# +========================================================================================+
-	def init_next_step(stage1_info, channel_info, fillmode, selected_radio, selected_chkbox):
+	def init_next_step(stage1_info, channel_info, fillmode, sel_radio, sel_chkbox):
 		
 		# ========================================step0=========================================
 		# step0 to step1
@@ -477,16 +477,16 @@ with gr.Blocks() as demo:
 		elif stage1_info["state"] == "step2-selecting":
 			# --------------------------------store information---------------------------------
 			# if the user has selected an in_channel to forward to the previous target tpl_channel
-			if selected_radio != []:
-				prev_target_name = stage1_info["missingTemplates"][stage1_info["step2"]["count"]-1]
-				prev_target_idx = channel_info["templateDict"][prev_target_name]["index"]
-				selected_idx = channel_info["inputDict"][selected_radio]["index"]
+			if sel_radio != []:
+				prev_tpl_name = stage1_info["missingTemplates"][stage1_info["step2"]["count"]-1]
+				prev_tpl_idx = channel_info["templateDict"][prev_tpl_name]["index"]
+				sel_idx = channel_info["inputDict"][sel_radio]["index"]
 				
-				stage1_info["mappingResults"][0]["newOrder"][prev_target_idx] = [selected_idx]
-				stage1_info["mappingResults"][0]["isOriginalData"][prev_target_idx] = True
-				channel_info["templateDict"][prev_target_name]["matched"] = True
-				channel_info["inputDict"][selected_radio]["assigned"] = True
-				#print(prev_target_name, '<-', selected_radio)
+				stage1_info["mappingResults"][0]["newOrder"][prev_tpl_idx] = [sel_idx]
+				stage1_info["mappingResults"][0]["isOriginalData"][prev_tpl_idx] = True
+				channel_info["templateDict"][prev_tpl_name]["matched"] = True
+				channel_info["inputDict"][sel_radio]["assigned"] = True
+				#print(prev_tpl_name, '<-', sel_radio)
 			
 			# --------------------------------update information--------------------------------
 			# exclude the selected in_channel of the previous round
@@ -566,11 +566,11 @@ with gr.Blocks() as demo:
 					"count" : 1,
 					"totalNum" : len(stage1_info["missingTemplates"])
 				}
-				target_name = stage1_info["missingTemplates"][0]
-				chkbox_label = '{} (1/{})'.format(target_name, stage1_info["step3"]["totalNum"])
+				tpl_name = stage1_info["missingTemplates"][0]
+				chkbox_label = '{} (1/{})'.format(tpl_name, stage1_info["step3"]["totalNum"])
 				
-				target_idx = channel_info["templateDict"][target_name]["index"]
-				chkbox_value = stage1_info["mappingResults"][0]["newOrder"][target_idx]
+				tpl_idx = channel_info["templateDict"][tpl_name]["index"]
+				chkbox_value = stage1_info["mappingResults"][0]["newOrder"][tpl_idx]
 				chkbox_value = [channel_info["inputOrder"][i] for i in chkbox_value]
 				
 				stage1_info["state"] = "step3-2-selecting"
@@ -596,11 +596,11 @@ with gr.Blocks() as demo:
 		# step3-2 to step4
 		elif stage1_info["state"] == "step3-2-selecting":
 			# --------------------------------store information---------------------------------
-			prev_target_name = stage1_info["missingTemplates"][stage1_info["step3"]["count"]-1]
-			prev_target_idx = channel_info["templateDict"][prev_target_name]["index"]
-			selected_indices = [channel_info["inputDict"][channel]["index"] for channel in selected_chkbox]
-			stage1_info["mappingResults"][0]["newOrder"][prev_target_idx] = selected_indices
-			#print(f'{prev_target_name}({prev_target_idx}): {selected_indices}')
+			prev_tpl_name = stage1_info["missingTemplates"][stage1_info["step3"]["count"]-1]
+			prev_tpl_idx = channel_info["templateDict"][prev_tpl_name]["index"]
+			sel_idx = [channel_info["inputDict"][channel]["index"] for channel in sel_chkbox]
+			stage1_info["mappingResults"][0]["newOrder"][prev_tpl_idx] = sel_idx if sel_idx!=[] else [None]
+			#print(prev_tpl_name, '<-', sel_chkbox)
 			# ----------------------------------------------------------------------------------
 			md = """
 			### Mapping Results
@@ -668,20 +668,20 @@ with gr.Blocks() as demo:
 		else:
 			return {radio_group : gr.Radio(value=[])}
 	
-	def update_radio(stage1_info, channel_info, selected):
+	def update_radio(stage1_info, channel_info, sel_name):
 		step2 = stage1_info["step2"]
 		# ----------------------------------store information-----------------------------------
 		# if the user has selected an in_channel to forward to the previous target tpl_channel
-		if selected != []:
-			prev_target_name = stage1_info["missingTemplates"][step2["count"]-1]
-			prev_target_idx = channel_info["templateDict"][prev_target_name]["index"]
-			selected_idx = channel_info["inputDict"][selected]["index"]
+		if sel_name != []:
+			prev_tpl_name = stage1_info["missingTemplates"][step2["count"]-1]
+			prev_tpl_idx = channel_info["templateDict"][prev_tpl_name]["index"]
+			sel_idx = channel_info["inputDict"][sel_name]["index"]
 			
-			stage1_info["mappingResults"][0]["newOrder"][prev_target_idx] = [selected_idx]
-			stage1_info["mappingResults"][0]["isOriginalData"][prev_target_idx] = True
-			channel_info["templateDict"][prev_target_name]["matched"] = True
-			channel_info["inputDict"][selected]["assigned"] = True
-			#print(prev_target_name, '<-', selected)
+			stage1_info["mappingResults"][0]["newOrder"][prev_tpl_idx] = [sel_idx]
+			stage1_info["mappingResults"][0]["isOriginalData"][prev_tpl_idx] = True
+			channel_info["templateDict"][prev_tpl_name]["matched"] = True
+			channel_info["inputDict"][sel_name]["assigned"] = True
+			#print(prev_tpl_name, '<-', sel_name)
 		
 		# ---------------------------------update the new round---------------------------------
 		step2["count"] += 1
@@ -689,8 +689,8 @@ with gr.Blocks() as demo:
 		# exclude the selected in_channel of the previous round
 		stage1_info["unassignedInputs"] = app_utils.get_unassigned_inputs(channel_info["inputOrder"], channel_info["inputDict"])
 		
-		target_name = stage1_info["missingTemplates"][step2["count"]-1]
-		radio_label = '{} ({}/{})'.format(target_name, step2["count"], step2["totalNum"])
+		tpl_name = stage1_info["missingTemplates"][step2["count"]-1]
+		radio_label = '{} ({}/{})'.format(tpl_name, step2["count"], step2["totalNum"])
 		
 		stage1_info["step2"] = step2
 		# determine which button to display
@@ -721,23 +721,23 @@ with gr.Blocks() as demo:
 	# +========================================================================================+
 	# |                                      Stage1-step3                                      |
 	# +========================================================================================+	
-	def update_chkbox(stage1_info, channel_info, selected):
+	def update_chkbox(stage1_info, channel_info, sel_name):
 		step3 = stage1_info["step3"]
 		# ----------------------------------store information-----------------------------------
-		prev_target_name = stage1_info["missingTemplates"][step3["count"]-1]
-		prev_target_idx = channel_info["templateDict"][prev_target_name]["index"]
-		selected_indices = [channel_info["inputDict"][channel]["index"] for channel in selected]
-		stage1_info["mappingResults"][0]["newOrder"][prev_target_idx] = selected_indices
-		#print(f'{prev_target_name}({prev_target_idx}): {selected_indices}')
+		prev_tpl_name = stage1_info["missingTemplates"][step3["count"]-1]
+		prev_tpl_idx = channel_info["templateDict"][prev_tpl_name]["index"]
+		sel_idx = [channel_info["inputDict"][channel]["index"] for channel in sel_name]
+		stage1_info["mappingResults"][0]["newOrder"][prev_tpl_idx] = sel_idx if sel_idx!=[] else [None]
+		#print(prev_tpl_name, '<-', sel_name)
 		
 		# ---------------------------------update the new round---------------------------------
 		step3["count"] += 1
 		
-		target_name = stage1_info["missingTemplates"][step3["count"]-1]
-		chkbox_label = '{} ({}/{})'.format(target_name, step3["count"], step3["totalNum"])
+		tpl_name = stage1_info["missingTemplates"][step3["count"]-1]
+		chkbox_label = '{} ({}/{})'.format(tpl_name, step3["count"], step3["totalNum"])
 		
-		target_idx = channel_info["templateDict"][target_name]["index"]
-		chkbox_value = stage1_info["mappingResults"][0]["newOrder"][target_idx]
+		tpl_idx = channel_info["templateDict"][tpl_name]["index"]
+		chkbox_value = stage1_info["mappingResults"][0]["newOrder"][tpl_idx]
 		chkbox_value = [channel_info["inputOrder"][i] for i in chkbox_value]
 		
 		stage1_info["step3"] = step3

app_utils.py

@@ -21,7 +21,7 @@ def reorder_data(idx_order, orig_flags, inputname, filename):
 	for i, (idx_set, flag) in enumerate(zip(idx_order, orig_flags)):
 		if flag == True:
 			new_data[i, :] = raw_data[idx_set[0], :]
-		elif idx_set == []:
+		elif idx_set == [None]:
 			new_data[i, :] = zero_arr
 		else:
 			tmp_data = [raw_data[j, :] for j in idx_set]
@@ -234,7 +234,7 @@ def match_names(stage1_info):
 	tpl_montage, in_montage, tpl_dict, in_dict = read_montage_data(loc_file)
 	tpl_order = tpl_montage.ch_names
 	in_order = in_montage.ch_names
-	new_idx = [[]]*30 # store the indices of the in_channels in the order of tpl_channels
+	new_idx = [[None]]*30 # store the indices of the in_channels in the order of tpl_channels
 	orig_flags = [False]*30
 	
 	alias_dict = {
@@ -304,7 +304,7 @@ def optimal_mapping(channel_info):
 	row_idx, col_idx = linear_sum_assignment(cost_matrix)
 	
 	# store the mapping results
-	new_idx = [[]]*30
+	new_idx = [[None]]*30
 	orig_flags = [False]*30
 	for i, j in zip(row_idx, col_idx):
 		if j < len(unassigned): # filter out dummy channels