You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pe...@apache.org on 2014/09/18 19:30:00 UTC
git commit: [flex-asjs] [refs/heads/develop] - Convert FlexJS chart
package to use IFill and IStroke for itemRenderers.
Repository: flex-asjs
Updated Branches:
refs/heads/develop f1e401b97 -> 405b7e5cd
Convert FlexJS chart package to use IFill and IStroke for itemRenderers.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/405b7e5c
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/405b7e5c
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/405b7e5c
Branch: refs/heads/develop
Commit: 405b7e5cdd800747e0d75ce54f26b92cf3b2505d
Parents: f1e401b
Author: Peter Ent <pe...@apache.org>
Authored: Thu Sep 18 13:29:56 2014 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Thu Sep 18 13:29:56 2014 -0400
----------------------------------------------------------------------
.../flex/charts/beads/layouts/BarChartLayout.as | 1 -
.../charts/beads/layouts/ColumnChartLayout.as | 1 -
.../layouts/LineChartCategoryVsLinearLayout.as | 3 -
.../layouts/LineChartLinearVsLinearLayout.as | 3 -
.../flex/charts/beads/layouts/PieChartLayout.as | 8 ++-
.../beads/layouts/StackedBarChartLayout.as | 1 -
.../beads/layouts/StackedColumnChartLayout.as | 1 -
.../flex/charts/supportClasses/BarSeries.as | 19 ------
.../charts/supportClasses/BoxItemRenderer.as | 45 ++++++++-----
.../flex/charts/supportClasses/ColumnSeries.as | 19 ------
.../supportClasses/ILineSegmentItemRenderer.as | 18 ++----
.../charts/supportClasses/IWedgeItemRenderer.as | 24 +++++++
.../supportClasses/LineSegmentItemRenderer.as | 45 +++----------
.../flex/charts/supportClasses/LineSeries.as | 33 ----------
.../flex/charts/supportClasses/PieSeries.as | 9 ---
.../charts/supportClasses/WedgeItemRenderer.as | 68 ++++++++++++--------
.../as/projects/FlexJSUI/basic-manifest.xml | 5 ++
.../flex/charts/core/IChartItemRenderer.as | 12 ----
.../org/apache/flex/charts/core/IChartSeries.as | 11 ----
19 files changed, 119 insertions(+), 207 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/405b7e5c/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/BarChartLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/BarChartLayout.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/BarChartLayout.as
index e444935..a7a39e1 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/BarChartLayout.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/BarChartLayout.as
@@ -124,7 +124,6 @@ package org.apache.flex.charts.beads.layouts
chartDataGroup.addElement(child);
child.itemRendererParent = chartDataGroup;
child.data = data;
- child.fillColor = bcs.fillColor;
xValue = Number(data[bcs.xField]);
child.x = yAxisOffset;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/405b7e5c/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/ColumnChartLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/ColumnChartLayout.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/ColumnChartLayout.as
index bd39252..9a917cd 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/ColumnChartLayout.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/ColumnChartLayout.as
@@ -114,7 +114,6 @@ package org.apache.flex.charts.beads.layouts
chartDataGroup.addElement(child);
child.itemRendererParent = chartDataGroup;
child.data = data;
- child.fillColor = bcs.fillColor;
yValue = Number(data[bcs.yField]);
child.y = useHeight - yValue*seriesMaxes[s].scaleFactor;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/405b7e5c/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/LineChartCategoryVsLinearLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/LineChartCategoryVsLinearLayout.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/LineChartCategoryVsLinearLayout.as
index 39163f5..06edffc 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/LineChartCategoryVsLinearLayout.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/LineChartCategoryVsLinearLayout.as
@@ -105,7 +105,6 @@ package org.apache.flex.charts.beads.layouts
var child:IChartItemRenderer = aseries.itemRenderer.newInstance() as IChartItemRenderer;
child.itemRendererParent = chartDataGroup;
child.data = data;
- child.fillColor = aseries.fillColor;
child.x = childX - 5;
child.y = childY - 5;
child.width = 10;
@@ -128,8 +127,6 @@ package org.apache.flex.charts.beads.layouts
var renderer:ILineSegmentItemRenderer = lcs.lineSegmentRenderer.newInstance() as ILineSegmentItemRenderer;
chartDataGroup.addElement(renderer);
renderer.itemRendererParent = chartDataGroup;
- renderer.lineColor = lcs.lineColor;
- renderer.lineThickness = lcs.lineThickness;
renderer.data = lcs;
renderer.points = seriesMaxes[s].points;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/405b7e5c/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/LineChartLinearVsLinearLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/LineChartLinearVsLinearLayout.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/LineChartLinearVsLinearLayout.as
index 86eca21..68906ea 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/LineChartLinearVsLinearLayout.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/LineChartLinearVsLinearLayout.as
@@ -113,7 +113,6 @@ package org.apache.flex.charts.beads.layouts
chartDataGroup.addElement(child);
child.itemRendererParent = chartDataGroup;
child.data = data;
- child.fillColor = aseries.fillColor;
child.x = childX - 5;
child.y = childY - 5;
child.width = 10;
@@ -133,8 +132,6 @@ package org.apache.flex.charts.beads.layouts
var renderer:ILineSegmentItemRenderer = lcs.lineSegmentRenderer.newInstance() as ILineSegmentItemRenderer;
chartDataGroup.addElement(renderer);
renderer.itemRendererParent = chartDataGroup;
- renderer.lineColor = lcs.lineColor;
- renderer.lineThickness = lcs.lineThickness;
renderer.data = lcs;
renderer.points = seriesMaxes[s].points;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/405b7e5c/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/PieChartLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/PieChartLayout.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/PieChartLayout.as
index 04d8fd5..445db82 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/PieChartLayout.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/PieChartLayout.as
@@ -23,6 +23,8 @@ package org.apache.flex.charts.beads.layouts
import org.apache.flex.charts.supportClasses.PieSeries;
import org.apache.flex.core.IBeadLayout;
import org.apache.flex.core.ISelectionModel;
+ import org.apache.flex.core.graphics.IFill;
+ import org.apache.flex.core.graphics.SolidColor;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
@@ -102,11 +104,15 @@ package org.apache.flex.charts.beads.layouts
obj = seriesMaxes[i];
data = dp[i];
+ var fill:SolidColor = new SolidColor();
+ fill.color = colors[i%colors.length];
+ fill.alpha = 1.0;
+
var child:IWedgeItemRenderer = (chart.series[s] as IChartSeries).itemRenderer.newInstance() as IWedgeItemRenderer;
chartDataGroup.addElement(child);
child.itemRendererParent = chartDataGroup;
child.data = data;
- child.fillColor = colors[i%colors.length];
+ child.fill = fill;
end = start + (360.0 * obj.percent);
var arc:Number = 360.0 * obj.percent;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/405b7e5c/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/StackedBarChartLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/StackedBarChartLayout.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/StackedBarChartLayout.as
index eda9e47..386066f 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/StackedBarChartLayout.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/StackedBarChartLayout.as
@@ -131,7 +131,6 @@ package org.apache.flex.charts.beads.layouts
chartDataGroup.addElement(child);
child.itemRendererParent = chartDataGroup;
child.data = data;
- child.fillColor = bcs.fillColor;
xValue = Number(data[bcs.xField]);
child.x = xpos;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/405b7e5c/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/StackedColumnChartLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/StackedColumnChartLayout.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/StackedColumnChartLayout.as
index 34b5139..aa18c61 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/StackedColumnChartLayout.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/layouts/StackedColumnChartLayout.as
@@ -128,7 +128,6 @@ package org.apache.flex.charts.beads.layouts
chartDataGroup.addElement(child);
child.itemRendererParent = chartDataGroup;
child.data = data;
- child.fillColor = bcs.fillColor;
yValue = Number(data[bcs.yField]);
child.x = xpos;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/405b7e5c/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BarSeries.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BarSeries.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BarSeries.as
index 0c8a0b8..b45d077 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BarSeries.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BarSeries.as
@@ -80,25 +80,6 @@ package org.apache.flex.charts.supportClasses
// not used
}
- private var _fillColor:uint;
-
- /**
- * The color to use for all bars in the series.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get fillColor():uint
- {
- return _fillColor;
- }
- public function set fillColor(value:uint):void
- {
- _fillColor = value;
- }
-
private var _itemRenderer:IFactory;
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/405b7e5c/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BoxItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BoxItemRenderer.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BoxItemRenderer.as
index dd56190..59314fe 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BoxItemRenderer.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BoxItemRenderer.as
@@ -19,9 +19,9 @@
package org.apache.flex.charts.supportClasses
{
import org.apache.flex.charts.core.IChartItemRenderer;
+ import org.apache.flex.core.graphics.IFill;
+ import org.apache.flex.core.graphics.IStroke;
import org.apache.flex.core.graphics.Rect;
- import org.apache.flex.core.graphics.SolidColor;
- import org.apache.flex.core.graphics.SolidColorStroke;
import org.apache.flex.html.supportClasses.DataItemRenderer;
/**
@@ -51,7 +51,7 @@ package org.apache.flex.charts.supportClasses
}
private var filledRect:Rect;
-
+
private var _yField:String = "y";
/**
@@ -90,7 +90,7 @@ package org.apache.flex.charts.supportClasses
_xField = value;
}
- private var _fillColor:uint;
+ private var _fill:IFill;
/**
* The color used to fill the interior of the box.
@@ -100,14 +100,32 @@ package org.apache.flex.charts.supportClasses
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function get fillColor():uint
+ public function get fill():IFill
{
- return _fillColor;
+ return _fill;
}
- public function set fillColor(value:uint):void
+ public function set fill(value:IFill):void
{
- _fillColor = value;
- drawBar();
+ _fill = value;
+ }
+
+ private var _stroke:IStroke;
+
+ /**
+ * The outline of the box.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get stroke():IStroke
+ {
+ return _stroke;
+ }
+ public function set stroke(value:IStroke):void
+ {
+ _stroke = value;
}
/**
@@ -166,13 +184,8 @@ package org.apache.flex.charts.supportClasses
needsAdd = true;
}
- var solidColor:SolidColor = new SolidColor();
- solidColor.color = fillColor;
- var solidStroke:SolidColorStroke = new SolidColorStroke();
- solidStroke.color = fillColor;
- solidStroke.weight = 1;
- filledRect.fill = solidColor;
- filledRect.stroke = solidStroke;
+ filledRect.fill = fill;
+ filledRect.stroke = stroke;
filledRect.drawRect(0,0,this.width,this.height);
if (needsAdd) {
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/405b7e5c/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/ColumnSeries.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/ColumnSeries.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/ColumnSeries.as
index 72d8d77..58924c6 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/ColumnSeries.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/ColumnSeries.as
@@ -70,25 +70,6 @@ package org.apache.flex.charts.supportClasses
_yField = value;
}
- private var _fillColor:uint;
-
- /**
- * The color to use for all bars in the series.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get fillColor():uint
- {
- return _fillColor;
- }
- public function set fillColor(value:uint):void
- {
- _fillColor = value;
- }
-
private var _itemRenderer:IFactory;
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/405b7e5c/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/ILineSegmentItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/ILineSegmentItemRenderer.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/ILineSegmentItemRenderer.as
index 6c0d6af..a42c1d8 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/ILineSegmentItemRenderer.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/ILineSegmentItemRenderer.as
@@ -19,6 +19,7 @@
package org.apache.flex.charts.supportClasses
{
import org.apache.flex.charts.core.IChartItemRenderer;
+ import org.apache.flex.core.graphics.IStroke;
/**
* The ILineSegmentItemRenderer interface must be implemented by any class that
@@ -43,25 +44,14 @@ package org.apache.flex.charts.supportClasses
function set points(value:Array):void;
/**
- * The color of the line.
+ * The characteristics of the line.
*
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- function get lineColor():uint;
- function set lineColor(value:uint):void;
-
- /**
- * The thickness (weight) of the line.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- function get lineThickness():int;
- function set lineThickness(value:int):void;
+ function get stroke():IStroke;
+ function set stroke(value:IStroke):void;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/405b7e5c/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/IWedgeItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/IWedgeItemRenderer.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/IWedgeItemRenderer.as
index 609e930..ca3fe08 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/IWedgeItemRenderer.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/IWedgeItemRenderer.as
@@ -19,6 +19,8 @@
package org.apache.flex.charts.supportClasses
{
import org.apache.flex.charts.core.IChartItemRenderer;
+ import org.apache.flex.core.graphics.IFill;
+ import org.apache.flex.core.graphics.IStroke;
/**
* The IWedgeItemRenderer interface must be implemented by any class that
@@ -85,5 +87,27 @@ package org.apache.flex.charts.supportClasses
*/
function get radius():Number;
function set radius(value:Number):void;
+
+ /**
+ * The color of the wedge.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ function get fill():IFill;
+ function set fill(value:IFill):void;
+
+ /**
+ * The color of the outline of the wedge.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ function get stroke():IStroke;
+ function set stroke(value:IStroke):void;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/405b7e5c/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/LineSegmentItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/LineSegmentItemRenderer.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/LineSegmentItemRenderer.as
index 57d7530..1eca5b9 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/LineSegmentItemRenderer.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/LineSegmentItemRenderer.as
@@ -18,8 +18,8 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.charts.supportClasses
{
+ import org.apache.flex.core.graphics.IStroke;
import org.apache.flex.core.graphics.Path;
- import org.apache.flex.core.graphics.SolidColorStroke;
import org.apache.flex.html.supportClasses.DataItemRenderer;
/**
@@ -57,45 +57,19 @@ package org.apache.flex.charts.supportClasses
drawLine();
}
- private var path:Path;
-
- private var _lineColor:uint = 0xFF0000;
+ private var _stroke:IStroke;
- /**
- * The color used to draw the line segments
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get lineColor():uint
+ public function get stroke():IStroke
{
- return _lineColor;
+ return _stroke;
}
- public function set lineColor(value:uint):void
+ public function set stroke(value:IStroke):void
{
- _lineColor = value;
+ _stroke = value;
+ drawLine();
}
- private var _lineThickness:int = 1;
-
- /**
- * The thickness or weight of the line segments
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get lineThickness():int
- {
- return _lineThickness;
- }
- public function set lineThickness(value:int):void
- {
- _lineThickness = value;
- }
+ private var path:Path;
/**
* @copy org.apache.flex.supportClasses.UIItemRendererBase#data
@@ -175,9 +149,6 @@ package org.apache.flex.charts.supportClasses
needsAddElement = true;
}
- var stroke:SolidColorStroke = new SolidColorStroke();
- stroke.color = lineColor;
- stroke.weight = lineThickness;
path.stroke = stroke;
path.fill = null;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/405b7e5c/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/LineSeries.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/LineSeries.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/LineSeries.as
index 765ee9b..b0b98c2 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/LineSeries.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/LineSeries.as
@@ -77,39 +77,6 @@ package org.apache.flex.charts.supportClasses
_yField = value;
}
- private var _fillColor:uint = 0xFF0000;
-
- public function get fillColor():uint
- {
- return _fillColor;
- }
- public function set fillColor(value:uint):void
- {
- _fillColor = value;
- }
-
- private var _lineColor:uint = 0xFF0000;
-
- public function get lineColor():uint
- {
- return _lineColor;
- }
- public function set lineColor(value:uint):void
- {
- _lineColor = value;
- }
-
- private var _lineThickness:uint;
-
- public function get lineThickness():uint
- {
- return _lineThickness;
- }
- public function set lineThickness(value:uint):void
- {
- _lineThickness = value;
- }
-
private var _itemRenderer:IFactory;
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/405b7e5c/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/PieSeries.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/PieSeries.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/PieSeries.as
index 0a482b5..e5e5c96 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/PieSeries.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/PieSeries.as
@@ -81,14 +81,5 @@ package org.apache.flex.charts.supportClasses
public function set yField(value:String):void
{
}
-
- public function get fillColor():uint
- {
- return 0;
- }
-
- public function set fillColor(value:uint):void
- {
- }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/405b7e5c/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/WedgeItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/WedgeItemRenderer.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/WedgeItemRenderer.as
index 145b347..24dc185 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/WedgeItemRenderer.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/WedgeItemRenderer.as
@@ -18,8 +18,9 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.charts.supportClasses
{
+ import org.apache.flex.core.graphics.IFill;
+ import org.apache.flex.core.graphics.IStroke;
import org.apache.flex.core.graphics.Path;
- import org.apache.flex.core.graphics.SolidColor;
import org.apache.flex.html.supportClasses.DataItemRenderer;
/**
@@ -37,27 +38,6 @@ package org.apache.flex.charts.supportClasses
super();
}
- private var _fillColor:uint = 0xFF0000;
-
- /**
- * The color of the wedge.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get fillColor():uint
- {
- return _fillColor;
- }
-
- public function set fillColor(value:uint):void
- {
- _fillColor = value;
- drawWedgeInternal();
- }
-
private var _centerX:Number;
/**
@@ -158,6 +138,44 @@ package org.apache.flex.charts.supportClasses
drawWedgeInternal();
}
+ private var _fill:IFill;
+
+ /**
+ * The color used to fill the interior of the box.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get fill():IFill
+ {
+ return _fill;
+ }
+ public function set fill(value:IFill):void
+ {
+ _fill = value;
+ }
+
+ private var _stroke:IStroke;
+
+ /**
+ * The outline of the box.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get stroke():IStroke
+ {
+ return _stroke;
+ }
+ public function set stroke(value:IStroke):void
+ {
+ _stroke = value;
+ }
+
/**
* @private
*/
@@ -187,9 +205,6 @@ package org.apache.flex.charts.supportClasses
radius:Number, yRadius:Number = NaN,
continueFlag:Boolean = false):void
{
- var color:SolidColor = new SolidColor();
- color.color = fillColor;
-
var x1:Number = x + radius * Math.cos(startAngle);
var y1:Number = y + radius * Math.sin(startAngle);
var x2:Number = x + radius * Math.cos(startAngle + arc);
@@ -199,7 +214,8 @@ package org.apache.flex.charts.supportClasses
' 0 0 1 ' + x2 + ' ' + y2 + ' z';
var path:Path = new Path();
- path.fill = color;
+ path.fill = fill;
+ path.stroke = stroke;
path.drawPath(0, 0, pathString);
addElement(path);
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/405b7e5c/frameworks/as/projects/FlexJSUI/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/basic-manifest.xml b/frameworks/as/projects/FlexJSUI/basic-manifest.xml
index 2cf68ff..28f9e7f 100644
--- a/frameworks/as/projects/FlexJSUI/basic-manifest.xml
+++ b/frameworks/as/projects/FlexJSUI/basic-manifest.xml
@@ -74,4 +74,9 @@
<component id="Map" class="org.apache.flex.maps.google.Map" />
+ <component id="GradientEntry" class="org.apache.flex.core.graphics.GradientEntry" />
+ <component id="LinearGradient" class="org.apache.flex.core.graphics.LinearGradient" />
+ <component id="SolidColor" class="org.apache.flex.core.graphics.SolidColor" />
+ <component id="SolidColorStroke" class="org.apache.flex.core.graphics.SolidColorStroke" />
+
</componentPackage>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/405b7e5c/frameworks/as/projects/FlexJSUI/src/org/apache/flex/charts/core/IChartItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/charts/core/IChartItemRenderer.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/charts/core/IChartItemRenderer.as
index a8b4fa4..89e85f5 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/charts/core/IChartItemRenderer.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/charts/core/IChartItemRenderer.as
@@ -56,18 +56,6 @@ package org.apache.flex.charts.core
function set yField(value:String):void;
/**
- * The primary or preferred color to use for the graphics for
- * the type of chart.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- function get fillColor():uint;
- function set fillColor(value:uint):void;
-
- /**
* The x display position for the itemRenderer. This is set by
* the chart's layout manager.
*
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/405b7e5c/frameworks/as/projects/FlexJSUI/src/org/apache/flex/charts/core/IChartSeries.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/charts/core/IChartSeries.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/charts/core/IChartSeries.as
index 43e8e66..4c2b1ce 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/charts/core/IChartSeries.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/charts/core/IChartSeries.as
@@ -54,17 +54,6 @@ package org.apache.flex.charts.core
function set yField(value:String):void;
/**
- * The preferred color to use for the series renderer.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- function get fillColor():uint;
- function set fillColor(value:uint):void;
-
- /**
* The itemRenderer class or factory that produces an instance of that class. This
* renderer uses the series data and properties to draw the representation for the
* chart type (e.g., the BarChart draws a bar in the fillColor).