Skip to content

Commit

Permalink
6.5.7 release
Browse files Browse the repository at this point in the history
Former-commit-id: 49c97d1
  • Loading branch information
alderg committed Apr 29, 2017
1 parent d6012a3 commit 918c956
Show file tree
Hide file tree
Showing 80 changed files with 2,457 additions and 1,051 deletions.
8 changes: 8 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
29-APR-2017: 6.5.7

- Fixes default and button labels for lost changes dialog
- Fixes event handling for overlapping edge handles
- Adds library export to local storage
- Ignores auth files in local storage picker
- Uses mxGraph 3.7.3 beta 3

27-APR-2017: 6.5.6

- Adds arrows and textbox to general sidebar
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.5.6
6.5.7
10 changes: 5 additions & 5 deletions etc/mxgraph/mxClient.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 19 additions & 3 deletions src/com/mxgraph/io/vsdx/VsdxShape.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;

import com.mxgraph.io.mxVsdxCodec;
import com.mxgraph.io.vsdx.theme.Color;
import com.mxgraph.io.vsdx.theme.QuickStyleVals;
import com.mxgraph.model.mxCell;
Expand Down Expand Up @@ -2231,11 +2232,14 @@ public mxCell createLabelSubShape(mxGraph graph, mxCell parent)
//image should be set for the parent shape only
styleMap.remove("image");
//styleMap.put("html", "1");


double rotation = getRotation();

if (txtAngleV != 0)
{
double labRot = txtAngleV * 180 / Math.PI;
labRot = Math.round((labRot + getRotation()) * 100.0) / 100.0;
double labRot = 360 - Math.toDegrees(txtAngleV);

labRot = Math.round(((labRot + rotation) % 360.0) * 100.0) / 100.0;

if (labRot != 0.0)
{
Expand All @@ -2249,6 +2253,18 @@ public mxCell createLabelSubShape(mxGraph graph, mxCell parent)
double y = parent.getGeometry().getHeight() - (txtPinYV + txtHV - txtLocPinYV);
double x = txtPinXV - txtLocPinXV;



if (rotation > 0)
{
mxGeometry tmpGeo = new mxGeometry(x, y, txtWV, txtHV);
mxGeometry pgeo = parent.getGeometry();
double hw = pgeo.getWidth() / 2, hh = pgeo.getHeight() / 2;
mxVsdxCodec.rotatedPoint(tmpGeo, rotation, hw, hh);
x = tmpGeo.getX();
y = tmpGeo.getY();
}

mxCell v1 = (mxCell) graph.insertVertex(parent, null, textLabel, x, y, txtWV, txtHV, style + ";html=1;");

return v1;
Expand Down
6 changes: 1 addition & 5 deletions war/WEB-INF/appengine-web.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,7 @@
</include>
<include path="/**" />
</static-files>

<resource-files>
<exclude path="/node_modules/**" />
</resource-files>


<instance-class>F2</instance-class>
<automatic-scaling>
<min-idle-instances>1</min-idle-instances>
Expand Down
2 changes: 1 addition & 1 deletion war/cache.manifest
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CACHE MANIFEST

# THIS FILE WAS GENERATED. DO NOT MODIFY!
# 04/27/2017 09:16 AM
# 04/29/2017 11:28 AM

app.html
index.html?offline=1
Expand Down
7 changes: 4 additions & 3 deletions war/electron.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ function createWindow (opt = {}) {
'db': 0,
'gapi': 0,
'od': 0,
'gh': 0,
'analytics': 0,
'picker': 0,
'mode': 'device',
Expand Down Expand Up @@ -72,11 +73,11 @@ function createWindow (opt = {}) {
win,
{
type: 'question',
buttons: ['Yes', 'No'],
buttons: ['Cancel', 'Discard Changes'],
title: 'Confirm',
message: 'All Changes will be lost' //mxResources.get('allChangesLost')
message: 'The document has unsaved changes. Do you really want to quit without saving?' //mxResources.get('allChangesLost')
})
if (choice === 0) {
if (choice === 1) {
win.destroy()
}
} else {
Expand Down
3 changes: 3 additions & 0 deletions war/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,9 @@
if (document.location.protocol == 'file:')
{
mxDevUrl = '../../mxgraph2';

// Forces includes for dev environment in node.js
mxForceIncludes = true;
}

var geBasePath = mxDevUrl + '/javascript/examples/grapheditor/www/js';
Expand Down
Loading

0 comments on commit 918c956

Please sign in to comment.