Modify connection between MainWindow and the NotesInputPanel.
This commit is contained in:
@@ -99,6 +99,11 @@ public class BasicDrawing extends JPanel implements Drawing {
|
||||
return point;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Color getColor() {
|
||||
return color;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void moveTo(Point point) {
|
||||
this.point = point;
|
||||
@@ -440,7 +445,7 @@ public class BasicDrawing extends JPanel implements Drawing {
|
||||
|
||||
@Override
|
||||
public void drawGraph(Graph graph, GraphPalette palette) {
|
||||
clear();
|
||||
this.clear();
|
||||
initialize(graph);
|
||||
for (Node node: graph.getNodes()) {
|
||||
for (Arc arc: node.getSuccessors()) {
|
||||
|
@@ -80,8 +80,12 @@ public class MapViewDrawing extends MapView implements Drawing {
|
||||
|
||||
private class MapViewMarkerOverlay extends MapViewOverlay implements MarkerOverlay {
|
||||
|
||||
public MapViewMarkerOverlay(Marker marker) {
|
||||
// Color of this marker
|
||||
Color color;
|
||||
|
||||
public MapViewMarkerOverlay(Marker marker, Color color) {
|
||||
super(new Layer[] { marker });
|
||||
this.color = color;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -90,6 +94,11 @@ public class MapViewDrawing extends MapView implements Drawing {
|
||||
return new Point(marker.getLatLong().getLongitude(), marker.getLatLong().getLatitude());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Color getColor() {
|
||||
return color;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void moveTo(Point point) {
|
||||
Marker marker = (Marker) this.layers[0];
|
||||
@@ -187,7 +196,7 @@ public class MapViewDrawing extends MapView implements Drawing {
|
||||
|
||||
@Override
|
||||
public MarkerOverlay drawMarker(Point point, Color color) {
|
||||
return new MapViewMarkerOverlay(createMarker(point, color));
|
||||
return new MapViewMarkerOverlay(createMarker(point, color), color);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -1,9 +1,16 @@
|
||||
package org.insa.graphics.drawing.overlays;
|
||||
|
||||
import java.awt.Color;
|
||||
|
||||
import org.insa.graph.Point;
|
||||
|
||||
public interface MarkerOverlay extends Overlay {
|
||||
|
||||
/**
|
||||
* @return Color associated with this marker.
|
||||
*/
|
||||
public Color getColor();
|
||||
|
||||
/**
|
||||
* @return The point associated with this marker.
|
||||
*/
|
||||
|
Reference in New Issue
Block a user