diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index d1971e7..b15991e 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,4 +1,4 @@ -#Fri Aug 26 16:05:48 CEST 2016 +#Fri Aug 26 16:11:52 CEST 2016 colormap=Grayscale colormapAutomatic=false colormapMax=255.0 @@ -6,8 +6,8 @@ colormapMin=0.0 flipHorizontally=false flipVertically=false grayscale=false -imageHeight=1628 -imageWidth=1280 +imageHeight=2160 +imageWidth=2560 invert=false rescaleFactor=1.0 rescaleOffset=0.0 diff --git a/plugins/Cameras.java b/plugins/Cameras.java index ea8ccc1..2386b55 100644 --- a/plugins/Cameras.java +++ b/plugins/Cameras.java @@ -48,7 +48,7 @@ public class Cameras extends Panel { @Override public void onInitialize(int runCount) { cameraConfigFiles = IO.listFiles(configFolder, new String[]{"json"}); - Arrays.sort(cameraConfigFiles, (a, b) -> a.getName().compareTo(b.getName())); + Arrays.sort(cameraConfigFiles, (a, b) -> a.compareTo(b)); DefaultComboBoxModel model = new DefaultComboBoxModel(); for (File file:cameraConfigFiles) { String prefix = IO.getPrefix(file);