Changeset 7075
- Timestamp:
- 10/14/10 18:23:51 (9 years ago)
- Location:
- trunk/components
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/components/bio-formats/src/loci/formats/FilePattern.java
r7071 r7075 161 161 buildFiles("", num, fileList); 162 162 files = fileList.toArray(new String[0]); 163 164 if (files.length == 0 && new Location(pattern).exists()) { 165 files = new String[] {pattern}; 166 } 163 167 164 168 valid = true; … … 448 452 { 449 453 String baseSuffix = base.substring(base.lastIndexOf(File.separator) + 1); 450 baseSuffix = baseSuffix.substring(baseSuffix.indexOf(".") + 1); 454 int dot = baseSuffix.indexOf("."); 455 if (dot < 0) baseSuffix = ""; 456 else baseSuffix = baseSuffix.substring(dot + 1); 451 457 452 458 ArrayList<String> patterns = new ArrayList<String>(); … … 457 463 if (start < 0) start = 0; 458 464 String patternSuffix = pattern.substring(start); 459 patternSuffix = patternSuffix.substring(patternSuffix.indexOf(".") + 1); 465 dot = patternSuffix.indexOf("."); 466 if (dot < 0) patternSuffix = ""; 467 else patternSuffix = patternSuffix.substring(dot + 1); 468 469 String checkPattern = findPattern(name, dir, nameList); 470 String[] checkFiles = new FilePattern(checkPattern).getFiles(); 460 471 461 472 if (!patterns.contains(pattern) && (!new Location(pattern).exists() || 462 base.equals(pattern)) && patternSuffix.equals(baseSuffix)) 473 base.equals(pattern)) && patternSuffix.equals(baseSuffix) && 474 DataTools.indexOf(checkFiles, base) >= 0) 463 475 { 464 476 patterns.add(pattern); -
trunk/components/bio-formats/src/loci/formats/FileStitcher.java
r7070 r7075 708 708 LOGGER.debug("initFile: {}", id); 709 709 710 String[] patterns = findPatterns(id); 711 externals = new ExternalSeries[patterns.length]; 712 713 for (int i=0; i<externals.length; i++) { 714 externals[i] = new ExternalSeries(new FilePattern(patterns[i])); 715 } 716 717 FilePattern fp = new FilePattern(patterns[0]); 710 FilePattern fp = new FilePattern(id); 718 711 719 712 boolean mustGroup = false; … … 735 728 return; 736 729 } 730 731 String[] patterns = findPatterns(id); 732 if (patterns.length == 0) patterns = new String[] {id}; 733 externals = new ExternalSeries[patterns.length]; 734 735 for (int i=0; i<externals.length; i++) { 736 externals[i] = new ExternalSeries(new FilePattern(patterns[i])); 737 } 738 fp = new FilePattern(patterns[0]); 739 737 740 reader.close(); 738 741 reader.setGroupFiles(false); … … 854 857 store = reader.getMetadataStore(); 855 858 // don't overwrite pixel info if files aren't actually grouped 856 if (!noStitch && externals.length > 1) {859 if (!noStitch) { 857 860 MetadataTools.populatePixels(store, this); 858 861 for (int i=0; i<getSeriesCount(); i++) { -
trunk/components/bio-formats/src/loci/formats/in/BioRadReader.java
r7063 r7075 278 278 in = new RandomAccessInputStream(id); 279 279 in.order(true); 280 281 /* debug */ System.out.println("initializing .pic file: " + id);282 280 283 281 offset = new Vector<Double>(); -
trunk/components/test-suite/src/loci/tests/testng/FormatReaderTest.java
r6881 r7075 942 942 private boolean initFile() { 943 943 if (skip) throw new SkipException(SKIP_MESSAGE); 944 945 // initialize configuration tree 946 if (config != null) config.setId(id); 947 944 948 if (reader == null) { 945 reader = new BufferedImageReader(new FileStitcher()); 949 if (config.noStitching()) { 950 reader = new BufferedImageReader(); 951 } 952 else { 953 reader = new BufferedImageReader(new FileStitcher()); 954 } 946 955 reader.setNormalized(true); 947 956 reader.setMetadataFiltered(true); … … 985 994 LOGGER.error("Used files list does not include base file"); 986 995 } 987 988 // initialize configuration tree989 if (config != null) config.setId(id);990 996 } 991 997 catch (Throwable t) {
Note: See TracChangeset
for help on using the changeset viewer.