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

Jump to bottom

MacroPreprocessor: resolve Button type inputs #262

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

MacroPreprocessor: resolve Button type inputs #262

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion src/main/java/net/imagej/legacy/plugin/MacroPreprocessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.scijava.module.process.PreprocessorPlugin;
import org.scijava.plugin.Parameter;
import org.scijava.plugin.Plugin;
import org.scijava.widget.Button;

/**
* Populates the module's input values, when the command is invoked from an
Expand Down Expand Up @@ -67,12 +68,16 @@ public void process(final Module module) {
if (!ij1Helper.isMacro()) return;
for (final ModuleItem<?> input : module.getInfo().inputs()) {
final String name = input.getName();
final Class<?> type = input.getType();
final String value = ij1Helper.getMacroParameter(name);
if (value == null) {
// no macro parameter value provided
if (type.equals(Button.class)) {
// skip if input is a button
module.resolveInput(name);
}
continue;
}
final Class<?> type = input.getType();
if (!convertService.supports(value, type)) {
// cannot convert macro value into the input's actual type
continue;
Expand Down