michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverting some new graphics classes back to how they were on master.

Browse Source
This commit is contained in:
Calum
2017-07-31 23:35:28 +12:00
parent b82d0d0137
commit 47c5e6f155
8 changed files with 77 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/fxObjects/AnnotationBox.java
+12 -8
View File
@@ -3,7 +3,6 @@ package seng302.visualiser.fxObjects;
import java.util.HashMap;
import java.util.Map;
import javafx.beans.value.ObservableValue;
import javafx.scene.CacheHint;
import javafx.scene.Group;
import javafx.scene.paint.Color;
import javafx.scene.paint.Paint;
@@ -80,7 +79,7 @@ public class AnnotationBox extends Group{
private Map<String, Annotation> annotationsByName = new HashMap<>();
public AnnotationBox() {
this.setCache(true);
// this.setCache(true);
background.setX(BACKGROUND_X);
background.setY(BACKGROUND_Y);
background.setWidth(backgroundWidth);
@@ -90,8 +89,8 @@ public class AnnotationBox extends Group{
background.setFill(new Color(1, 1, 1, 0.75));
background.setStroke(theme);
background.setStrokeWidth(2);
background.setCache(true);
background.setCacheHint(CacheHint.SPEED);
// background.setCache(true);
// background.setCacheHint(CacheHint.SPEED);
this.getChildren().add(background);
}
@@ -99,11 +98,15 @@ public class AnnotationBox extends Group{
annotationsByName.put(annotationName, annotation);
this.getChildren().add(annotation.getText());
visibleAnnotations++;
update();
}
public void addAnnotation (String annotationName, String annotationText) {
Text text = getTextObject();
annotationsByName.put(annotationName, new Annotation(text, annotationText));
this.getChildren().add(text);
visibleAnnotations++;
update();
}
public <E> void addAnnotation (String annotationName, ObservableValue<E> observable) {
@@ -116,6 +119,7 @@ public class AnnotationBox extends Group{
annotationsByName.put(annotationName, new Annotation<>(newText, observable, formatter));
this.getChildren().add(newText);
visibleAnnotations++;
update();
}
public void setAnnotationVisibility (String annotationName, boolean visibility) {
@@ -144,8 +148,8 @@ public class AnnotationBox extends Group{
}
public void setLocation (double x, double y) {
this.setLayoutX(x);
this.setLayoutY(y);
this.setTranslateX(x);
this.setTranslateY(y);
}
public void setWidth (double width) {
@@ -172,8 +176,8 @@ public class AnnotationBox extends Group{
Text text = new Text();
text.setFill(theme);
text.setStrokeWidth(2);
text.setCacheHint(CacheHint.SPEED);
text.setCache(true);
// text.setCacheHint(CacheHint.SPEED);
// text.setCache(true);
return text;
}
src/main/java/seng302/visualiser/fxObjects/BoatObject.java
+2 -2
View File
@@ -80,8 +80,8 @@ public class BoatObject extends Group {
boatPoly.setStroke(Color.BLACK);
});
boatPoly.setOnMouseClicked(event -> setIsSelected(!isSelected));
boatPoly.setCache(true);
boatPoly.setCacheHint(CacheHint.SPEED);
// boatPoly.setCache(true);
// boatPoly.setCacheHint(CacheHint.SPEED);
// annotationBox = new AnnotationBox();
// annotationBox.setFill(colour);