6.4.6 release

Former-commit-id: 3c54049

Author: davidjgraph

ChangeLog

@@ -1,8 +1,12 @@
-05-APR_2017: 6.4.5
+06-APR-2017: 6.4.6
+
+- Works around page counter loop condition in FF
+
+05-APR-2017: 6.4.5
 
 - .vsdx import improvements
 
-03-APR_2017: 6.4.4
+03-APR-2017: 6.4.4
 
 - Increases black header title in Conf Cloud to push tick and cross out of visible area
 

VERSION

@@ -1 +1 @@
-6.4.5
+6.4.6

src/com/mxgraph/io/vsdx/VsdxShape.java

@@ -27,9 +27,6 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.mxgraph.io.vsdx.geometry.LineTo;
-import com.mxgraph.io.vsdx.geometry.MoveTo;
-import com.mxgraph.io.vsdx.geometry.Row;
 import com.mxgraph.io.vsdx.theme.Color;
 import com.mxgraph.model.mxCell;
 import com.mxgraph.model.mxGeometry;
@@ -213,6 +210,11 @@ public VsdxShape(mxVsdxPage page, Element shape, boolean vertex, Map<String, mxV
 		{
 			masterShape.processGeomList(null);
 			processGeomList(masterShape.getGeomList());
+
+			//recalculate width and height using master data
+			if (this.width == 0) this.width = getScreenNumericalValue(getCellElement(mxVsdxConstants.WIDTH), 0);
+			
+			if (this.height == 0) this.height = getScreenNumericalValue(getCellElement(mxVsdxConstants.HEIGHT), 0);
 		}
 		else
 		{
@@ -1003,6 +1005,12 @@ else if (!(linePattern.equals("0") || linePattern.equals("1")))
 	 */
 	public double getLineWidth()
 	{
+		//if an edge has a fill geometry, then the line width matches the min of the shape width & height 
+		if (!isVertex() && geomList != null && !geomList.isNoFill())
+		{
+			return Math.min(height, width);
+		}
+
 		String lineWeight = getValue(this.getCellElement(mxVsdxConstants.LINE_WEIGHT), "0");
 
 		double lWeight = 0;
@@ -1445,7 +1453,7 @@ public Map<String, String> getForm()
 				this.styleDebug("shape type = " + type);
 
 				//The master may contain the foreign object data
-				if (this.imageData != null || (mxVsdxConstants.FOREIGN.equals(type) && masterShape.imageData != null))
+				if (this.imageData != null || (mxVsdxConstants.FOREIGN.equals(type) && masterShape != null && masterShape.imageData != null))
 				{
 					Map<String, String> imageData = this.imageData != null? this.imageData : masterShape.imageData;
 
@@ -2072,8 +2080,8 @@ public mxCell createLabelSubShape(mxGraph graph, mxCell parent)
 		double txtHV = getScreenNumericalValue(getShapeNode(mxVsdxConstants.TXT_HEIGHT), getHeight());
 		double txtLocPinXV = getScreenNumericalValue(getShapeNode(mxVsdxConstants.TXT_LOC_PIN_X), txtWV / 2.0);
 		double txtLocPinYV = getScreenNumericalValue(getShapeNode(mxVsdxConstants.TXT_LOC_PIN_Y), txtHV / 2.0);
-		double txtPinXV =getScreenNumericalValue(getShapeNode(mxVsdxConstants.TXT_PIN_X), 0);
-		double txtPinYV = getScreenNumericalValue(getShapeNode(mxVsdxConstants.TXT_PIN_Y), txtHV);
+		double txtPinXV =getScreenNumericalValue(getShapeNode(mxVsdxConstants.TXT_PIN_X), txtLocPinXV);
+		double txtPinYV = getScreenNumericalValue(getShapeNode(mxVsdxConstants.TXT_PIN_Y), txtLocPinYV);
 		double txtAngleV = getValueAsDouble(getShapeNode(mxVsdxConstants.TXT_ANGLE), 0);
 
 		String textLabel = getTextLabel();
@@ -2084,9 +2092,11 @@ public mxCell createLabelSubShape(mxGraph graph, mxCell parent)
 			styleMap.put(mxConstants.STYLE_FILLCOLOR, mxConstants.NONE);
 			styleMap.put(mxConstants.STYLE_STROKECOLOR, mxConstants.NONE);
 			styleMap.put(mxConstants.STYLE_GRADIENTCOLOR, mxConstants.NONE);
-			styleMap.put("align", "center");
-			styleMap.put("verticalAlign", "middle");
-			styleMap.put("whiteSpace", "wrap");
+			
+			//We don't need to override these attributes in order to properly align the text
+			if (!styleMap.containsKey("align")) styleMap.put("align", "center");
+			if (!styleMap.containsKey("verticalAlign")) styleMap.put("verticalAlign", "middle");
+			if (!styleMap.containsKey("whiteSpace")) styleMap.put("whiteSpace", "wrap");
 
 			// Doesn't make sense to set a shape, it's not rendered and doesn't affect the text perimeter
 			styleMap.remove("shape");

war/WEB-INF/appengine-web.xml

@@ -2,7 +2,7 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 	<application>drawdotio</application>
 	<!-- IMPORTANT! DO NOT CHANGE THIS VALUE IN SOURCE CONTROL! -->
-	<version>6-4-5</version>
+	<version>6-4-6</version>
 
 	<!-- Configure java.util.logging -->
 	<system-properties>

war/cache.manifest

@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 04/05/2017 03:25 PM
+# 04/06/2017 12:53 AM
 
 app.html
 index.html?offline=1