Changeset 1102 for trunk/src/org/expeditee/items/widgets/charts/AbstractValueAxis.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/AbstractValueAxis.java (modified) (4 diffs)

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

@@ -20 +20 @@
 
 import java.awt.BasicStroke;
-import java.awt.Color;
 import java.awt.Stroke;
 
+import org.expeditee.core.Colour;
+import org.expeditee.gio.swing.SwingConversions;
 import org.expeditee.gui.Frame;
 import org.expeditee.items.Text;
@@ -56 +57 @@
 
         @Override
-        public void setSourceColor(Color c) {
+        public void setSourceColor(Colour c) {
                 super.setSourceColor(c);
                 if (getChart() == null)
@@ -70 +71 @@
                                         .setTickLabelPaint(Axis.DEFAULT_TICK_LABEL_PAINT);
                 } else {
-                        plot.getDomainAxis().setLabelPaint(c);
-                        plot.getRangeAxis().setLabelPaint(c);
-                        plot.getDomainAxis().setTickLabelPaint(c);
-                        plot.getRangeAxis().setTickLabelPaint(c);
+                        plot.getDomainAxis().setLabelPaint(SwingConversions.toSwingColor(c));
+                        plot.getRangeAxis().setLabelPaint(SwingConversions.toSwingColor(c));
+                        plot.getDomainAxis().setTickLabelPaint(SwingConversions.toSwingColor(c));
+                        plot.getRangeAxis().setTickLabelPaint(SwingConversions.toSwingColor(c));
                 }
         }
 
         @Override
-        public void setSourceBorderColor(Color c) {
+        public void setSourceBorderColor(Colour c) {
                 super.setSourceBorderColor(c);
                 if (getChart() == null)
@@ -89 +90 @@
                         plot.getRangeAxis().setTickMarkPaint(Plot.DEFAULT_OUTLINE_PAINT);
                 } else {
-                        Color brighter = c.brighter();
-                        plot.setDomainGridlinePaint(brighter);
-                        plot.setRangeGridlinePaint(brighter);
-                        plot.getDomainAxis().setTickMarkPaint(c);
-                        plot.getRangeAxis().setTickMarkPaint(c);
+                        Colour brighter = c.brighter();
+                        plot.setDomainGridlinePaint(SwingConversions.toSwingColor(brighter));
+                        plot.setRangeGridlinePaint(SwingConversions.toSwingColor(brighter));
+                        plot.getDomainAxis().setTickMarkPaint(SwingConversions.toSwingColor(c));
+                        plot.getRangeAxis().setTickMarkPaint(SwingConversions.toSwingColor(c));
                 }
         }