FLEX-33052: fix chart initStyles() methods in modules and subapps when some styles are in parent app
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/7a6be43c Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/7a6be43c Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/7a6be43c Branch: refs/heads/master Commit: 7a6be43c7dfd8a66300312dc5b65a997202bceb9 Parents: 00f5c28 Author: Alex Harui <aha...@apache.org> Authored: Sun Sep 1 22:21:31 2013 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Thu Oct 10 23:18:34 2013 -0700 ---------------------------------------------------------------------- .../projects/charts/src/mx/charts/AreaChart.as | 19 +++-- .../charts/src/mx/charts/AxisRenderer.as | 73 +++++++++++------- .../projects/charts/src/mx/charts/BarChart.as | 17 +++-- .../charts/src/mx/charts/BubbleChart.as | 19 +++-- .../charts/src/mx/charts/CandlestickChart.as | 63 ++++++++-------- .../charts/src/mx/charts/ColumnChart.as | 18 +++-- .../projects/charts/src/mx/charts/GridLines.as | 24 +++--- .../projects/charts/src/mx/charts/HLOCChart.as | 70 +++++++++--------- .../projects/charts/src/mx/charts/LineChart.as | 60 +++++++-------- .../projects/charts/src/mx/charts/PieChart.as | 10 ++- .../projects/charts/src/mx/charts/PlotChart.as | 78 ++++++++++---------- .../mx/charts/chartClasses/CartesianChart.as | 7 +- .../src/mx/charts/chartClasses/ChartBase.as | 15 ++-- .../src/mx/charts/chartClasses/PolarChart.as | 12 +-- .../charts/src/mx/charts/series/AreaSeries.as | 24 +++--- .../charts/src/mx/charts/series/BarSeries.as | 15 ++-- .../charts/src/mx/charts/series/BubbleSeries.as | 13 ++-- .../src/mx/charts/series/CandlestickSeries.as | 17 +++-- .../charts/src/mx/charts/series/ColumnSeries.as | 14 ++-- .../charts/src/mx/charts/series/HLOCSeries.as | 14 ++-- .../charts/src/mx/charts/series/LineSeries.as | 16 ++-- .../charts/src/mx/charts/series/PieSeries.as | 16 ++-- .../charts/src/mx/charts/series/PlotSeries.as | 14 ++-- .../charts/src/mx/charts/styles/HaloDefaults.as | 24 ++++++ 24 files changed, 378 insertions(+), 274 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7a6be43c/frameworks/projects/charts/src/mx/charts/AreaChart.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/charts/src/mx/charts/AreaChart.as b/frameworks/projects/charts/src/mx/charts/AreaChart.as index 421ea95..d6427f0 100644 --- a/frameworks/projects/charts/src/mx/charts/AreaChart.as +++ b/frameworks/projects/charts/src/mx/charts/AreaChart.as @@ -206,7 +206,7 @@ public class AreaChart extends CartesianChart // //-------------------------------------------------------------------------- - /** + /** * @private */ private function initStyles():Boolean @@ -237,13 +237,16 @@ public class AreaChart extends CartesianChart f(o, null, HaloDefaults.defaultFills[i]); } - var areaChartStyle:CSSStyleDeclaration = styleManager.getStyleDeclaration("mx.charts.AreaChart"); - areaChartStyle.setStyle("chartSeriesStyles", areaChartSeriesStyles); - areaChartStyle.setStyle("fill", new SolidColor(0xFFFFFF, 0)); - areaChartStyle.setStyle("calloutStroke", new SolidColorStroke(0x888888,2)); - areaChartStyle.setStyle("horizontalAxisStyleNames", ["hangingCategoryAxis"]); - areaChartStyle.setStyle("verticalAxisStyleNames", ["blockNumericAxis"]); - + var areaChartStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.AreaChart"); + if (areaChartStyle) + { + areaChartStyle.setStyle("chartSeriesStyles", areaChartSeriesStyles); + areaChartStyle.setStyle("fill", new SolidColor(0xFFFFFF, 0)); + areaChartStyle.setStyle("calloutStroke", new SolidColorStroke(0x888888,2)); + areaChartStyle.setStyle("horizontalAxisStyleNames", ["hangingCategoryAxis"]); + areaChartStyle.setStyle("verticalAxisStyleNames", ["blockNumericAxis"]); + } + return true; } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7a6be43c/frameworks/projects/charts/src/mx/charts/AxisRenderer.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/charts/src/mx/charts/AxisRenderer.as b/frameworks/projects/charts/src/mx/charts/AxisRenderer.as index 1f67d4f..5274aee 100644 --- a/frameworks/projects/charts/src/mx/charts/AxisRenderer.as +++ b/frameworks/projects/charts/src/mx/charts/AxisRenderer.as @@ -1100,44 +1100,65 @@ public class AxisRenderer extends DualStyleObject implements IAxisRenderer // Overridden methods: UIComponent // //-------------------------------------------------------------------------- - + /** * @private */ private function initStyles():Boolean { HaloDefaults.init(styleManager); - var axisRenderer:CSSStyleDeclaration = styleManager.getStyleDeclaration("mx.charts.AxisRenderer"); - axisRenderer.setStyle("axisStroke", new SolidColorStroke(0, 0, 1)); - axisRenderer.setStyle("tickStroke", new SolidColorStroke(0, 0, 1)); - axisRenderer.setStyle("minorTickStroke", new SolidColorStroke(0, 0, 1)); + var axisRenderer:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.AxisRenderer"); + if (axisRenderer) + { + axisRenderer.setStyle("axisStroke", new SolidColorStroke(0, 0, 1)); + axisRenderer.setStyle("tickStroke", new SolidColorStroke(0, 0, 1)); + axisRenderer.setStyle("minorTickStroke", new SolidColorStroke(0, 0, 1)); + } - var blockCategoryAxis:CSSStyleDeclaration = styleManager.getStyleDeclaration(".blockCategoryAxis"); - blockCategoryAxis.setStyle("axisStroke", new SolidColorStroke(0xBBCCDD, 8, 1, false, "normal", "none")); - blockCategoryAxis.setStyle("tickStroke", new SolidColorStroke(0xFFFFFF, 2, 1, false, "normal", "none")); + var blockCategoryAxis:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, ".blockCategoryAxis"); + if (blockCategoryAxis) + { + blockCategoryAxis.setStyle("axisStroke", new SolidColorStroke(0xBBCCDD, 8, 1, false, "normal", "none")); + blockCategoryAxis.setStyle("tickStroke", new SolidColorStroke(0xFFFFFF, 2, 1, false, "normal", "none")); + } - var blockNumericAxis:CSSStyleDeclaration = styleManager.getStyleDeclaration(".blockNumericAxis"); - blockNumericAxis.setStyle("axisStroke", new SolidColorStroke(0xBBCCDD, 8, 1, false, "normal", "none")); - blockNumericAxis.setStyle("tickStroke", new SolidColorStroke(0xBBCCDD, 1, 1,false, "normal", "none")); - blockNumericAxis.setStyle("minorTickStroke", new SolidColorStroke(0xFFFFFF, 1, 1, false, "normal", "none")); + var blockNumericAxis:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, ".blockNumericAxis"); + if (blockNumericAxis) + { + blockNumericAxis.setStyle("axisStroke", new SolidColorStroke(0xBBCCDD, 8, 1, false, "normal", "none")); + blockNumericAxis.setStyle("tickStroke", new SolidColorStroke(0xBBCCDD, 1, 1,false, "normal", "none")); + blockNumericAxis.setStyle("minorTickStroke", new SolidColorStroke(0xFFFFFF, 1, 1, false, "normal", "none")); + } - var lineNumericAxis:CSSStyleDeclaration = styleManager.getStyleDeclaration(".linedNumericAxis"); - lineNumericAxis.setStyle("axisStroke", new SolidColorStroke(0xBBCCDD, 1, 1, false, "normal", "none")); - lineNumericAxis.setStyle("tickStroke", new SolidColorStroke(0xBBCCDD, 1, 1,false, "normal", "none")); - lineNumericAxis.setStyle("minorTickStroke", new SolidColorStroke(0xBBCCDD, 1, 1, false, "normal", "none")); + var lineNumericAxis:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, ".linedNumericAxis"); + if (lineNumericAxis) + { + lineNumericAxis.setStyle("axisStroke", new SolidColorStroke(0xBBCCDD, 1, 1, false, "normal", "none")); + lineNumericAxis.setStyle("tickStroke", new SolidColorStroke(0xBBCCDD, 1, 1,false, "normal", "none")); + lineNumericAxis.setStyle("minorTickStroke", new SolidColorStroke(0xBBCCDD, 1, 1, false, "normal", "none")); + } - var dashedNumericAxis:CSSStyleDeclaration = styleManager.getStyleDeclaration(".dashedNumericAxis"); - dashedNumericAxis.setStyle("tickStroke", new SolidColorStroke(0xBBCCDD, 1, 1,false, "normal", "none")); - dashedNumericAxis.setStyle("minorTickStroke", new SolidColorStroke(0xBBCCDD, 1, 1, false, "normal", "none")); + var dashedNumericAxis:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, ".dashedNumericAxis"); + if (dashedNumericAxis) + { + dashedNumericAxis.setStyle("tickStroke", new SolidColorStroke(0xBBCCDD, 1, 1,false, "normal", "none")); + dashedNumericAxis.setStyle("minorTickStroke", new SolidColorStroke(0xBBCCDD, 1, 1, false, "normal", "none")); + } - var dashedCategoryAxis:CSSStyleDeclaration = styleManager.getStyleDeclaration(".dashedCategoryAxis"); - dashedCategoryAxis.setStyle("axisStroke", new SolidColorStroke(0xBBCCDD, 1, 1,false, "normal", "none")); - dashedCategoryAxis.setStyle("tickStroke", new SolidColorStroke(0xFFFFFF, 2, 1, false, "normal", "none")); + var dashedCategoryAxis:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, ".dashedCategoryAxis"); + if (dashedCategoryAxis) + { + dashedCategoryAxis.setStyle("axisStroke", new SolidColorStroke(0xBBCCDD, 1, 1,false, "normal", "none")); + dashedCategoryAxis.setStyle("tickStroke", new SolidColorStroke(0xFFFFFF, 2, 1, false, "normal", "none")); + } - var hangingCategoryAxis:CSSStyleDeclaration = styleManager.getStyleDeclaration(".hangingCategoryAxis"); - hangingCategoryAxis.setStyle("axisStroke", new SolidColorStroke(0xBBCCDD, 1, 1,false, "normal", "none")); - hangingCategoryAxis.setStyle("tickStroke", new SolidColorStroke(0xBBCCDD, 1, 1, false, "normal", "none")); - hangingCategoryAxis.setStyle("minorTickStroke", new SolidColorStroke(0,0,0)); + var hangingCategoryAxis:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, ".hangingCategoryAxis"); + if (hangingCategoryAxis) + { + hangingCategoryAxis.setStyle("axisStroke", new SolidColorStroke(0xBBCCDD, 1, 1,false, "normal", "none")); + hangingCategoryAxis.setStyle("tickStroke", new SolidColorStroke(0xBBCCDD, 1, 1, false, "normal", "none")); + hangingCategoryAxis.setStyle("minorTickStroke", new SolidColorStroke(0,0,0)); + } return true; } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7a6be43c/frameworks/projects/charts/src/mx/charts/BarChart.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/charts/src/mx/charts/BarChart.as b/frameworks/projects/charts/src/mx/charts/BarChart.as index f4a7ba1..06e298d 100644 --- a/frameworks/projects/charts/src/mx/charts/BarChart.as +++ b/frameworks/projects/charts/src/mx/charts/BarChart.as @@ -316,19 +316,22 @@ public class BarChart extends CartesianChart // //-------------------------------------------------------------------------- - /** * @private */ private function initStyles():Boolean { HaloDefaults.init(styleManager); - var barChartStyle:CSSStyleDeclaration = styleManager.getStyleDeclaration("mx.charts.BarChart"); - barChartStyle.setStyle("chartSeriesStyles", HaloDefaults.chartBaseChartSeriesStyles); - barChartStyle.setStyle("fill", new SolidColor(0xFFFFFF, 0)); - barChartStyle.setStyle("calloutStroke", new SolidColorStroke(0x888888,2)); - barChartStyle.setStyle("horizontalAxisStyleNames", ["blockNumericAxis"]); - barChartStyle.setStyle("verticalAxisStyleNames", ["blockCategoryAxis"]); + var barChartStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.BarChart"); + if (barChartStyle) + { + barChartStyle.setStyle("chartSeriesStyles", HaloDefaults.chartBaseChartSeriesStyles); + barChartStyle.setStyle("fill", new SolidColor(0xFFFFFF, 0)); + barChartStyle.setStyle("calloutStroke", new SolidColorStroke(0x888888,2)); + barChartStyle.setStyle("horizontalAxisStyleNames", ["blockNumericAxis"]); + barChartStyle.setStyle("verticalAxisStyleNames", ["blockCategoryAxis"]); + } + return true; } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7a6be43c/frameworks/projects/charts/src/mx/charts/BubbleChart.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/charts/src/mx/charts/BubbleChart.as b/frameworks/projects/charts/src/mx/charts/BubbleChart.as index bbb606a..311c676 100644 --- a/frameworks/projects/charts/src/mx/charts/BubbleChart.as +++ b/frameworks/projects/charts/src/mx/charts/BubbleChart.as @@ -214,20 +214,23 @@ public class BubbleChart extends CartesianChart // //-------------------------------------------------------------------------- - /** + /** * @private */ private function initStyles():Boolean { HaloDefaults.init(styleManager); - var bubbleChartStyle:CSSStyleDeclaration = styleManager.getStyleDeclaration("mx.charts.BubbleChart"); - bubbleChartStyle.setStyle("chartSeriesStyles", HaloDefaults.chartBaseChartSeriesStyles); - bubbleChartStyle.setStyle("dataTipCalloutStroke", new SolidColorStroke(2,0)); - bubbleChartStyle.setStyle("fill", new SolidColor(0xFFFFFF, 0)); - bubbleChartStyle.setStyle("calloutStroke", new SolidColorStroke(0x888888,2)); - bubbleChartStyle.setStyle("horizontalAxisStyleNames", ["blockNumericAxis"]); - bubbleChartStyle.setStyle("verticalAxisStyleNames", ["blockNumericAxis"]); + var bubbleChartStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.BubbleChart"); + if (bubbleChartStyle) + { + bubbleChartStyle.setStyle("chartSeriesStyles", HaloDefaults.chartBaseChartSeriesStyles); + bubbleChartStyle.setStyle("dataTipCalloutStroke", new SolidColorStroke(2,0)); + bubbleChartStyle.setStyle("fill", new SolidColor(0xFFFFFF, 0)); + bubbleChartStyle.setStyle("calloutStroke", new SolidColorStroke(0x888888,2)); + bubbleChartStyle.setStyle("horizontalAxisStyleNames", ["blockNumericAxis"]); + bubbleChartStyle.setStyle("verticalAxisStyleNames", ["blockNumericAxis"]); + } return true; } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7a6be43c/frameworks/projects/charts/src/mx/charts/CandlestickChart.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/charts/src/mx/charts/CandlestickChart.as b/frameworks/projects/charts/src/mx/charts/CandlestickChart.as index 1af209b..63071ff 100644 --- a/frameworks/projects/charts/src/mx/charts/CandlestickChart.as +++ b/frameworks/projects/charts/src/mx/charts/CandlestickChart.as @@ -198,7 +198,7 @@ public class CandlestickChart extends CartesianChart // //-------------------------------------------------------------------------- - /** + /** * @private */ private function initStyles():Boolean @@ -206,36 +206,39 @@ public class CandlestickChart extends CartesianChart HaloDefaults.init(styleManager); var candlestickChartSeriesStyles:Array /* of Object */ = []; - var csChartStyle:CSSStyleDeclaration = styleManager.getStyleDeclaration("mx.charts.CandlestickChart"); - csChartStyle.setStyle("chartSeriesStyles", candlestickChartSeriesStyles); - csChartStyle.setStyle("fill", new SolidColor(0xFFFFFF, 0)); - csChartStyle.setStyle("calloutStroke", new SolidColorStroke(0x888888,2)); - csChartStyle.setStyle("horizontalAxisStyleNames", ["blockCategoryAxis"]); - csChartStyle.setStyle("verticalAxisStyleNames", ["blockNumericAxis"]); + var csChartStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.CandlestickChart"); + if (csChartStyle) + { + csChartStyle.setStyle("chartSeriesStyles", candlestickChartSeriesStyles); + csChartStyle.setStyle("fill", new SolidColor(0xFFFFFF, 0)); + csChartStyle.setStyle("calloutStroke", new SolidColorStroke(0x888888,2)); + csChartStyle.setStyle("horizontalAxisStyleNames", ["blockCategoryAxis"]); + csChartStyle.setStyle("verticalAxisStyleNames", ["blockNumericAxis"]); + + var n:int = HaloDefaults.defaultColors.length; + for (var i:int = 0; i < n; i++) + { + var styleName:String = "haloCandlestickSeries" + i; + candlestickChartSeriesStyles[i] = styleName; + + var o:CSSStyleDeclaration = + HaloDefaults.createSelector("." + styleName, styleManager); + + var f:Function = function(o:CSSStyleDeclaration, boxStroke:Stroke, + declineFill:IFill):void + { + o.defaultFactory = function():void + { + this.boxStroke = boxStroke; + this.declineFill = declineFill; + } + } + + f(o, new Stroke(HaloDefaults.defaultColors[i], 0, 1), + new SolidColor(HaloDefaults.defaultColors[i])); + } + } - var n:int = HaloDefaults.defaultColors.length; - for (var i:int = 0; i < n; i++) - { - var styleName:String = "haloCandlestickSeries" + i; - candlestickChartSeriesStyles[i] = styleName; - - var o:CSSStyleDeclaration = - HaloDefaults.createSelector("." + styleName, styleManager); - - var f:Function = function(o:CSSStyleDeclaration, boxStroke:Stroke, - declineFill:IFill):void - { - o.defaultFactory = function():void - { - this.boxStroke = boxStroke; - this.declineFill = declineFill; - } - } - - f(o, new Stroke(HaloDefaults.defaultColors[i], 0, 1), - new SolidColor(HaloDefaults.defaultColors[i])); - } - return true; } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7a6be43c/frameworks/projects/charts/src/mx/charts/ColumnChart.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/charts/src/mx/charts/ColumnChart.as b/frameworks/projects/charts/src/mx/charts/ColumnChart.as index 816fbe0..a135517 100644 --- a/frameworks/projects/charts/src/mx/charts/ColumnChart.as +++ b/frameworks/projects/charts/src/mx/charts/ColumnChart.as @@ -425,20 +425,22 @@ public class ColumnChart extends CartesianChart // //-------------------------------------------------------------------------- - /** + /** * @private */ private function initStyles():Boolean { HaloDefaults.init(styleManager); - var columnChartStyle:CSSStyleDeclaration = styleManager.getStyleDeclaration("mx.charts.ColumnChart"); - columnChartStyle.setStyle("chartSeriesStyles", HaloDefaults.chartBaseChartSeriesStyles); - columnChartStyle.setStyle("fill", new SolidColor(0xFFFFFF, 0)); - columnChartStyle.setStyle("calloutStroke", new SolidColorStroke(0x888888,2)); - columnChartStyle.setStyle("horizontalAxisStyleNames", ["blockCategoryAxis"]); - columnChartStyle.setStyle("verticalAxisStyleNames", ["blockNumericAxis"]); - + var columnChartStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.ColumnChart"); + if (columnChartStyle) + { + columnChartStyle.setStyle("chartSeriesStyles", HaloDefaults.chartBaseChartSeriesStyles); + columnChartStyle.setStyle("fill", new SolidColor(0xFFFFFF, 0)); + columnChartStyle.setStyle("calloutStroke", new SolidColorStroke(0x888888,2)); + columnChartStyle.setStyle("horizontalAxisStyleNames", ["blockCategoryAxis"]); + columnChartStyle.setStyle("verticalAxisStyleNames", ["blockNumericAxis"]); + } return true; } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7a6be43c/frameworks/projects/charts/src/mx/charts/GridLines.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/charts/src/mx/charts/GridLines.as b/frameworks/projects/charts/src/mx/charts/GridLines.as index 341c926..f9b757f 100644 --- a/frameworks/projects/charts/src/mx/charts/GridLines.as +++ b/frameworks/projects/charts/src/mx/charts/GridLines.as @@ -355,15 +355,21 @@ public class GridLines extends ChartElement { HaloDefaults.init(styleManager); - var gridLinesStyle:CSSStyleDeclaration = styleManager.getStyleDeclaration("mx.charts.GridLines"); - gridLinesStyle.setStyle("horizontalOriginStroke", new SolidColorStroke(0xB0C1D0, 1)); - gridLinesStyle.setStyle("horizontalStroke", new SolidColorStroke(0xEEEEEE, 0)); - gridLinesStyle.setStyle("verticalOriginStroke", new SolidColorStroke(0xB0C1D0, 1)); - gridLinesStyle.setStyle("verticalStroke", new SolidColorStroke(0xEEEEEE, 0)); - - var hgridLinesStyle:CSSStyleDeclaration = styleManager.getStyleDeclaration(".horizontalGridLines"); - hgridLinesStyle.setStyle("horizontalFill", null); - hgridLinesStyle.setStyle("verticalFill", null); + var gridLinesStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.GridLines"); + if (gridLinesStyle) + { + gridLinesStyle.setStyle("horizontalOriginStroke", new SolidColorStroke(0xB0C1D0, 1)); + gridLinesStyle.setStyle("horizontalStroke", new SolidColorStroke(0xEEEEEE, 0)); + gridLinesStyle.setStyle("verticalOriginStroke", new SolidColorStroke(0xB0C1D0, 1)); + gridLinesStyle.setStyle("verticalStroke", new SolidColorStroke(0xEEEEEE, 0)); + } + + var hgridLinesStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, ".horizontalGridLines"); + if (hgridLinesStyle) + { + hgridLinesStyle.setStyle("horizontalFill", null); + hgridLinesStyle.setStyle("verticalFill", null); + } return true; } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7a6be43c/frameworks/projects/charts/src/mx/charts/HLOCChart.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/charts/src/mx/charts/HLOCChart.as b/frameworks/projects/charts/src/mx/charts/HLOCChart.as index 91b7a27..8c72787 100644 --- a/frameworks/projects/charts/src/mx/charts/HLOCChart.as +++ b/frameworks/projects/charts/src/mx/charts/HLOCChart.as @@ -194,7 +194,7 @@ public class HLOCChart extends CartesianChart // //-------------------------------------------------------------------------- - /** + /** * @private */ private function initStyles():Boolean @@ -203,39 +203,41 @@ public class HLOCChart extends CartesianChart var hlocChartSeriesStyles:Array /* of Object */ = []; - var hlocChartStyle:CSSStyleDeclaration = styleManager.getStyleDeclaration("mx.charts.HLOCChart"); - hlocChartStyle.setStyle("chartSeriesStyles", hlocChartSeriesStyles); - hlocChartStyle.setStyle("fill", new SolidColor(0xFFFFFF, 0)); - hlocChartStyle.setStyle("calloutStroke", new SolidColorStroke(0x888888,2)); - hlocChartStyle.setStyle("horizontalAxisStyleNames", ["blockCategoryAxis"]); - hlocChartStyle.setStyle("verticalAxisStyleNames", ["blockNumericAxis"]); - - var n:int = HaloDefaults.defaultColors.length; - for (var i:int = 0; i < n; i++) - { - var styleName:String = "haloHLOCSeries"+i; - hlocChartSeriesStyles[i] = styleName; - - var o:CSSStyleDeclaration = - HaloDefaults.createSelector("." + styleName, styleManager); - - var f:Function = function(o:CSSStyleDeclaration, stroke:Stroke, - tickStroke:Stroke):void - { - o.defaultFactory = function():void - { - this.closeTickStroke = tickStroke; - this.openTickStroke = tickStroke; - this.stroke = stroke; - this.hlocColor = stroke.color; - } - } - - f(o, new Stroke(HaloDefaults.defaultColors[i], 0, 1), - new Stroke(HaloDefaults.defaultColors[i], 2, 1, - false, "normal", "none")); - } - + var hlocChartStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.HLOCChart"); + if (hlocChartStyle) + { + hlocChartStyle.setStyle("chartSeriesStyles", hlocChartSeriesStyles); + hlocChartStyle.setStyle("fill", new SolidColor(0xFFFFFF, 0)); + hlocChartStyle.setStyle("calloutStroke", new SolidColorStroke(0x888888,2)); + hlocChartStyle.setStyle("horizontalAxisStyleNames", ["blockCategoryAxis"]); + hlocChartStyle.setStyle("verticalAxisStyleNames", ["blockNumericAxis"]); + + var n:int = HaloDefaults.defaultColors.length; + for (var i:int = 0; i < n; i++) + { + var styleName:String = "haloHLOCSeries"+i; + hlocChartSeriesStyles[i] = styleName; + + var o:CSSStyleDeclaration = + HaloDefaults.createSelector("." + styleName, styleManager); + + var f:Function = function(o:CSSStyleDeclaration, stroke:Stroke, + tickStroke:Stroke):void + { + o.defaultFactory = function():void + { + this.closeTickStroke = tickStroke; + this.openTickStroke = tickStroke; + this.stroke = stroke; + this.hlocColor = stroke.color; + } + } + + f(o, new Stroke(HaloDefaults.defaultColors[i], 0, 1), + new Stroke(HaloDefaults.defaultColors[i], 2, 1, + false, "normal", "none")); + } + } return true; } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7a6be43c/frameworks/projects/charts/src/mx/charts/LineChart.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/charts/src/mx/charts/LineChart.as b/frameworks/projects/charts/src/mx/charts/LineChart.as index 0b9ade8..79dea55 100644 --- a/frameworks/projects/charts/src/mx/charts/LineChart.as +++ b/frameworks/projects/charts/src/mx/charts/LineChart.as @@ -155,35 +155,37 @@ public class LineChart extends CartesianChart var lineChartSeriesStyles:Array /* of Object */ = []; - var lineChartStyle:CSSStyleDeclaration = styleManager.getStyleDeclaration("mx.charts.LineChart"); - lineChartStyle.setStyle("chartSeriesStyles", lineChartSeriesStyles); - lineChartStyle.setStyle("fill", new SolidColor(0xFFFFFF, 0)); - lineChartStyle.setStyle("calloutStroke", new SolidColorStroke(0x888888,2)); - lineChartStyle.setStyle("horizontalAxisStyleNames", ["hangingCategoryAxis"]); - lineChartStyle.setStyle("verticalAxisStyleNames", ["blockNumericAxis"]); - - var n:int = HaloDefaults.defaultColors.length; - for (var i:int = 0; i < n; i++) - { - var styleName:String = "haloLineSeries" + i; - lineChartSeriesStyles[i] = styleName; - - var o:CSSStyleDeclaration = - HaloDefaults.createSelector("." + styleName, styleManager); - - var f:Function = function(o:CSSStyleDeclaration, stroke:Stroke):void - { - o.defaultFactory = function():void - { - this.lineStroke = stroke; - this.stroke = stroke; - this.lineSegmentRenderer = new ClassFactory(LineRenderer); - } - } - - f(o, new Stroke(HaloDefaults.defaultColors[i], 3, 1)); - } - + var lineChartStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.LineChart"); + if (lineChartStyle) + { + lineChartStyle.setStyle("chartSeriesStyles", lineChartSeriesStyles); + lineChartStyle.setStyle("fill", new SolidColor(0xFFFFFF, 0)); + lineChartStyle.setStyle("calloutStroke", new SolidColorStroke(0x888888,2)); + lineChartStyle.setStyle("horizontalAxisStyleNames", ["hangingCategoryAxis"]); + lineChartStyle.setStyle("verticalAxisStyleNames", ["blockNumericAxis"]); + + var n:int = HaloDefaults.defaultColors.length; + for (var i:int = 0; i < n; i++) + { + var styleName:String = "haloLineSeries" + i; + lineChartSeriesStyles[i] = styleName; + + var o:CSSStyleDeclaration = + HaloDefaults.createSelector("." + styleName, styleManager); + + var f:Function = function(o:CSSStyleDeclaration, stroke:Stroke):void + { + o.defaultFactory = function():void + { + this.lineStroke = stroke; + this.stroke = stroke; + this.lineSegmentRenderer = new ClassFactory(LineRenderer); + } + } + + f(o, new Stroke(HaloDefaults.defaultColors[i], 3, 1)); + } + } return true; } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7a6be43c/frameworks/projects/charts/src/mx/charts/PieChart.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/charts/src/mx/charts/PieChart.as b/frameworks/projects/charts/src/mx/charts/PieChart.as index 41c5c9d..b1d6694 100644 --- a/frameworks/projects/charts/src/mx/charts/PieChart.as +++ b/frameworks/projects/charts/src/mx/charts/PieChart.as @@ -192,10 +192,12 @@ public class PieChart extends PolarChart { HaloDefaults.init(styleManager); - var pieChartStyle:CSSStyleDeclaration = styleManager.getStyleDeclaration("mx.charts.PieChart"); - pieChartStyle.setStyle("fill", new SolidColor(0xFFFFFF, 0)); - pieChartStyle.setStyle("calloutStroke", new SolidColorStroke(0x888888,2)); - + var pieChartStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.PieChart"); + if (pieChartStyle) + { + pieChartStyle.setStyle("fill", new SolidColor(0xFFFFFF, 0)); + pieChartStyle.setStyle("calloutStroke", new SolidColorStroke(0x888888,2)); + } return true; } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7a6be43c/frameworks/projects/charts/src/mx/charts/PlotChart.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/charts/src/mx/charts/PlotChart.as b/frameworks/projects/charts/src/mx/charts/PlotChart.as index f872900..4e2bdd6 100644 --- a/frameworks/projects/charts/src/mx/charts/PlotChart.as +++ b/frameworks/projects/charts/src/mx/charts/PlotChart.as @@ -119,7 +119,7 @@ public class PlotChart extends CartesianChart // //-------------------------------------------------------------------------- - /** + /** * @private */ private function initStyles():Boolean @@ -128,43 +128,45 @@ public class PlotChart extends CartesianChart var plotChartSeriesStyles:Array /* of Object */ = []; - var plotChartStyle:CSSStyleDeclaration = styleManager.getStyleDeclaration("mx.charts.PlotChart"); - plotChartStyle.setStyle("chartSeriesStyles", plotChartSeriesStyles); - plotChartStyle.setStyle("fill", new SolidColor(0xFFFFFF, 0)); - plotChartStyle.setStyle("calloutStroke", new SolidColorStroke(0x888888,2)); - plotChartStyle.setStyle("horizontalAxisStyleNames", ["blockNumericAxis"]); - plotChartStyle.setStyle("verticalAxisStyleNames", ["blockNumericAxis"]); - - var defaultSkins:Array /* of IFactory */ = [ new ClassFactory(DiamondItemRenderer), - new ClassFactory(CircleItemRenderer), - new ClassFactory(BoxItemRenderer) ]; - var defaultSizes:Array /* of Number */ = [ 5, 3.5, 3.5 ]; - - var n:int = HaloDefaults.defaultFills.length; - for (var i:int = 0; i < n; i++) - { - var styleName:String = "haloPlotSeries"+i; - plotChartSeriesStyles[i] = styleName; - - var o:CSSStyleDeclaration = - HaloDefaults.createSelector("." + styleName, styleManager); - - var f:Function = function(o:CSSStyleDeclaration, skin:IFactory, - fill:IFill, radius:Number):void - { - o.defaultFactory = function():void - { - this.fill = fill; - this.itemRenderer = skin; - this.radius = radius - } - } - - f(o, defaultSkins[i % defaultSkins.length], - HaloDefaults.defaultFills[i], - defaultSizes[i % defaultSizes.length]); - } - + var plotChartStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.PlotChart"); + if (plotChartStyle) + { + plotChartStyle.setStyle("chartSeriesStyles", plotChartSeriesStyles); + plotChartStyle.setStyle("fill", new SolidColor(0xFFFFFF, 0)); + plotChartStyle.setStyle("calloutStroke", new SolidColorStroke(0x888888,2)); + plotChartStyle.setStyle("horizontalAxisStyleNames", ["blockNumericAxis"]); + plotChartStyle.setStyle("verticalAxisStyleNames", ["blockNumericAxis"]); + + var defaultSkins:Array /* of IFactory */ = [ new ClassFactory(DiamondItemRenderer), + new ClassFactory(CircleItemRenderer), + new ClassFactory(BoxItemRenderer) ]; + var defaultSizes:Array /* of Number */ = [ 5, 3.5, 3.5 ]; + + var n:int = HaloDefaults.defaultFills.length; + for (var i:int = 0; i < n; i++) + { + var styleName:String = "haloPlotSeries"+i; + plotChartSeriesStyles[i] = styleName; + + var o:CSSStyleDeclaration = + HaloDefaults.createSelector("." + styleName, styleManager); + + var f:Function = function(o:CSSStyleDeclaration, skin:IFactory, + fill:IFill, radius:Number):void + { + o.defaultFactory = function():void + { + this.fill = fill; + this.itemRenderer = skin; + this.radius = radius + } + } + + f(o, defaultSkins[i % defaultSkins.length], + HaloDefaults.defaultFills[i], + defaultSizes[i % defaultSizes.length]); + } + } return true; } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7a6be43c/frameworks/projects/charts/src/mx/charts/chartClasses/CartesianChart.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/charts/src/mx/charts/chartClasses/CartesianChart.as b/frameworks/projects/charts/src/mx/charts/chartClasses/CartesianChart.as index af9e587..9460f93 100644 --- a/frameworks/projects/charts/src/mx/charts/chartClasses/CartesianChart.as +++ b/frameworks/projects/charts/src/mx/charts/chartClasses/CartesianChart.as @@ -787,19 +787,22 @@ public class CartesianChart extends ChartBase invalidateProperties(); } - /** + /** * @private */ private function initStyles():Boolean { HaloDefaults.init(styleManager); - var cartesianChartStyle:CSSStyleDeclaration = styleManager.getStyleDeclaration("mx.charts.chartClasses.CartesianChart"); + var cartesianChartStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.chartClasses.CartesianChart"); + if (cartesianChartStyle) + { cartesianChartStyle.setStyle("chartSeriesStyles", HaloDefaults.chartBaseChartSeriesStyles); cartesianChartStyle.setStyle("fill", new SolidColor(0xFFFFFF, 0)); cartesianChartStyle.setStyle("calloutStroke", new SolidColorStroke(0x888888,2)); cartesianChartStyle.setStyle("horizontalAxisStyleNames", ["blockCategoryAxis"]); cartesianChartStyle.setStyle("verticalAxisStyleNames", ["blockNumericAxis"]); + } return true; } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7a6be43c/frameworks/projects/charts/src/mx/charts/chartClasses/ChartBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/charts/src/mx/charts/chartClasses/ChartBase.as b/frameworks/projects/charts/src/mx/charts/chartClasses/ChartBase.as index d5932ce..f548052 100644 --- a/frameworks/projects/charts/src/mx/charts/chartClasses/ChartBase.as +++ b/frameworks/projects/charts/src/mx/charts/chartClasses/ChartBase.as @@ -30,7 +30,7 @@ import flash.events.KeyboardEvent; import flash.events.MouseEvent; import flash.geom.Point; import flash.geom.Rectangle; -import flash.utils.*; +import flash.utils.Dictionary; import mx.charts.ChartItem; import mx.charts.HitData; @@ -1859,17 +1859,20 @@ public class ChartBase extends UIComponent implements IFocusManagerComponent priority, useWeakReference); } - /** + /** * @private */ private function initStyles():Boolean { HaloDefaults.init(styleManager); - var chartBaseStyle:CSSStyleDeclaration = styleManager.getStyleDeclaration("mx.charts.chartClasses.ChartBase"); - chartBaseStyle.setStyle("chartSeriesStyles", HaloDefaults.chartBaseChartSeriesStyles); - chartBaseStyle.setStyle("fill", new SolidColor(0xFFFFFF, 0)); - chartBaseStyle.setStyle("calloutStroke", new SolidColorStroke(0x888888,2)); + var chartBaseStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.chartClasses.ChartBase"); + if (chartBaseStyle) + { + chartBaseStyle.setStyle("chartSeriesStyles", HaloDefaults.chartBaseChartSeriesStyles); + chartBaseStyle.setStyle("fill", new SolidColor(0xFFFFFF, 0)); + chartBaseStyle.setStyle("calloutStroke", new SolidColorStroke(0x888888,2)); + } return true; } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7a6be43c/frameworks/projects/charts/src/mx/charts/chartClasses/PolarChart.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/charts/src/mx/charts/chartClasses/PolarChart.as b/frameworks/projects/charts/src/mx/charts/chartClasses/PolarChart.as index df60f38..1319439 100644 --- a/frameworks/projects/charts/src/mx/charts/chartClasses/PolarChart.as +++ b/frameworks/projects/charts/src/mx/charts/chartClasses/PolarChart.as @@ -205,17 +205,19 @@ public class PolarChart extends ChartBase // //-------------------------------------------------------------------------- - /** + /** * @private */ private function initStyles():Boolean { HaloDefaults.init(styleManager); - var polarChartStyle:CSSStyleDeclaration = styleManager.getStyleDeclaration("mx.charts.chartClasses.PolarChart"); - polarChartStyle.setStyle("fill", new SolidColor(0xFFFFFF, 0)); - polarChartStyle.setStyle("calloutStroke", new SolidColorStroke(0x888888,2)) - + var polarChartStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.chartClasses.PolarChart"); + if (polarChartStyle) + { + polarChartStyle.setStyle("fill", new SolidColor(0xFFFFFF, 0)); + polarChartStyle.setStyle("calloutStroke", new SolidColorStroke(0x888888,2)) + } return true; } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7a6be43c/frameworks/projects/charts/src/mx/charts/series/AreaSeries.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/charts/src/mx/charts/series/AreaSeries.as b/frameworks/projects/charts/src/mx/charts/series/AreaSeries.as index 6fbc951..1b26975 100644 --- a/frameworks/projects/charts/src/mx/charts/series/AreaSeries.as +++ b/frameworks/projects/charts/src/mx/charts/series/AreaSeries.as @@ -873,12 +873,15 @@ public class AreaSeries extends Series implements IStackable2 { HaloDefaults.init(styleManager); - var areaSeriesStyle:CSSStyleDeclaration = styleManager.getStyleDeclaration("mx.charts.series.AreaSeries"); - areaSeriesStyle.setStyle("areaRenderer", new ClassFactory(mx.charts.renderers.AreaRenderer)); - areaSeriesStyle.setStyle("legendMarkerRenderer", new ClassFactory(AreaSeriesLegendMarker)); - areaSeriesStyle.setStyle("areaFill", new SolidColor(0x000000)); - areaSeriesStyle.setStyle("fills", []); - areaSeriesStyle.setStyle("stroke", HaloDefaults.pointStroke); + var areaSeriesStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.series.AreaSeries"); + if (areaSeriesStyle) + { + areaSeriesStyle.setStyle("areaRenderer", new ClassFactory(mx.charts.renderers.AreaRenderer)); + areaSeriesStyle.setStyle("legendMarkerRenderer", new ClassFactory(AreaSeriesLegendMarker)); + areaSeriesStyle.setStyle("areaFill", new SolidColor(0x000000)); + areaSeriesStyle.setStyle("fills", []); + areaSeriesStyle.setStyle("stroke", HaloDefaults.pointStroke); + } return true; } @@ -2145,13 +2148,14 @@ public class AreaSeries extends Series implements IStackable2 import flash.display.Graphics; -import mx.charts.series.AreaSeries; -import mx.graphics.IStroke; -import mx.graphics.IFill; -import mx.graphics.Stroke; import flash.geom.Rectangle; + import mx.charts.chartClasses.GraphicsUtilities; +import mx.charts.series.AreaSeries; +import mx.graphics.IFill; +import mx.graphics.IStroke; import mx.graphics.LinearGradientStroke; +import mx.graphics.Stroke; import mx.skins.ProgrammaticSkin; /** http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7a6be43c/frameworks/projects/charts/src/mx/charts/series/BarSeries.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/charts/src/mx/charts/series/BarSeries.as b/frameworks/projects/charts/src/mx/charts/series/BarSeries.as index a19b40b..864e37e 100644 --- a/frameworks/projects/charts/src/mx/charts/series/BarSeries.as +++ b/frameworks/projects/charts/src/mx/charts/series/BarSeries.as @@ -1055,18 +1055,21 @@ public class BarSeries extends Series implements IStackable2, IBar // //-------------------------------------------------------------------------- - /** + /** * @private */ private function initStyles():Boolean { HaloDefaults.init(styleManager); - var barSeriesStyle:CSSStyleDeclaration = styleManager.getStyleDeclaration("mx.charts.series.BarSeries"); - barSeriesStyle.setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.BoxItemRenderer)); - barSeriesStyle.setStyle("fill", new SolidColor(0x000000)); - barSeriesStyle.setStyle("fills", []); - barSeriesStyle.setStyle("stroke", HaloDefaults.emptyStroke); + var barSeriesStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.series.BarSeries"); + if (barSeriesStyle) + { + barSeriesStyle.setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.BoxItemRenderer)); + barSeriesStyle.setStyle("fill", new SolidColor(0x000000)); + barSeriesStyle.setStyle("fills", []); + barSeriesStyle.setStyle("stroke", HaloDefaults.emptyStroke); + } return true; } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7a6be43c/frameworks/projects/charts/src/mx/charts/series/BubbleSeries.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/charts/src/mx/charts/series/BubbleSeries.as b/frameworks/projects/charts/src/mx/charts/series/BubbleSeries.as index c84bece..57bfcfb 100644 --- a/frameworks/projects/charts/src/mx/charts/series/BubbleSeries.as +++ b/frameworks/projects/charts/src/mx/charts/series/BubbleSeries.as @@ -703,11 +703,14 @@ public class BubbleSeries extends Series { HaloDefaults.init(styleManager); - var bubbleSeriesStyle:CSSStyleDeclaration = styleManager.getStyleDeclaration("mx.charts.series.BubbleSeries"); - bubbleSeriesStyle.setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.CircleItemRenderer)); - bubbleSeriesStyle.setStyle("fill", new SolidColor(0x444444)); - bubbleSeriesStyle.setStyle("fills", []); - bubbleSeriesStyle.setStyle("stroke", new SolidColorStroke(0,1,0.2)); + var bubbleSeriesStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.series.BubbleSeries"); + if (bubbleSeriesStyle) + { + bubbleSeriesStyle.setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.CircleItemRenderer)); + bubbleSeriesStyle.setStyle("fill", new SolidColor(0x444444)); + bubbleSeriesStyle.setStyle("fills", []); + bubbleSeriesStyle.setStyle("stroke", new SolidColorStroke(0,1,0.2)); + } return true; } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7a6be43c/frameworks/projects/charts/src/mx/charts/series/CandlestickSeries.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/charts/src/mx/charts/series/CandlestickSeries.as b/frameworks/projects/charts/src/mx/charts/series/CandlestickSeries.as index 8d1f13b..32959fb 100644 --- a/frameworks/projects/charts/src/mx/charts/series/CandlestickSeries.as +++ b/frameworks/projects/charts/src/mx/charts/series/CandlestickSeries.as @@ -288,13 +288,16 @@ public class CandlestickSeries extends HLOCSeriesBase { HaloDefaults.init(styleManager); - var csSeriesStyle:CSSStyleDeclaration = styleManager.getStyleDeclaration("mx.charts.series.CandlestickSeries"); - csSeriesStyle.setStyle("boxStroke", new SolidColorStroke(0,0)); - csSeriesStyle.setStyle("declineFill", new SolidColor(0)); - csSeriesStyle.setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.CandlestickItemRenderer)); - csSeriesStyle.setStyle("fill", new SolidColor(0xFFFFFF)); - csSeriesStyle.setStyle("fills", []); - csSeriesStyle.setStyle("stroke", new SolidColorStroke(0,0)); + var csSeriesStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.series.CandlestickSeries"); + if (csSeriesStyle) + { + csSeriesStyle.setStyle("boxStroke", new SolidColorStroke(0,0)); + csSeriesStyle.setStyle("declineFill", new SolidColor(0)); + csSeriesStyle.setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.CandlestickItemRenderer)); + csSeriesStyle.setStyle("fill", new SolidColor(0xFFFFFF)); + csSeriesStyle.setStyle("fills", []); + csSeriesStyle.setStyle("stroke", new SolidColorStroke(0,0)); + } return true; } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7a6be43c/frameworks/projects/charts/src/mx/charts/series/ColumnSeries.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/charts/src/mx/charts/series/ColumnSeries.as b/frameworks/projects/charts/src/mx/charts/series/ColumnSeries.as index fd37e69..bf81896 100644 --- a/frameworks/projects/charts/src/mx/charts/series/ColumnSeries.as +++ b/frameworks/projects/charts/src/mx/charts/series/ColumnSeries.as @@ -1050,12 +1050,14 @@ public class ColumnSeries extends Series implements IColumn,IStackable2 { HaloDefaults.init(styleManager); - var columnSeriesStyle:CSSStyleDeclaration = styleManager.getStyleDeclaration("mx.charts.series.ColumnSeries"); - columnSeriesStyle.setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.BoxItemRenderer)); - columnSeriesStyle.setStyle("fill", new SolidColor(0x000000)); - columnSeriesStyle.setStyle("fills", []); - columnSeriesStyle.setStyle("stroke", HaloDefaults.emptyStroke); - + var columnSeriesStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.series.ColumnSeries"); + if (columnSeriesStyle) + { + columnSeriesStyle.setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.BoxItemRenderer)); + columnSeriesStyle.setStyle("fill", new SolidColor(0x000000)); + columnSeriesStyle.setStyle("fills", []); + columnSeriesStyle.setStyle("stroke", HaloDefaults.emptyStroke); + } return true; } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7a6be43c/frameworks/projects/charts/src/mx/charts/series/HLOCSeries.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/charts/src/mx/charts/series/HLOCSeries.as b/frameworks/projects/charts/src/mx/charts/series/HLOCSeries.as index 31804d2..93a5739 100644 --- a/frameworks/projects/charts/src/mx/charts/series/HLOCSeries.as +++ b/frameworks/projects/charts/src/mx/charts/series/HLOCSeries.as @@ -186,7 +186,6 @@ public class HLOCSeries extends HLOCSeriesBase // //-------------------------------------------------------------------------- - /** * @private */ @@ -194,11 +193,14 @@ public class HLOCSeries extends HLOCSeriesBase { HaloDefaults.init(styleManager); - var hlocSeriesStyle:CSSStyleDeclaration = styleManager.getStyleDeclaration("mx.charts.series.HLOCSeries"); - hlocSeriesStyle.setStyle("closeTickStroke", new SolidColorStroke(0, 3, 1, false, "normal", "none")); - hlocSeriesStyle.setStyle("openTickStroke", new SolidColorStroke(0, 3, 1, false, "normal", "none")); - hlocSeriesStyle.setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.HLOCItemRenderer)); - hlocSeriesStyle.setStyle("stroke", new SolidColorStroke(0,0)); + var hlocSeriesStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.series.HLOCSeries"); + if (hlocSeriesStyle) + { + hlocSeriesStyle.setStyle("closeTickStroke", new SolidColorStroke(0, 3, 1, false, "normal", "none")); + hlocSeriesStyle.setStyle("openTickStroke", new SolidColorStroke(0, 3, 1, false, "normal", "none")); + hlocSeriesStyle.setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.HLOCItemRenderer)); + hlocSeriesStyle.setStyle("stroke", new SolidColorStroke(0,0)); + } return true; } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7a6be43c/frameworks/projects/charts/src/mx/charts/series/LineSeries.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/charts/src/mx/charts/series/LineSeries.as b/frameworks/projects/charts/src/mx/charts/series/LineSeries.as index f68b5b2..08c97c4 100644 --- a/frameworks/projects/charts/src/mx/charts/series/LineSeries.as +++ b/frameworks/projects/charts/src/mx/charts/series/LineSeries.as @@ -880,19 +880,21 @@ public class LineSeries extends Series // //-------------------------------------------------------------------------- - /** + /** * @private */ private function initStyles():Boolean { HaloDefaults.init(styleManager); - var lineSeriesStyle:CSSStyleDeclaration = styleManager.getStyleDeclaration("mx.charts.series.LineSeries"); - lineSeriesStyle.setStyle("lineSegmentRenderer", new ClassFactory(LineRenderer)); - lineSeriesStyle.setStyle("fill", new SolidColor(0xFFFFFF)); - lineSeriesStyle.setStyle("fills", []); - lineSeriesStyle.setStyle("lineStroke", new SolidColorStroke(0,3)); - + var lineSeriesStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.series.LineSeries"); + if (lineSeriesStyle) + { + lineSeriesStyle.setStyle("lineSegmentRenderer", new ClassFactory(LineRenderer)); + lineSeriesStyle.setStyle("fill", new SolidColor(0xFFFFFF)); + lineSeriesStyle.setStyle("fills", []); + lineSeriesStyle.setStyle("lineStroke", new SolidColorStroke(0,3)); + } return true; } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7a6be43c/frameworks/projects/charts/src/mx/charts/series/PieSeries.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/charts/src/mx/charts/series/PieSeries.as b/frameworks/projects/charts/src/mx/charts/series/PieSeries.as index 30198f7..fb64092 100644 --- a/frameworks/projects/charts/src/mx/charts/series/PieSeries.as +++ b/frameworks/projects/charts/src/mx/charts/series/PieSeries.as @@ -1167,7 +1167,6 @@ public class PieSeries extends Series // //-------------------------------------------------------------------------- - /** * @private */ @@ -1183,12 +1182,14 @@ public class PieSeries extends Series pieFills[i] = HaloDefaults.defaultFills[i]; } - var pieSeriesStyle:CSSStyleDeclaration = styleManager.getStyleDeclaration("mx.charts.series.PieSeries"); - pieSeriesStyle.setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.WedgeItemRenderer)); - pieSeriesStyle.setStyle("fills", pieFills); - pieSeriesStyle.setStyle("legendMarkerRenderer", new ClassFactory(PieSeriesLegendMarker)); - pieSeriesStyle.setStyle("calloutStroke", new SolidColorStroke(0,0,1)); - + var pieSeriesStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.series.PieSeries"); + if (pieSeriesStyle) + { + pieSeriesStyle.setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.WedgeItemRenderer)); + pieSeriesStyle.setStyle("fills", pieFills); + pieSeriesStyle.setStyle("legendMarkerRenderer", new ClassFactory(PieSeriesLegendMarker)); + pieSeriesStyle.setStyle("calloutStroke", new SolidColorStroke(0,0,1)); + } return true; } @@ -3118,6 +3119,7 @@ public class PieSeries extends Series import flash.display.Graphics; import flash.geom.Rectangle; + import mx.charts.chartClasses.LegendData; import mx.core.IDataRenderer; import mx.graphics.IFill; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7a6be43c/frameworks/projects/charts/src/mx/charts/series/PlotSeries.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/charts/src/mx/charts/series/PlotSeries.as b/frameworks/projects/charts/src/mx/charts/series/PlotSeries.as index cec1303..7d1c7bb 100644 --- a/frameworks/projects/charts/src/mx/charts/series/PlotSeries.as +++ b/frameworks/projects/charts/src/mx/charts/series/PlotSeries.as @@ -629,18 +629,20 @@ public class PlotSeries extends Series // //-------------------------------------------------------------------------- - /** + /** * @private */ private function initStyles():Boolean { HaloDefaults.init(styleManager); - var plotSeriesStyle:CSSStyleDeclaration = styleManager.getStyleDeclaration("mx.charts.series.PlotSeries"); - plotSeriesStyle.setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.DiamondItemRenderer)); - plotSeriesStyle.setStyle("fill", new SolidColor(0x4444AA)); - plotSeriesStyle.setStyle("fills", []); - + var plotSeriesStyle:CSSStyleDeclaration = HaloDefaults.findStyleDeclaration(styleManager, "mx.charts.series.PlotSeries"); + if (plotSeriesStyle) + { + plotSeriesStyle.setStyle("itemRenderer", new ClassFactory(mx.charts.renderers.DiamondItemRenderer)); + plotSeriesStyle.setStyle("fill", new SolidColor(0x4444AA)); + plotSeriesStyle.setStyle("fills", []); + } return true; } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7a6be43c/frameworks/projects/charts/src/mx/charts/styles/HaloDefaults.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/charts/src/mx/charts/styles/HaloDefaults.as b/frameworks/projects/charts/src/mx/charts/styles/HaloDefaults.as index 73d92ad..4fb3e67 100644 --- a/frameworks/projects/charts/src/mx/charts/styles/HaloDefaults.as +++ b/frameworks/projects/charts/src/mx/charts/styles/HaloDefaults.as @@ -220,6 +220,30 @@ public class HaloDefaults } } + + /** + * Returns the CSSStyleDeclaration by chasing the chain of styleManagers + * if necessary. + * + * @param name The name of the CSSStyleDeclaration + * @return The CSSStyleDeclaration or null if not found + */ + public static function findStyleDeclaration(styleManager:IStyleManager2, name:String):CSSStyleDeclaration + { + var decl:CSSStyleDeclaration = styleManager.getStyleDeclaration(name); + if (!decl) + { + var sm:IStyleManager2 = styleManager; + while (sm.parent) + { + decl = sm.getStyleDeclaration(name); + if (decl) + break; + sm = sm.parent; + } + } + return decl; + } } }
