Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Normalized Instance Ports and Parameter States #189

Merged
merged 7 commits into from
Dec 16, 2024
Merged

Normalized Instance Ports and Parameter States #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e34350f
moved parameters to a flat map in instances reducers rather than nest…
fde31 Dec 13, 2024
7668b1a
support for removing individual parameters by path upon info from the…
fde31 Dec 13, 2024
639a24e
flatted instance inport and outports into instances reducer
fde31 Dec 13, 2024
7a85b65
renamed InstanceStateRecord to PatcherInstanceRecord
fde31 Dec 16, 2024
436f92b
consolidated instance and patcher state
fde31 Dec 16, 2024
1920e51
pass PatcherInstance.index when creating message ports
fde31 Dec 16, 2024
67ad278
renamed instances to patchers state and overall polished action and s…
fde31 Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 30 additions & 11 deletions src/actions/graph.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ import { ConnectionType, GraphConnectionRecord, GraphControlNodeRecord, GraphNod
import { getConnectionsForSourceNodeAndPort, getNode, getPatcherNodeByIndex, getNodes, getSystemNodeByJackNameAndDirection, getConnections, getPatcherNodes, getSystemNodes, getControlNodes } from "../selectors/graph";
import { showNotification } from "./notifications";
import { NotificationLevel } from "../models/notification";
import { InstanceStateRecord } from "../models/instance";
import { deleteInstance, setInstance, setInstances } from "./instances";
import { getInstance } from "../selectors/instances";
import { PatcherRecord } from "../models/patcher";
import { getPatchers } from "../selectors/patchers";
import { PatcherInstanceRecord } from "../models/instance";
import { deleteInstance, setInstance, setInstanceMessageInports, setInstanceMessageOutports, setInstanceParameters, setInstances } from "./patchers";
import { getPatcherInstance, getPatcherExports } from "../selectors/patchers";
import { PatcherExportRecord } from "../models/patcher";
import { defaultNodeGap, nodeDefaultWidth, nodeHeaderHeight } from "../lib/constants";
import { getGraphEditorInstance } from "../selectors/editor";
import { ParameterRecord } from "../models/parameter";
import { MessagePortRecord } from "../models/messageport";

const getPatcherOrControlNodeCoordinates = (node: GraphPatcherNodeRecord | GraphControlNodeRecord, nodes: GraphNodeRecord[]): { x: number, y: number } => {

Expand Down Expand Up @@ -342,7 +343,10 @@ export const initNodes = (jackPortsInfo: OSCQueryRNBOJackPortInfo, instanceInfo:
const state = getState();
const existingNodes = getNodes(state);

const instances: InstanceStateRecord[] = [];
const instances: PatcherInstanceRecord[] = [];
const instanceParameters: ParameterRecord[] = [];
const instanceMessageInports: MessagePortRecord[] = [];
const instanceMessageOutports: MessagePortRecord[] = [];
const patcherAndControlNodes: Array<GraphPatcherNodeRecord | GraphControlNodeRecord> = [];

const meta: OSCQuerySetMeta = deserializeSetMeta(instanceInfo.CONTENTS.control.CONTENTS.sets.CONTENTS.meta.VALUE as string);
Expand All @@ -356,7 +360,11 @@ export const initNodes = (jackPortsInfo: OSCQueryRNBOJackPortInfo, instanceInfo:
node = node.updatePosition(x, y);

patcherAndControlNodes.push(node);
instances.push(InstanceStateRecord.fromDescription(info));
const instance = PatcherInstanceRecord.fromDescription(info);
instances.push(instance);
instanceParameters.push(...ParameterRecord.fromDescription(instance.index, info.CONTENTS.params));
instanceMessageInports.push(...MessagePortRecord.fromDescription(instance.index, info.CONTENTS.messages?.CONTENTS?.in));
instanceMessageOutports.push(...MessagePortRecord.fromDescription(instance.index, info.CONTENTS.messages?.CONTENTS?.out));
}

// Build a list of all Jack generated names that have not been used for PatcherNodes above
Expand Down Expand Up @@ -421,6 +429,9 @@ export const initNodes = (jackPortsInfo: OSCQueryRNBOJackPortInfo, instanceInfo:
dispatch(deleteNodes(existingNodes.valueSeq().toArray()));
dispatch(setNodes([...systemNodes, ...patcherAndControlNodes]));
dispatch(setInstances(instances));
dispatch(setInstanceParameters(instanceParameters));
dispatch(setInstanceMessageInports(instanceMessageInports));
dispatch(setInstanceMessageOutports(instanceMessageOutports));
dispatch(setPortsAliases(portAliases));
};

Expand Down Expand Up @@ -533,7 +544,7 @@ export const updateSystemOrControlPortInfo = (type: ConnectionType, direction: P
let systemInputY = -defaultNodeGap;
let systemOutputY = -defaultNodeGap;

const patchers = getPatchers(state).valueSeq();
const patchers = getPatcherExports(state).valueSeq();
const missingSystemOrControlJackName = Array.from(systemOrControlJackNames.values())
.filter(name => !patchers.find(patcher => name.startsWith(`${patcher.name}-`)));

Expand Down Expand Up @@ -617,7 +628,7 @@ export const unloadPatcherNodeByIndexOnRemote = (instanceIndex: number): AppThun
}
};

export const loadPatcherNodeOnRemote = (patcher: PatcherRecord): AppThunk =>
export const loadPatcherNodeOnRemote = (patcher: PatcherExportRecord): AppThunk =>
(dispatch) => {
try {
const message = {
Expand Down Expand Up @@ -683,8 +694,15 @@ export const addPatcherNode = (desc: OSCQueryRNBOInstance, metaString: string):
dispatch(setNode(node));

// Create Instance State
const instance = InstanceStateRecord.fromDescription(desc);
const instance = PatcherInstanceRecord.fromDescription(desc);
const parameters = ParameterRecord.fromDescription(instance.index, desc.CONTENTS.params);
const messageInports = MessagePortRecord.fromDescription(instance.index, desc.CONTENTS.messages?.CONTENTS?.in);
const messageOutports = MessagePortRecord.fromDescription(instance.index, desc.CONTENTS.messages?.CONTENTS?.out);

dispatch(setInstance(instance));
dispatch(setInstanceParameters(parameters));
dispatch(setInstanceMessageInports(messageInports));
dispatch(setInstanceMessageOutports(messageOutports));
};

export const removePatcherNode = (index: number): AppThunk =>
Expand All @@ -696,8 +714,9 @@ export const removePatcherNode = (index: number): AppThunk =>
if (node?.type !== NodeType.Patcher) return;
dispatch(deleteNode(node));

const instance = getInstance(state, node.id);
const instance = getPatcherInstance(state, node.id);
if (!instance) return;

dispatch(deleteInstance(instance));
} catch (e) {
console.log(e);
Expand Down
Loading
Loading