Skip to content
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

Jump to bottom

Fix the image scaling based on the given dimension (#1750) #1751

Merged
merged 2 commits into from
Jun 23, 2024
Merged

Fix the image scaling based on the given dimension (#1750) #1751

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82afd14
Fix the image scaling based on the given dimension (#1750)
speckyspooky Jun 23, 2024
99a188c
Exchanged the direct use of the dpi-value to a constant
speckyspooky Jun 23, 2024
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
41 changes: 30 additions & 11 deletions ...rt.emitters.excel/src/uk/co/spudsoft/birt/emitters/excel/handlers/CellContentHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*************************************************************************************
* Copyright (c) 2011, 2012, 2013 James Talbut.
* Copyright (c) 2011, 2012, 2013, 2024 James Talbut and others
* [email protected]
*
*
Expand Down Expand Up @@ -157,6 +157,7 @@ public CellContentHandler(IContentEmitter emitter, Logger log, IHandler parent,
colSpan = 1;
}

@SuppressWarnings("unused")
@Override
public void startCell(HandlerState state, ICellContent cell) throws BirtException {
if (cell.getBookmark() != null) {
Expand Down Expand Up @@ -341,7 +342,7 @@ protected void endCellContent(HandlerState state, ICellContent birtCell, IConten
&& ((lastValue instanceof String) || (lastValue instanceof RichTextString))) {
int spannedRowAlgorithm = EmitterServices.integerOption(state.getRenderOptions(), element,
ExcelEmitter.SPANNED_ROW_HEIGHT, ExcelEmitter.SPANNED_ROW_HEIGHT_SPREAD);
Font defaultFont = state.getWb().getFontAt(cell.getCellStyle().getFontIndexAsInt() /* .getFontIndex() */);
Font defaultFont = state.getWb().getFontAt(cell.getCellStyle().getFontIndex());
double cellWidth = spanWidthMillimetres(state.currentSheet, cell.getColumnIndex(),
cell.getColumnIndex() + colSpan - 1);
float cellDesiredHeight = smu.calculateTextHeightPoints(cell.getStringCellValue(), defaultFont, cellWidth,
Expand Down Expand Up @@ -823,18 +824,36 @@ public void recordImage(HandlerState state, Coordinate location, IImageContent i
+ birtImage.getPhysicalWidthDpi() + "dpi=" + birtImage.getPhysicalWidthInch() + "in) x "
+ birtImage.getHeight() + " (@" + birtImage.getPhysicalHeightDpi() + "dpi="
+ birtImage.getPhysicalHeightInch() + "in)");

if (image.getWidth() == null) {
DimensionType Width = new DimensionType(
(birtImage.getPhysicalWidthInch() > 0) ? birtImage.getPhysicalWidthInch()
: birtImage.getWidth() / 96.0,
"in");
// calculate the width based on the given height and the physical dimensions
DimensionType Width;
if (image.getHeight() != null) {
double factor = birtImage.getWidth() * 1.0 / birtImage.getHeight() * 1.0;
double imgWidth = image.getHeight().getMeasure() * factor;
Width = new DimensionType(imgWidth, image.getHeight().getUnits());
} else {
Width = new DimensionType(
(birtImage.getPhysicalWidthInch() > 0) ? birtImage.getPhysicalWidthInch()
: birtImage.getWidth() / 96.0,
"in");
}
image.setWidth(Width);
}
if (image.getHeight() == null) {
DimensionType Height = new DimensionType(
(birtImage.getPhysicalHeightInch() > 0) ? birtImage.getPhysicalHeightInch()
: birtImage.getHeight() / 96.0,
"in");
if (image.getHeight() == null && birtImage.getWidth() > 0 && birtImage.getHeight() > 0) {

// calculate the height based on the given width and the physical dimensions
DimensionType Height;
if (image.getWidth() != null) {
double factor = birtImage.getHeight() * 1.0 / birtImage.getWidth() * 1.0;
double imgHeight = image.getWidth().getMeasure() * factor;
Height = new DimensionType(imgHeight, image.getWidth().getUnits());
} else {
Height = new DimensionType(
(birtImage.getPhysicalHeightInch() > 0) ? birtImage.getPhysicalHeightInch()
: birtImage.getHeight() / 96.0,
"in");
}
image.setHeight(Height);
}
}
Expand Down
Loading