Changeset 3277


Ignore:
Timestamp:
10/15/07 12:33:20 (12 years ago)
Author:
curtis
Message:

Fix problems with duplicate macro options.

Location:
trunk/loci/plugins
Files:
2 edited

Legend:

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

    r3276 r3277  
    630630 
    631631    int step = 1; 
    632     if (range) { 
    633       step = c; 
    634       c = r.getSizeC(); 
    635     } 
     632    if (range) step = c = r.getSizeC(); 
    636633 
    637634    ImageStack[] newStacks = new ImageStack[c]; 
  • trunk/loci/plugins/ImporterOptions.java

    r3244 r3277  
    101101  public static final String PREF_CONCATENATE = "bioformats.concatenate"; 
    102102  public static final String PREF_RANGE = "bioformats.specifyRanges"; 
     103  public static final String PREF_AUTOSCALE = "bioformats.autoscale"; 
    103104  public static final String PREF_THUMBNAIL = "bioformats.forceThumbnails"; 
    104105  public static final String PREF_MERGE_OPTION = "bioformats.mergeOption"; 
    105   public static final String PREF_AUTOSCALE = "bioformats.autoscale"; 
    106106 
    107107  // labels for user dialog; when trimmed these double as argument & macro keys 
    108108  public static final String LABEL_STACK = "View stack with: "; 
    109   public static final String LABEL_ORDER = "Stack order: "; 
    110   public static final String LABEL_MERGE = "Merge channels to RGB"; 
     109  public static final String LABEL_ORDER = "Stack_order: "; 
     110  public static final String LABEL_MERGE = "Merge_channels to RGB"; 
    111111  public static final String LABEL_COLORIZE = "Colorize channels"; 
    112112  public static final String LABEL_SPLIT = 
    113     "Open each channel in its own window"; 
     113    "Split_channels into separate windows"; 
    114114  public static final String LABEL_INDIVIDUAL = 
    115     "Open each plane in its own window"; 
    116   public static final String LABEL_SWAP = "Specify stack organization";  
    117   public static final String LABEL_METADATA = "Display associated metadata"; 
    118   public static final String LABEL_GROUP = "Group files with similar names"; 
     115    "Split_planes into separate windows"; 
     116  public static final String LABEL_SWAP = "Specify_stack organization";  
     117  public static final String LABEL_METADATA = 
     118    "Display_metadata in results window"; 
     119  public static final String LABEL_GROUP = "Group_files with similar names"; 
    119120  public static final String LABEL_CONCATENATE = 
    120     "Concatenate compatible series"; 
    121   public static final String LABEL_RANGE = "Specify range for each series"; 
     121    "Concatenate_series when compatible"; 
     122  public static final String LABEL_RANGE = "Specify_range for each series"; 
    122123  public static final String LABEL_AUTOSCALE = "Autoscale images"; 
    123124 
Note: See TracChangeset for help on using the changeset viewer.