Skip to content

support ellipse, rectangle, line as shapes in xls, xlsx, ods export #56

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

Closed
ozawa-hi wants to merge 11 commits into from
Closed

support ellipse, rectangle, line as shapes in xls, xlsx, ods export #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cbb10ee
support ellipse in xls export
ozawa-hi Apr 7, 2019
d3ed903
change to use LengthUtil() to calculate EMU
ozawa-hi Apr 8, 2019
98f0dfa
fix xls export line to draw diagonal line
ozawa-hi Apr 8, 2019
35cb690
support ods shapes in ods export
ozawa-hi Apr 9, 2019
5ac2bb6
change rectangle to draw using shape in xls export
ozawa-hi Apr 10, 2019
41b105b
support shapes in xlsx
ozawa-hi Apr 10, 2019
45bea0b
change to use JRColorUtil and linestyle block
ozawa-hi Apr 11, 2019
f515662
support rounded corner rectangle in xlsx export
ozawa-hi Apr 11, 2019
2be10ce
fix xls background color
ozawa-hi Apr 12, 2019
201b8a5
support round rectangle in ods and fix background color
ozawa-hi Apr 12, 2019
f631581
support line as shape in ods
ozawa-hi Apr 14, 2019
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
6 changes: 4 additions & 2 deletions jasperreports/src/net/sf/jasperreports/engine/export/JRXlsAbstractExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,7 +1248,7 @@ else if (element instanceof JRPrintRectangle)
}
else if (element instanceof JRPrintEllipse)
{
exportRectangle((JRPrintEllipse)element, gridCell, colIndex, rowIndex);
exportEllipse((JRPrintEllipse)element, gridCell, colIndex, rowIndex);
}
else if (element instanceof JRPrintImage)
{
Expand Down Expand Up @@ -2404,7 +2404,9 @@ protected void configureDefinedNames(PropertySuffix propertySuffix)

protected abstract void exportImage(JRPrintImage image, JRExporterGridCell cell, int colIndex, int rowIndex, int emptyCols, int yCutsRow, JRGridLayout layout) throws JRException;

protected abstract void exportRectangle(JRPrintGraphicElement element, JRExporterGridCell cell, int colIndex, int rowIndex) throws JRException;
protected abstract void exportRectangle(JRPrintRectangle element, JRExporterGridCell cell, int colIndex, int rowIndex) throws JRException;

protected abstract void exportEllipse(JRPrintEllipse element, JRExporterGridCell cell, int colIndex, int rowIndex) throws JRException;

protected abstract void exportLine(JRPrintLine line, JRExporterGridCell cell, int colIndex, int rowIndex) throws JRException;

Expand Down
13 changes: 10 additions & 3 deletions jasperreports/src/net/sf/jasperreports/engine/export/JRXlsAbstractMetadataExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ else if (element instanceof JRPrintRectangle)
}
else if (element instanceof JRPrintEllipse)
{
exportRectangle((JRPrintEllipse)element);
exportEllipse((JRPrintEllipse)element);
}
else if (element instanceof JRPrintImage)
{
Expand Down Expand Up @@ -547,7 +547,12 @@ public void exportImage(JRPrintImage image, JRExporterGridCell cell, int colInde
}

@Override
protected void exportRectangle(JRPrintGraphicElement element, JRExporterGridCell cell, int colIndex, int rowIndex) throws JRException
protected void exportRectangle(JRPrintRectangle element, JRExporterGridCell cell, int colIndex, int rowIndex) throws JRException
{
}

@Override
protected void exportEllipse(JRPrintEllipse element, JRExporterGridCell cell, int colIndex, int rowIndex) throws JRException
{
}

Expand Down Expand Up @@ -617,7 +622,9 @@ protected void setRowHeight(int rowIndex, int lastRowHeight) throws JRException

public abstract void exportImage(JRPrintImage image) throws JRException;

protected abstract void exportRectangle(JRPrintGraphicElement element) throws JRException;
protected abstract void exportRectangle(JRPrintRectangle element) throws JRException;

protected abstract void exportEllipse(JRPrintEllipse element) throws JRException;

protected abstract void exportLine(JRPrintLine line) throws JRException;

Expand Down
235 changes: 165 additions & 70 deletions jasperreports/src/net/sf/jasperreports/engine/export/JRXlsExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@
import org.apache.poi.hssf.usermodel.HSSFPrintSetup;
import org.apache.poi.hssf.usermodel.HSSFRichTextString;
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFShape;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFSimpleShape;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.usermodel.HeaderFooter;
import org.apache.poi.hssf.util.HSSFColor;
Expand All @@ -91,11 +93,13 @@
import net.sf.jasperreports.engine.JRLineBox;
import net.sf.jasperreports.engine.JRPen;
import net.sf.jasperreports.engine.JRPrintElement;
import net.sf.jasperreports.engine.JRPrintEllipse;
import net.sf.jasperreports.engine.JRPrintFrame;
import net.sf.jasperreports.engine.JRPrintGraphicElement;
import net.sf.jasperreports.engine.JRPrintHyperlink;
import net.sf.jasperreports.engine.JRPrintImage;
import net.sf.jasperreports.engine.JRPrintLine;
import net.sf.jasperreports.engine.JRPrintRectangle;
import net.sf.jasperreports.engine.JRPrintText;
import net.sf.jasperreports.engine.JRPropertiesUtil;
import net.sf.jasperreports.engine.JRRuntimeException;
Expand All @@ -111,6 +115,7 @@
import net.sf.jasperreports.engine.export.type.ImageAnchorTypeEnum;
import net.sf.jasperreports.engine.type.ImageTypeEnum;
import net.sf.jasperreports.engine.type.LineDirectionEnum;
import net.sf.jasperreports.engine.type.LineStyleEnum;
import net.sf.jasperreports.engine.type.ModeEnum;
import net.sf.jasperreports.engine.type.OrientationEnum;
import net.sf.jasperreports.engine.type.RunDirectionEnum;
Expand Down Expand Up @@ -151,7 +156,7 @@ public class JRXlsExporter extends JRXlsAbstractExporter<XlsReportConfiguration,
public static short MAX_COLOR_INDEX = 56;
public static short MIN_COLOR_INDEX = 10; /* Indexes from 0 to 9 are reserved */
private static short A2_PAPERSIZE = (short)66; /* A2_PAPERSIZE defined locally since it is not declared in HSSFPrintSetup */

private static Map<HSSFColor, short[]> hssfColorsRgbs;

static
Expand Down Expand Up @@ -739,99 +744,161 @@ protected void addOccupiedCell(OccupiedGridCell occupiedGridCell, int colIndex,
@Override
protected void exportLine(JRPrintLine line, JRExporterGridCell gridCell, int colIndex, int rowIndex)
{
short forecolor = getWorkbookColor(line.getLinePen().getLineColor()).getIndex();

int side = BoxStyle.TOP;
float ratio = line.getWidth() / line.getHeight();
if (ratio > 1)
int row1 = rowIndex;
int row2 = rowIndex;
if (line.getDirectionValue() == LineDirectionEnum.TOP_DOWN)
{
if (line.getDirectionValue() == LineDirectionEnum.TOP_DOWN)
{
side = BoxStyle.TOP;
}
else
{
side = BoxStyle.BOTTOM;
}
row2 += gridCell.getRowSpan();
}
else
{
if (line.getDirectionValue() == LineDirectionEnum.TOP_DOWN)
{
side = BoxStyle.LEFT;
}
else
row1 += gridCell.getRowSpan();
}
HSSFClientAnchor anchor = new HSSFClientAnchor(0, 0, 0, 0, (short) colIndex, row1, (short) (colIndex + gridCell.getColSpan()), row2);
HSSFSimpleShape shape = patriarch.createSimpleShape(anchor);
shape.setShapeType(HSSFSimpleShape.OBJECT_TYPE_LINE );
JRPen pen = line.getLinePen();

if (pen.getLineWidth() > 0)
{
shape.setLineWidth(LengthUtil.emu(Math.round(pen.getLineWidth())));
switch (pen.getLineStyleValue())
{
side = BoxStyle.RIGHT;
case DASHED :
{
shape.setLineStyle(HSSFShape.LINESTYLE_DASHGEL);
break;
}
case DOTTED :
{
shape.setLineStyle(HSSFShape.LINESTYLE_DOTSYS);
break;
}
case DOUBLE :
case SOLID :
default :
{
shape.setLineStyle(HSSFShape.LINESTYLE_SOLID);
break;
}
}
}
BoxStyle boxStyle = new BoxStyle(side, line.getLinePen());

FillPatternType mode = backgroundMode;
short backcolor = whiteIndex;
if (!Boolean.TRUE.equals(sheetInfo.ignoreCellBackground) && gridCell.getCellBackcolor() != null)
Color penColor = pen.getLineColor();
shape.setLineStyleColor(penColor.getRed(), penColor.getGreen(), penColor.getBlue());

if (line.getModeValue() == ModeEnum.OPAQUE && line.getBackcolor() != null)
{
mode = FillPatternType.SOLID_FOREGROUND;
backcolor = getWorkbookColor(gridCell.getCellBackcolor()).getIndex();
Color bgcolor = line.getBackcolor();
shape.setFillColor(bgcolor.getRed(), bgcolor.getGreen(), bgcolor.getBlue());
shape.setNoFill(true);
}
else
{
shape.setNoFill(true);
}
createMergeRegion(gridCell, colIndex, rowIndex);
}

HSSFCellStyle cellStyle =
getLoadedCellStyle(
mode,
backcolor,
HorizontalAlignment.LEFT,
VerticalAlignment.TOP,
(short)0,
getLoadedFont(getDefaultFont(), forecolor, null, getLocale()),
boxStyle,
false,
isCellLocked(line),
isCellHidden(line),
isShrinkToFit(line)
);

createMergeRegion(gridCell, colIndex, rowIndex, cellStyle);
@Override
protected void exportRectangle(JRPrintRectangle element, JRExporterGridCell gridCell, int colIndex, int rowIndex)
{
HSSFClientAnchor anchor = new HSSFClientAnchor(0, 0, 0, 0, (short) colIndex, rowIndex, (short) (colIndex + gridCell.getColSpan()), rowIndex + gridCell.getRowSpan());
HSSFSimpleShape shape = patriarch.createSimpleShape(anchor);
shape.setShapeType(HSSFSimpleShape.OBJECT_TYPE_RECTANGLE );
JRPen pen = element.getLinePen();

cell = row.createCell(colIndex);
cell.setCellStyle(cellStyle);
}
if (pen.getLineWidth() > 0)
{
shape.setLineWidth(LengthUtil.emu(Math.round(pen.getLineWidth())));
switch (pen.getLineStyleValue())
{
case DASHED :
{
shape.setLineStyle(HSSFShape.LINESTYLE_DASHGEL);
break;
}
case DOTTED :
{
shape.setLineStyle(HSSFShape.LINESTYLE_DOTSYS);
break;
}
case DOUBLE :
case SOLID :
default :
{
shape.setLineStyle(HSSFShape.LINESTYLE_SOLID);
break;
}
}
}

Color penColor = pen.getLineColor();
shape.setLineStyleColor(penColor.getRed(), penColor.getGreen(), penColor.getBlue());

if (element.getModeValue() == ModeEnum.OPAQUE && element.getBackcolor() != null)
{
Color bgcolor = element.getBackcolor();
shape.setFillColor(bgcolor.getRed(), bgcolor.getGreen(), bgcolor.getBlue());
shape.setNoFill(false);
}
else
{
shape.setNoFill(true);
}
createMergeRegion(gridCell, colIndex, rowIndex);
}

@Override
protected void exportRectangle(JRPrintGraphicElement element, JRExporterGridCell gridCell, int colIndex, int rowIndex)
protected void exportEllipse(JRPrintEllipse element, JRExporterGridCell gridCell, int colIndex, int rowIndex)
{
short forecolor = getWorkbookColor(element.getLinePen().getLineColor()).getIndex();
HSSFClientAnchor anchor = new HSSFClientAnchor(0, 0, 0, 0, (short) colIndex, rowIndex, (short) (colIndex + gridCell.getColSpan()), rowIndex + gridCell.getRowSpan());
HSSFSimpleShape shape = patriarch.createSimpleShape(anchor);
shape.setShapeType(HSSFSimpleShape.OBJECT_TYPE_OVAL);
JRPen pen = element.getLinePen();

FillPatternType mode = backgroundMode;
short backcolor = whiteIndex;
if (!Boolean.TRUE.equals(sheetInfo.ignoreCellBackground) && gridCell.getCellBackcolor() != null)
if (pen.getLineWidth() > 0)
{
mode = FillPatternType.SOLID_FOREGROUND;
backcolor = getWorkbookColor(gridCell.getCellBackcolor()).getIndex();
shape.setLineWidth(LengthUtil.emu(Math.round(pen.getLineWidth())));
switch (pen.getLineStyleValue())
{
case DASHED :
{
shape.setLineStyle(HSSFShape.LINESTYLE_DASHGEL);
break;
}
case DOTTED :
{
shape.setLineStyle(HSSFShape.LINESTYLE_DOTSYS);
break;
}
case DOUBLE :
case SOLID :
default :
{
shape.setLineStyle(HSSFShape.LINESTYLE_SOLID);
break;
}
}
}

HSSFCellStyle cellStyle =
getLoadedCellStyle(
mode,
backcolor,
HorizontalAlignment.LEFT,
VerticalAlignment.TOP,
(short)0,
getLoadedFont(getDefaultFont(), forecolor, null, getLocale()),
gridCell,
isWrapText(element),
isCellLocked(element),
isCellHidden(element),
isShrinkToFit(element)
);

createMergeRegion(gridCell, colIndex, rowIndex, cellStyle);
Color penColor = pen.getLineColor();
shape.setLineStyleColor(penColor.getRed(), penColor.getGreen(), penColor.getBlue());

cell = row.createCell(colIndex);
cell.setCellStyle(cellStyle);
if (element.getModeValue() == ModeEnum.OPAQUE && element.getBackcolor() != null)
{
Color bgcolor = element.getBackcolor();
shape.setFillColor(bgcolor.getRed(), bgcolor.getGreen(), bgcolor.getBlue());
shape.setNoFill(false);
}
else
{
shape.setNoFill(true);
}
createMergeRegion(gridCell, colIndex, rowIndex);
}


@Override
public void exportText(JRPrintText textElement, JRExporterGridCell gridCell, int colIndex, int rowIndex) throws JRException
{
Expand Down Expand Up @@ -1146,6 +1213,34 @@ protected void createMergeRegion(JRExporterGridCell gridCell, int colIndex, int
}
}

protected void createMergeRegion(JRExporterGridCell gridCell, int colIndex, int rowIndex)
{
boolean isCollapseRowSpan = getCurrentItemConfiguration().isCollapseRowSpan();
int rowSpan = isCollapseRowSpan ? 1 : gridCell.getRowSpan();
if (gridCell.getColSpan() > 1 || rowSpan > 1)
{
sheet.addMergedRegion(new CellRangeAddress(rowIndex, (rowIndex + rowSpan - 1),
colIndex, (colIndex + gridCell.getColSpan() - 1)));

for(int i = 0; i < rowSpan; i++)
{
HSSFRow spanRow = sheet.getRow(rowIndex + i);
if (spanRow == null)
{
spanRow = sheet.createRow(rowIndex + i);
}
for(int j = 0; j < gridCell.getColSpan(); j++)
{
HSSFCell spanCell = spanRow.getCell((colIndex + j));
if (spanCell == null)
{
spanCell = spanRow.createCell((colIndex + j));
}
}
}
}
}

private HorizontalAlignment getHorizontalAlignment(TextAlignHolder alignment)
{
switch (alignment.horizontalAlignment)
Expand Down
Loading