[primefaces] r12412 committed - Displaying small values on Donut and Pie chart.

[prime...@googlecode.com]

Revision: 12412
Author: sinca...@gmail.com
Date: Wed Mar 25 18:41:55 2015 UTC
Log: Displaying small values on Donut and Pie chart.
https://code.google.com/p/primefaces/source/detail?r=12412

Modified:

/primefaces/trunk/src/main/java/org/primefaces/component/chart/renderer/DonutRenderer.java

/primefaces/trunk/src/main/java/org/primefaces/component/chart/renderer/PieRenderer.java

/primefaces/trunk/src/main/java/org/primefaces/model/chart/DonutChartModel.java

/primefaces/trunk/src/main/java/org/primefaces/model/chart/PieChartModel.java

/primefaces/trunk/src/main/resources/META-INF/resources/primefaces/charts/charts.js

=======================================
---
/primefaces/trunk/src/main/java/org/primefaces/component/chart/renderer/DonutRenderer.java
Wed Mar 25 14:58:36 2015 UTC
+++
/primefaces/trunk/src/main/java/org/primefaces/component/chart/renderer/DonutRenderer.java
Wed Mar 25 18:41:55 2015 UTC
@@ -68,11 +68,13 @@
boolean showDataLabels = model.isShowDataLabels();
String dataFormat = model.getDataFormat();
String dataLabelFormatString = model.getDataLabelFormatString();
+ int dataLabelThreshold = model.getDataLabelThreshold();

if(sliceMargin != 0) writer.write(",sliceMargin:" + sliceMargin);
if(!fill) writer.write(",fill:false");
if(showDataLabels) writer.write(",showDataLabels:true");
if(dataFormat != null) writer.write(",dataFormat:\"" + dataFormat
+ "\"");
if(dataLabelFormatString != null)
writer.write(",dataLabelFormatString:\"" + dataLabelFormatString + "\"");
+ if(dataLabelThreshold > 0 && dataLabelThreshold < 100)
writer.write(",dataLabelThreshold:" + dataLabelThreshold);
}
}
=======================================
---
/primefaces/trunk/src/main/java/org/primefaces/component/chart/renderer/PieRenderer.java
Wed Mar 25 14:58:36 2015 UTC
+++
/primefaces/trunk/src/main/java/org/primefaces/component/chart/renderer/PieRenderer.java
Wed Mar 25 18:41:55 2015 UTC
@@ -56,6 +56,7 @@
boolean showDataLabels = model.isShowDataLabels();
String dataFormat = model.getDataFormat();
String dataLabelFormatString = model.getDataLabelFormatString();
+ int dataLabelThreshold = model.getDataLabelThreshold();

if(diameter != 0) writer.write(",diameter:" + diameter);
if(sliceMargin != 0) writer.write(",sliceMargin:" + sliceMargin);
@@ -63,6 +64,7 @@
if(showDataLabels) writer.write(",showDataLabels:true");
if(dataFormat != null) writer.write(",dataFormat:\"" + dataFormat
+ "\"");
if(dataLabelFormatString != null)
writer.write(",dataLabelFormatString:\"" + dataLabelFormatString + "\"");
+ if(dataLabelThreshold > 0 && dataLabelThreshold < 100)
writer.write(",dataLabelThreshold:" + dataLabelThreshold);
}

}
=======================================
---
/primefaces/trunk/src/main/java/org/primefaces/model/chart/DonutChartModel.java
Wed Mar 25 14:58:36 2015 UTC
+++
/primefaces/trunk/src/main/java/org/primefaces/model/chart/DonutChartModel.java
Wed Mar 25 18:41:55 2015 UTC
@@ -27,7 +27,8 @@
private boolean showDataLabels = false;
private String dataFormat;
private String dataLabelFormatString;
-
+ private int dataLabelThreshold;
+
public DonutChartModel() {
data = new ArrayList<Map<String, Number>>();
}
@@ -87,5 +88,13 @@
public void setDataLabelFormatString(String dataLabelFormatString) {
this.dataLabelFormatString = dataLabelFormatString;
}
+
+ public int getDataLabelThreshold() {
+ return dataLabelThreshold;
+ }
+
+ public void setDataLabelThreshold(int dataLabelThreshold) {
+ this.dataLabelThreshold = dataLabelThreshold;
+ }

}
=======================================
---
/primefaces/trunk/src/main/java/org/primefaces/model/chart/PieChartModel.java
Wed Mar 25 14:58:36 2015 UTC
+++
/primefaces/trunk/src/main/java/org/primefaces/model/chart/PieChartModel.java
Wed Mar 25 18:41:55 2015 UTC
@@ -27,6 +27,7 @@
private boolean showDataLabels = false;
private String dataFormat;
private String dataLabelFormatString;
+ private int dataLabelThreshold;

public PieChartModel() {
data = new LinkedHashMap<String, Number>();
@@ -99,5 +100,13 @@
public void setDataLabelFormatString(String dataLabelFormatString) {
this.dataLabelFormatString = dataLabelFormatString;
}
+
+ public int getDataLabelThreshold() {
+ return dataLabelThreshold;
+ }
+
+ public void setDataLabelThreshold(int dataLabelThreshold) {
+ this.dataLabelThreshold = dataLabelThreshold;
+ }

}
=======================================
---
/primefaces/trunk/src/main/resources/META-INF/resources/primefaces/charts/charts.js
Wed Mar 25 14:58:36 2015 UTC
+++
/primefaces/trunk/src/main/resources/META-INF/resources/primefaces/charts/charts.js
Wed Mar 25 18:41:55 2015 UTC
@@ -22111,7 +22111,8 @@
showDataLabels : chart.cfg.showDataLabels,
dataLabels : chart.cfg.dataFormat||'percent',
highlightMouseOver: chart.cfg.highlightMouseOver,
- dataLabelFormatString:
chart.cfg.dataLabelFormatString
+ dataLabelFormatString:
chart.cfg.dataLabelFormatString,
+ dataLabelThreshold: chart.cfg.dataLabelThreshold||3
}
};
}
@@ -22209,7 +22210,8 @@
showDataLabels : chart.cfg.showDataLabels,
dataLabels : chart.cfg.dataFormat||'percent',
highlightMouseOver: chart.cfg.highlightMouseOver,
- dataLabelFormatString:
chart.cfg.dataLabelFormatString
+ dataLabelFormatString:
chart.cfg.dataLabelFormatString,
+ dataLabelThreshold: chart.cfg.dataLabelThreshold||3
}
};
}