hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2509 from SiboVG/issue-2483

Browse Source 
[#2483] Support more (larger) paper sizes
This commit is contained in:
Joe Pfeiffer 2024-07-14 13:32:07 -06:00 committed by GitHub
commit 8ebf335a49
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
swing/src/main/java/info/openrocket/swing/gui/print/PaperSize.java
View File

@ -3,6 +3,7 @@ package info.openrocket.swing.gui.print;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.FileReader; import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.util.List;
import java.util.Locale; import java.util.Locale;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -12,18 +13,25 @@ import com.itextpdf.text.PageSize;
import com.itextpdf.text.Rectangle; import com.itextpdf.text.Rectangle;
public enum PaperSize { public enum PaperSize {
A1("A1", PageSize.A1),
A2("A2", PageSize.A2),
A3("A3", PageSize.A3), A3("A3", PageSize.A3),
A4("A4", PageSize.A4), A4("A4", PageSize.A4),
A5("A5", PageSize.A5), A5("A5", PageSize.A5),
LETTER("Letter", PageSize.LETTER), ANSI_D("ANSI D", new Rectangle(22 * PrintUnit.POINTS_PER_INCH, 34 * PrintUnit.POINTS_PER_INCH)),
LEGAL("Legal", PageSize.LEGAL); ANSI_C("ANSI C", new Rectangle(17 * PrintUnit.POINTS_PER_INCH, 22 * PrintUnit.POINTS_PER_INCH)),
TABLOID("Tabloid (ANSI B)", PageSize.TABLOID, "Tabloid", "ANSI B"),
LEGAL("Legal", PageSize.LEGAL),
LETTER("Letter (ANSI A)", PageSize.LETTER, "Letter", "ANSI A");
private final String name; private final String name;
private final List<String> alternativeNames;
private final Rectangle size; private final Rectangle size;
private PaperSize(String name, Rectangle size) { PaperSize(String name, Rectangle size, String... alternativeNames) {
this.name = name; this.name = name;
this.size = size; this.size = size;
this.alternativeNames = List.of(alternativeNames);
} }
public Rectangle getSize() { public Rectangle getSize() {
@ -158,6 +166,11 @@ public enum PaperSize {
if (p.name.equalsIgnoreCase(size)) { if (p.name.equalsIgnoreCase(size)) {
return p; return p;
} }
for (String alt : p.alternativeNames) {
if (alt.equalsIgnoreCase(size)) {
return p;
}
}
} }
return null; return null;
} }