Fixed magnification for german locale and added custom separator textfield

Author: NilsFo

CellomicsArrayScanPuzzleHelper.iml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="CellomicsPuzzleHelper" level="project" />
     <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="CellomicsPuzzleHelper" level="project" />
   </component>
 </module>

src/de/rub/bph/CellomicsPuzzleHelper.java

@@ -12,7 +12,7 @@ public class CellomicsPuzzleHelper {
 
 	public static final String AUTHOR = "Nils Förster";
 	public static final String NAME = "OmniSphero Smart-Well Creator";
-	public static final String VERSION = "1.5";
+	public static final String VERSION = "1.6";
 	public static PuzzleHelperGUI helperGUI;
 
 	public static void main(String[] args) {

src/de/rub/bph/ui/PuzzleHelperGUI.form

@@ -3,7 +3,7 @@
   <grid id="27dc6" binding="basePanel" layout-manager="GridLayoutManager" row-count="2" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="1186" height="586"/>
+      <xy x="20" y="20" width="1186" height="590"/>
     </constraints>
     <properties/>
     <clientProperties>
@@ -315,17 +315,17 @@
           </hspacer>
         </children>
       </grid>
-      <grid id="8db69" layout-manager="GridLayoutManager" row-count="4" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="8db69" layout-manager="GridLayoutManager" row-count="4" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none" title="Plating Partitions"/>
         <children>
           <tabbedpane id="62895" binding="partitionsTabbedPane">
             <constraints>
-              <grid row="1" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
+              <grid row="1" column="0" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
                 <preferred-size width="200" height="200"/>
               </grid>
             </constraints>
@@ -335,15 +335,15 @@
           </tabbedpane>
           <component id="e5e8e" class="javax.swing.JLabel">
             <constraints>
-              <grid row="2" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="Separate your partitions with the &quot;§&quot; character."/>
+              <text value="Partition separation indicator:"/>
             </properties>
           </component>
           <component id="cacd7" class="javax.swing.JLabel">
             <constraints>
-              <grid row="3" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="3" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="White wells are ignored. Red wells are puzzled. Blue wells are controls."/>
@@ -365,9 +365,19 @@
           </component>
           <hspacer id="5fee3">
             <constraints>
-              <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="0" column="2" row-span="1" col-span="2" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
           </hspacer>
+          <component id="6a8e1" class="javax.swing.JTextField" binding="separatorTF">
+            <constraints>
+              <grid row="2" column="1" row-span="1" col-span="3" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                <preferred-size width="150" height="-1"/>
+              </grid>
+            </constraints>
+            <properties>
+              <text value="§"/>
+            </properties>
+          </component>
         </children>
       </grid>
     </children>

src/de/rub/bph/ui/PuzzleHelperGUI.java

@@ -20,19 +20,16 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import java.awt.*;
-import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.*;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 
 /**
@@ -44,6 +41,7 @@ public class PuzzleHelperGUI extends JFrame implements WellPartitionPanel.WellPa
 
 	public static final String INSTRUCTION_IMHEIGHT = "imheight";
 	public static final String INSTRUCTION_IMWIDTH = "imwidth";
+	public static final String INSTRUCTION_SEPARATOR = "separatorChar";
 	public static final String INSTRUCTION_MAGNIFICATION = "immagni";
 	public static final String INSTRUCTION_MIRROR_COLUMN_TILING = "pmirrorcolumntiling";
 	public static final String INSTRUCTION_MIRROR_ROW_TILING = "pmirrorrowtiling";
@@ -82,14 +80,29 @@ public class PuzzleHelperGUI extends JFrame implements WellPartitionPanel.WellPa
 	private JSpinner partitionsSP;
 	private JLabel magnificationLB;
 	private JLabel partitionsWarningLB;
+	private JTextField separatorTF;
 
 	private JCheckBoxMenuItem autoUpdateCB;
 
 	public PuzzleHelperGUI() {
 		exportFileFilter = new FileNameExtensionFilter("XML", "xml");
 		imageFileFilter = new FileNameExtensionFilter("Image files", "tiff", "tif", "png", "bmp");
 
-		magnificationSP.setModel(new SpinnerNumberModel(1, Integer.MIN_VALUE, Integer.MAX_VALUE, 0.001));
+		MouseAdapter mouseListenerUpdate = new MouseAdapter() {
+			@Override
+			public void mouseEntered(MouseEvent e) {
+				super.mouseEntered(e);
+				requestUpdate();
+			}
+			
+			@Override
+			public void mouseExited(MouseEvent e) {
+				super.mouseExited(e);
+				requestUpdate();
+			}
+		};
+		
+		magnificationSP.setModel(new SpinnerNumberModel(1.0, -100.0, 100.0, 0.001));
 		pWidthSP.setModel(new SpinnerNumberModel(10, 1, Integer.MAX_VALUE, 1));
 		pHeightSP.setModel(new SpinnerNumberModel(10, 1, Integer.MAX_VALUE, 1));
 		imWidthSP.setModel(new SpinnerNumberModel(1000, 1, Integer.MAX_VALUE, 1));
@@ -103,6 +116,8 @@ public PuzzleHelperGUI() {
 		imHeightSP.addChangeListener(l);
 		partitionsSP.addChangeListener(changeEvent -> update());
 		magnificationSP.addChangeListener(changeEvent -> update());
+		magnificationSP.addMouseListener(mouseListenerUpdate);
+		exportInstructionFileButton.addMouseListener(mouseListenerUpdate);
 
 		directionCB.addItem(PuzzleDirection.RIGHT);
 		directionCB.addItem(PuzzleDirection.DOWN);
@@ -254,6 +269,7 @@ private void actionExportFile() throws IOException {
 		map.put(INSTRUCTION_PFLIPROW, String.valueOf(flipRowCB.isSelected()));
 		map.put(INSTRUCTION_PFLIPRESULT, String.valueOf(flipFinalImageCB.isSelected()));
 		map.put(INSTRUCTION_MAGNIFICATION, String.valueOf(getMagnification()));
+		map.put(INSTRUCTION_SEPARATOR, String.valueOf(separatorTF.getText()));
 		map.put(INSTRUCTION_VERSION, CellomicsPuzzleHelper.VERSION);
 
 		FileOutputStream fout = new FileOutputStream(f);
@@ -375,6 +391,7 @@ private void actionImportFile() throws IOException, ParserConfigurationException
 			pWidthSP.setValue(Integer.valueOf(document.getElementsByTagName(INSTRUCTION_PWIDTH).item(0).getTextContent()));
 			magnificationSP.setValue(Double.valueOf(document.getElementsByTagName(INSTRUCTION_MAGNIFICATION).item(0).getTextContent()));
 			pHeightSP.setValue(Integer.valueOf(document.getElementsByTagName(INSTRUCTION_PHEIGHT).item(0).getTextContent()));
+			separatorTF.setText(String.valueOf(document.getElementsByTagName(INSTRUCTION_SEPARATOR).item(0).getTextContent()));
 			flipFinalImageCB.setSelected(Boolean.valueOf(document.getElementsByTagName(INSTRUCTION_PFLIPRESULT).item(0).getTextContent()));
 			flipRowCB.setSelected(Boolean.valueOf(document.getElementsByTagName(INSTRUCTION_PFLIPROW).item(0).getTextContent()));
 			mirrorColumnTilingCB.setSelected(Boolean.valueOf(document.getElementsByTagName(INSTRUCTION_MIRROR_ROW_TILING).item(0).getTextContent()));
@@ -477,7 +494,12 @@ private void autoReadImageSize() {
 	}
 
 	private void requestUpdate() {
-		if (autoUpdateCB.isSelected()) update();
+		try {
+			if (autoUpdateCB.isSelected()) update();
+		}catch (Exception e){
+			e.printStackTrace();
+			JOptionPane.showConfirmDialog(this,"Error while trying to update the UI:\n"+e.getMessage(),"Error: "+e.getClass().getName(),JOptionPane.ERROR_MESSAGE);
+		}
 	}
 
 	private void update() {
@@ -538,9 +560,28 @@ public boolean hasWellPartitionsWithAtLeastOneControl(){
 	}
 
 	public double getMagnification(){
+		DecimalFormat format = (DecimalFormat) DecimalFormat.getInstance();
+		DecimalFormatSymbols symbols = format.getDecimalFormatSymbols();
+		char sep=symbols.getDecimalSeparator();
 		DecimalFormat df = new DecimalFormat("#.###");
-		double magnification = (double) magnificationSP.getValue();
+		
+		double magnification;
+		// So, there is a bug within Java to round the double spinner value to the nearest integer using "getValue()"
+		// That's why we gotta read the spinner text. Great.
+		JSpinner.NumberEditor numEditor = (JSpinner.NumberEditor) magnificationSP.getEditor();
+		JFormattedTextField textField = numEditor.getTextField();
+		JFormattedTextField.AbstractFormatter formatter = textField.getFormatter();
+		String text = textField.getText();
+		if (sep==','){
+			// Turns out we are on a German Locale. That means we gotta read the text field directly.
+			text = text.replace(",",".");
+			magnification = Double.parseDouble(text);
+		}else{
+			magnification=(double) magnificationSP.getValue();
+		}
+		
 		String formattedMagnification = df.format(magnification);
+		formattedMagnification=formattedMagnification.replace(",",".");
 		return Double.parseDouble(formattedMagnification);
 	}
 

src/de/rub/bph/ui/component/DoubleNumberModel.java

@@ -0,0 +1,70 @@
+package de.rub.bph.ui.component;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.util.ArrayList;
+
+public class DoubleNumberModel extends AbstractSpinnerModel {
+	
+	private double currentValue;
+	private double stepSize;
+	private double min;
+	private double max;
+	
+	public DoubleNumberModel(double value, double min, double max,double stepSize) {
+		super();
+		this.stepSize = stepSize;
+		this.min = min;
+		this.max = max;
+		this.currentValue=value;
+	}
+	
+	@Override
+	public Object getValue() {
+		return currentValue;
+	}
+	
+	@Override
+	public void setValue(Object value) {
+		currentValue = Double.parseDouble(value.toString());
+		fireStateChanged();
+	}
+	
+	@Override
+	public Object getNextValue() {
+		fireStateChanged();
+		return currentValue + stepSize;
+	}
+	
+	@Override
+	public Object getPreviousValue() {
+		fireStateChanged();
+		return currentValue - stepSize;
+	}
+	
+	
+	public double getStepSize() {
+		return stepSize;
+	}
+	
+	public void setStepSize(double stepSize) {
+		this.stepSize = stepSize;
+	}
+	
+	public double getMin() {
+		return min;
+	}
+	
+	public void setMin(double min) {
+		this.min = min;
+	}
+	
+	public double getMax() {
+		return max;
+	}
+	
+	public void setMax(double max) {
+		this.max = max;
+	}
+}