INSA/be-graphes
3
0
Fork 0
Code Issues 4 Releases Wiki Activity

Merge master.

Browse Source
This commit is contained in:
Holt59 2018-03-13 23:32:35 +01:00
parent e78ea25ab3
commit ccd6d7d7af
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/org/insa/graphics/NodesInputPanel.java
View File

@ -248,8 +248,8 @@ public class NodesInputPanel extends JPanel
MarkerOverlay tracker = markerTrackers.getOrDefault(textField, null); MarkerOverlay tracker = markerTrackers.getOrDefault(textField, null);
if (curnode != null) { if (curnode != null) {
if (tracker == null) { if (tracker == null) {
tracker = drawing.drawMarker(curnode.getPoint(), markerColor, markerColor, tracker = drawing.drawMarker(curnode.getPoint(), markerColor, Color.BLACK,
AlphaMode.OPAQUE); AlphaMode.TRANSPARENT);
markerTrackers.put(textField, tracker); markerTrackers.put(textField, tracker);
} }
else { else {
@ -414,7 +414,7 @@ public class NodesInputPanel extends JPanel
MarkerOverlay tracker = markerTrackers.getOrDefault(input, null); MarkerOverlay tracker = markerTrackers.getOrDefault(input, null);
if (tracker != null) { if (tracker != null) {
MarkerOverlay newMarker = this.drawing.drawMarker(tracker.getPoint(), MarkerOverlay newMarker = this.drawing.drawMarker(tracker.getPoint(),
tracker.getColor(), tracker.getColor(), AlphaMode.OPAQUE); tracker.getColor(), Color.BLACK, AlphaMode.TRANSPARENT);
markerTrackers.put(input, newMarker); markerTrackers.put(input, newMarker);
newMarker.setVisible(tracker.isVisible()); newMarker.setVisible(tracker.isVisible());
tracker.delete(); tracker.delete();

25
src/main/org/insa/graphics/drawing/overlays/MarkerUtils.java
View File

@ -29,14 +29,27 @@ public class MarkerUtils {
// Color[] map = getColorMapping(color); // Color[] map = getColorMapping(color);
int outerRGB = outer.getRGB() & 0x00ffffff; int outerRGB = outer.getRGB() & 0x00ffffff;
int innerRGB = inner.getRGB() & 0x00ffffff;
for (int i = 0; i < image.getHeight(); ++i) { for (int i = 0; i < image.getHeight(); ++i) {
for (int j = 0; j < image.getWidth(); ++j) { for (int j = 0; j < image.getWidth(); ++j) {
if (i >= MIN_Y_CENTER && i < MAX_Y_CENTER && j >= MIN_X_CENTER
&& j < MAX_X_CENTER) { // If we are in the "inner" part of the marker...
image.setRGB(j, i, innerRGB if (i >= MIN_Y_CENTER && i < MAX_Y_CENTER && j >= MIN_X_CENTER && j < MAX_X_CENTER
| ((mode == AlphaMode.OPAQUE ? MAXIMUM_MAX_VALUE : mask[i][j]) << 24)); && mask[i][j] != MAXIMUM_INNER_MASK_VALUE) {
// Don't ask... https://stackoverflow.com/a/29321264/2666289
// Basically, this compute a "middle" color between outer and inner depending on
// the current mask value.
double t = 1 - (mask[i][j] - MINIMUM_INNER_MASK_VALUE)
/ (double) (MAXIMUM_INNER_MASK_VALUE - MINIMUM_INNER_MASK_VALUE);
int r = (int) Math.sqrt((1 - t) * outer.getRed() * outer.getRed()
+ t * inner.getRed() * inner.getRed());
int g = (int) Math.sqrt((1 - t) * outer.getGreen() * outer.getGreen()
+ t * inner.getGreen() * inner.getGreen());
int b = (int) Math.sqrt((1 - t) * outer.getBlue() * outer.getBlue()
+ t * inner.getBlue() * inner.getBlue());
int a = mode == AlphaMode.OPAQUE ? MAXIMUM_INNER_MASK_VALUE : mask[i][j];
image.setRGB(j, i, (a << 24) | (r << 16) | (g << 8) | b);
} }
// Otherwize, just fill with the outer color and set the alpha value properly.
else { else {
image.setRGB(j, i, outerRGB | (mask[i][j] << 24)); image.setRGB(j, i, outerRGB | (mask[i][j] << 24));
} }
@ -53,7 +66,7 @@ public class MarkerUtils {
// with a different color. // with a different color.
private static final int MIN_X_CENTER = 40, MAX_X_CENTER = 101, MIN_Y_CENTER = 40, private static final int MIN_X_CENTER = 40, MAX_X_CENTER = 101, MIN_Y_CENTER = 40,
MAX_Y_CENTER = 100; MAX_Y_CENTER = 100;
private static final int MAXIMUM_MAX_VALUE = 249; private static final int MINIMUM_INNER_MASK_VALUE = 116, MAXIMUM_INNER_MASK_VALUE = 249;
/** /**
* @return Retrieve the mask from the mask file or from the cache. * @return Retrieve the mask from the mask file or from the cache.