TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-24 04:42:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

improved float dragging

Browse Source
This commit is contained in:
hneemann 2021-01-25 12:58:57 +01:00
parent 2682fcad12
commit f63695b96f
3 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/de/neemann/digital/core/IntFormat.java
View File

@ -508,14 +508,27 @@ public enum IntFormat {
}
@Override
public long dragValue(long initial, int bits, double inc) {
double dif = Math.signum(inc) * (Math.exp(Math.abs(inc * 10)) - 1);
public long dragValue(long initialInt, int bits, double inc) {
double initial;
if (bits == 32)
return Float.floatToIntBits((float) (Float.intBitsToFloat((int) initial) + dif));
initial = Float.intBitsToFloat((int) initialInt);
else if (bits == 64)
return Double.doubleToLongBits(Double.longBitsToDouble(initial) + dif);
initial = Double.longBitsToDouble(initialInt);
else
return initial;
return HEX_FORMATTER.dragValue(initialInt, bits, inc);
if (!Double.isFinite(initial))
initial = 0;
double fac = Math.exp(Math.abs(inc) * 15) / 1000;
double delta = Math.abs(initial == 0 ? 1 : initial) * fac * Math.signum(inc);
double exp = Math.pow(10, Math.floor(Math.log10(Math.abs(delta))));
double val = Math.round((initial + delta) / exp) * exp;
if (bits == 32)
return Float.floatToIntBits((float) val);
else
return Double.doubleToLongBits(val);
}
}

13
src/main/java/de/neemann/digital/draw/shapes/InputShape.java
View File

@ -181,11 +181,14 @@ public class InputShape implements Shape {
startValue = value.getValue();
lastValueSet = startValue;
} else {
double inc = ((double) (startPos.y - posOnScreen.y)) / SLIDER_HEIGHT;
long val = formatter.dragValue(startValue, value.getBits(), inc);
if (val != lastValueSet) {
modelSync.modify(() -> value.setValue(val));
lastValueSet = val;
int dy = startPos.y - posOnScreen.y;
if (dy != 0) {
double inc = ((double) dy) / SLIDER_HEIGHT;
long val = formatter.dragValue(startValue, value.getBits(), inc);
if (val != lastValueSet) {
modelSync.modify(() -> value.setValue(val));
lastValueSet = val;
}
}
}
}

22
src/test/java/de/neemann/digital/core/IntFormatTest.java
View File

@ -29,6 +29,7 @@ public class IntFormatTest extends TestCase {
}
public void testBin() {
assertFalse(IntFormat.bin.dependsOnAttributes());
ValueFormatter vf = IntFormat.bin.createFormatter(null);
assertEquals("0b1", vf.formatToView(new Value(1, 1)));
assertEquals("0b01", vf.formatToView(new Value(1, 2)));
@ -39,6 +40,9 @@ public class IntFormatTest extends TestCase {
}
public void testDec() {
assertFalse(IntFormat.dec.dependsOnAttributes());
assertFalse(IntFormat.decSigned.dependsOnAttributes());
assertEquals("3", IntFormat.dec.createFormatter(null).formatToView(new Value(-1, 2)));
assertEquals("-1", IntFormat.decSigned.createFormatter(null).formatToView(new Value(-1, 2)));
}
@ -125,6 +129,7 @@ public class IntFormatTest extends TestCase {
}
public void testStrLen() {
assertFalse(IntFormat.hex.dependsOnAttributes());
ValueFormatter vf = IntFormat.hex.createFormatter(null);
assertEquals(6, vf.strLen(16));
assertEquals(6, vf.strLen(15));
@ -165,4 +170,21 @@ public class IntFormatTest extends TestCase {
assertEquals(5, vf.strLen(9));
assertEquals(6, vf.strLen(10));
}
public void testDragFloat() {
assertFalse(IntFormat.floating.dependsOnAttributes());
ValueFormatter f = IntFormat.floating.createFormatter(null);
checkFloatDrag(f, 1f, 1.001f, 0.004);
checkFloatDrag(f, 1f, 1.002f, 0.04);
checkFloatDrag(f, 1f, 1.4f, 0.4);
checkFloatDrag(f, 1f, 3000f, 1);
checkFloatDrag(f, 1f, -3000f, -1);
}
private void checkFloatDrag(ValueFormatter f, float initial, float expected, double inc) {
long d = f.dragValue(Float.floatToIntBits(initial), 32, inc);
float result = Float.intBitsToFloat((int) d);
assertEquals(expected, result, 1e-5);
}
}