Changeset 2660


Ignore:
Timestamp:
04/23/07 13:32:00 (13 years ago)
Author:
curtis
Message:

Eliminate use of term "stitch" in favor of terms "group" and "concatenate."

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/plugins/Importer.java

    r2652 r2660  
    7474  private Checkbox splitBox; 
    7575  private Checkbox metadataBox; 
    76   private Checkbox stitchBox; 
    77   private Checkbox stitchStackBox; 
     76  private Checkbox groupBox; 
     77  private Checkbox concatenateBox; 
    7878  private Checkbox rangeBox; 
    7979  private Choice stackChoice; 
    8080  private boolean mergeChannels; 
    81   private boolean stitchStack; 
     81  private boolean concatenate; 
    8282 
    8383  private Vector imps = new Vector(); 
     
    228228    boolean splitWindows = Prefs.get("bioformats.splitWindows", true); 
    229229    boolean showMetadata = Prefs.get("bioformats.showMetadata", false); 
    230     boolean stitchFiles = Prefs.get("bioformats.stitchFiles", false); 
    231     stitchStack = Prefs.get("bioformats.stitchStack", false); 
     230    boolean groupFiles = Prefs.get("bioformats.groupFiles", false); 
     231    concatenate = Prefs.get("bioformats.concatenate", false); 
    232232    boolean specifyRanges = Prefs.get("bioformats.specifyRanges", false); 
    233233    stackFormat = Prefs.get("bioformats.stackFormat", VIEW_STANDARD); 
     
    237237    final String splitString = "Open each channel in its own window"; 
    238238    final String metadataString = "Display associated metadata"; 
    239     final String stitchString = "Stitch files with similar names"; 
    240     final String stitchStackString = "Stitch compatible series"; 
     239    final String groupString = "Group files with similar names"; 
     240    final String concatenateString = "Concatenate compatible series"; 
    241241    final String rangeString = "Specify range for each series"; 
    242242    final String stackString = "View stack with: "; 
     
    248248    gd.addCheckbox(splitString, splitWindows); 
    249249    gd.addCheckbox(metadataString, showMetadata); 
    250     gd.addCheckbox(stitchString, stitchFiles); 
    251     gd.addCheckbox(stitchStackString, stitchStack); 
     250    gd.addCheckbox(groupString, groupFiles); 
     251    gd.addCheckbox(concatenateString, concatenate); 
    252252    gd.addCheckbox(rangeString, specifyRanges); 
    253253    gd.addChoice(stackString, stackFormats, stackFormat); 
     
    260260      splitBox = (Checkbox) boxes.get(2); 
    261261      metadataBox = (Checkbox) boxes.get(3); 
    262       stitchBox = (Checkbox) boxes.get(4); 
    263       stitchStackBox = (Checkbox) boxes.get(5); 
     262      groupBox = (Checkbox) boxes.get(4); 
     263      concatenateBox = (Checkbox) boxes.get(5); 
    264264      rangeBox = (Checkbox) boxes.get(6); 
    265265      for (int i=0; i<boxes.size(); i++) { 
     
    284284    splitWindows = gd.getNextBoolean(); 
    285285    showMetadata = gd.getNextBoolean(); 
    286     stitchFiles = gd.getNextBoolean(); 
    287     stitchStack = gd.getNextBoolean(); 
     286    groupFiles = gd.getNextBoolean(); 
     287    concatenate = gd.getNextBoolean(); 
    288288    specifyRanges = gd.getNextBoolean(); 
    289289    stackFormat = stackFormats[gd.getNextChoiceIndex()]; 
     
    305305      String currentFile = r.getCurrentFile(); 
    306306 
    307       if (stitchFiles) { 
     307      if (groupFiles) { 
    308308        fs = new FileStitcher(r, true); 
    309309        // prompt user to confirm detected file pattern 
     
    451451        } 
    452452 
    453         if (stitchStack) { 
     453        if (concatenate) { 
    454454          for (int i=0; i<seriesCount; i++) { 
    455455            if (!series[i]) { 
     
    883883        } 
    884884 
    885         if (stitchStack) { 
     885        if (concatenate) { 
    886886          Vector widths = new Vector(); 
    887887          Vector heights = new Vector(); 
     
    937937      Prefs.set("bioformats.splitWindows", splitWindows); 
    938938      Prefs.set("bioformats.showMetadata", showMetadata); 
    939       Prefs.set("bioformats.stitchFiles", stitchFiles); 
    940       Prefs.set("bioformats.stitchStack", stitchStack); 
     939      Prefs.set("bioformats.groupFiles", groupFiles); 
     940      Prefs.set("bioformats.concatenate", concatenate); 
    941941      Prefs.set("bioformats.specifyRanges", specifyRanges); 
    942942      Prefs.set("bioformats.stackFormat", stackFormat); 
     
    995995      } 
    996996    } 
    997     else if (src == stitchBox) { 
     997    else if (src == groupBox) { 
     998    } 
     999    else if (src == concatenateBox) { 
    9981000    } 
    9991001    else if (src == rangeBox) { 
     
    12201222        imp.getNSlices(), imp.getNFrames()); 
    12211223      if (stackFormat.equals(VIEW_STANDARD)) { 
    1222         if (!stitchStack) imp.show(); 
     1224        if (!concatenate) imp.show(); 
    12231225        else imps.add(imp); 
    12241226      } 
     
    12901292    catch (Exception e) { 
    12911293      /* debug */ e.printStackTrace();  
    1292       if (!stitchStack) imp.show(); 
     1294      if (!concatenate) imp.show(); 
    12931295      else imps.add(imp); 
    12941296    } 
Note: See TracChangeset for help on using the changeset viewer.