Changeset 729 for trunk/src/org/expeditee/items/widgets

Timestamp:

01/21/14 11:59:05 (10 years ago)

Author:

jts21

Message:

Move ColorWheels to UserSettings, store them as new ArraySetting type that handles default values (so now ColorWheels have defaults if you unlink their setting)

File:

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

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

@@ -27 +27 @@
 import org.expeditee.items.Text;
 import org.expeditee.items.widgets.DataFrameWidget;
+import org.expeditee.settings.UserSettings;
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.JFreeChart;
@@ -109 +110 @@
                                                         Color newColor = ColorUtils.getNextColor(
                                                                         getSource().getFillColor(),
-                                                                        Frame.COLOR_WHEEL, null);
+                                                                        UserSettings.BackgroundColorWheel.get(), null);
                                                         setSourceFillColor(newColor);
                                                 }
@@ -117 +118 @@
                                                 } else {
                                                         Color newColor = ColorUtils.getNextColor(
-                                                                        getSource().getColor(), Item.COLOR_WHEEL,
+                                                                        getSource().getColor(), UserSettings.ColorWheel.get(),
                                                                         null);
                                                         setSourceColor(newColor);