WIP

Author: imagejan

src/main/java/org/scijava/ui/swing/widget/SwingNumberWidget.java

@@ -84,7 +84,7 @@ public class SwingNumberWidget extends SwingInputWidget<Number> implements
 	@Parameter
 	private LogService log;
 
-	private JScrollBar scrollBar;
+	private CalibratedScrollBar scrollBar;
 	private CalibratedSlider slider;
 	private JSpinner spinner;
 
@@ -116,6 +116,7 @@ else if (model.isStyle(NumberWidget.SLIDER_STYLE)) {
 		}
 
 		// add spinner widget
+		// TODO fix spinner size for integer min/max with double stepSize
 		final Class<?> type = model.getItem().getType();
 		final Number value = (Number) model.getValue();
 		final SpinnerNumberModel spinnerModel =
@@ -143,7 +144,7 @@ public boolean supports(final WidgetModel model) {
 	@Override
 	public void adjustmentValueChanged(final AdjustmentEvent e) {
 		// sync spinner with scroll bar value
-		final int value = scrollBar.getValue();
+		final Number value = scrollBar.getCalibratedValue();
 		spinner.setValue(value);
 	}
 
@@ -184,14 +185,27 @@ private void addScrollBar(final Number min, final Number max,
 			log.warn("Invalid min/max/step; cannot render scroll bar");
 			return;
 		}
+		
+		int sMin = 0;
+		int sMax = (int) ((max.doubleValue() - min.doubleValue()) / step.doubleValue());
+		long range = sMax - sMin;
+		if (range > Integer.MAX_VALUE) {
+			log.warn("Scrollbar span too large; max - min < 2^31 required.");
+			return;
+		}
+		/*
 		int mn = min.intValue();
 		if (mn == Integer.MIN_VALUE) mn = Integer.MIN_VALUE + 1;
 		int mx = max.intValue();
 		if (mx < Integer.MAX_VALUE) mx++;
 		final int st = step.intValue();
+		*/
 
-		scrollBar = new JScrollBar(Adjustable.HORIZONTAL, mn, 1, mn, mx);
+		scrollBar = new CalibratedScrollBar(min, max, step);
+		/*
+		scrollBar = new JScrollBar(HORIZONTAL, mn, 1, mn, mx);
 		scrollBar.setUnitIncrement(st);
+		*/
 		setToolTip(scrollBar);
 		getComponent().add(scrollBar);
 		scrollBar.addAdjustmentListener(this);
@@ -316,12 +330,13 @@ private void syncSliders() {
 		}
 		if (scrollBar != null) {
 			// clamp value within scroll bar bounds
-			int value = getValue().intValue();
-			if (value < scrollBar.getMinimum()) value = scrollBar.getMinimum();
-			else if (value > scrollBar.getMaximum()) value = scrollBar.getMaximum();
+			Number value = getValue().intValue();
+			if (value.doubleValue() < scrollBar.getCalibratedMinimum().doubleValue()) value = scrollBar.getCalibratedMinimum();
+			else if (value.doubleValue() > scrollBar.getCalibratedMaximum().doubleValue()) value = scrollBar.getCalibratedMaximum();
 			scrollBar.removeAdjustmentListener(this);
-			scrollBar.setValue(getValue().intValue());
+			scrollBar.setCalibratedValue(value);
 			scrollBar.addAdjustmentListener(this);
+			// TODO avoid snapping back to next floor integer when adjusting
 		}
 	}
 
@@ -421,4 +436,55 @@ private JLabel makeLabel(Number n, int scale) {
 		}
 
 	}
+
+	private class CalibratedScrollBar extends JScrollBar {
+		
+		private Number min;
+		private Number max;
+		private Number stepSize;
+		
+		private CalibratedScrollBar(final Number min, final Number max, final Number stepSize) {
+			// set extent to 1 to make sure the scroll bar is visible
+			super(HORIZONTAL, 0, 1, 0, 1);
+
+			this.min = min;
+			this.max = max;
+			this.stepSize = stepSize;
+
+			int sMin = 0;
+			int sMax = (int) ((max.doubleValue() - min.doubleValue()) / stepSize.doubleValue());
+
+			// Adjust max to be an integer multiple of stepSize
+			this.max = min.doubleValue() + (sMax-sMin) * stepSize.doubleValue();
+
+			setMinimum(sMin);
+			setMaximum(sMax);
+			setValue(sMin);
+		}
+		
+		private void setCalibratedValue(Number value) {
+			setValue(fromCalibrated(value));
+		}
+
+		private Number getCalibratedValue() {
+			return toCalibrated(getValue());
+		}
+
+		private Number getCalibratedMinimum() {
+			return min;
+		}
+
+		private Number getCalibratedMaximum() {
+			return max;
+		}
+		
+		private int fromCalibrated(Number n) {
+			return (int) ((n.doubleValue() - min.doubleValue()) / stepSize.doubleValue());
+		}
+		
+		private Number toCalibrated(int n) {
+			return n * stepSize.doubleValue() + min.doubleValue();
+		}
+		
+	}
 }