Changeset 1771


Ignore:
Timestamp:
11/09/06 08:13:59 (13 years ago)
Author:
curtis
Message:

Layout improvements, to fit Slim Plotter into 1024x768 properly.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/apps/slim/SlimPlotter.java

    r1770 r1771  
    120120    System.setErr(new ConsoleStream(new PrintStream(console))); 
    121121    console.getTextArea().setColumns(54); 
    122     console.getTextArea().setRows(20); 
     122    console.getTextArea().setRows(10); 
    123123 
    124124    ProgressMonitor progress = new ProgressMonitor(null, 
     
    559559 
    560560    JPanel options = new JPanel(); 
    561     options.setBorder(new EmptyBorder(8, 5, 8, 20)); 
    562     options.setLayout(new BoxLayout(options, BoxLayout.X_AXIS)); 
     561    options.setBorder(new EmptyBorder(8, 5, 8, 5)); 
     562    options.setLayout(new BoxLayout(options, BoxLayout.Y_AXIS)); 
    563563 
    564564    linear = new JRadioButton("Linear", true); 
     
    576576    showPanel.setBorder(new TitledBorder("Show")); 
    577577    showPanel.setLayout(new BoxLayout(showPanel, BoxLayout.X_AXIS)); 
    578     JPanel showPanel1 = new JPanel(); 
    579     showPanel1.setLayout(new BoxLayout(showPanel1, BoxLayout.Y_AXIS)); 
    580     showPanel.add(showPanel1); 
    581     JPanel showPanel2 = new JPanel(); 
    582     showPanel2.setLayout(new BoxLayout(showPanel2, BoxLayout.Y_AXIS)); 
    583     showPanel.add(showPanel2); 
    584     JPanel showPanel3 = new JPanel(); 
    585     showPanel3.setLayout(new BoxLayout(showPanel3, BoxLayout.Y_AXIS)); 
    586     showPanel.add(showPanel3); 
    587578 
    588579    showData = new JCheckBox("Data", true); 
    589580    showData.addActionListener(this); 
    590     showPanel1.add(showData); 
     581    showPanel.add(showData); 
    591582    showScale = new JCheckBox("Scale", true); 
    592583    showScale.addActionListener(this); 
    593     showPanel1.add(showScale); 
     584    showPanel.add(showScale); 
    594585    showBox = new JCheckBox("Box", true); 
    595586    showBox.addActionListener(this); 
    596     showPanel2.add(showBox); 
     587    showPanel.add(showBox); 
    597588    showLine = new JCheckBox("Line", adjustPeaks); 
    598589    showLine.setEnabled(adjustPeaks); 
    599590    showLine.addActionListener(this); 
    600     showPanel2.add(showLine); 
     591    showPanel.add(showLine); 
    601592    showFit = new JCheckBox("Fit", false); 
    602593    showFit.setEnabled(adjustPeaks); 
    603594    showFit.addActionListener(this); 
    604     showPanel3.add(showFit); 
     595    showPanel.add(showFit); 
    605596    showResiduals = new JCheckBox("Residuals", false); 
    606597    showResiduals.setEnabled(adjustPeaks); 
    607598    showResiduals.addActionListener(this); 
    608     showPanel3.add(showResiduals); 
     599    showPanel.add(showResiduals); 
    609600 
    610601    numCurves = new JSpinner(new SpinnerNumberModel(1, 1, 9, 1)); 
     
    632623    breakawayPanel.setContentPane(leftPanel); 
    633624 
    634     options.add(makeRadioPanel("Scale", linear, log)); 
    635     options.add(makeRadioPanel("Projection", perspective, parallel)); 
    636     options.add(makeRadioPanel("Data", dataSurface, dataLines)); 
    637     options.add(makeRadioPanel("Fit", fitSurface, fitLines)); 
    638     options.add(makeRadioPanel("Residuals", resSurface, resLines)); 
    639     options.add(showPanel); 
    640 //    options.add(numCurves); 
    641     options.add(Box.createHorizontalStrut(5)); 
    642     options.add(exportData); 
     625    JPanel options1 = new JPanel(); 
     626    options1.setLayout(new BoxLayout(options1, BoxLayout.X_AXIS)); 
     627    options1.add(makeRadioPanel("Scale", linear, log)); 
     628    options1.add(makeRadioPanel("Projection", perspective, parallel)); 
     629    options1.add(makeRadioPanel("Data", dataSurface, dataLines)); 
     630    options1.add(makeRadioPanel("Fit", fitSurface, fitLines)); 
     631    options1.add(makeRadioPanel("Residuals", resSurface, resLines)); 
     632//    options1.add(numCurves); 
     633    JPanel options2 = new JPanel(); 
     634    options2.setLayout(new BoxLayout(options2, BoxLayout.X_AXIS)); 
     635    options2.add(showPanel); 
     636    options2.add(Box.createHorizontalStrut(5)); 
     637    options2.add(exportData); 
     638    options.add(options1); 
     639    options.add(options2); 
    643640    decayPane.add(options, BorderLayout.SOUTH); 
    644641    masterPane.add(decayPane, BorderLayout.CENTER); 
Note: See TracChangeset for help on using the changeset viewer.