Changeset 6659


Ignore:
Timestamp:
07/07/10 11:54:55 (9 years ago)
Author:
curtis
Message:

Disable 'Record modifications to virtual stack' option (broken anyway).

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

Legend:

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

    r6657 r6659  
    4848import loci.plugins.BF; 
    4949import loci.plugins.util.ImageProcessorReader; 
     50import loci.plugins.util.VirtualImagePlus; 
    5051 
    5152/** 
     
    177178 
    178179  private void applyDisplayRanges(ImagePlus imp, int series) { 
     180    if (imp instanceof VirtualImagePlus) { 
     181      // virtual stacks handle their own display ranges 
     182      return; 
     183    } 
     184 
    179185    final ImporterOptions options = process.getOptions(); 
    180186    final ImageProcessorReader reader = process.getReader(); 
  • trunk/components/loci-plugins/src/loci/plugins/in/ImagePlusReader.java

    r6654 r6659  
    311311    // CTR FIXME: Make virtual stack work with different color modes? 
    312312    final BFVirtualStack virtualStack = new BFVirtualStack(options.getId(), 
    313       reader, false, false, options.isRecord()); 
     313      reader, false, false, false); 
    314314    for (int i=0; i<imageCount; i++) { 
    315315      final String label = constructSliceLabel(i, 
  • trunk/components/loci-plugins/src/loci/plugins/in/ImporterOptions.java

    r6604 r6659  
    6464  public static final String KEY_OPEN_ALL_SERIES = "openAllSeries"; 
    6565  public static final String KEY_QUIET           = "quiet"; 
    66   public static final String KEY_RECORD          = "record"; 
     66  //public static final String KEY_RECORD          = "record"; 
    6767  public static final String KEY_SERIES          = "series"; 
    6868  public static final String KEY_SHOW_METADATA   = "showMetadata"; 
     
    303303 
    304304  // record 
    305   public String getRecordInfo() { return getInfo(KEY_RECORD); } 
    306   public boolean isRecord() { return isSet(KEY_RECORD); } 
    307   public void setRecord(boolean b) { setValue(KEY_RECORD, b); } 
     305  //public String getRecordInfo() { return getInfo(KEY_RECORD); } 
     306  //public boolean isRecord() { return isSet(KEY_RECORD); } 
     307  //public void setRecord(boolean b) { setValue(KEY_RECORD, b); } 
    308308 
    309309  // series 
  • trunk/components/loci-plugins/src/loci/plugins/in/MainDialog.java

    r6604 r6659  
    8080  protected Checkbox ungroupFilesBox; 
    8181  protected Checkbox openAllSeriesBox; 
    82   protected Checkbox recordBox; 
     82  //protected Checkbox recordBox; 
    8383  protected Checkbox showMetadataBox; 
    8484  protected Checkbox showOMEXMLBox; 
     
    121121    addCheckbox(gd, ImporterOptions.KEY_OPEN_ALL_SERIES); 
    122122    addCheckbox(gd, ImporterOptions.KEY_QUIET); // NB: invisible 
    123     addCheckbox(gd, ImporterOptions.KEY_RECORD); 
     123    //addCheckbox(gd, ImporterOptions.KEY_RECORD); 
    124124    addCheckbox(gd, ImporterOptions.KEY_SHOW_METADATA); 
    125125    addCheckbox(gd, ImporterOptions.KEY_SHOW_OME_XML); 
     
    147147    options.setOpenAllSeries(gd.getNextBoolean()); 
    148148    options.setQuiet(gd.getNextBoolean()); // NB: invisible 
    149     options.setRecord(gd.getNextBoolean()); 
     149    //options.setRecord(gd.getNextBoolean()); 
    150150    options.setShowMetadata(gd.getNextBoolean()); 
    151151    options.setShowOMEXML(gd.getNextBoolean()); 
     
    239239      openAllSeriesBox  = boxes.get(boxIndex++); 
    240240      boxIndex++; // quiet 
    241       recordBox         = boxes.get(boxIndex++); 
     241      //recordBox         = boxes.get(boxIndex++); 
    242242      showMetadataBox   = boxes.get(boxIndex++); 
    243243      showOMEXMLBox     = boxes.get(boxIndex++); 
     
    269269    infoTable.put(ungroupFilesBox, options.getUngroupFilesInfo()); 
    270270    infoTable.put(openAllSeriesBox, options.getOpenAllSeriesInfo()); 
    271     infoTable.put(recordBox, options.getRecordInfo()); 
     271    //infoTable.put(recordBox, options.getRecordInfo()); 
    272272    infoTable.put(showMetadataBox, options.getShowMetadataInfo()); 
    273273    infoTable.put(showOMEXMLBox, options.getShowOMEXMLInfo()); 
     
    354354    builder.add(virtualBox, xyw(cc, 5, row, 1)); 
    355355    row += 2; 
    356     builder.add(recordBox, xyw(cc, 5, row, 1)); 
    357     row += 2; 
     356    //builder.add(recordBox, xyw(cc, 5, row, 1)); 
     357    //row += 2; 
    358358    builder.add(specifyRangesBox, xyw(cc, 5, row, 1)); 
    359359    row += 2; 
     
    405405    boolean ungroupFilesEnabled = ungroupFilesBox.isEnabled(); 
    406406    boolean openAllSeriesEnabled = openAllSeriesBox.isEnabled(); 
    407     boolean recordEnabled = recordBox.isEnabled(); 
     407    //boolean recordEnabled = recordBox.isEnabled(); 
    408408    boolean showMetadataEnabled = showMetadataBox.isEnabled(); 
    409409    boolean showOMEXMLEnabled = showOMEXMLBox.isEnabled(); 
     
    424424    boolean isUngroupFiles = ungroupFilesBox.getState(); 
    425425    boolean isOpenAllSeries = openAllSeriesBox.getState(); 
    426     boolean isRecord = recordBox.getState(); 
     426    //boolean isRecord = recordBox.getState(); 
    427427    boolean isShowMetadata = showMetadataBox.getState(); 
    428428    boolean isShowOMEXML = showOMEXMLBox.getState(); 
     
    506506 
    507507    // recordBox 
    508     recordEnabled = isVirtual; 
    509     if (!recordEnabled) isRecord = false; 
     508    //recordEnabled = isVirtual; 
     509    //if (!recordEnabled) isRecord = false; 
    510510 
    511511    // specifyRangesBox 
     
    554554    ungroupFilesBox.setEnabled(ungroupFilesEnabled); 
    555555    openAllSeriesBox.setEnabled(openAllSeriesEnabled); 
    556     recordBox.setEnabled(recordEnabled); 
     556    //recordBox.setEnabled(recordEnabled); 
    557557    showMetadataBox.setEnabled(showMetadataEnabled); 
    558558    showOMEXMLBox.setEnabled(showOMEXMLEnabled); 
     
    573573    ungroupFilesBox.setState(isUngroupFiles); 
    574574    openAllSeriesBox.setState(isOpenAllSeries); 
    575     recordBox.setState(isRecord); 
     575    //recordBox.setState(isRecord); 
    576576    showMetadataBox.setState(isShowMetadata); 
    577577    showOMEXMLBox.setState(isShowOMEXML); 
     
    597597        ungroupFilesBox, 
    598598        openAllSeriesBox, 
    599         recordBox, 
     599        //recordBox, 
    600600        showMetadataBox, 
    601601        showOMEXMLBox, 
  • trunk/components/loci-plugins/src/loci/plugins/in/ThumbLoader.java

    r6595 r6659  
    138138      BufferedImage thumb = thumbReader.openThumbImage(ndx); 
    139139      boolean notFloat = thumbReader.getPixelType() != FormatTools.FLOAT; 
    140       if (autoscale && notFloat) thumb = AWTImageTools.autoscale(thumb); 
     140      thumb = AWTImageTools.autoscale(thumb); 
    141141      ImageIcon icon = new ImageIcon(thumb); 
    142142      panel.removeAll(); 
  • trunk/components/loci-plugins/src/loci/plugins/in/importer-options.txt

    r6610 r6659  
    160160default = false 
    161161 
    162 [record] 
    163 type = boolean 
    164 label = Record_modifications_to_virtual_stack 
    165 info = <b>Record modifications to virtual stack</b> - \ 
    166   <i>BETA FEATURE</i> - Record and reapply changes to virtual stack      \ 
    167   planes.                                                                \ 
    168   <br><br>When viewing as a virtual stack with this option enabled,      \ 
    169   Bio-Formats will attempt to record the operations you perform. When    \ 
    170   you switch to a new image plane, Bio-Formats will \"play back\" those  \ 
    171   same operations, so that the image plane undergoes the same processing \ 
    172   you performed previously. In this way, the image stack should behave   \ 
    173   more like a normal, fully memory-resident image stack. 
    174 default = false 
     162#[record] 
     163#type = boolean 
     164#label = Record_modifications_to_virtual_stack 
     165#info = <b>Record modifications to virtual stack</b> - \ 
     166#  <i>BETA FEATURE</i> - Record and reapply changes to virtual stack      \ 
     167#  planes.                                                                \ 
     168#  <br><br>When viewing as a virtual stack with this option enabled,      \ 
     169#  Bio-Formats will attempt to record the operations you perform. When    \ 
     170#  you switch to a new image plane, Bio-Formats will \"play back\" those  \ 
     171#  same operations, so that the image plane undergoes the same processing \ 
     172#  you performed previously. In this way, the image stack should behave   \ 
     173#  more like a normal, fully memory-resident image stack. 
     174#default = false 
    175175 
    176176[series] 
Note: See TracChangeset for help on using the changeset viewer.