Yaniv Dary has uploaded a new change for review. Change subject: reports: set max to bars width (#850012) ......................................................................
reports: set max to bars width (#850012) https://bugzilla.redhat.com/850012 Change-Id: If0c045570fcfbba11dffc18fd60db153d5169db2 Signed-off-by: Yaniv Dary <[email protected]> --- M reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DrBarChartCustomizer.java A reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DrStackedBarChartCustomizer.java M reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/cluster_dashboard/no_used/top_five_ha_virtual_servers_uptime_dr19_files/top_five_ha_virtual_servers_uptime_dr19_jrxml.data M reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/cluster_dashboard/no_used/top_five_hosts_uptime_dr17_files/top_five_hosts_uptime_dr17_jrxml.data M reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/cluster_dashboard/top_five_ha_virtual_servers_downtime_dr20_files/top_five_ha_virtual_servers_downtime_dr20_jrxml.data M reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/cluster_dashboard/top_five_hosts_downtime_dr18_files/top_five_hosts_downtime_dr18_jrxml.data M reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/dc_dashboard/not_used/top_five_clusters_host_uptime_dr15_files/top_five_clusters_host_uptime_dr15_jrxml.data M reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/dc_dashboard/top_five_clusters_host_downtime_dr16_files/top_five_clusters_host_downtime_dr16_jrxml.data M reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/cluster_dashboard_files/top_five_ha_virtual_servers_downtime_dr20_jrxml.data M reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/cluster_dashboard_files/top_five_hosts_downtime_dr18_jrxml.data M reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/datacenter_dashboard_files/top_five_clusters_host_downtime_dr16_jrxml.data M reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/datacenter_dashboard_files/top_five_clusters_host_uptime_dr15_jrxml.data 12 files changed, 76 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/75/7675/1 diff --git a/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DrBarChartCustomizer.java b/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DrBarChartCustomizer.java index 0881dc2..9d9d1ed 100644 --- a/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DrBarChartCustomizer.java +++ b/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DrBarChartCustomizer.java @@ -19,6 +19,7 @@ import org.jfree.chart.renderer.category.BarRenderer; public class DrBarChartCustomizer implements JRChartCustomizer { + @Override public void customize(JFreeChart chart, JRChart jasperChart) { BarRenderer renderer = (BarRenderer) chart.getCategoryPlot().getRenderer(); CategoryPlot categoryPlot = renderer.getPlot(); @@ -34,6 +35,7 @@ CategoryAxis domainaxis = categoryPlot.getDomainAxis(); domainaxis.setMaximumCategoryLabelWidthRatio(1.5f); domainaxis.setTickMarksVisible(true); + domainaxis.setMaximumCategoryLabelLines(2); LegendItemCollection chartLegend = categoryPlot.getLegendItems(); diff --git a/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DrStackedBarChartCustomizer.java b/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DrStackedBarChartCustomizer.java new file mode 100644 index 0000000..cd837b3 --- /dev/null +++ b/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DrStackedBarChartCustomizer.java @@ -0,0 +1,64 @@ +package com.ovirt.reports.jasper; + +import java.awt.Shape; +import java.awt.geom.Rectangle2D; +import java.text.DecimalFormat; + +import net.sf.jasperreports.engine.JRChart; +import net.sf.jasperreports.engine.JRChartCustomizer; + +import org.jfree.chart.JFreeChart; +import org.jfree.chart.LegendItem; +import org.jfree.chart.LegendItemCollection; +import org.jfree.chart.axis.AxisLocation; +import org.jfree.chart.axis.CategoryAxis; +import org.jfree.chart.axis.NumberAxis; +import org.jfree.chart.axis.ValueAxis; +import org.jfree.chart.block.BlockBorder; +import org.jfree.chart.plot.CategoryPlot; +import org.jfree.chart.renderer.category.StackedBarRenderer; + +public class DrStackedBarChartCustomizer implements JRChartCustomizer { + + @Override + public void customize(JFreeChart chart, JRChart jasperChart) { + StackedBarRenderer renderer = (StackedBarRenderer) chart.getCategoryPlot().getRenderer(); + CategoryPlot categoryPlot = renderer.getPlot(); + renderer.setMaximumBarWidth(0.1); + categoryPlot.setNoDataMessage("No Data Available"); + categoryPlot.setRangeAxisLocation(AxisLocation.BOTTOM_OR_LEFT); + +// Widen the categories so those dots won't show up in the category. + CategoryAxis domainaxis = categoryPlot.getDomainAxis(); + domainaxis.setMaximumCategoryLabelWidthRatio(1.5f); + domainaxis.setTickMarksVisible(true); + domainaxis.setMaximumCategoryLabelLines(2); + + + LegendItemCollection chartLegend = categoryPlot.getLegendItems(); + LegendItemCollection res = new LegendItemCollection(); + Shape square = new Rectangle2D.Double(0,0,5,5); + for (int i = 0; i < chartLegend.getItemCount(); i++) { + LegendItem item = chartLegend.get(i); + String label = item.getLabel(); + if (label.length() > 18) + { + label = label.substring(0,10).concat("...").concat(label.substring(label.length() - 5, label.length())); + } + if (label != "" && label != "/Rx Rate" && label != "/Tx Rate") + { + res.add(new LegendItem(label, item.getDescription(), item.getToolTipText(), item.getURLText(), true, square, true, item.getFillPaint(), item.isShapeOutlineVisible(), item.getOutlinePaint(), item.getOutlineStroke(), false, item.getLine(), item.getLineStroke(), item.getLinePaint())); + } + } + categoryPlot.setFixedLegendItems(res); + chart.getLegend().setFrame(BlockBorder.NONE); + + ValueAxis rangeAxis = categoryPlot.getRangeAxis(); + if (rangeAxis instanceof NumberAxis) { + NumberAxis axis = (NumberAxis) rangeAxis; + axis.setNumberFormatOverride(new DecimalFormat("###,###,###.#")); + axis.setUpperBound(axis.getUpperBound()+1); + axis.setAutoRangeMinimumSize(1.0); + } + } +} \ No newline at end of file diff --git a/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/cluster_dashboard/no_used/top_five_ha_virtual_servers_uptime_dr19_files/top_five_ha_virtual_servers_uptime_dr19_jrxml.data b/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/cluster_dashboard/no_used/top_five_ha_virtual_servers_uptime_dr19_files/top_five_ha_virtual_servers_uptime_dr19_jrxml.data index a8c173c..0a002fb 100644 --- a/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/cluster_dashboard/no_used/top_five_ha_virtual_servers_uptime_dr19_files/top_five_ha_virtual_servers_uptime_dr19_jrxml.data +++ b/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/cluster_dashboard/no_used/top_five_ha_virtual_servers_uptime_dr19_files/top_five_ha_virtual_servers_uptime_dr19_jrxml.data @@ -29,7 +29,7 @@ <summary> <band height="167" splitType="Stretch"> <stackedBarChart> - <chart evaluationTime="Report" customizerClass="com.ovirt.reports.jasper.StackedBarChartCustomizer" theme="WebadminLineBarChartTheme"> + <chart evaluationTime="Report" customizerClass="com.ovirt.reports.jasper.DrStackedBarChartCustomizer" theme="WebadminLineBarChartTheme"> <reportElement mode="Transparent" x="0" y="0" width="418" height="167"/> <chartTitle> <font fontName="DejaVu Sans"/> diff --git a/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/cluster_dashboard/no_used/top_five_hosts_uptime_dr17_files/top_five_hosts_uptime_dr17_jrxml.data b/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/cluster_dashboard/no_used/top_five_hosts_uptime_dr17_files/top_five_hosts_uptime_dr17_jrxml.data index 67ef5b5..fc54df8 100644 --- a/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/cluster_dashboard/no_used/top_five_hosts_uptime_dr17_files/top_five_hosts_uptime_dr17_jrxml.data +++ b/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/cluster_dashboard/no_used/top_five_hosts_uptime_dr17_files/top_five_hosts_uptime_dr17_jrxml.data @@ -28,7 +28,7 @@ <summary> <band height="167" splitType="Stretch"> <stackedBarChart> - <chart evaluationTime="Report" customizerClass="com.ovirt.reports.jasper.StackedBarChartCustomizer" theme="WebadminLineBarChartTheme"> + <chart evaluationTime="Report" customizerClass="com.ovirt.reports.jasper.DrStackedBarChartCustomizer" theme="WebadminLineBarChartTheme"> <reportElement mode="Transparent" x="0" y="0" width="418" height="167"/> <chartTitle> <font fontName="DejaVu Sans"/> diff --git a/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/cluster_dashboard/top_five_ha_virtual_servers_downtime_dr20_files/top_five_ha_virtual_servers_downtime_dr20_jrxml.data b/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/cluster_dashboard/top_five_ha_virtual_servers_downtime_dr20_files/top_five_ha_virtual_servers_downtime_dr20_jrxml.data index 11a1d51..35c7f4a 100644 --- a/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/cluster_dashboard/top_five_ha_virtual_servers_downtime_dr20_files/top_five_ha_virtual_servers_downtime_dr20_jrxml.data +++ b/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/cluster_dashboard/top_five_ha_virtual_servers_downtime_dr20_files/top_five_ha_virtual_servers_downtime_dr20_jrxml.data @@ -27,7 +27,7 @@ <summary> <band height="260" splitType="Stretch"> <stackedBarChart> - <chart evaluationTime="Report" customizerClass="com.ovirt.reports.jasper.StackedBarChartCustomizer" theme="WebadminLineBarChartTheme"> + <chart evaluationTime="Report" customizerClass="com.ovirt.reports.jasper.DrStackedBarChartCustomizer" theme="WebadminLineBarChartTheme"> <reportElement uuid="2d1bfb2e-f032-43dd-b852-e8b3e15c0a41" mode="Transparent" x="0" y="0" width="445" height="260"/> <chartTitle> <font fontName="DejaVu Sans"/> diff --git a/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/cluster_dashboard/top_five_hosts_downtime_dr18_files/top_five_hosts_downtime_dr18_jrxml.data b/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/cluster_dashboard/top_five_hosts_downtime_dr18_files/top_five_hosts_downtime_dr18_jrxml.data index 142c84d..578a436 100644 --- a/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/cluster_dashboard/top_five_hosts_downtime_dr18_files/top_five_hosts_downtime_dr18_jrxml.data +++ b/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/cluster_dashboard/top_five_hosts_downtime_dr18_files/top_five_hosts_downtime_dr18_jrxml.data @@ -28,7 +28,7 @@ <summary> <band height="260" splitType="Stretch"> <stackedBarChart> - <chart evaluationTime="Report" customizerClass="com.ovirt.reports.jasper.StackedBarChartCustomizer" theme="WebadminLineBarChartTheme"> + <chart evaluationTime="Report" customizerClass="com.ovirt.reports.jasper.DrStackedBarChartCustomizer" theme="WebadminLineBarChartTheme"> <reportElement uuid="dc298783-7b10-4fde-bf45-dd2bad14bb5a" mode="Transparent" x="0" y="0" width="445" height="260"/> <chartTitle> <font fontName="DejaVu Sans"/> diff --git a/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/dc_dashboard/not_used/top_five_clusters_host_uptime_dr15_files/top_five_clusters_host_uptime_dr15_jrxml.data b/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/dc_dashboard/not_used/top_five_clusters_host_uptime_dr15_files/top_five_clusters_host_uptime_dr15_jrxml.data index 7546f5d..6306126 100644 --- a/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/dc_dashboard/not_used/top_five_clusters_host_uptime_dr15_files/top_five_clusters_host_uptime_dr15_jrxml.data +++ b/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/dc_dashboard/not_used/top_five_clusters_host_uptime_dr15_files/top_five_clusters_host_uptime_dr15_jrxml.data @@ -27,7 +27,7 @@ <summary> <band height="167" splitType="Stretch"> <stackedBarChart> - <chart evaluationTime="Report" customizerClass="com.ovirt.reports.jasper.StackedBarChartCustomizer" theme="WebadminLineBarChartTheme"> + <chart evaluationTime="Report" customizerClass="com.ovirt.reports.jasper.DrStackedBarChartCustomizer" theme="WebadminLineBarChartTheme"> <reportElement mode="Transparent" x="0" y="0" width="418" height="167"/> <chartTitle> <font fontName="DejaVu Sans"/> diff --git a/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/dc_dashboard/top_five_clusters_host_downtime_dr16_files/top_five_clusters_host_downtime_dr16_jrxml.data b/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/dc_dashboard/top_five_clusters_host_downtime_dr16_files/top_five_clusters_host_downtime_dr16_jrxml.data index efdcd6f..ae1c7fe 100644 --- a/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/dc_dashboard/top_five_clusters_host_downtime_dr16_files/top_five_clusters_host_downtime_dr16_jrxml.data +++ b/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/dc_dashboard/top_five_clusters_host_downtime_dr16_files/top_five_clusters_host_downtime_dr16_jrxml.data @@ -29,7 +29,7 @@ <summary> <band height="260" splitType="Stretch"> <stackedBarChart> - <chart evaluationTime="Report" customizerClass="com.ovirt.reports.jasper.StackedBarChartCustomizer" theme="WebadminLineBarChartTheme"> + <chart evaluationTime="Report" customizerClass="com.ovirt.reports.jasper.DrStackedBarChartCustomizer" theme="WebadminLineBarChartTheme"> <reportElement uuid="d49201a8-9a58-49c0-8de8-ad901a3220fd" mode="Transparent" x="0" y="0" width="445" height="260"/> <chartTitle> <font fontName="DejaVu Sans"/> diff --git a/reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/cluster_dashboard_files/top_five_ha_virtual_servers_downtime_dr20_jrxml.data b/reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/cluster_dashboard_files/top_five_ha_virtual_servers_downtime_dr20_jrxml.data index 11a1d51..35c7f4a 100644 --- a/reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/cluster_dashboard_files/top_five_ha_virtual_servers_downtime_dr20_jrxml.data +++ b/reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/cluster_dashboard_files/top_five_ha_virtual_servers_downtime_dr20_jrxml.data @@ -27,7 +27,7 @@ <summary> <band height="260" splitType="Stretch"> <stackedBarChart> - <chart evaluationTime="Report" customizerClass="com.ovirt.reports.jasper.StackedBarChartCustomizer" theme="WebadminLineBarChartTheme"> + <chart evaluationTime="Report" customizerClass="com.ovirt.reports.jasper.DrStackedBarChartCustomizer" theme="WebadminLineBarChartTheme"> <reportElement uuid="2d1bfb2e-f032-43dd-b852-e8b3e15c0a41" mode="Transparent" x="0" y="0" width="445" height="260"/> <chartTitle> <font fontName="DejaVu Sans"/> diff --git a/reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/cluster_dashboard_files/top_five_hosts_downtime_dr18_jrxml.data b/reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/cluster_dashboard_files/top_five_hosts_downtime_dr18_jrxml.data index 142c84d..578a436 100644 --- a/reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/cluster_dashboard_files/top_five_hosts_downtime_dr18_jrxml.data +++ b/reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/cluster_dashboard_files/top_five_hosts_downtime_dr18_jrxml.data @@ -28,7 +28,7 @@ <summary> <band height="260" splitType="Stretch"> <stackedBarChart> - <chart evaluationTime="Report" customizerClass="com.ovirt.reports.jasper.StackedBarChartCustomizer" theme="WebadminLineBarChartTheme"> + <chart evaluationTime="Report" customizerClass="com.ovirt.reports.jasper.DrStackedBarChartCustomizer" theme="WebadminLineBarChartTheme"> <reportElement uuid="dc298783-7b10-4fde-bf45-dd2bad14bb5a" mode="Transparent" x="0" y="0" width="445" height="260"/> <chartTitle> <font fontName="DejaVu Sans"/> diff --git a/reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/datacenter_dashboard_files/top_five_clusters_host_downtime_dr16_jrxml.data b/reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/datacenter_dashboard_files/top_five_clusters_host_downtime_dr16_jrxml.data index efdcd6f..ae1c7fe 100644 --- a/reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/datacenter_dashboard_files/top_five_clusters_host_downtime_dr16_jrxml.data +++ b/reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/datacenter_dashboard_files/top_five_clusters_host_downtime_dr16_jrxml.data @@ -29,7 +29,7 @@ <summary> <band height="260" splitType="Stretch"> <stackedBarChart> - <chart evaluationTime="Report" customizerClass="com.ovirt.reports.jasper.StackedBarChartCustomizer" theme="WebadminLineBarChartTheme"> + <chart evaluationTime="Report" customizerClass="com.ovirt.reports.jasper.DrStackedBarChartCustomizer" theme="WebadminLineBarChartTheme"> <reportElement uuid="d49201a8-9a58-49c0-8de8-ad901a3220fd" mode="Transparent" x="0" y="0" width="445" height="260"/> <chartTitle> <font fontName="DejaVu Sans"/> diff --git a/reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/datacenter_dashboard_files/top_five_clusters_host_uptime_dr15_jrxml.data b/reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/datacenter_dashboard_files/top_five_clusters_host_uptime_dr15_jrxml.data index 7546f5d..6306126 100644 --- a/reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/datacenter_dashboard_files/top_five_clusters_host_uptime_dr15_jrxml.data +++ b/reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/datacenter_dashboard_files/top_five_clusters_host_uptime_dr15_jrxml.data @@ -27,7 +27,7 @@ <summary> <band height="167" splitType="Stretch"> <stackedBarChart> - <chart evaluationTime="Report" customizerClass="com.ovirt.reports.jasper.StackedBarChartCustomizer" theme="WebadminLineBarChartTheme"> + <chart evaluationTime="Report" customizerClass="com.ovirt.reports.jasper.DrStackedBarChartCustomizer" theme="WebadminLineBarChartTheme"> <reportElement mode="Transparent" x="0" y="0" width="418" height="167"/> <chartTitle> <font fontName="DejaVu Sans"/> -- To view, visit http://gerrit.ovirt.org/7675 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If0c045570fcfbba11dffc18fd60db153d5169db2 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Yaniv Dary <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
