git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug/JAL-3120restoreFeatureColour' into merge/JAL-3120
[jalview.git]
/
src
/
jalview
/
gui
/
FeatureTypeSettings.java
diff --git
a/src/jalview/gui/FeatureTypeSettings.java
b/src/jalview/gui/FeatureTypeSettings.java
index
843c1f3
..
82e826f
100644
(file)
--- a/
src/jalview/gui/FeatureTypeSettings.java
+++ b/
src/jalview/gui/FeatureTypeSettings.java
@@
-242,8
+242,7
@@
public class FeatureTypeSettings extends JalviewDialog
String title = MessageManager
.formatMessage("label.display_settings_for", new String[]
{ theType });
String title = MessageManager
.formatMessage("label.display_settings_for", new String[]
{ theType });
- initDialogFrame(this, true, false, title, 500, 500);
-
+ initDialogFrame(this, true, false, title, 580, 500);
waitForInput();
}
waitForInput();
}
@@
-366,7
+365,7
@@
public class FeatureTypeSettings extends JalviewDialog
: BELOW_THRESHOLD_OPTION);
slider.setEnabled(true);
slider.setValue((int) (fc.getThreshold() * scaleFactor));
: BELOW_THRESHOLD_OPTION);
slider.setEnabled(true);
slider.setValue((int) (fc.getThreshold() * scaleFactor));
- thresholdValue.setText(String.valueOf(getRoundedSliderValue()));
+ thresholdValue.setText(String.valueOf(fc.getThreshold()));
thresholdValue.setEnabled(true);
thresholdIsMin.setEnabled(true);
}
thresholdValue.setEnabled(true);
thresholdIsMin.setEnabled(true);
}
@@
-659,6
+658,7
@@
public class FeatureTypeSettings extends JalviewDialog
{
thresholdValue
.setText(String.valueOf(slider.getValue() / scaleFactor));
{
thresholdValue
.setText(String.valueOf(slider.getValue() / scaleFactor));
+ thresholdValue.setBackground(Color.white); // to reset red for invalid
sliderValueChanged();
}
}
sliderValueChanged();
}
}
@@
-1024,21
+1024,23
@@
public class FeatureTypeSettings extends JalviewDialog
{
try
{
{
try
{
+ /*
+ * set 'adjusting' flag while moving the slider, so it
+ * doesn't then in turn change the value (with rounding)
+ */
adjusting = true;
float f = Float.parseFloat(thresholdValue.getText());
adjusting = true;
float f = Float.parseFloat(thresholdValue.getText());
+ f = Float.max(f, this.min);
+ f = Float.min(f, this.max);
+ thresholdValue.setText(String.valueOf(f));
slider.setValue((int) (f * scaleFactor));
threshline.value = f;
thresholdValue.setBackground(Color.white); // ok
slider.setValue((int) (f * scaleFactor));
threshline.value = f;
thresholdValue.setBackground(Color.white); // ok
-
- /*
- * force repaint of any Overview window or structure
- */
- ap.paintAlignment(true, true);
+ adjusting = false;
+ colourChanged(true);
} catch (NumberFormatException ex)
{
thresholdValue.setBackground(Color.red); // not ok
} catch (NumberFormatException ex)
{
thresholdValue.setBackground(Color.red); // not ok
- } finally
- {
adjusting = false;
}
}
adjusting = false;
}
}