Mirrors/Stirling-PDF
Mirrors/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Frooodle/Stirling-PDF.git synced 2026-02-01 20:10:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat(core): add mode handling and page ordering logic for multi-page merge

Browse Source 
- Introduced logic to calculate rows and columns depending on the selected mode (DEFAULT or CUSTOM).
  • DEFAULT mode uses pagesPerSheet with validation for 2, 3, or perfect squares.
  • CUSTOM mode uses user-defined rows × cols with >0 checks.
- Calculated rows, cols, and pagesPerSheet dynamically for each mode.
- Implemented page order switch logic (LR_TD, RL_TD, TD_LR, TD_RL) to determine
  row and column indexes for correct page placement.
This commit is contained in:
OUNZAR Aymane 2025-10-24 00:08:26 +02:00
parent 3f3525f0c3
commit 4afe99f97b
1 changed files with 60 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
app/core/src/main/java/stirling/software/SPDF/controller/api/MultiPageLayoutController.java
View File

@ -49,22 +49,45 @@ public class MultiPageLayoutController {
public ResponseEntity<byte[]> mergeMultiplePagesIntoOne(
@ModelAttribute MergeMultiplePagesRequest request) throws IOException {
int pagesPerSheet = request.getPagesPerSheet();
MultipartFile file = request.getFileInput();
String orientation = request.getOrientation();
boolean addBorder = Boolean.TRUE.equals(request.getAddBorder());
String mode = request.getMode();
int rows = 0;
int cols = 0;
int pagesPerSheet = 0;
switch (mode) {
case "DEFAULT":
pagesPerSheet = request.getPagesPerSheet();
if (pagesPerSheet != 2
&& pagesPerSheet != 3
&& pagesPerSheet
!= (int) Math.sqrt(pagesPerSheet) * Math.sqrt(pagesPerSheet)) {
throw new IllegalArgumentException(
"pagesPerSheet must be 2, 3 or a perfect square");
}
if (pagesPerSheet != 2
&& pagesPerSheet != 3
&& pagesPerSheet != (int) Math.sqrt(pagesPerSheet) * Math.sqrt(pagesPerSheet)) {
throw new IllegalArgumentException("pagesPerSheet must be 2, 3 or a perfect square");
cols =
pagesPerSheet == 2 || pagesPerSheet == 3
? pagesPerSheet
: (int) Math.sqrt(pagesPerSheet);
rows =
pagesPerSheet == 2 || pagesPerSheet == 3
? 1
: (int) Math.sqrt(pagesPerSheet);
break;
case "CUSTOM":
rows = request.getRows();
cols = request.getCols();
if (rows <= 0 || cols <= 0) {
throw new IllegalArgumentException(
"rows and cols must be greater than 0 in CUSTOM mode");
}
pagesPerSheet = cols * rows;
break;
}
int cols =
pagesPerSheet == 2 || pagesPerSheet == 3
? pagesPerSheet
: (int) Math.sqrt(pagesPerSheet);
int rows = pagesPerSheet == 2 || pagesPerSheet == 3 ? 1 : (int) Math.sqrt(pagesPerSheet);
MultipartFile file = request.getFileInput();
String orientation = request.getOrientation();
String pageOrder = request.getPageOrder();
boolean addBorder = Boolean.TRUE.equals(request.getAddBorder());
PDDocument sourceDocument = pdfDocumentFactory.load(file);
PDDocument newDocument =
@ -120,8 +143,30 @@ public class MultiPageLayoutController {
int adjustedPageIndex =
i % pagesPerSheet; // Close the current content stream and create a new
// page and content stream
int rowIndex = adjustedPageIndex / cols;
int colIndex = adjustedPageIndex % cols;
int rowIndex = 0;
int colIndex = 0;
switch (pageOrder) {
case "LR_TD": // Left→Right, then Top→Down
rowIndex = adjustedPageIndex / cols;
colIndex = adjustedPageIndex % cols;
break;
case "RL_TD": // Right→Left, then Top→Down
rowIndex = adjustedPageIndex / cols;
colIndex = cols - 1 - (adjustedPageIndex % cols);
break;
case "TD_LR": // Top→Down, then Left→Right
colIndex = adjustedPageIndex / rows;
rowIndex = adjustedPageIndex % rows;
break;
case "TD_RL": // Top→Down, then Right→Left
colIndex = cols - 1 - (adjustedPageIndex / rows);
rowIndex = adjustedPageIndex % rows;
break;
}
float x = colIndex * cellWidth + (cellWidth - rect.getWidth() * scale) / 2;
float y =