X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOptsAndParamsPage.java;h=3e09a35d6272ac4e433afee21b5842831061c3c4;hb=5e22c6b15dc429055036c19fcfc48c16d37d7ad0;hp=e584eb754d80c9c6641293eaa14b2379c3403276;hpb=37de9310bec3501cbc6381e0c3dcb282fcaad812;p=jalview.git diff --git a/src/jalview/gui/OptsAndParamsPage.java b/src/jalview/gui/OptsAndParamsPage.java index e584eb7..3e09a35 100644 --- a/src/jalview/gui/OptsAndParamsPage.java +++ b/src/jalview/gui/OptsAndParamsPage.java @@ -20,12 +20,15 @@ */ package jalview.gui; +import static jalview.ws.params.simple.LogarithmicParameter.LOGSLIDERSCALE; + import jalview.util.MessageManager; import jalview.ws.params.ArgumentI; import jalview.ws.params.OptionI; import jalview.ws.params.ParameterI; import jalview.ws.params.ValueConstrainI; import jalview.ws.params.ValueConstrainI.ValueType; +import jalview.ws.params.simple.LogarithmicParameter; import java.awt.BorderLayout; import java.awt.Component; @@ -35,12 +38,13 @@ import java.awt.GridLayout; import java.awt.Rectangle; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.net.URL; import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -71,13 +75,31 @@ import net.miginfocom.swing.MigLayout; */ public class OptsAndParamsPage { - /** + public static final int PARAM_WIDTH = 340; + + public static final int PARAM_HEIGHT = 150; + + public static final int PARAM_CLOSEDHEIGHT = 80; + + URL linkImageURL = getClass().getResource("/images/link.gif"); + + Map optSet = new LinkedHashMap<>(); + + Map paramSet = new LinkedHashMap<>(); + + /* * compact or verbose style parameters */ boolean compact = false; - public class OptionBox extends JPanel implements MouseListener, - ActionListener + OptsParametersContainerI poparent; + + /** + * A class that models a panel rendering a single option (checkbox or choice + * list) + */ + public class OptionBox extends JPanel + implements MouseListener, ActionListener { JCheckBox enabled = new JCheckBox(); @@ -93,13 +115,14 @@ public class OptsAndParamsPage JLabel optlabel = new JLabel(); - JComboBox val = new JComboBox(); + JComboBox val = new JComboBox<>(); public OptionBox(OptionI opt) { option = opt; setLayout(new BorderLayout()); enabled.setSelected(opt.isRequired()); // TODO: lock required options + // enabled.setEnabled(!opt.isRequired()); enabled.setFont(new Font("Verdana", Font.PLAIN, 11)); enabled.setText(""); enabled.setText(opt.getName()); @@ -110,25 +133,24 @@ public class OptsAndParamsPage { hasLink = true; - enabled.setToolTipText(JvSwingUtils - .wrapTooltip( - true, - ((desc == null || desc.trim().length() == 0) ? MessageManager - .getString("label.opt_and_params_further_details") - : desc) - + "
")); + enabled.setToolTipText(JvSwingUtils.wrapTooltip(true, + ((desc == null || desc.trim().length() == 0) + ? MessageManager.getString( + "label.opt_and_params_further_details") + : desc) + "
")); enabled.addMouseListener(this); } else { if (desc != null && desc.trim().length() > 0) { - enabled.setToolTipText(JvSwingUtils.wrapTooltip(true, - opt.getDescription())); + enabled.setToolTipText( + JvSwingUtils.wrapTooltip(true, opt.getDescription())); } } add(enabled, BorderLayout.NORTH); - for (Object str : opt.getPossibleValues()) + for (String str : opt.getPossibleValues()) { val.addItem(str); } @@ -271,14 +293,21 @@ public class OptsAndParamsPage } - public class ParamBox extends JPanel implements ChangeListener, - ActionListener, MouseListener + /** + * A class that models a panel rendering a single parameter + */ + public class ParamBox extends JPanel + implements ChangeListener, ActionListener, MouseListener { + private static final float SLIDERSCALE = 1000f; + + boolean isLogarithmic; + boolean adjusting = false; boolean choice = false; - JComboBox choicebox; + JComboBox choicebox; JPanel controlPanel = new JPanel(); @@ -308,7 +337,8 @@ public class OptsAndParamsPage JTextField valueField = null; - public ParamBox(final OptsParametersContainerI pmlayout, ParameterI parm) + public ParamBox(final OptsParametersContainerI pmlayout, + ParameterI parm) { pmdialogbox = pmlayout; finfo = parm.getFurtherDetails(); @@ -325,6 +355,10 @@ public class OptsAndParamsPage choice = true; } } + if (parm instanceof LogarithmicParameter) + { + isLogarithmic = true; + } if (!compact) { @@ -349,20 +383,16 @@ public class OptsAndParamsPage && parm.getDescription().trim().length() > 0) { // Only create description boxes if there actually is a description. - ttipText = (JvSwingUtils - .wrapTooltip( - true, - parm.getDescription() - + (finfo != null ? "
" - + MessageManager - .getString("label.opt_and_params_further_details") - : ""))); - } - - JvSwingUtils.mgAddtoLayout(this, ttipText, - new JLabel(parm.getName()), controlPanel, ""); + ttipText = (JvSwingUtils.wrapTooltip(true, + parm.getDescription() + (finfo != null ? "
" + + MessageManager.getString( + "label.opt_and_params_further_details") + : ""))); + } + + JvSwingUtils.mgAddtoLayout(this, ttipText, new JLabel(parm.getName()), + controlPanel, ""); updateControls(parm); validate(); } @@ -399,21 +429,18 @@ public class OptsAndParamsPage // Only create description boxes if there actually is a description. if (finfo != null) { - showDesc.setToolTipText(JvSwingUtils.wrapTooltip( - true, - MessageManager - .formatMessage( - "label.opt_and_params_show_brief_desc_image_link", - new String[] { linkImageURL - .toExternalForm() }))); + showDesc.setToolTipText(JvSwingUtils.wrapTooltip(true, + MessageManager.formatMessage( + "label.opt_and_params_show_brief_desc_image_link", + new String[] + { linkImageURL.toExternalForm() }))); showDesc.addMouseListener(this); } else { - showDesc.setToolTipText(JvSwingUtils.wrapTooltip( - true, - MessageManager - .getString("label.opt_and_params_show_brief_desc"))); + showDesc.setToolTipText( + JvSwingUtils.wrapTooltip(true, MessageManager.getString( + "label.opt_and_params_show_brief_desc"))); } showDesc.addActionListener(new ActionListener() { @@ -578,14 +605,38 @@ public class OptsAndParamsPage { if (!adjusting) { - valueField.setText("" - + ((integ) ? ("" + slider.getValue()) : ("" + slider - .getValue() / 1000f))); + if (!isLogarithmic) + { + /* + * set (int or float formatted) text field value + */ + valueField.setText(integ ? String.valueOf(slider.getValue()) + : String.valueOf(slider.getValue() / SLIDERSCALE)); + } + else + { + double base = ((LogarithmicParameter) parameter).getBase(); + double value = Math.pow(base, slider.getValue() / LOGSLIDERSCALE); + valueField.setText(formatDouble(value)); + } checkIfModified(); } } + /** + * Answers the value formatted as a string to 3 decimal places - in + * scientific notation if the value is less than 0.001 + * + * @param value + * @return + */ + public String formatDouble(double value) + { + String format = value < 0.001 ? "%3.3e" : "%3.3f"; + return String.format(format, value); + } + public void updateControls(ParameterI parm) { adjusting = true; @@ -594,7 +645,7 @@ public class OptsAndParamsPage { if (choice) { - choicebox = new JComboBox(); + choicebox = new JComboBox<>(); choicebox.addActionListener(this); controlPanel.add(choicebox, BorderLayout.CENTER); } @@ -604,14 +655,8 @@ public class OptsAndParamsPage slider.addChangeListener(this); valueField = new JTextField(); valueField.addActionListener(this); - valueField.addKeyListener(new KeyListener() + valueField.addKeyListener(new KeyAdapter() { - - @Override - public void keyTyped(KeyEvent e) - { - } - @Override public void keyReleased(KeyEvent e) { @@ -623,16 +668,10 @@ public class OptsAndParamsPage } } } - - @Override - public void keyPressed(KeyEvent e) - { - } }); - valueField.setPreferredSize(new Dimension(60, 25)); + valueField.setPreferredSize(new Dimension(80, 25)); controlPanel.add(slider, BorderLayout.WEST); controlPanel.add(valueField, BorderLayout.EAST); - } } @@ -642,8 +681,7 @@ public class OptsAndParamsPage { if (init) { - List vals = parm.getPossibleValues(); - for (Object val : vals) + for (String val : parm.getPossibleValues()) { choicebox.addItem(val); } @@ -656,7 +694,18 @@ public class OptsAndParamsPage } else { - valueField.setText(parm.getValue()); + if (parm instanceof LogarithmicParameter) + { + double base = ((LogarithmicParameter) parm).getBase(); + // double value = Math.pow(base, + // Double.parseDouble(parm.getValue()) / LOGSLIDERSCALE); + double value = Double.parseDouble(parm.getValue()); + valueField.setText(formatDouble(value)); + } + else + { + valueField.setText(parm.getValue()); + } } } lastVal = updateSliderFromValueField(); @@ -667,6 +716,7 @@ public class OptsAndParamsPage { int iVal; float fVal; + double dVal; if (validator != null) { if (integ) @@ -692,8 +742,8 @@ public class OptsAndParamsPage } } catch (Exception e) { + System.err.println(e.getMessage()); } - ; // update value field to reflect any bound checking we performed. valueField.setText("" + iVal); if (validator.getMin() != null && validator.getMax() != null) @@ -708,6 +758,53 @@ public class OptsAndParamsPage } return new int[] { iVal }; } + else if (isLogarithmic) + { + dVal = 0d; + try + { + valueField.setText(valueField.getText().trim()); + double eValue = Double.valueOf(valueField.getText()); + + dVal = Math.log(eValue) / Math + .log(((LogarithmicParameter) parameter).getBase()) + * LOGSLIDERSCALE; + + if (validator.getMin() != null + && validator.getMin().doubleValue() > dVal) + { + dVal = validator.getMin().doubleValue(); + // TODO: provide visual indication that hard limit was reached for + // this parameter + // update value field to reflect any bound checking we performed. + valueField.setText(formatDouble(eValue)); + } + if (validator.getMax() != null + && validator.getMax().doubleValue() < dVal) + { + dVal = validator.getMax().doubleValue(); + // TODO: provide visual indication that hard limit was reached for + // this parameter + // update value field to reflect any bound checking we performed. + valueField.setText(formatDouble(eValue)); + } + } catch (Exception e) + { + } + + if (validator.getMin() != null && validator.getMax() != null) + { + slider.getModel().setRangeProperties((int) (dVal), 1, + (int) (validator.getMin().doubleValue()), + 1 + (int) (validator.getMax().doubleValue()), + true); + } + else + { + slider.setVisible(false); + } + return new double[] { dVal }; + } else { fVal = 0f; @@ -736,12 +833,12 @@ public class OptsAndParamsPage } catch (Exception e) { } - ; + if (validator.getMin() != null && validator.getMax() != null) { - slider.getModel().setRangeProperties((int) (fVal * 1000f), 1, - (int) (validator.getMin().floatValue() * 1000f), - 1 + (int) (validator.getMax().floatValue() * 1000f), + slider.getModel().setRangeProperties((int) (fVal * SLIDERSCALE), 1, + (int) (validator.getMin().floatValue() * SLIDERSCALE), + 1 + (int) (validator.getMax().floatValue() * SLIDERSCALE), true); } else @@ -767,12 +864,6 @@ public class OptsAndParamsPage } } - public static final int PARAM_WIDTH = 340; - - public static final int PARAM_HEIGHT = 150; - - public static final int PARAM_CLOSEDHEIGHT = 80; - public OptsAndParamsPage(OptsParametersContainerI paramContainer) { this(paramContainer, false); @@ -790,8 +881,9 @@ public class OptsAndParamsPage { JPopupMenu mnu = new JPopupMenu(); - JMenuItem mitem = new JMenuItem(MessageManager.formatMessage( - "label.view_params", new String[] { finfo })); + JMenuItem mitem = new JMenuItem( + MessageManager.formatMessage("label.view_params", new String[] + { finfo })); mitem.addActionListener(new ActionListener() { @@ -806,12 +898,6 @@ public class OptsAndParamsPage mnu.show(invoker, x, y); } - URL linkImageURL = getClass().getResource("/images/link.gif"); - - Map optSet = new java.util.LinkedHashMap(); - - Map paramSet = new java.util.LinkedHashMap(); - public Map getOptSet() { return optSet; @@ -832,8 +918,6 @@ public class OptsAndParamsPage this.paramSet = paramSet; } - OptsParametersContainerI poparent; - OptionBox addOption(OptionI opt) { OptionBox cb = optSet.get(opt.getName()); @@ -877,11 +961,9 @@ public class OptsAndParamsPage } else { - throw new Error(MessageManager.formatMessage( - "error.invalid_value_for_option", new String[] { string, - option.getName() })); + throw new Error(String.format("Invalid value '%s' for option '%s'", + string, option.getName())); } - } if (option.isRequired() && !cb.enabled.isSelected()) { @@ -911,7 +993,7 @@ public class OptsAndParamsPage */ public List getCurrentSettings() { - List argSet = new ArrayList(); + List argSet = new ArrayList<>(); for (OptionBox opts : getOptSet().values()) { OptionI opt = opts.getOptionIfEnabled();