Changeset 2026


Ignore:
Timestamp:
01/04/07 17:33:41 (13 years ago)
Author:
chris
Message:

Browser:
1) references to getSizeC() in CacheManager changed to
getEffectiveSizeC() ...
2) added code to try to kill the manager if it already
exists when calling LociDataBrowser.run() ...this wasn't
very successful, for some reason the merging on runtime
is still messing up the cachemanager.
3) Added more consistent naming to priority comboboxes in
optionswindow
4) Added scrollpane so that the optionswindow won't be so
long it's mostly offscreen and irksome.

Location:
trunk/loci/plugins/browser
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/plugins/browser/CacheManager.java

    r2023 r2026  
    226226        sizeZ = read.getSizeZ(fileName); 
    227227        sizeT = read.getSizeT(fileName); 
    228         sizeC = read.getSizeC(fileName); 
     228        sizeC = read.getEffectiveSizeC(fileName); 
    229229        cache = new ImageProcessor[read.getImageCount(fileName)]; 
    230230      } 
     
    18391839        sizeZ = read.getSizeZ(fileName); 
    18401840        sizeT = read.getSizeT(fileName); 
    1841         sizeC = read.getSizeC(fileName); 
     1841        sizeC = read.getEffectiveSizeC(fileName); 
    18421842        cache = new ImageProcessor[read.getImageCount(fileName)]; 
    18431843      } 
  • trunk/loci/plugins/browser/LociDataBrowser.java

    r2023 r2026  
    318318 
    319319            int num = reader.getImageCount(id); 
    320  
     320            if(manager != null) { 
     321              manager.finish(); 
     322              manager = null; 
     323            } 
    321324            manager = new CacheManager(0, 0, 0, 0, 0, 0, 20, 0, 0, 
    322325              this, id, CacheManager.T_AXIS, 
  • trunk/loci/plugins/browser/OptionsWindow.java

    r2023 r2026  
    347347    String[] strats = {"Forward","Surround"}; 
    348348    stratBox = new JComboBox(strats); 
    349     String[] boxAxes = {"Z","T","C"}; 
    350     topBox = new JComboBox(boxAxes); 
    351     midBox = new JComboBox(boxAxes); 
    352     lowBox = new JComboBox(boxAxes); 
     349    topBox = new JComboBox(choices); 
     350    midBox = new JComboBox(choices); 
     351    lowBox = new JComboBox(choices); 
    353352    topBox.setSelectedIndex(1); 
    354353    midBox.setSelectedIndex(0); 
     
    442441    //configure/layout content pane 
    443442 
     443    JPanel viewPanel = new JPanel(); 
     444 
    444445    FormLayout lastLayout = new FormLayout( 
    445446      "pref:grow", 
    446447      "pref,pref,pref,pref"); 
    447     setLayout(lastLayout); 
     448    viewPanel.setLayout(lastLayout); 
    448449    CellConstraints ccs = new CellConstraints(); 
    449450 
    450     add(aniPane,ccs.xy(1,1)); 
    451     add(cachePane,ccs.xy(1,2)); 
    452     add(disPane,ccs.xy(1,3)); 
    453     add(inputPane,ccs.xy(1,4)); 
     451    viewPanel.add(aniPane,ccs.xy(1,1)); 
     452    viewPanel.add(cachePane,ccs.xy(1,2)); 
     453    viewPanel.add(disPane,ccs.xy(1,3)); 
     454    viewPanel.add(inputPane,ccs.xy(1,4)); 
    454455 
    455456    oldTop = topBox.getSelectedIndex(); 
    456457    oldMid = midBox.getSelectedIndex(); 
    457458    oldLow = lowBox.getSelectedIndex(); 
     459     
     460    JScrollPane jsp = new JScrollPane((Component)viewPanel); 
     461    Dimension viewSize = viewPanel.getPreferredSize(); 
     462    jsp.setPreferredSize(new Dimension(viewSize.width + 20,600)); 
     463    setContentPane(jsp); 
    458464 
    459465    //useful frame method that handles closing of window 
     
    461467    //put frame in the right place, with the right size, and make visible 
    462468    setLocation(100, 100); 
    463 //    ((JComponent) getContentPane()).setPreferredSize(new Dimension(300,500)); 
    464469    pack(); 
    465470    setVisible(true); 
Note: See TracChangeset for help on using the changeset viewer.