Adds option to normalize stencil size (scaling to absolute size)

Author: egrimate

src/com/mxgraph/svg2xml/Shape2Xml.java

@@ -50,6 +50,11 @@ public static Element parse(Element element, Document xmlDoc, XmlConfig configDo
 	{
 		double s = configDoc.getRelativeScalingRatio();
 
+		if (!configDoc.isRelativeScaling())
+		{
+			s = Math.min(configDoc.getAbsoluteScalingX() / configDoc.getStencilBoundsX(), configDoc.getAbsoluteScalingY() / configDoc.getStencilBoundsY());
+		}
+		
 		if (element.getNodeName().equals("rect"))
 		{
 			if (element.getAttribute("transform") != null && !element.getAttribute("transform").equals(""))

src/com/mxgraph/svg2xml/Svg2Xml.java

@@ -336,11 +336,11 @@ else if (aspectRatio.toLowerCase().equals("variable"))
 				Constraint currConstraint = constraints.get(j);
 
 				double x = currConstraint.getX() - bounds.getMinX();
-				x = Math.round(x * 100.0 / bounds.getWidth()) / 100.0;
+				x = Math.round(x * 1000.0 / bounds.getWidth()) / 1000.0;
 				currConstraint.setX(x);
 
 				double y = currConstraint.getY() - bounds.getMinY();
-				y = Math.round(y * 100.0 / bounds.getHeight()) / 100.0;
+				y = Math.round(y * 1000.0 / bounds.getHeight()) / 1000.0;
 				currConstraint.setY(y);
 			}
 
@@ -2252,8 +2252,16 @@ private static void createBackbone(Document destDoc, XmlConfig destConfigDoc, St
 
 		if (destConfigDoc.isCalculateBorder())
 		{
-			double w = destConfigDoc.getStencilBoundsX() * s;
-			double h = destConfigDoc.getStencilBoundsY() * s;
+			double w = Math.round(destConfigDoc.getStencilBoundsX() * s * 1000.0) / 1000.0;
+			double h = Math.round(destConfigDoc.getStencilBoundsY() * s * 1000.0) / 1000.0;
+			
+			if (!destConfigDoc.isRelativeScaling())
+			{
+				double sc = Math.min(destConfigDoc.getAbsoluteScalingX() / destConfigDoc.getStencilBoundsX(), destConfigDoc.getAbsoluteScalingY() / destConfigDoc.getStencilBoundsY());
+				w = Math.round(destConfigDoc.getStencilBoundsX() * sc * 1000.0) / 1000.0;
+				h = Math.round(destConfigDoc.getStencilBoundsY() * sc * 1000.0) / 1000.0;
+			}
+			
 			root.setAttribute("w", String.valueOf(w));
 			root.setAttribute("h", String.valueOf(h));
 		}

src/com/mxgraph/svg2xml/Svg2XmlGui.java

@@ -49,7 +49,7 @@ public class Svg2XmlGui implements ActionListener{
 	protected boolean roundCoords=true;
 
 	//round to decimals (used with roundCoords=true)
-	protected int decimalsToRound=2;
+	protected int decimalsToRound=3;
 
 	//i'm not yet sure about the exact functionality of this
 	protected boolean overrideLocalConfig=false; //TODO make use of this var
@@ -136,7 +136,7 @@ public void actionPerformed(ActionEvent e) {
 		relScalePanel.add(relScaleComponent);
 
 		JPanel absScalePanel = new JPanel();
-		useAbsScaleComponent = new JRadioButton("TODO", !relativeScaling); //Use absolute scaling
+		useAbsScaleComponent = new JRadioButton("Normalize size to:", !relativeScaling); //Use absolute scaling
 		JLabel absScaleLabel1 = new JLabel("x:");
 		absXScaleComponent = new JTextField(Double.toString(absoluteScalingX), 4);
 		JLabel absScaleLabel2 = new JLabel("px   y:");
@@ -156,7 +156,7 @@ public void actionPerformed(ActionEvent e) {
 
 		JPanel roundPanel = new JPanel();
 		roundCoordinatesComponent = new JCheckBox("Round coordinates to ", roundCoords);
-		roundDecimalNumComponent = new JTextField("2", 4);
+		roundDecimalNumComponent = new JTextField("3", 4);
 		JLabel decimalLabel1 = new JLabel("decimals");
 		roundPanel.add(roundCoordinatesComponent);
 		roundPanel.add(roundDecimalNumComponent);