Skip to content
This repository has been archived by the owner on Jan 26, 2022. It is now read-only.

Commit

Permalink
Merge pull request #107 from mattcasters/master
Browse files Browse the repository at this point in the history 
issue #89
  • Loading branch information
@mattcasters
mattcasters committed Feb 15, 2019
2 parents f41f868 + 5a7ac1f commit 651583f
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 44 deletions.
147 changes: 104 additions & 43 deletions src/main/java/bi/know/kettle/neo4j/model/GraphModelDialog.java
View file
@@ -1,6 +1,7 @@
package bi.know.kettle.neo4j.model;

import bi.know.kettle.neo4j.steps.output.Neo4JOutputDialog;
import org.apache.commons.lang.StringUtils;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.custom.CTabFolder;
Expand Down Expand Up @@ -28,6 +29,7 @@
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.List;
import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
Expand Down Expand Up @@ -100,6 +102,15 @@ public class GraphModelDialog extends Dialog {
private RowMetaInterface inputRowMeta;
private Point mouseDownPoint;
private Canvas wCanvas;
private Label wlNodeName;
private Label wlNodeDescription;
private Label wlNodeProperties;
private Label wlRelName;
private Label wlRelDescription;
private Label wlRelLabel;
private Label wlRelSource;
private Label wlRelTarget;
private Label wlRelProperties;

public GraphModelDialog( Shell parent, GraphModel graphModel ) {
this( parent, graphModel, null );
Expand Down Expand Up @@ -188,6 +199,16 @@ public boolean open() {

private void ok() {

// We really need a name for the graph model...
//
if ( StringUtils.isEmpty(graphModel.getName())) {
MessageBox box = new MessageBox( shell, SWT.OK | SWT.ICON_ERROR );
box.setText( "Error" );
box.setMessage( "Please give this model a name so it can be saved and referenced." );
box.open();
return;
}

ok = true;
originalGraphModel.replace( graphModel );
dispose();
Expand All @@ -208,25 +229,58 @@ private void getData() {
refreshNodesList();
if ( graphModel.getNodes().size() > 0 ) {
String activeName = graphModel.getNodeNames()[ 0 ];
activeNode = graphModel.findNode( activeName );
setActiveNode( activeName );
wNodesList.setSelection( new String[] { activeName } );
refreshNodeFields();
}
refreshRelationshipsList();
if ( graphModel.getRelationships().size() > 0 ) {
String activeRelationshipName = graphModel.getRelationshipNames()[ 0 ];
activeRelationship = graphModel.findRelationship( activeRelationshipName );
setActiveRelationship( activeRelationshipName );
wRelationshipsList.setSelection( new String[] { activeRelationshipName } );
refreshRelationshipsFields();
}

enableFields();
}

private void enableFields() {
boolean nodeSelected = activeNode != null;

wlNodeName.setEnabled( nodeSelected );
wNodeName.setEnabled( nodeSelected );
wlNodeDescription.setEnabled( nodeSelected );
wNodeDescription.setEnabled( nodeSelected );
wNodeLabels.setEnabled( nodeSelected );
wlNodeProperties.setEnabled( nodeSelected );
wNodeProperties.setEnabled( nodeSelected );

boolean relationshipSelected = activeRelationship != null;

wlRelName.setEnabled( relationshipSelected );
wRelName.setEnabled( relationshipSelected );
wlRelDescription.setEnabled( relationshipSelected );
wRelDescription.setEnabled( relationshipSelected );
wlRelLabel.setEnabled( relationshipSelected );
wRelLabel.setEnabled( relationshipSelected );
wlRelSource.setEnabled( relationshipSelected );
wRelSource.setEnabled( relationshipSelected );
wlRelTarget.setEnabled( relationshipSelected );
wRelTarget.setEnabled( relationshipSelected );
wlRelProperties.setEnabled( relationshipSelected );
wRelProperties.setEnabled( relationshipSelected );
}

private void setActiveNode( String nodeName ) {
activeNode = graphModel.findNode( nodeName );

enableFields();
}

private void setActiveRelationship( String relationshipName ) {
activeRelationship = graphModel.findRelationship( relationshipName );

enableFields();
}


Expand Down Expand Up @@ -497,7 +551,7 @@ private void addNodesTab() {
refreshNodeFields();
} );

Label wlNodeName = new Label( wNodesComp, SWT.RIGHT );
wlNodeName = new Label( wNodesComp, SWT.RIGHT );
wlNodeName.setText( "Name" );
props.setLook( wlNodeName );
FormData fdlNodeName = new FormData();
Expand All @@ -521,7 +575,7 @@ private void addNodesTab() {
fdNodeName.top = new FormAttachment( wlNodeName, 0, SWT.CENTER );
wNodeName.setLayoutData( fdNodeName );

Label wlNodeDescription = new Label( wNodesComp, SWT.RIGHT );
wlNodeDescription = new Label( wNodesComp, SWT.RIGHT );
wlNodeDescription.setText( "Description" );
props.setLook( wlNodeDescription );
FormData fdlNodeDescription = new FormData();
Expand Down Expand Up @@ -558,7 +612,7 @@ private void addNodesTab() {

// Properties
//
Label wlNodeProperties = new Label( wNodesComp, SWT.LEFT );
wlNodeProperties = new Label( wNodesComp, SWT.LEFT );
wlNodeProperties.setText( "Properties:" );
props.setLook( wlNodeProperties );
FormData fdlNodeProperties = new FormData();
Expand Down Expand Up @@ -774,6 +828,7 @@ private void copyNode() {
refreshNodesList();
wNodesList.setSelection( new String[] { graphNode.getName(), } );
refreshNodeFields();
enableFields();
}

private void deleteNode() {
Expand All @@ -792,16 +847,19 @@ private void deleteNode() {
wNodesList.setSelection( selectionIndex );
if ( wNodesList.getSelection().length > 0 ) {
setActiveNode( wNodesList.getSelection()[ 0 ] );
} else {
setActiveNode( null );
}
refreshNodeFields();
}
enableFields();
}

private void newNode() {
GraphNode node = new GraphNode();
node.setName( "Node " + ( graphModel.getNodes().size() + 1 ) );
graphModel.getNodes().add( node );
activeNode = node;
setActiveNode( node.getName() );
refreshNodesList();
refreshNodeFields();
}
Expand Down Expand Up @@ -878,7 +936,7 @@ private void addRelationshipsTab() {
refreshRelationshipsFields();
} );

Label wlRelName = new Label( wRelComp, SWT.LEFT );
wlRelName = new Label( wRelComp, SWT.LEFT );
wlRelName.setText( "Name" );
props.setLook( wlRelName );
FormData fdlRelName = new FormData();
Expand All @@ -902,7 +960,7 @@ private void addRelationshipsTab() {
}
} );

Label wlRelDescription = new Label( wRelComp, SWT.LEFT );
wlRelDescription = new Label( wRelComp, SWT.LEFT );
wlRelDescription.setText( "Description" );
props.setLook( wlRelDescription );
FormData fdlRelDescription = new FormData();
Expand All @@ -922,7 +980,7 @@ private void addRelationshipsTab() {
}
} );

