Changeset 1102 for trunk/src/org/expeditee/items/widgets/charts/AbstractXY.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/src/org/expeditee/items/widgets/charts/AbstractXY.java (modified) (3 diffs)

trunk/src/org/expeditee/items/widgets/charts/AbstractXY.java

@@ -19 +19 @@
 package org.expeditee.items.widgets.charts;
 
-import java.awt.Color;
 import java.util.Collection;
 import java.util.HashSet;
 
+import org.expeditee.core.Colour;
+import org.expeditee.gio.swing.SwingConversions;
 import org.expeditee.gui.AttributeValuePair;
 import org.expeditee.items.Item;
@@ -55 +56 @@
                         Collection<Text> items, boolean swap) {
                 XYSeries newSeries = new XYSeries(categoryName);
-                Color categoryColor = null;
+                Colour categoryColor = null;
                 boolean foundData = false;
                 Collection<Item> seen = new HashSet<Item>();
@@ -123 +124 @@
                 if (foundData) {
                         _data.addSeries(newSeries);
-                        _paints.put(categoryName, categoryColor);
+                        _paints.put(categoryName, SwingConversions.toSwingColor(categoryColor));
                 }
                 return foundData;