X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSliderPanel.java;h=647c70d279a676237afb618676d6ec3bee40a783;hb=b21920d2355ae42bdada6dfc0c42614aa0539137;hp=6f8a0b228feb60fa9d75a10cece9e429596629c6;hpb=7e137e5223c11e93e8fbcac9831156a6eacf5f5e;p=jalview.git diff --git a/src/jalview/gui/SliderPanel.java b/src/jalview/gui/SliderPanel.java index 6f8a0b2..647c70d 100755 --- a/src/jalview/gui/SliderPanel.java +++ b/src/jalview/gui/SliderPanel.java @@ -1,6 +1,6 @@ /* * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -44,7 +44,6 @@ public class SliderPanel extends GSliderPanel static JInternalFrame PIDSlider; AlignmentPanel ap; boolean forConservation = true; - boolean forAnnotation = false; ColourSchemeI cs; /** @@ -68,7 +67,7 @@ public class SliderPanel extends GSliderPanel { label.setText("Enter value to increase conservation visibility"); slider.setMinimum(0); - slider.setMaximum(50); + slider.setMaximum(100); } else { @@ -90,43 +89,6 @@ public class SliderPanel extends GSliderPanel valueField.setText(value + ""); } - public SliderPanel(final AlignmentAnnotation annotation, final AlignmentPanel ap) - { - forAnnotation = true; - undoButton.setVisible(false); - applyButton.setVisible(false); - allGroupsCheck.setVisible(false); - label.setText("Adjust value - "+annotation.getGraphLine(0).label); - - float range = annotation.graphMax * 1000 - annotation.graphMin * 1000; - - slider.setMinimum( (int) (annotation.graphMin * 1000)); - slider.setMaximum( (int) (annotation.graphMax * 1000)); - slider.setValue( (int) (annotation.getGraphLine(0).value * 1000)); - valueField.setText( annotation.getGraphLine(0).value + ""); - slider.setMajorTickSpacing( (int) (range / 10f)); - slider.setMinorTickSpacing( (int) (range / 100f)); - slider.setPaintTicks(true); - - JInternalFrame slideFrame = new JInternalFrame(); - slideFrame.setLayer(JLayeredPane.PALETTE_LAYER); - Desktop.addInternalFrame(slideFrame, - "Adjust " + annotation.label +" value", - 250, 90); - - slideFrame.setContentPane(this); - slider.addChangeListener(new ChangeListener() - { - public void stateChanged(ChangeEvent evt) - { - valueField.setText( ((float)slider.getValue()/1000f) + ""); - annotation.getGraphLine(0).value = (float)slider.getValue()/1000f; - ap.repaint(); - } - }); - - } - /** * DOCUMENT ME! @@ -282,12 +244,10 @@ public class SliderPanel extends GSliderPanel public void valueChanged(int i) { if (cs == null) - {System.out.println("cs is null"); + { return; } - - ColourSchemeI toChange = null; Vector allGroups = null; int groupIndex = 0; @@ -354,18 +314,10 @@ public class SliderPanel extends GSliderPanel { try { - if (forAnnotation) - { - float f = Float.parseFloat(valueField.getText()); - slider.setValue( (int)( f * 1000 )); - } - else - { int i = Integer.parseInt(valueField.getText()); slider.setValue(i); - } } - catch (Exception ex) + catch (NumberFormatException ex) { valueField.setText(slider.getValue() + ""); } @@ -390,4 +342,11 @@ public class SliderPanel extends GSliderPanel { return Integer.parseInt(valueField.getText()); } + + public void slider_mouseReleased(MouseEvent e) + { + if (ap.overviewPanel != null) + ap.overviewPanel.updateOverviewImage(); + } + }