Changeset 6660


Ignore:
Timestamp:
07/07/10 12:01:06 (9 years ago)
Author:
curtis
Message:

Remove unnecessary thumbnail autoscaling logic.

Location:
trunk/components/loci-plugins/src/loci/plugins/in
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/loci-plugins/src/loci/plugins/in/SeriesDialog.java

    r6588 r6660  
    132132        if (options.isForceThumbnails()) { 
    133133          // load thumbnail immediately 
    134           ThumbLoader.loadThumb(thumbReader, 
    135             i, p[i], options.isQuiet(), options.isAutoscale()); 
     134          ThumbLoader.loadThumb(thumbReader, i, p[i], options.isQuiet()); 
    136135        } 
    137136      } 
     
    174173    if (thumbReader != null && !options.isForceThumbnails()) { 
    175174      // spawn background thumbnail loader 
    176       loader = new ThumbLoader(thumbReader, p, gd, options.isAutoscale()); 
     175      loader = new ThumbLoader(thumbReader, p, gd); 
    177176    } 
    178177    gd.showDialog(); 
  • trunk/components/loci-plugins/src/loci/plugins/in/ThumbLoader.java

    r6659 r6660  
    3737import loci.common.DebugTools; 
    3838import loci.formats.FormatException; 
    39 import loci.formats.FormatTools; 
    4039import loci.formats.IFormatReader; 
    4140import loci.formats.gui.AWTImageTools; 
     
    5857  private Panel[] p; 
    5958  private Dialog dialog; 
    60   private boolean scale; 
    6159  private boolean stop; 
    6260  private Thread loader; 
     
    7068   * @param dialog the dialog containing the panels 
    7169   */ 
    72   public ThumbLoader(IFormatReader ir, Panel[] p, Dialog dialog, boolean scale) 
    73   { 
     70  public ThumbLoader(IFormatReader ir, Panel[] p, Dialog dialog) { 
    7471    this.ir = BufferedImageReader.makeBufferedImageReader(ir); 
    7572    this.p = p; 
    7673    this.dialog = dialog; 
    77     this.scale = scale; 
    7874    loader = new Thread(this, "BioFormats-ThumbLoader"); 
    7975    loader.start(); 
     
    118114      if (stop) return; 
    119115      final int ii = info[i].index; 
    120       loadThumb(ir, ii, p[ii], false, scale); 
     116      loadThumb(ir, ii, p[ii], false); 
    121117      if (dialog != null) dialog.validate(); 
    122118    } 
     
    126122 
    127123  public static void loadThumb(BufferedImageReader thumbReader, 
    128     int series, Panel panel, boolean quiet, boolean autoscale) 
     124    int series, Panel panel, boolean quiet) 
    129125  { 
    130126    BF.status(quiet, "Reading thumbnail for series #" + (series + 1)); 
     
    137133    try { 
    138134      BufferedImage thumb = thumbReader.openThumbImage(ndx); 
    139       boolean notFloat = thumbReader.getPixelType() != FormatTools.FLOAT; 
    140135      thumb = AWTImageTools.autoscale(thumb); 
    141136      ImageIcon icon = new ImageIcon(thumb); 
Note: See TracChangeset for help on using the changeset viewer.