Skip to content

Prepare public release #15

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
imagejan merged 3 commits into from
Jun 26, 2018
Merged

Prepare public release #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1713385
Remove outputFolder parameter as it is not used currently
imagejan Jun 20, 2018
f350235
Handle invalid folder locations in callback
imagejan Jun 26, 2018
27ee285
Use BatchService to retrieve compatible inputs in ScriptInfo widget
imagejan Jun 26, 2018
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
8 changes: 5 additions & 3 deletions src/main/java/org/scijava/batch/FileScriptBatchProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ public class FileScriptBatchProcessor extends DynamicCommand {
@Parameter(visibility = ItemVisibility.MESSAGE, persist = false)
private String message = " "; // Placeholder message

@Parameter(label = "Output directory", style = FileWidget.DIRECTORY_STYLE, required = false)
private File outputFolder;
// @Parameter(label = "Output directory", style = FileWidget.DIRECTORY_STYLE, required = false)
// private File outputFolder;

private List<File> fileList;
private ModuleInfo moduleInfo;
Expand All @@ -80,7 +80,7 @@ public void run() {
inputMap.put("moduleInfo", moduleInfo);
File[] fileArray = fileList.toArray(new File[fileList.size()]);
inputMap.put("inputFileList", fileArray);
inputMap.put("outputFolder", outputFolder);
// inputMap.put("outputFolder", outputFolder);
commands.run(ModuleBatchProcessor.class, true, inputMap);
}

Expand All @@ -105,6 +105,8 @@ private List<File> populateFileList(File folder, FilenameFilter filter, boolean
* Count all applicable files and display them in the dialog message
*/
protected void directoryCallback() {
if (inputFolder == null || !inputFolder.exists()) return;

// get list of all applicable files
FilenameFilter inputFilter;
try {
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/org/scijava/batch/MenuScriptBatchProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ public class MenuScriptBatchProcessor extends DynamicCommand {
@Parameter(visibility = ItemVisibility.MESSAGE, persist = false)
private String message = " "; // Placeholder message

@Parameter(label = "Output directory", style = FileWidget.DIRECTORY_STYLE, required = false)
private File outputFolder;
// @Parameter(label = "Output directory", style = FileWidget.DIRECTORY_STYLE, required = false)
// private File outputFolder;

private List<File> fileList;

Expand All @@ -58,7 +58,7 @@ public void run() {
inputMap.put("moduleInfo", scriptInfo);
File[] fileArray = fileList.toArray(new File[fileList.size()]);
inputMap.put("inputFileList", fileArray);
inputMap.put("outputFolder", outputFolder);
// inputMap.put("outputFolder", outputFolder);
commands.run(ModuleBatchProcessor.class, true, inputMap);
}

Expand All @@ -85,6 +85,8 @@ private List<File> populateFileList(File folder, FilenameFilter filter,
* Count all applicable files and display them in the dialog message
*/
protected void directoryCallback() {
if (inputFolder == null || !inputFolder.exists()) return;

// get list of all applicable files
FilenameFilter inputFilter;
try {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/scijava/batch/ModuleBatchProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ public class ModuleBatchProcessor extends DynamicCommand {
@Parameter(label = "Input files")
private File[] inputFileList;

@Parameter(label = "Output directory", style = FileWidget.DIRECTORY_STYLE, required = false)
private File outputFolder;
// @Parameter(label = "Output directory", style = FileWidget.DIRECTORY_STYLE, required = false)
// private File outputFolder;

@SuppressWarnings("rawtypes")
@Parameter(type = ItemIO.OUTPUT)
Expand Down
42 changes: 9 additions & 33 deletions src/main/java/org/scijava/batch/SwingScriptInfoWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,16 @@

import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import javax.swing.JComboBox;
import javax.swing.JPanel;

import org.scijava.Priority;
import org.scijava.convert.ConvertService;
import org.scijava.log.LogService;
import org.scijava.module.Module;
import org.scijava.module.ModuleService;
import org.scijava.module.ModuleItem;
import org.scijava.plugin.Parameter;
import org.scijava.plugin.Plugin;
import org.scijava.script.ScriptInfo;
Expand All @@ -22,18 +20,15 @@
import org.scijava.widget.InputWidget;
import org.scijava.widget.WidgetModel;

@Plugin(type = InputWidget.class, priority = Priority.NORMAL_PRIORITY)
@Plugin(type = InputWidget.class, priority = Priority.NORMAL)
public class SwingScriptInfoWidget extends SwingInputWidget<ScriptInfo>
implements ActionListener, ScriptInfoWidget<JPanel> {

@Parameter
private ScriptService scripts;
private ScriptService scriptService;

@Parameter
private ModuleService modules;

@Parameter
private ConvertService convert;
private BatchService batchService;

@Parameter
private LogService log;
Expand All @@ -55,30 +50,11 @@ public void actionPerformed(final ActionEvent e) {
public void set(final WidgetModel model) {
super.set(model);

// get required class from style attribute
String style = model.getItem().getWidgetStyle();
if (style == null) {
style = "java.io.File"; // default to File
}
Class<?> inputType;
try {
inputType = Class.forName(style);
} catch (ClassNotFoundException exc) {
log.warn("Wrong style attribute: ", exc);
inputType = File.class;
}

// create script map
for (ScriptInfo script : scripts.getScripts()) {
Module scriptModule = modules.createModule(script);
for (String inputItem : scriptModule.getInputs().keySet()) {
// TODO consider replacing by isAssignableFrom
if (convert.supports(inputType, script.getInput(inputItem).getType())) {
//if (script.getInput(inputItem).getType().isAssignableFrom(inputType)) {
log.info("Support conversion from " + inputType + " to " + script.getInput(inputItem).getType());
scriptMap.put(script.getMenuPath().getMenuString(), script);
break;
}
for (ScriptInfo script : scriptService.getScripts()) {
List<ModuleItem<?>> compatibleInputs = batchService.batchableInputs(script);
if (!compatibleInputs.isEmpty()) {
scriptMap.put(script.getMenuPath().getMenuString(), script);
}
}

Expand Down