Changeset 4237


Ignore:
Timestamp:
07/23/08 12:35:12 (12 years ago)
Author:
curtis
Message:

Tweak some panel layouts.

Location:
trunk/loci/slim
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/slim/GACurveFitter.java

    r4236 r4237  
    203203    for (int i = firstindex; i < curveData.length && i <= lastindex; i++) { 
    204204      if (expected[i] > 0) { 
    205         double observed = (double) curveData[i]; 
     205        int observed = curveData[i]; 
    206206        double term = (observed - expected[i]); 
    207207        // (o-e)^2 
  • trunk/loci/slim/SlimPlotter.java

    r4235 r4237  
    679679      scalePanel.add(zScaleValue); 
    680680 
     681      JPanel scaleTogglePanel = makeRadioPanel("Scale", linear, log); 
     682      JPanel colorsTogglePanel = 
     683        makeRadioPanel("Colors", colorHeight, colorTau); 
     684      JPanel projectionTogglePanel = 
     685        makeRadioPanel("Projection", perspective, parallel); 
     686      JPanel dataTogglePanel = makeRadioPanel("Data", dataSurface, dataLines); 
     687      JPanel fitTogglePanel = makeRadioPanel("Fit", fitSurface, fitLines); 
     688      JPanel residualsTogglePanel = 
     689        makeRadioPanel("Residuals", resSurface, resLines); 
     690 
    681691      JPanel miscRow1 = new JPanel(); 
    682       miscRow1.setLayout(new BoxLayout(miscRow1, BoxLayout.X_AXIS)); 
    683       miscRow1.add(makeRadioPanel("Scale", linear, log)); 
    684       miscRow1.add(makeRadioPanel("Projection", perspective, parallel)); 
    685       miscRow1.add(makeRadioPanel("Data", dataSurface, dataLines)); 
     692      miscRow1.setLayout(new GridLayout(2, 3)); 
     693      miscRow1.add(scaleTogglePanel); 
     694      miscRow1.add(projectionTogglePanel); 
     695      miscRow1.add(colorsTogglePanel); 
     696      miscRow1.add(dataTogglePanel); 
     697      miscRow1.add(fitTogglePanel); 
     698      miscRow1.add(residualsTogglePanel); 
    686699 
    687700      JPanel miscRow2 = new JPanel(); 
    688701      miscRow2.setLayout(new BoxLayout(miscRow2, BoxLayout.X_AXIS)); 
    689       miscRow2.add(makeRadioPanel("Fit", fitSurface, fitLines)); 
    690       miscRow2.add(makeRadioPanel("Residuals", resSurface, resLines)); 
    691       miscRow2.add(makeRadioPanel("Colors", colorHeight, colorTau)); 
    692  
    693       JPanel miscRow3 = new JPanel(); 
    694       miscRow3.setLayout(new BoxLayout(miscRow3, BoxLayout.X_AXIS)); 
    695       miscRow3.add(scalePanel); 
    696       miscRow3.add(Box.createHorizontalStrut(5)); 
    697       miscRow3.add(exportData); 
     702      miscRow2.add(scalePanel); 
     703      miscRow2.add(Box.createHorizontalStrut(5)); 
     704      miscRow2.add(exportData); 
    698705 
    699706      JPanel miscPanel = new JPanel(); 
     
    701708      miscPanel.add(miscRow1); 
    702709      miscPanel.add(miscRow2); 
    703       miscPanel.add(miscRow3); 
    704710 
    705711      JPanel options = new JPanel(); 
Note: See TracChangeset for help on using the changeset viewer.