Label wlRelLabel = new Label( wRelComp, SWT.LEFT );
wlRelLabel = new Label( wRelComp, SWT.LEFT );
wlRelLabel.setText( "Label" );
props.setLook( wlRelLabel );
FormData fdlRelLabel = new FormData();
Expand All @@ -942,7 +1000,7 @@ private void addRelationshipsTab() {
}
} );

Label wlRelSource = new Label( wRelComp, SWT.LEFT );
wlRelSource = new Label( wRelComp, SWT.LEFT );
wlRelSource.setText( "Source" );
props.setLook( wlRelSource );
FormData fdlRelSource = new FormData();
Expand All @@ -962,7 +1020,7 @@ private void addRelationshipsTab() {
}
} );

Label wlRelTarget = new Label( wRelComp, SWT.LEFT );
wlRelTarget = new Label( wRelComp, SWT.LEFT );
wlRelTarget.setText( "Target" );
props.setLook( wlRelTarget );
FormData fdlRelTarget = new FormData();
Expand All @@ -985,7 +1043,7 @@ private void addRelationshipsTab() {

// Properties
//
Label wlRelProperties = new Label( wRelComp, SWT.LEFT );
wlRelProperties = new Label( wRelComp, SWT.LEFT );
wlRelProperties.setText( "Properties:" );
props.setLook( wlRelProperties );
FormData fdlRelProperties = new FormData();
Expand Down Expand Up @@ -1063,7 +1121,7 @@ private void copyRelationship() {
GraphRelationship graphRelationship = new GraphRelationship( activeRelationship );
graphRelationship.setName( activeRelationship.getName() + " (copy)" );
graphModel.getRelationships().add( graphRelationship );
activeRelationship = graphRelationship;
setActiveRelationship( graphRelationship.getName() );
refreshRelationshipsList();
wRelationshipsList.setSelection( new String[] { graphRelationship.getName(), } );
refreshRelationshipsFields();
Expand All @@ -1085,6 +1143,8 @@ private void deleteRelationship() {
wRelationshipsList.setSelection( selectionIndex );
if ( wRelationshipsList.getSelection().length > 0 ) {
setActiveRelationship( wRelationshipsList.getSelection()[ 0 ] );
} else {
setActiveRelationship( null );
}
refreshRelationshipsFields();
}
Expand All @@ -1094,7 +1154,7 @@ private void newRelationship() {
GraphRelationship relationship = new GraphRelationship();
relationship.setName( "Relationship " + ( graphModel.getRelationships().size() + 1 ) );
graphModel.getRelationships().add( relationship );
activeRelationship = relationship;
setActiveRelationship(relationship.getName() );
refreshRelationshipsList();
refreshRelationshipsFields();
}
Expand Down Expand Up @@ -1167,7 +1227,7 @@ private void autoModelLayout( Event event ) {
Rectangle bounds = wCanvas.getBounds();
nodeCache = new HashMap<>();

int optDistance = (int) (( bounds.width + bounds.height ) * 1.5 / ( graphModel.getNodes().size() + 1 ));
int optDistance = (int) ( ( bounds.width + bounds.height ) * 1.5 / ( graphModel.getNodes().size() + 1 ) );
int nrNodes = graphModel.getNodes().size();

java.util.List<Point> nodesizes = getNodeSizes();
Expand Down Expand Up @@ -1205,19 +1265,19 @@ private void autoModelLayout( Event event ) {
}

private java.util.List<Point> getNodeSizes() {
java.util.List<Point> sizes = new ArrayList<>( );
java.util.List<Point> sizes = new ArrayList<>();

Image image = new Image(shell.getDisplay(), 100, 100);
GC gc = new GC(image);
Image image = new Image( shell.getDisplay(), 100, 100 );
GC gc = new GC( image );
gc.setFont( GUIResource.getInstance().getFontMediumBold() );

for (GraphNode node : graphModel.getNodes()) {
for ( GraphNode node : graphModel.getNodes() ) {
Point textExtent = gc.textExtent( node.getName() );

int width = textExtent.x + 2 * 10; // 10 : margin
int height = textExtent.y + 2 * 10;

sizes.add(new Point(width, height ));
sizes.add( new Point( width, height ) );
}
gc.dispose();
image.dispose();
Expand Down Expand Up @@ -1259,7 +1319,8 @@ public void calculateTotal() {
}

@Override public String toString() {
return "Score: " + (long)score + " [distanceToOthers=" + (long)distanceToOthers + ", distanceToCenter" + (long)distanceToCenter + ", vertexLength=" + (long)vertexLength + ", crossedVertices=" + (long)crossedVertices + ", overlappingLabels="+overlappingLabels+"]";
return "Score: " + (long) score + " [distanceToOthers=" + (long) distanceToOthers + ", distanceToCenter" + (long) distanceToCenter + ", vertexLength=" + (long) vertexLength
+ ", crossedVertices=" + (long) crossedVertices + ", overlappingLabels=" + overlappingLabels + "]";
}
}

Expand Down Expand Up @@ -1291,7 +1352,7 @@ private Scoring calculateGraphScore( java.util.List<Point> coordinates, Rectangl

// Add penalty for being far from the center!
//
scoring.distanceToCenter += 25*calculateDistance( center, nodePoint );
scoring.distanceToCenter += 25 * calculateDistance( center, nodePoint );
}

// Penalties for crossing vertices
Expand Down Expand Up @@ -1329,33 +1390,33 @@ private Scoring calculateGraphScore( java.util.List<Point> coordinates, Rectangl

// Build label rectangles
//
java.util.List<Rectangle> labels = new ArrayList<>( );
for (int s=0;s<nodeSizes.size();s++) {
Point nodePoint = coordinates.get(s);
java.util.List<Rectangle> labels = new ArrayList<>();
for ( int s = 0; s < nodeSizes.size(); s++ ) {
Point nodePoint = coordinates.get( s );
Point size = nodeSizes.get( s );
labels.add(new Rectangle( nodePoint.x, nodePoint.y, size.x, size.y ));
labels.add( new Rectangle( nodePoint.x, nodePoint.y, size.x, size.y ) );
}

// Pentalties for overlapping labels
//
for (int a=0;a<labels.size();a++) {
for ( int a = 0; a < labels.size(); a++ ) {
Rectangle labelA = labels.get( a );
// Intersection with other label?
//
for (int b=0;b<labels.size();b++) {
if (a!=b) {
for ( int b = 0; b < labels.size(); b++ ) {
if ( a != b ) {
Rectangle labelB = labels.get( b );
if (labelA.intersects( labelB )) {
if ( labelA.intersects( labelB ) ) {
scoring.overlappingLabels += 30000;
}
}
}
// Label outside of bounds?
//
if (labelA.x+labelA.width>bounds.width) {
if ( labelA.x + labelA.width > bounds.width ) {
scoring.overlappingLabels += 50000;
}
if (labelA.y+labelA.height>bounds.height) {
if ( labelA.y + labelA.height > bounds.height ) {
scoring.overlappingLabels += 50000;
}
// Intersection with any vertices?
Expand Down Expand Up @@ -1383,16 +1444,16 @@ private java.util.List<Point> generateRandomPoints( Rectangle bounds, int size )
java.util.List<Point> points = new ArrayList<>();
for ( int i = 0; i < size; i++ ) {

Point point = generateRandomPoint(bounds);
Point point = generateRandomPoint( bounds );
points.add( point );
}
return points;
}

private Point generateRandomPoint( Rectangle bounds ) {
int x = (int) ( ( random.nextDouble() * bounds.width * 0.7 ) + ( 0.15*bounds.width ) );
int y = (int) ( ( random.nextDouble() * bounds.height * 0.7 ) + ( 0.15*bounds.height ) );
return new Point(x, y);
int x = (int) ( ( random.nextDouble() * bounds.width * 0.7 ) + ( 0.15 * bounds.width ) );
int y = (int) ( ( random.nextDouble() * bounds.height * 0.7 ) + ( 0.15 * bounds.height ) );
return new Point( x, y );
}


Expand All @@ -1409,8 +1470,8 @@ private java.util.List<Point> modifyRandomPoints( java.util.List<Point> original
//
for ( int i = 0; i < count; i++ ) {
int index = (int) ( random.nextDouble() * size );
Point point = generateRandomPoint(bounds);
points.set( index, point);
Point point = generateRandomPoint( bounds );
points.set( index, point );
}
return points;
}
Expand Down Expand Up @@ -1496,13 +1557,13 @@ private void moveGraphObject( Event e ) {
} else {
// Move all the objects around
//
int offsetX = mouseDownPoint.x-e.x;
int offsetY = mouseDownPoint.y-e.y;
int offsetX = mouseDownPoint.x - e.x;
int offsetY = mouseDownPoint.y - e.y;

for (GraphNode graphNode : graphModel.getNodes()) {
for ( GraphNode graphNode : graphModel.getNodes() ) {
GraphPresentation p = graphNode.getPresentation();
p.setX(p.getX()-offsetX);
p.setY(p.getY()-offsetY);
p.setX( p.getX() - offsetX );
p.setY( p.getY() - offsetY );
}
mouseDownPoint.x = e.x;
mouseDownPoint.y = e.y;
Expand Down

0 comments on commit 651583f

Please sign in to comment.