fix for bug 51622: autosize columns with leading whitespace
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1712477 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
265d198612
commit
20ba4851a8
@ -21,6 +21,7 @@ import java.awt.font.FontRenderContext;
|
|||||||
import java.awt.font.TextAttribute;
|
import java.awt.font.TextAttribute;
|
||||||
import java.awt.font.TextLayout;
|
import java.awt.font.TextLayout;
|
||||||
import java.awt.geom.AffineTransform;
|
import java.awt.geom.AffineTransform;
|
||||||
|
import java.awt.geom.Rectangle2D;
|
||||||
import java.text.AttributedString;
|
import java.text.AttributedString;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@ -165,6 +166,7 @@ public class SheetUtil {
|
|||||||
private static double getCellWidth(int defaultCharWidth, int colspan,
|
private static double getCellWidth(int defaultCharWidth, int colspan,
|
||||||
CellStyle style, double width, AttributedString str) {
|
CellStyle style, double width, AttributedString str) {
|
||||||
TextLayout layout = new TextLayout(str.getIterator(), fontRenderContext);
|
TextLayout layout = new TextLayout(str.getIterator(), fontRenderContext);
|
||||||
|
final Rectangle2D bounds;
|
||||||
if(style.getRotation() != 0){
|
if(style.getRotation() != 0){
|
||||||
/*
|
/*
|
||||||
* Transform the text using a scale so that it's height is increased by a multiple of the leading,
|
* Transform the text using a scale so that it's height is increased by a multiple of the leading,
|
||||||
@ -177,10 +179,13 @@ public class SheetUtil {
|
|||||||
trans.concatenate(
|
trans.concatenate(
|
||||||
AffineTransform.getScaleInstance(1, fontHeightMultiple)
|
AffineTransform.getScaleInstance(1, fontHeightMultiple)
|
||||||
);
|
);
|
||||||
width = Math.max(width, ((layout.getOutline(trans).getBounds().getWidth() / colspan) / defaultCharWidth) + style.getIndention());
|
bounds = layout.getOutline(trans).getBounds();
|
||||||
} else {
|
} else {
|
||||||
width = Math.max(width, ((layout.getBounds().getWidth() / colspan) / defaultCharWidth) + style.getIndention());
|
bounds = layout.getBounds();
|
||||||
}
|
}
|
||||||
|
// entireWidth accounts for leading spaces which is excluded from bounds.getWidth()
|
||||||
|
final double frameWidth = bounds.getX() + bounds.getWidth();
|
||||||
|
width = Math.max(width, ((frameWidth / colspan) / defaultCharWidth) + style.getIndention());
|
||||||
return width;
|
return width;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -300,6 +305,7 @@ public class SheetUtil {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static boolean containsCell(CellRangeAddress cr, int rowIx, int colIx) {
|
public static boolean containsCell(CellRangeAddress cr, int rowIx, int colIx) {
|
||||||
|
//FIXME: isn't this the same as cr.isInRange(rowInd, colInd) ?
|
||||||
if (cr.getFirstRow() <= rowIx && cr.getLastRow() >= rowIx
|
if (cr.getFirstRow() <= rowIx && cr.getLastRow() >= rowIx
|
||||||
&& cr.getFirstColumn() <= colIx && cr.getLastColumn() >= colIx)
|
&& cr.getFirstColumn() <= colIx && cr.getLastColumn() >= colIx)
|
||||||
{
|
{
|
||||||
|
@ -31,6 +31,8 @@ import java.text.AttributedString;
|
|||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
import java.awt.geom.Rectangle2D;
|
||||||
|
|
||||||
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
||||||
import org.apache.poi.hssf.util.PaneInformation;
|
import org.apache.poi.hssf.util.PaneInformation;
|
||||||
import org.apache.poi.ss.ITestDataProvider;
|
import org.apache.poi.ss.ITestDataProvider;
|
||||||
@ -416,7 +418,64 @@ public abstract class BaseTestBugzillaIssues {
|
|||||||
sheet.setColumnWidth(0, sheet.getColumnWidth(0)); // Bug 50681 reports exception at this point
|
sheet.setColumnWidth(0, sheet.getColumnWidth(0)); // Bug 50681 reports exception at this point
|
||||||
wb.close();
|
wb.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public final void bug51622_testAutoSizeShouldRecognizeLeadingSpaces() throws IOException {
|
||||||
|
Workbook wb = _testDataProvider.createWorkbook();
|
||||||
|
BaseTestSheetAutosizeColumn.fixFonts(wb);
|
||||||
|
Sheet sheet = wb.createSheet();
|
||||||
|
Row row = sheet.createRow(0);
|
||||||
|
Cell cell0 = row.createCell(0);
|
||||||
|
Cell cell1 = row.createCell(1);
|
||||||
|
Cell cell2 = row.createCell(2);
|
||||||
|
|
||||||
|
cell0.setCellValue("Test Column AutoSize");
|
||||||
|
cell1.setCellValue(" Test Column AutoSize");
|
||||||
|
cell2.setCellValue("Test Column AutoSize ");
|
||||||
|
|
||||||
|
sheet.autoSizeColumn(0);
|
||||||
|
sheet.autoSizeColumn(1);
|
||||||
|
sheet.autoSizeColumn(2);
|
||||||
|
|
||||||
|
int noWhitespaceColWidth = sheet.getColumnWidth(0);
|
||||||
|
int leadingWhitespaceColWidth = sheet.getColumnWidth(1);
|
||||||
|
int trailingWhitespaceColWidth = sheet.getColumnWidth(2);
|
||||||
|
|
||||||
|
// Based on the amount of text and whitespace used, and the default font
|
||||||
|
// assume that the cell with whitespace should be at least 20% wider than
|
||||||
|
// the cell without whitespace. This number is arbitrary, but should be large
|
||||||
|
// enough to guarantee that the whitespace cell isn't wider due to chance.
|
||||||
|
// Experimentally, I calculated the ratio as 1.2478181, though this ratio may change
|
||||||
|
// if the default font or margins change.
|
||||||
|
final double expectedRatioThreshold = 1.2f;
|
||||||
|
double leadingWhitespaceRatio = ((double) leadingWhitespaceColWidth)/noWhitespaceColWidth;
|
||||||
|
double trailingWhitespaceRatio = ((double) leadingWhitespaceColWidth)/noWhitespaceColWidth;
|
||||||
|
|
||||||
|
assertGreaterThan("leading whitespace is longer than no whitespace", leadingWhitespaceRatio, expectedRatioThreshold);
|
||||||
|
assertGreaterThan("trailing whitespace is longer than no whitespace", trailingWhitespaceRatio, expectedRatioThreshold);
|
||||||
|
assertEquals("cells with equal leading and trailing whitespace have equal width",
|
||||||
|
leadingWhitespaceColWidth, trailingWhitespaceColWidth);
|
||||||
|
|
||||||
|
wb.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test if a > b. Fails if false.
|
||||||
|
*
|
||||||
|
* @param message
|
||||||
|
* @param a
|
||||||
|
* @param b
|
||||||
|
*/
|
||||||
|
private void assertGreaterThan(String message, double a, double b) {
|
||||||
|
if (a > b) { // expected
|
||||||
|
} else {
|
||||||
|
String msg = "Expected: " + a + " > " + b;
|
||||||
|
fail(message + ": " + msg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// FIXME: this function is a self-fulfilling prophecy: this test will always pass as long
|
||||||
|
// as the code-under-test and the testcase code are written the same way (have the same bugs).
|
||||||
private double computeCellWidthManually(Cell cell0, Font font) {
|
private double computeCellWidthManually(Cell cell0, Font font) {
|
||||||
final FontRenderContext fontRenderContext = new FontRenderContext(null, true, true);
|
final FontRenderContext fontRenderContext = new FontRenderContext(null, true, true);
|
||||||
RichTextString rt = cell0.getRichStringCellValue();
|
RichTextString rt = cell0.getRichStringCellValue();
|
||||||
@ -432,7 +491,14 @@ public abstract class BaseTestBugzillaIssues {
|
|||||||
}
|
}
|
||||||
|
|
||||||
TextLayout layout = new TextLayout(str.getIterator(), fontRenderContext);
|
TextLayout layout = new TextLayout(str.getIterator(), fontRenderContext);
|
||||||
return ((layout.getBounds().getWidth() / 1) / 8);
|
double frameWidth = getFrameWidth(layout);
|
||||||
|
return ((frameWidth / 1) / 8);
|
||||||
|
}
|
||||||
|
|
||||||
|
private double getFrameWidth(TextLayout layout) {
|
||||||
|
Rectangle2D bounds = layout.getBounds();
|
||||||
|
double frameWidth = bounds.getX() + bounds.getWidth();
|
||||||
|
return frameWidth;
|
||||||
}
|
}
|
||||||
|
|
||||||
private double computeCellWidthFixed(Font font, String txt) {
|
private double computeCellWidthFixed(Font font, String txt) {
|
||||||
@ -441,7 +507,8 @@ public abstract class BaseTestBugzillaIssues {
|
|||||||
copyAttributes(font, str, 0, txt.length());
|
copyAttributes(font, str, 0, txt.length());
|
||||||
|
|
||||||
TextLayout layout = new TextLayout(str.getIterator(), fontRenderContext);
|
TextLayout layout = new TextLayout(str.getIterator(), fontRenderContext);
|
||||||
return layout.getBounds().getWidth();
|
double frameWidth = getFrameWidth(layout);
|
||||||
|
return frameWidth;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void copyAttributes(Font font, AttributedString str, int startIdx, int endIdx) {
|
private static void copyAttributes(Font font, AttributedString str, int startIdx, int endIdx) {
|
||||||
|
Loading…
Reference in New Issue
Block a user