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

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

@@ -19 +19 @@
 package org.expeditee.items.widgets.charts;
 
-import java.awt.Color;
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -27 +26 @@
 import java.util.Date;
 
+import org.expeditee.Util;
+import org.expeditee.core.Colour;
+import org.expeditee.gio.swing.SwingConversions;
 import org.expeditee.gui.AttributeValuePair;
 import org.expeditee.gui.Frame;
@@ -100 +102 @@
                         String startDateString = dataFrame.getAnnotationValue("start");
                         if (startDateString != null) {
-                                _startDate = parseDate(startDateString);
+                                _startDate = Util.parseDate(startDateString);
                         }
                 } catch (Exception e) {
@@ -135 +137 @@
 
                 boolean foundData = false;
-                Color newColor = null;
+                Colour newColor = null;
                 for (Text i : items) {
                         if (!i.isLineEnd()) {
@@ -157 +159 @@
                                                 RegularTimePeriod rtp = null;
                                                 if (attribute == null) {
-                                                        Date date = parseDate(avp.getAttribute());
+                                                        Date date = Util.parseDate(avp.getAttribute());
                                                         rtp = _periodType.getConstructor(
                                                                         new Class[] { Date.class }).newInstance(
@@ -212 +214 @@
                 if (foundData) {
                         _data.addSeries(newSeries);
-                        _paints.put(categoryName, newColor);
+                        _paints.put(categoryName, SwingConversions.toSwingColor(newColor));
                 }
                 return foundData;
         }
-
-        /**
-         * @param avp
-         * @return
-         * @throws ParseException
-         */
-        public static Date parseDate(String dateString) throws ParseException {
-                // Select the best match for a date or time format
-                DateFormat df = null;
-                if (dateString.length() > Formatter.DATE_FORMAT
-                                .length()) {
-                        df = new SimpleDateFormat(Formatter.DATE_TIME_FORMAT);
-                } else if (dateString.length() <= Formatter.TIME_FORMAT.length()) {
-                        df = new SimpleDateFormat(Formatter.TIME_FORMAT);
-                }else {
-                        df = new SimpleDateFormat(Formatter.DATE_FORMAT);
-                }
-                Date date = df.parse(dateString);
-                return date;
-        }
 }