Allow ewsc files to be imported

See fiji#9
tferr · Oct 27, 2016 · 8c5a339 · 8c5a339
1 parent 66937ef
commit 8c5a339
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/tracing/NeuriteTracerResultsDialog.java b/src/main/java/tracing/NeuriteTracerResultsDialog.java
@@ -716,7 +716,7 @@ public NeuriteTracerResultsDialog( String title,
 
 		menuBar.add(helpMenu());
 
-		loadMenuItem = new JMenuItem("Load traces / SWC file...");
+		loadMenuItem = new JMenuItem("Load traces / (e)SWC file...");
 		loadMenuItem.addActionListener(this);
 		fileMenu.add(loadMenuItem);
 

diff --git a/src/main/java/tracing/PathAndFillManager.java b/src/main/java/tracing/PathAndFillManager.java
@@ -1670,7 +1670,7 @@ public boolean importSWC( BufferedReader br, boolean assumeCoordinatesIndexVoxel
 			if( mEmpty.matches() )
 				continue;
 			String [] fields = line.split("\\s+");
-			if( fields.length != 7 ) {
+			if( fields.length < 7 ) {
 				IJ.error("Wrong number of fields ("+fields.length+") in line: "+line);
 				return false;
 			}

diff --git a/src/main/java/tracing/ShollAnalysisPlugin.java b/src/main/java/tracing/ShollAnalysisPlugin.java
@@ -106,7 +106,7 @@ public void run(final String ignoredArgument) {
 
 		imp = (impRequired) ? IJ.openImage(imgPath) : null;
 		if (impRequired && imp == null || !validTracesFile(new File(tracesPath))) {
-			IJ.error("Invalid image or invalid Traces/SWC file\n \n" + imgPath + "\n" + tracesPath);
+			IJ.error("Invalid image or invalid Traces/(e)SWC file\n \n" + imgPath + "\n" + tracesPath);
 			return;
 		}
 
@@ -254,7 +254,7 @@ private boolean showDialog() {
 			guessInitialPaths();
 
 		gd = new EnhancedGenericDialog("Sholll Analysis (Tracings)...");
-		gd.addFileField("Traces/SWC file", tracesPath, 32);
+		gd.addFileField("Traces/(e)SWC file", tracesPath, 32);
 		gd.addFileField("Image file", imgPath, 32);
 		gd.setInsets(0, 40, 20);
 		gd.addCheckbox("Load tracings without image", !impRequired);
@@ -365,7 +365,7 @@ public boolean dialogItemChanged(final GenericDialog arg0, final AWTEvent event)
 		}
 		if (!validTracesFile(new File(tracesPath))) {
 			enableOK = false;
-			warning += "Not a valid .traces/.swc file";
+			warning += "Not a valid .traces/.(e)swc file";
 		}
 		if (!warning.isEmpty()) {
 			infoMsg.setForeground(Utils.warningColor());
@@ -426,7 +426,7 @@ private boolean expectedImageFile(final File file) {
 	}
 
 	private boolean tracingsFile(final File file) {
-		final String[] tracingsExts = new String[] { ".traces", ".swc" };
+		final String[] tracingsExts = new String[] { ".traces", ".swc", ".eswc" };
 		for (final String ext : tracingsExts)
 			if (file.getName().toLowerCase().endsWith(ext))
 				return true;

diff --git a/src/main/java/tracing/SimpleNeuriteTracer.java b/src/main/java/tracing/SimpleNeuriteTracer.java
@@ -489,7 +489,7 @@ synchronized public void loadTracings( ) {
 
 		OpenDialog od;
 
-		od = new OpenDialog("Select .traces or .swc file...",
+		od = new OpenDialog("Select .traces or .(e)swc file...",
 				    directory,
 				    null );