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

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

@@ -20 +20 @@
 
 import java.awt.BasicStroke;
-import java.awt.Color;
 import java.awt.Component;
 import java.awt.Font;
 import java.awt.Paint;
-import java.awt.Point;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
@@ -35 +33 @@
 import javax.swing.JPanel;
 
+import org.expeditee.core.Colour;
+import org.expeditee.core.Point;
+import org.expeditee.gio.gesture.StandardGestureActions;
+import org.expeditee.gio.swing.SwingConversions;
 import org.expeditee.gui.ColorUtils;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
-import org.expeditee.gui.FrameKeyboardActions;
-import org.expeditee.gui.FrameMouseActions;
 import org.expeditee.gui.FunctionKey;
 import org.expeditee.items.Text;
@@ -103 +104 @@
                                 case SizeUp:
                                         invalidateLink();
-                                        FrameKeyboardActions.SetSize(getFirstCorner(), 1, false,
-                                                        true, false);
+                                        StandardGestureActions.SetSize(getFirstCorner(), 1, false, true, false);
                                         invalidateSelf();
-                                        FrameGraphics.refresh(true);
+                                        DisplayController.requestRefresh(true);
                                         // FrameGraphics.requestRefresh(true);
                                         break;
                                 case SizeDown:
                                         invalidateLink();
-                                        FrameKeyboardActions.SetSize(getFirstCorner(), -1, false,
+                                        StandardGestureActions.SetSize(getFirstCorner(), -1, false,
                                                         true, false);
                                         invalidateSelf();
-                                        FrameGraphics.refresh(true);
+                                        DisplayController.requestRefresh(true);
                                         // FrameGraphics.ForceRepaint();
                                         // FrameGraphics.refresh(true);
@@ -125 +125 @@
                                                         setSourceFillColor(null);
                                                 } else {
-                                                        Color newColor = ColorUtils.getNextColor(
+                                                        Colour newColor = ColorUtils.getNextColor(
                                                                         getSource().getFillColor(),
                                                                         TemplateSettings.BackgroundColorWheel.get(), null);
@@ -134 +134 @@
                                                         setBackgroundColor(null);
                                                 } else {
-                                                        Color newColor = ColorUtils.getNextColor(
+                                                        Colour newColor = ColorUtils.getNextColor(
                                                                         getSource().getColor(), TemplateSettings.ColorWheel.get(),
                                                                         null);
@@ -141 +141 @@
                                         }
                                         break;
+                                default:
+                                        break;
                                 }
                         }
@@ -148 +150 @@
 
                         public void keyTyped(KeyEvent e) {
-                                FrameKeyboardActions.processChar(e.getKeyChar(), e
+                                StandardGestureActions.processChar(e.getKeyChar(), e
                                                 .isShiftDown());
                         }
@@ -155 +157 @@
 
                         public void mouseClicked(MouseEvent e) {
-                                FrameMouseActions.getInstance().mouseClicked(translateEvent(e));
+                                //StandardGestureActions.mouseClicked(translateEvent(e));
                         }
 
@@ -167 +169 @@
 
                         public void mousePressed(MouseEvent e) {
-                                FrameMouseActions.getInstance().mousePressed(translateEvent(e));
+                                //StandardGestureActions.mousePressed(translateEvent(e));
                         }
 
@@ -180 +182 @@
 
                         public void mouseReleased(MouseEvent e) {
-                                FrameMouseActions.getInstance()
-                                                .mouseReleased(translateEvent(e));
+                                //StandardGestureActions.mouseReleased(translateEvent(e));
                         }
 
@@ -272 +273 @@
                                 if (foundData |= addCategoryData(categoryName, linkFrame
                                                 .getNonAnnotationText(true), swap)) {
-                                        Color backgroundColor = category.getBackgroundColor();
+                                        Colour backgroundColor = category.getBackgroundColor();
                                         if (backgroundColor != null)
-                                                _paints.put(categoryName, backgroundColor);
+                                                _paints.put(categoryName, SwingConversions.toSwingColor(backgroundColor));
                                         addSubject(linkFrame);
                                 }
@@ -307 +308 @@
 
         @Override
-        public void setBackgroundColor(Color c) {
+        public void setBackgroundColor(Colour c) {
                 super.setBackgroundColor(c);
                 if (_chart == null)
@@ -314 +315 @@
                         _chart.setBackgroundPaint(JFreeChart.DEFAULT_BACKGROUND_PAINT);
                 } else {
-                        _chart.setBackgroundPaint(c);
-                }
-        }
-
-        @Override
-        public void setSourceColor(Color c) {
+                        _chart.setBackgroundPaint(SwingConversions.toSwingColor(c));
+                }
+        }
+
+        @Override
+        public void setSourceColor(Colour c) {
                 super.setSourceColor(c);
                 if (_chart == null)
@@ -326 +327 @@
                         _chart.getTitle().setPaint(TextTitle.DEFAULT_TEXT_PAINT);
                 } else {
-                        _chart.getTitle().setPaint(c);
+                        _chart.getTitle().setPaint(SwingConversions.toSwingColor(c));
                 }
                 for (Title t : _chart.getSubtitles()) {
@@ -332 +333 @@
                                 t.setPaint(TextTitle.DEFAULT_TEXT_PAINT);
                         } else {
-                                t.setPaint(c);
+                                t.setPaint(SwingConversions.toSwingColor(c));
                         }
                 }
@@ -338 +339 @@
                 if (legend != null) {
                         if (c == null) {
-                                legend.setFrame(new BlockBorder(Color.black));
+                                legend.setFrame(new BlockBorder(SwingConversions.toSwingColor(Colour.BLACK)));
                         } else {
-                                legend.setFrame(new BlockBorder(c));
-                        }
-                }
-        }
-
-        @Override
-        public void setSourceBorderColor(Color c) {
+                                legend.setFrame(new BlockBorder(SwingConversions.toSwingColor(c)));
+                        }
+                }
+        }
+
+        @Override
+        public void setSourceBorderColor(Colour c) {
                 super.setSourceBorderColor(c);
                 if (_chart == null)
@@ -353 +354 @@
                         _chart.getPlot().setOutlinePaint(Plot.DEFAULT_OUTLINE_PAINT);
                 } else {
-                        _chart.getPlot().setOutlinePaint(c);
-                }
-        }
-
-        @Override
-        public void setSourceFillColor(Color c) {
+                        _chart.getPlot().setOutlinePaint(SwingConversions.toSwingColor(c));
+                }
+        }
+
+        @Override
+        public void setSourceFillColor(Colour c) {
                 super.setSourceFillColor(c);
                 if (_chart == null)
@@ -368 +369 @@
                                 legend.setBackgroundPaint(null);
                 } else {
-                        _chart.getPlot().setBackgroundPaint(c);
+                        _chart.getPlot().setBackgroundPaint(SwingConversions.toSwingColor(c));
                         if (legend != null)
-                                legend.setBackgroundPaint(c);
+                                legend.setBackgroundPaint(SwingConversions.toSwingColor(c));
                 }
         }
@@ -387 +388 @@
                 if (legend != null) {
                         legend.setFrame(new BlockBorder(newThickness, newThickness,
-                                        newThickness, newThickness, getSource().getPaintColor()));
+                                        newThickness, newThickness, SwingConversions.toSwingColor(getSource().getPaintColor())));
                         legend.setItemFont(legend.getItemFont().deriveFont(fontSize));
                         float pad = newThickness + 1;