Added more chart supports. #144

sandeeptiwari32 · 2019-05-04T11:23:35Z

Added more chart supports.
fixed bug while creating chart with bar and line series.

fixed bug while creating chart with bar and line series.

asfgit · 2019-05-04T11:25:02Z

Can one of the admins verify this patch?

sandeeptiwari32 · 2019-05-04T11:25:12Z

src/examples/src/org/apache/poi/xssf/usermodel/examples/BarAndLineChart.java

            XDDFBarChartData.Series series1 = (XDDFBarChartData.Series) bar.addSeries(xs, ys1);
            series1.setTitle("Bars", new CellReference("Sheet1!$B$1"));
            bar.setVaryColors(true);
            bar.setBarDirection(BarDirection.COL);
            chart.plot(bar);

-            // the line chart
+            // the line chart on secondary axis
            XDDFLineChartData lines = (XDDFLineChartData) chart.createData(ChartTypes.LINE, lineCategories,


create line series with secondary axis

sandeeptiwari32 · 2019-05-04T11:25:54Z

src/examples/src/org/apache/poi/xssf/usermodel/examples/BarAndLineChart.java

            XDDFLineChartData.Series series2 = (XDDFLineChartData.Series) lines.addSeries(xs, ys2);
+            series2.updateIdXVal(1);


update axis value and order value of series.

sandeeptiwari32 · 2019-05-04T11:27:00Z

src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ChartTypes.java

@@ -17,9 +17,16 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 package org.apache.poi.xddf.usermodel.chart;

 public enum ChartTypes {
+    AREA,


enum for new chart types

sandeeptiwari32 · 2019-05-04T11:27:37Z

src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFArea3DChartData.java

@@ -0,0 +1,165 @@
+/* ====================================================================


support for area 3d chart

sandeeptiwari32 · 2019-05-04T11:27:56Z

src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFAreaChartData.java

@@ -0,0 +1,168 @@
+/* ====================================================================


support for area chart

sandeeptiwari32 · 2019-05-04T11:28:45Z

src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFBar3DChartData.java

@@ -0,0 +1,201 @@
+/* ====================================================================


support for bar 3d chart

sandeeptiwari32 · 2019-05-04T11:30:15Z

src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFBarChartData.java

@@ -187,5 +187,16 @@ protected CTAxDataSource getAxDS() {
        protected CTNumDataSource getNumDS() {
            return series.getVal();
        }
+


overrided method to update series id and order id

I can see these methods, but your comment does not help to understand what problem they were supposed to solve in the first place.

I first of all question their public visibility. Since I don't think it is good practice to rely on the developer using the library to know when to use and what to expect from them...

so we created update methods, because in a chart, we need to provide unique value to each series, now while creating combo chart, i.e. line series and bar series in that case we assigning same values to each series due to that it was corrupting the office file. Now either we can create a new constructor with new parameter i.e. index or can provide an update method to re-assign axis id and order id. so i chose update method.

I finally understood what you were trying to achieve! I had a similar code in a PR that I left aside because of some more changes required after a comment about API requiring changes.

https://github.com/apache/poi/pull/139/files#diff-17a515ee7210ab25ee2bcedbf5e49a87R116

I also tried to get all series list in chart data, but as there is no relationship between different series types, so we are left with only series list of particular chart data.

sandeeptiwari32 · 2019-05-04T11:30:58Z

src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java

+     * 
+     * @return this method will add 3D view
+     */
+    public XDDFView3D getOrAddView3D()


method to add 3d view into chart

sandeeptiwari32 · 2019-05-04T11:32:03Z

src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java

+        Map<Long, XDDFChartAxis> categories = null;
+        Map<Long, XDDFValueAxis> mapValues = null;
+
+        if(ChartTypes.PIE != type && ChartTypes.PIE3D != type)


handled null pointer exception in case of pie chart.

nice catch!

thank you :)

sandeeptiwari32 · 2019-05-04T11:33:40Z

src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java

+            categories = Collections.singletonMap(category.getId(), category);
+            mapValues = Collections.singletonMap(values.getId(), values);
+        }
+
        final CTPlotArea plotArea = getCTPlotArea();
        switch (type) {


added case to create instance for new added chart

sandeeptiwari32 · 2019-05-04T11:34:38Z

src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java

@@ -98,6 +98,10 @@ public XDDFCategoryAxis getCategoryAxis() {

        protected abstract CTNumDataSource getNumDS();

+        protected abstract void updateIdXVal(long val);


abstract methods to update series id and order id

sandeeptiwari32 · 2019-05-04T11:34:54Z

src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFLine3DChartData.java

@@ -0,0 +1,233 @@
+/* ====================================================================


support for Line 3d chart

sandeeptiwari32 · 2019-05-04T11:36:21Z

src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFLineChartData.java

@@ -67,7 +67,11 @@ public Grouping getGrouping() {
    }

    public void setGrouping(Grouping grouping) {
+        if (chart.getGrouping()!=null) {


handled case in case of grouping was not created in chart

sandeeptiwari32 · 2019-05-04T11:36:55Z

src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFPie3DChartData.java

@@ -0,0 +1,157 @@
+/* ====================================================================


support for pie 3d chart

sandeeptiwari32 · 2019-05-04T11:37:41Z

src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFSurface3DChartData.java

@@ -0,0 +1,168 @@
+/* ====================================================================


support for surface 3d chart

sandeeptiwari32 · 2019-05-04T11:38:08Z

src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFSurfaceChartData.java

@@ -0,0 +1,167 @@
+/* ====================================================================


support for surface chart

sandeeptiwari32 · 2019-05-04T11:39:02Z

src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFView3D.java

@@ -0,0 +1,106 @@
+/*


created class to use 3d view

sandeeptiwari32

please review.

Alain-Bearez

After formatting details are fixed, we will start discussing some more in depth design decisions.

Alain-Bearez · 2019-05-06T21:53:46Z

src/examples/src/org/apache/poi/xssf/usermodel/examples/BarAndLineChart.java

@@ -134,17 +134,26 @@ public static void main(String[] args) throws Exception {
            lineCategories.crossAxis(rightValues);

            // the bar chart
-            XDDFBarChartData bar = (XDDFBarChartData) chart.createData(ChartTypes.BAR, lineCategories, rightValues);
+            XDDFBarChartData bar = (XDDFBarChartData) chart.createData(ChartTypes.BAR, barCategories, leftValues);


great catch!

thank you :)

Alain-Bearez · 2019-05-06T21:57:11Z

src/examples/src/org/apache/poi/xssf/usermodel/examples/BarAndLineChart.java

            XDDFLineChartData.Series series2 = (XDDFLineChartData.Series) lines.addSeries(xs, ys2);
+            series2.updateIdXVal(1);
+            series2.updateOrderVal(1);


Your updateXXXVal() methods are disguised setters. I am not quite sure this is the best way to achieve your goal (which I still does not understand at this point).

so we created update methods, because in a chart, we need to provide unique value to each series, now while creating combo chart, i.e. line series and bar series in that case we assigning same values to each series due to that it was corrupting the office file. Now either we can create a new constructor with new parameter i.e. index or can provide an update method to re-assign axis id and order id. so i chose update method.

Alain-Bearez · 2019-05-06T22:00:53Z

src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ChartTypes.java

-    SCATTER
+    SCATTER,
+    SURFACE,
+    SURFACE3D


Seven new chart types at once!!!

Very impressive, indeed!

Alain-Bearez · 2019-05-06T22:16:13Z

src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFBarChartData.java

@@ -187,5 +187,16 @@ protected CTAxDataSource getAxDS() {
        protected CTNumDataSource getNumDS() {
            return series.getVal();
        }
+


I can see these methods, but your comment does not help to understand what problem they were supposed to solve in the first place.

I first of all question their public visibility. Since I don't think it is good practice to rely on the developer using the library to know when to use and what to expect from them...

Alain-Bearez · 2019-05-06T22:18:37Z

src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java

+    public XDDFView3D getOrAddView3D()
+    {
+        CTView3D view3D;
+        if(chart.isSetView3D()) {


missing whitespace between if and (

updated code.

Alain-Bearez · 2019-05-06T22:41:32Z

src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFSurfaceChartData.java

+
+    @Override
+    public void setVaryColors(boolean varyColors) {
+


added comment.

Alain-Bearez · 2019-05-06T22:41:44Z

src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFSurfaceChartData.java

+
+        @Override
+        public void setShowLeaderLines(boolean showLeaderLines) {
+


added comment.

Alain-Bearez · 2019-05-06T22:42:50Z

src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFView3D.java

+            view3D.getRotY().setVal(val);
+        }
+        else
+            view3D.addNewRotY().setVal(val);


The three lines above don't follow formatting rules for the project...

And the pattern is (wrongly) repeated until the end of this class!

updated code.

Alain-Bearez · 2019-05-06T22:46:50Z

src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFView3D.java

+    }
+
+    public int getRotXVal() {
+        return view3D.getRotX().getVal();


Despite being internally represented as an int value, the rotation represents an angle which developers using this library will expect to be expressed in degrees instead of the scaled range allowed by the specs.

We will have to provide a converting mechanism. I am sorry I got it wrong in the first place on the other properties representing angles...

yes we need to write a utility method for conversion.

i am writing that utility method. so if it's completed early so i will check in that code with this pull request.

While reading the specs, this is one of the few places where the angles are given as integer values, without scaling by 60,000 to get more precision.

Alain-Bearez · 2019-05-06T22:52:57Z

src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFView3D.java

+        return view3D.getHPercent().getVal();
+    }
+
+    public void setHPercentVal(int val) {


As matter of facts, all the methods names have to be adapted to the conventions used otherwise in the project:

no Val suffix

no unpronounceable name such as RAngAx

no shortcut as RotX, RotY or HPercent but RotationX, RotationY and HeightPercent

updated method names.

updating local repo.

sandeeptiwari32

updated suggested changes.

Alain-Bearez · 2019-05-21T00:16:06Z

applied as r1859590

closes #139 closes #144 git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1859676 13f79535-47bb-0310-9956-ffa450edef68

closes apache#139 closes apache#144 git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1859676 13f79535-47bb-0310-9956-ffa450edef68

Added more chart supports.

6123729

fixed bug while creating chart with bar and line series.

sandeeptiwari32 commented May 4, 2019

View reviewed changes

src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFView3D.java

@@ -0,0 +1,106 @@

/*

Copy link

Author

sandeeptiwari32 May 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

created class to use 3d view

sandeeptiwari32 commented May 4, 2019

View reviewed changes

Alain-Bearez suggested changes May 6, 2019

View reviewed changes

sandeeptiwari32 added 5 commits May 8, 2019 00:10

Merge pull request #1 from apache/trunk

4a4442d

updating local repo.

Updated suggested code changes

5e5965c

updated suggested code changes

3fc5e5b

update suggested code changes

ff1b33b

updated suggested code

2e970f8

sandeeptiwari32 commented May 8, 2019

View reviewed changes

Alain-Bearez mentioned this pull request May 12, 2019

Seven more XDDF charts and bug fixes #147

Closed

asfgit closed this in 5e070fd May 21, 2019

asfgit pushed a commit that referenced this pull request Oct 6, 2019

code inspired from Axel Richter on StackOverflow

9995e17

closes #139 closes #144 git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1859676 13f79535-47bb-0310-9956-ffa450edef68

Alain-Bearez pushed a commit to cuali/poi that referenced this pull request Dec 12, 2019

code inspired from Axel Richter on StackOverflow

76e558a

closes apache#139 closes apache#144 git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1859676 13f79535-47bb-0310-9956-ffa450edef68

		XDDFLineChartData.Series series2 = (XDDFLineChartData.Series) lines.addSeries(xs, ys2);
		series2.updateIdXVal(1);

		@@ -0,0 +1,165 @@
		/* ====================================================================

		@@ -0,0 +1,168 @@
		/* ====================================================================

		@@ -0,0 +1,201 @@
		/* ====================================================================

		@@ -98,6 +98,10 @@ public XDDFCategoryAxis getCategoryAxis() {

		protected abstract CTNumDataSource getNumDS();

		protected abstract void updateIdXVal(long val);

		@@ -0,0 +1,233 @@
		/* ====================================================================

		@@ -0,0 +1,157 @@
		/* ====================================================================

		@@ -0,0 +1,167 @@
		/* ====================================================================


		@Override
		public void setShowLeaderLines(boolean showLeaderLines) {

Added more chart supports. #144

Added more chart supports. #144

Conversation

sandeeptiwari32 commented May 4, 2019

asfgit commented May 4, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sandeeptiwari32 left a comment

Choose a reason for hiding this comment

Alain-Bearez left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sandeeptiwari32 May 7, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sandeeptiwari32 May 7, 2019 • edited Loading

Choose a reason for hiding this comment

Alain-Bearez May 12, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sandeeptiwari32 left a comment

Choose a reason for hiding this comment

Alain-Bearez commented May 21, 2019

sandeeptiwari32 May 7, 2019 •

edited

Loading

sandeeptiwari32 May 7, 2019 •

edited

Loading

Alain-Bearez May 12, 2019 •

edited

Loading