Skip to content

Commit 2777b4f

Browse files
authored
Merge pull request #207 from jburel/fiji_import_win
Fiji: import image not saved on disk: windows
2 parents 8a54f76 + 421670b commit 2777b4f

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

src/main/java/org/openmicroscopy/shoola/env/data/model/FileObject.java

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,11 +260,15 @@ public File getFileToImport()
260260
//prepare command
261261
ImagePlus img = (ImagePlus) file;
262262
generated = true;
263+
StringWriter sw = new StringWriter();
264+
PrintWriter pw = new PrintWriter(sw);
263265
try {
264266
String baseName = CommonsLangUtils.deleteWhitespace(img.getTitle());
267+
baseName = baseName.replaceAll("\\.", "_");
268+
baseName = baseName.replaceAll(":", "_");
265269
String n = baseName+".ome.tif";
266-
f = File.createTempFile(baseName, ".ome.tif");
267-
File p = f.getParentFile();
270+
File ff = File.createTempFile(baseName, ".ome.tif");
271+
File p = ff.getParentFile();
268272
File[] list = p.listFiles();
269273
if (list != null) {
270274
File toDelete = null;
@@ -280,8 +284,18 @@ public File getFileToImport()
280284
}
281285
f = new File(p, n);
282286
f.deleteOnExit();
287+
ff.deleteOnExit();
283288
} catch (Exception e) {
289+
e.printStackTrace(pw);
290+
IJ.log(sw.toString());
284291
return null;
292+
} finally {
293+
try {
294+
sw.close();
295+
} catch (IOException e) {
296+
IJ.log("I/O Exception:" + e.getMessage());
297+
}
298+
pw.close();
285299
}
286300
StringBuffer buffer = new StringBuffer();
287301
buffer.append("outfile="+f.getAbsolutePath());

0 commit comments

Comments
 (0)