Skip to content

Make mrc_call_python_function work for calling methods in the same class. #68

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

Merged
merged 4 commits into from
Feb 28, 2025
Merged

Make mrc_call_python_function work for calling methods in the same class. #68

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
54ac8e1
Updated block type mrc_call_python_function to support calling an ins…
lizlooney Feb 25, 2025
1f5dcfe
Address review comment about including instance_within in comments an…
lizlooney Feb 26, 2025
3953bd2
Use enum for function kind.
lizlooney Feb 26, 2025
5530863
Merge branch 'main' of github.com:wpilibsuite/systemcore-blocks-inter…
lizlooney Feb 26, 2025
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
19 changes: 19 additions & 0 deletions src/blocks/mrc_call_python_function.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const FUNCTION_KIND_MODULE = 'module';
const FUNCTION_KIND_STATIC = 'static';
const FUNCTION_KIND_CONSTRUCTOR = 'constructor';
const FUNCTION_KIND_INSTANCE = 'instance';
const FUNCTION_KIND_INSTANCE_WITHIN = 'instance_within';

const RETURN_TYPE_NONE = 'None';

Expand Down Expand Up @@ -127,6 +128,11 @@ const CALL_PYTHON_FUNCTION = {
tooltip = 'Calls the function ' + className + '.' + functionName + '.';
break;
}
case FUNCTION_KIND_INSTANCE_WITHIN: {
const functionName = this.getFieldValue(pythonUtils.FIELD_FUNCTION_NAME);
tooltip = 'Calls the method ' + functionName + '.';
break;
}
default:
throw new Error('mrcVarKind must be "module", "static", "constructor", or "instance".')
}
Expand Down Expand Up @@ -238,6 +244,11 @@ const CALL_PYTHON_FUNCTION = {
.appendField('.')
.appendField(createFieldNonEditableText(''), pythonUtils.FIELD_FUNCTION_NAME);
break;
case FUNCTION_KIND_INSTANCE_WITHIN:
this.appendDummyInput()
.appendField('call')
.appendField(createFieldNonEditableText(''), pythonUtils.FIELD_FUNCTION_NAME);
break;
default:
throw new Error('mrcVarKind must be "module", "static", "constructor", or "instance".')
}
Expand Down Expand Up @@ -301,6 +312,14 @@ export const pythonFromBlock = function(
argStartIndex = 1; // Skip the self argument.
break;
}
case FUNCTION_KIND_INSTANCE_WITHIN: {
const callPythonFunctionBlock = block as CallPythonFunctionBlock;
const functionName = (callPythonFunctionBlock.mrcActualFunctionName)
? callPythonFunctionBlock.mrcActualFunctionName
: block.getFieldValue(pythonUtils.FIELD_FUNCTION_NAME);
code = 'self.' + functionName;
break;
}
}
code += '(' + generateCodeForArguments(callPythonFunctionBlock, generator, argStartIndex) + ')';
if (block.outputConnection) {
Expand Down