Added CueSheet UIPanel

Author: Liam Sherwin

components/CueItem/CueItem.gd

@@ -151,7 +151,7 @@ func _on_active_cue_changed(cue: Cue) -> void:
 
 	elif _is_enabled: 
 		var fade_time: float = 0
-		fade_time = _cue_list.get_global_fade_speed() if _cue_list.get_global_fade_state() else _cue.get_fade_time()
+		fade_time = _cue_list.get_global_fade_speed() if _cue_list.get_global_fade_state() else cue.get_fade_time()
 
 		set_status_bar(false, fade_time)
 		$Selected.hide()

components/IntensityButton/IntensityButton.gd

@@ -15,19 +15,23 @@ class_name IntensityButton extends Button
 ## The function to control
 var function: Function = null : set = set_function
 
-
 ## The last value used
 var _last_value: float = 0
 
 
 ## Disable the process at startup
-func _ready() -> void: set_process(false)
+func _ready() -> void: 
+	set_process(false)
 
 
 ## Sets the function
 func set_function(p_function: Function) -> void:
-	if is_instance_valid(function): function.intensity_changed.disconnect(_on_function_intensity_changed)
+	if is_instance_valid(function): 
+		function.intensity_changed.disconnect(_on_function_intensity_changed)
+	
 	function = p_function
+	disabled = not is_instance_valid(function)
+	
 	if is_instance_valid(function): 
 		function.intensity_changed.connect(_on_function_intensity_changed)
 		$ProgressBar.value = function.get_intensity()

core/components/containers/Cue.gd

@@ -93,6 +93,7 @@ func set_tracking_mode(p_tracking_mode: TrackingMode) -> Promise:
 func get_qid() -> String:
 	return _qid
 
+
 ## Returns the fade time in seconds
 func get_fade_time() -> float:
 	return _fade_time

core/components/containers/DataContainer.gd

@@ -128,7 +128,7 @@ func _store_item(p_item: ContainerItem, no_signal: bool = false) -> bool:
 	_items.append(p_item)
 	_fixture.get_or_add(p_item.get_fixture(), {}).get_or_add(p_item.get_zone(), {})[p_item.get_parameter()] = p_item
 
-	ComponentDB.register_component(p_item)
+	#ComponentDB.register_component(p_item)
 	p_item.delete_requested.connect(_erase_item.bind(p_item))
 
 	if not no_signal:

core/components/functions/CueList.gd

@@ -81,7 +81,7 @@ func _component_ready() -> void:
 	register_callback("on_loop_mode_changed", _set_loop_mode)
 	register_callback("on_cues_added", _add_cues)
 	register_callback("on_cues_removed", _remove_cues)
-	register_callback("cue_order_changed", _set_cue_position)
+	register_callback("on_cue_order_changed", _set_cue_position)
 
 	register_control_method("go_previous", go_previous)
 	register_control_method("go_next", go_next)
@@ -153,6 +153,11 @@ func get_loop_mode() -> LoopMode:
 	return _loop_mode
 
 
+## Gets the position of a cue
+func get_cue_position(p_cue: Cue) -> int:
+	return _cues.find(p_cue)
+
+
 ## Gets whether triggered cues can loop back to the start
 func get_allow_triggered_looping() -> bool:
 	return _allow_triggered_looping
@@ -178,6 +183,11 @@ func get_global_pre_wait_speed() -> float:
 	return _global_pre_wait
 
 
+## Gets the active cue, or null
+func get_active_cue() -> Cue:
+	return _active_cue
+
+
 ## Server: Seeks to the next cue in the list
 func go_next() -> Promise:
 	return rpc("go_next", [])
@@ -247,15 +257,15 @@ func _remove_cues(p_cues: Array) -> void:
 
 
 ## Internal: Sets the position of a cue in the list
-func _set_cue_position(cue: Cue, position: int) -> void:
-	if cue not in _cues:
+func _set_cue_position(p_cue: Cue, p_position: int) -> void:
+	if p_cue not in _cues or p_position > len(_cues):
 		return
 
-	var old_index: int = _cues.find(cue)
-	_cues.insert(position, cue)
+	var old_index: int = _cues.find(p_cue)
 	_cues.remove_at(old_index)
+	_cues.insert(p_position, p_cue)
 
-	cue_order_changed.emit(cue, position)
+	cue_order_changed.emit(p_cue, p_position)
 
 
 ## Internal: Sets whether triggered cues can loop back to the start
@@ -339,8 +349,13 @@ func _load_request(serialized_data: Dictionary) -> void:
 	_global_pre_wait = type_convert(serialized_data.get("global_pre_wait", _global_pre_wait), TYPE_FLOAT)
 	_allow_triggered_looping = type_convert(serialized_data.get("allow_triggered_looping", _allow_triggered_looping), TYPE_BOOL)
 	_loop_mode = type_convert(serialized_data.get("loop_mode", _loop_mode), TYPE_INT)
-
+	
 	_add_cues(Utils.deseralise_component_array(type_convert(serialized_data.get("cues", []), TYPE_ARRAY)))
+	
+	var active_cue: EngineComponent = ComponentDB.get_component(type_convert(serialized_data.get("active_cue_uuid", ""), TYPE_STRING))
+	
+	if _cues.has(active_cue):
+		_active_cue = active_cue
 
 
 ## Called when this CueList is to be deleted

core/types/RefMap.gd

@@ -12,6 +12,11 @@ var _left: Dictionary = {}
 var _right: Dictionary = {}
 
 
+## Init
+func _init(left_type: Variant = null, right_type: Variant = null) -> void:
+	pass
+
+
 ## Maps 2 items, returning false if the map failed
 func map(left: Variant, right: Variant) -> void:
 	_left[left] = right

panels/CuePlayback/CuePlayback.gd

@@ -29,6 +29,7 @@ var _signal_connections: Dictionary = {
 	"cues_added": _reload_cues,
 	"cues_removed": _reload_cues,
 	"active_cue_changed": _scroll_to_cue,
+	"cue_order_changed": _move_cue_to,
 	"delete_request": set_cue_list.bind(null)
 }
 
@@ -69,6 +70,12 @@ func _scroll_to_cue(p_cue: Cue) -> void:
 	_cue_container.get_parent_control().scroll_vertical = cue_item.position.y - cue_item.size.y
 
 
+## Moves a given cue to a given position
+func _move_cue_to(p_cue: Cue, p_position: int) -> void:
+	var cue_item: CueItem = _cues[p_cue.uuid]
+	_cue_container.move_child(cue_item, p_position)
+
+
 ## Called when the Go Previous button is pressed
 func _on_previous_pressed() -> void: 
 	_cue_list.go_previous()