Skip to content

Prevent labels on summary charts from overlapping #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rlreamy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Prevent labels on summary charts from overlapping #43

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 24 additions & 12 deletions grails-app/services/ChartService.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import org.jfree.chart.axis.ValueAxis
import org.jfree.chart.entity.StandardEntityCollection
import org.jfree.chart.labels.BoxAndWhiskerToolTipGenerator
import org.jfree.chart.plot.CategoryPlot
import org.jfree.chart.plot.PiePlot
import org.jfree.chart.plot.PieLabelLinkStyle
import org.jfree.chart.plot.PlotOrientation
import org.jfree.chart.plot.XYPlot
import org.jfree.chart.renderer.category.*
Expand Down Expand Up @@ -297,7 +299,7 @@ class ChartService {

// Getting the concept data
p.conceptData = i2b2HelperService.getConceptDistributionDataForConcept(concept, p.instance)
p.conceptBar = getSVGChart(type: 'bar', data: p.conceptData, size: [width: 400, height: p.conceptData.size() * 15 + 80])
p.conceptBar = getSVGChart(type: 'bar', data: p.conceptData, size: [width: 500, height: p.conceptData.size() * 22 + 90], ylabel: "Count", xlabel:"Concept")
}

// Let's calculate the χ² test if possible
Expand Down Expand Up @@ -360,6 +362,11 @@ class ChartService {
def width = size?.width ?: 300
def height = size?.height ?: 300

if (type == 'pie') {
width = 400;
height = 400;
}

// If no data is being sent we return an empty string
if (data.isEmpty()) return ''
def nValues = 0;
Expand Down Expand Up @@ -540,14 +547,14 @@ class ChartService {

chart.title.font.size = 13
chart.title.padding = new RectangleInsets(30, 0, 0, 0)
chart.plot.labelBackgroundPaint = new Color(230, 230, 230)
chart.plot.labelOutlinePaint = new Color(130, 130, 130)
chart.plot.labelShadowPaint = transparent
chart.plot.labelPadding = new RectangleInsets(5, 5, 5, 5)
chart.plot.maximumLabelWidth = 0.2
chart.plot.shadowPaint = transparent
chart.plot.interiorGap = 0
chart.plot.baseSectionOutlinePaint = new Color(213, 18, 42)
PiePlot plot = (PiePlot) chart.getPlot();
plot.setLabelBackgroundPaint(null);
plot.setLabelOutlinePaint(null);
plot.setLabelShadowPaint(null);
plot.setMaximumLabelWidth(0.25);
plot.setShadowPaint(transparent);
plot.setInteriorGap(0.25);
plot.setLabelLinkStyle(PieLabelLinkStyle.STANDARD);

data.eachWithIndex { o, i ->
if(o.key){
Expand All @@ -573,9 +580,14 @@ class ChartService {

chart = ChartFactory.createBarChart(title, xlabel, ylabel, set, PlotOrientation.HORIZONTAL, false, true, false)
chart.setChartParameters()

chart.plot.renderer.setSeriesPaint(0, new Color(128, 193, 119))
chart.plot.renderer.setSeriesOutlinePaint(0, new Color(84, 151, 12))
def categoryPlot = chart.getCategoryPlot()
categoryPlot.setRangeAxisLocation(AxisLocation.BOTTOM_OR_RIGHT)
categoryPlot.renderer.setSeriesPaint(0, new Color(128, 193, 119))
categoryPlot.renderer.setSeriesOutlinePaint(0, new Color(84, 151, 12))
CategoryAxis axis = new CategoryAxis();
axis.setMaximumCategoryLabelLines(2);
axis.configure();
categoryPlot.setDomainAxis(axis);

break;
}
Expand Down