Fix the property pane.

Author: gfokkema

dnainator-core/src/main/java/nl/tudelft/dnainator/graph/impl/Neo4jSequenceNode.java

@@ -59,8 +59,9 @@ public Neo4jSequenceNode(GraphDatabaseService service, Node node) {
 		this.scores = new HashMap<>();
 
 		try (Transaction tx = service.beginTx()) {
-			this.id  = (String) node.getProperty(SequenceProperties.ID.name());
-			basedist = (int)    node.getProperty(SequenceProperties.BASE_DIST.name());
+			this.id         = (String) node.getProperty(SequenceProperties.ID.name());
+			basedist        = (int) node.getProperty(SequenceProperties.BASE_DIST.name());
+			interestingness = (int) node.getProperty(SequenceProperties.INTERESTINGNESS.name(), 0);
 
 			node.getRelationships(RelTypes.NEXT, Direction.OUTGOING).forEach(e -> {
 				outgoing.add((String) e.getEndNode().getProperty(SequenceProperties.ID.name()));
@@ -137,7 +138,6 @@ public Map<ScoreIdentifier, Integer> getScores() {
 
 	@Override
 	public int getInterestingnessScore() {
-		load();
 		return interestingness;
 	}
 
@@ -159,7 +159,6 @@ private void load() {
 			for (ScoreIdentifier id : Scores.values()) {
 				scores.put(id, (Integer) node.getProperty(id.name(), 0));
 			}
-			interestingness = (int) node.getProperty(SequenceProperties.INTERESTINGNESS.name(), 0);
 			tx.success();
 		}
 

dnainator-javafx/src/main/java/nl/tudelft/dnainator/javafx/drawables/strains/ClusterDrawable.java

@@ -18,7 +18,6 @@
 import javafx.collections.MapChangeListener;
 import javafx.scene.Group;
 import javafx.scene.shape.Circle;
-import javafx.scene.text.Text;
 
 /**
  * This enum represents all properties a Cluster can have.
@@ -32,7 +31,7 @@ enum ClusterPropertyTypes implements PropertyType {
 	SOURCES("Sources"),
 	STARTRANK("Start rank"),
 	BASEDIST("Start base"),
-	SCORE("Total interestingness score");
+	SCORE("Maximum interestingness score");
 
 	private String description;
 	private ClusterPropertyTypes(String description) {
@@ -60,7 +59,6 @@ public class ClusterDrawable extends Group implements Drawable, Propertyable {
 	private static final int INTERESTINGNESS_THRESHOLD = 600;
 	private Cluster cluster;
 	private Set<String> sources;
-	private Text label;
 	private Pie pie;
 	private Map<PropertyType, String> properties;
 	private int interestingness;
@@ -79,7 +77,6 @@ public ClusterDrawable(ColorServer colorServer, Cluster cluster) {
 		this.interestingness = cluster.getNodes().stream()
 				.mapToInt(e -> e.getInterestingnessScore())
 				.max().getAsInt();
-		label = new Text(Integer.toString(cluster.getNodes().size()));
 		setOnMouseClicked(e -> AbstractView.setLastClicked(this));
 		draw(colorServer);
 	}
@@ -88,7 +85,7 @@ public ClusterDrawable(ColorServer colorServer, Cluster cluster) {
 	 * Add all properties of a cluster to the property pane.
 	 */
 	private void initProperties() {
-		properties.put(ClusterPropertyTypes.TITLE, null);
+		properties.put(ClusterPropertyTypes.TITLE, cluster.getNodes().size() + " nodes");
 		properties.put(ClusterPropertyTypes.ID, cluster.getNodes().stream()
 								.map(e -> e.getId())
 								.collect(Collectors.toList()).toString());
@@ -107,12 +104,13 @@ private void initProperties() {
 	 */
 	private void initSingletonProperties() {
 		EnrichedSequenceNode sn = cluster.getNodes().iterator().next();
+		String score = properties.remove(ClusterPropertyTypes.SCORE);
 		properties.put(ClusterPropertyTypes.BASEDIST, Integer.toString(sn.getBaseDistance()));
 		properties.put(ClusterPropertyTypes.STARTREF, Integer.toString(sn.getStartRef()));
 		properties.put(ClusterPropertyTypes.ENDREF, Integer.toString(sn.getEndRef()));
 		properties.put(ClusterPropertyTypes.SEQUENCE, sn.getSequence());
+		properties.put(ClusterPropertyTypes.SCORE, score);
 
-		properties.put(ClusterPropertyTypes.SCORE, Integer.toString(sn.getInterestingnessScore()));
 		sn.getScores().forEach((k, v) -> properties.put(k, Integer.toString(v)));
 	}
 
@@ -137,7 +135,6 @@ private void draw(ColorServer colorServer) {
 		if (interestingness > INTERESTINGNESS_THRESHOLD) {
 			commonNode.getStyleClass().add("interesting-node");
 		}
-		getChildren().add(label);
 	}
 
 	/**