cyy/Fairscan_cyy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap to standard formats: A4, Letter...

Browse Source
This commit is contained in:
Pierre-Yves Nicolas
2026-05-23 20:10:51 +02:00
parent 9394b19731
commit c3bd144681
6 changed files with 179 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/fairscan/app/domain/ExportPreparation.kt
View File

@@ -39,7 +39,7 @@ data class PageToExport(
val quad = metadata.normalizedQuad.scaledTo(1.0, 1.0, size.width, size.height)
val realDimensions = estimateRealDimensions(
quad, size.width.toInt(), size.height.toInt(), metadata.opticalMeasures
)
).snapToStandardFormat()
return realDimensions.applyRotation(metadata.baseRotation)
}
}

29
app/src/main/java/org/fairscan/app/platform/AndroidPdfWriter.kt
View File

@@ -24,6 +24,7 @@ import org.fairscan.app.BuildConfig
import org.fairscan.app.data.PdfWriter
import org.fairscan.app.domain.PageToExport
import org.fairscan.imageprocessing.EstimatedDimensions
import org.fairscan.imageprocessing.PaperFormats
import java.io.OutputStream
import java.util.Calendar
@@ -43,17 +44,18 @@ class AndroidPdfWriter : PdfWriter {
val heightPx = image.height.toFloat()
val dimensions = page.estimatedDimensions()
val (widthPoints, heightPoints) = when (dimensions) {
is EstimatedDimensions.Physical -> {
dimensions.widthMm.toFloat() * pointsPerMm to dimensions.heightMm.toFloat() * pointsPerMm
}
val (widthMm, heightMm) = when (dimensions) {
is EstimatedDimensions.Physical ->
clipToMaxFormat(dimensions.widthMm, dimensions.heightMm)
else -> {
// No physical dimensions available: approximate using US Letter max dimension
val maxDimInMm = 279.4f
val scalePxToMm = maxDimInMm / maxOf(widthPx, heightPx)
widthPx * scalePxToMm * pointsPerMm to heightPx * scalePxToMm * pointsPerMm
// No physical dimensions available
val maxDimMm = PaperFormats.A4.heightMm
val scalePxToMm = maxDimMm / maxOf(widthPx, heightPx)
clipToMaxFormat(widthPx * scalePxToMm, heightPx * scalePxToMm)
}
}
val widthPoints = widthMm.toFloat() * pointsPerMm
val heightPoints = heightMm.toFloat() * pointsPerMm
val page = PDPage(PDRectangle(widthPoints, heightPoints))
document.addPage(page)
@@ -68,3 +70,14 @@ class AndroidPdfWriter : PdfWriter {
return doc.numberOfPages
}
}
fun clipToMaxFormat(widthMm: Double, heightMm: Double): Pair<Double, Double> {
// Normalize to portrait for comparison
val (w, h) = if (widthMm <= heightMm) widthMm to heightMm else heightMm to widthMm
val portrait = widthMm <= heightMm
val maxFormat = PaperFormats.A4
val scale = minOf(maxFormat.widthMm / w, maxFormat.heightMm / h, 1.0)
val clipped = w * scale to h * scale
return if (portrait) clipped else clipped.second to clipped.first
}