Skip to content

Commit

Permalink
6.7.1 release
Browse files Browse the repository at this point in the history
Former-commit-id: 931f0c5
  • Loading branch information
alderg committed May 30, 2017
1 parent 850ee56 commit f5757a5
Show file tree
Hide file tree
Showing 22 changed files with 1,290 additions and 219 deletions.
12 changes: 12 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
30-MAY-2017: 6.7.1

- Adds viewer lightbox option in Confluence Connect
- Uses mxGraph 3.7.3 beta 9

29-MAY-2017: 6.7.0

- Adds viewer toolbar config for Confluence Connect
- Enables video and source tags in labels and tooltips
- Fixes reset of edge styles in CSV import
- Uses mxGraph 3.7.3 beta 8

25-MAY-2017: 6.6.5

- Adds print option in lightbox
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.6.5
6.7.1
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: 17 additions & 5 deletions src/com/mxgraph/io/gliffy/importer/GliffyDiagramConverter.java
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,7 @@ private mxCell getTerminalCell(GliffyObject gliffyEdge, boolean start)
* @param startTerminal starting point
* @param endTerminal ending point
*/
private void setWaypoints(GliffyObject object, mxCell startTerminal,
mxCell endTerminal)
private void setWaypoints(GliffyObject object, mxCell startTerminal, mxCell endTerminal)
{
mxCell cell = object.getMxObject();
mxGeometry geo = drawioDiagram.getModel().getGeometry(cell);
Expand All @@ -227,13 +226,17 @@ private void setWaypoints(GliffyObject object, mxCell startTerminal,
{
return;
}

List<mxPoint> mxPoints = new ArrayList<mxPoint>();

for (float[] point : points)
{
mxPoints.add(new mxPoint((int) point[0] + (int) object.x,
(int) point[1] + (int) object.y));
float[] pts = {point[0], point[1]};

if(object.rotation != 0)
pts = rotate(pts[0], pts[1], object.rotation);

mxPoints.add(new mxPoint(pts[0] + object.x, pts[1] + object.y));
}

if (startTerminal == null)
Expand All @@ -258,6 +261,15 @@ private void setWaypoints(GliffyObject object, mxCell startTerminal,
drawioDiagram.getModel().setGeometry(cell, geo);

}

private float[] rotate(float px, float py, float angle)
{
double angleRad = Math.toRadians(angle);
double x = px * Math.cos(angleRad) - py * Math.sin(angleRad);
double y = px * Math.sin(angleRad) + py * Math.cos(angleRad);

return new float[] {(float)x, (float)y};
}

/**
* Creates a map of all vertices so they can be easily accessed when looking
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ com.gliffy.shape.flowchart.flowchart_v1.default.delay=delay
com.gliffy.shape.flowchart.flowchart_v1.default.start_end=mxgraph.flowchart.terminator
com.gliffy.shape.flowchart.flowchart_v1.default.connector=ellipse;perimeter=ellipsePerimeter
com.gliffy.shape.flowchart.flowchart_v1.default.off_page_connector=offPageConnector;size=0.3
com.gliffy.shape.flowchart.flowchart_v1.default.left_arrow=mxgraph.arrows2.arrow;dy=0.6;dx=25;flipH=1;notch=0
com.gliffy.shape.flowchart.flowchart_v1.default.right_arrow=mxgraph.arrows2.arrow;dy=0.6;dx=25;notch=0
com.gliffy.shape.flowchart.flowchart_v1.default.double_arrow=mxgraph.arrows2.twoWayArrow;dy=0.6;dx=25
com.gliffy.shape.flowchart.flowchart_v1.default.left_arrow=mxgraph.arrows2.arrow;dy=0.65;dx=8.29;flipH=1;notch=0
com.gliffy.shape.flowchart.flowchart_v1.default.right_arrow=mxgraph.arrows2.arrow;dy=0.65;dx=8.29;notch=0
com.gliffy.shape.flowchart.flowchart_v1.default.double_arrow=mxgraph.arrows2.twoWayArrow;dy=0.65;dx=8.29;
#
# SWIMLANES
#
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!
# 05/26/2017 12:24 PM
# 05/30/2017 11:30 AM

app.html
index.html?offline=1
Expand Down
Loading

0 comments on commit f5757a5

Please sign in to comment.