/*\r
* Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
*\r
* This program is free software; you can redistribute it and/or\r
* modify it under the terms of the GNU General Public License\r
{\r
label.setText("Enter value to increase conservation visibility");\r
slider.setMinimum(0);\r
- slider.setMaximum(50);\r
+ slider.setMaximum(100);\r
}\r
else\r
{\r
valueField.setText(value + "");\r
}\r
\r
+\r
/**\r
* DOCUMENT ME!\r
*\r
ColourSchemeI cs, String source)\r
{\r
SliderPanel sp = null;\r
- ConservationColourScheme ccs = (ConservationColourScheme) cs;\r
\r
if (conservationSlider == null)\r
{\r
- sp = new SliderPanel(ap, ccs.inc, true, cs);\r
+ sp = new SliderPanel(ap, cs.getConservationInc(), true, cs);\r
conservationSlider = new JInternalFrame();\r
conservationSlider.setContentPane(sp);\r
conservationSlider.setLayer(JLayeredPane.PALETTE_LAYER);\r
{\r
SliderPanel pid = null;\r
\r
- int threshold = 50;\r
-\r
- if (cs instanceof ResidueColourScheme)\r
- {\r
- threshold = (((ResidueColourScheme) cs).getThreshold());\r
- }\r
- else if (cs instanceof ScoreColourScheme)\r
- {\r
- threshold = (((ScoreColourScheme) cs).getThreshold());\r
- }\r
+ int threshold = cs.getThreshold();\r
\r
if (PIDSlider == null)\r
{\r
toChange = cs;\r
}\r
\r
+\r
while (groupIndex > -1)\r
{\r
if (allGroups != null)\r
\r
if (forConservation)\r
{\r
- if (toChange instanceof ConservationColourScheme)\r
+ if (toChange.conservationApplied())\r
{\r
- ((ConservationColourScheme) toChange).inc = i;\r
+ toChange.setConservationInc(i);\r
}\r
}\r
else\r
{\r
- ((ResidueColourScheme) toChange).setThreshold(i);\r
+ toChange.setThreshold(i, ap.av.getIgnoreGapsConsensus());\r
}\r
\r
groupIndex--;\r
int i = Integer.parseInt(valueField.getText());\r
slider.setValue(i);\r
}\r
- catch (Exception ex)\r
+ catch (NumberFormatException ex)\r
{\r
valueField.setText(slider.getValue() + "");\r
}\r
{\r
return Integer.parseInt(valueField.getText());\r
}\r
+\r
+ public void slider_mouseReleased(MouseEvent e)\r
+ {\r
+ if (ap.overviewPanel != null)\r
+ ap.overviewPanel.updateOverviewImage();\r
+ }\r
+\r
}\r