mirror of
https://github.com/PAMGuard/PAMGuard.git
synced 2024-11-22 07:02:29 +00:00
Merge from dg branch (#134)
* options to modify scroller focus Needed to stop focus of scroller when other components need to use some of the key strokes which would normally be consumed by the scroller. * update lims search in overlay mark.
This commit is contained in:
parent
3e2de8f5dc
commit
786bfb1ef5
@ -173,10 +173,10 @@ public class OverlayMark {
|
||||
|
||||
//now must find the limits of the zoom. Can be complex shapes so a bit difficult;
|
||||
double minX=Double.MAX_VALUE;
|
||||
double maxX=Double.MIN_VALUE;
|
||||
double maxX=Double.NEGATIVE_INFINITY;
|
||||
|
||||
double minY=Double.MAX_VALUE;
|
||||
double maxY=Double.MIN_VALUE;
|
||||
double maxY=Double.NEGATIVE_INFINITY;
|
||||
|
||||
//now find those maximum, and minimum values,
|
||||
for (int i=0; i<coordinates.size(); i++){
|
||||
|
@ -39,6 +39,7 @@ public class PamScrollSlider extends AbstractPamScrollerAWT {
|
||||
panel.add(BorderLayout.CENTER, slider);
|
||||
panel.add(BorderLayout.SOUTH, getButtonPanel());
|
||||
}
|
||||
// slider.setFocusable(false);
|
||||
}
|
||||
|
||||
class SliderListener implements ChangeListener {
|
||||
@ -180,5 +181,11 @@ public class PamScrollSlider extends AbstractPamScrollerAWT {
|
||||
// TODO Auto-generated method stub
|
||||
super.setPageStep(pageStep);
|
||||
}
|
||||
/**
|
||||
* @return the slider
|
||||
*/
|
||||
public JSlider getSlider() {
|
||||
return slider;
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user