kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-10-07 20:34:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Paper size presets: never fit fewer than 3 columns or rows

Browse Source 
fitCells() tried counts from 1, but BorderTitleBlock raises any column
or row count below 3 to 3. With very large cells (A5 portrait with
columns of about 200 px or more) the preset picked 2 columns; the folio
then got 3, came out wider than the sheet, and the dropdown fell back
to "Custom". Start the search, and the capped fallback, at 3, and
refuse a paper that leaves no room for 3 cells of the smallest size.

A5 portrait with 300 px columns now gives 3 x 179 px instead of
2 x 269 px; A4 landscape with the default cells is unchanged
(19 x 58 px). ctest 65/65.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
ispyisail
2026-10-07 18:07:03 +13:00
parent 2752e6705c
commit 5f21d4fce2
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/ui/borderpropertieswidget.cpp
+9 -4
View File
@@ -47,6 +47,10 @@ namespace {
/// Smallest column width or row height a paper size may give
const int min_cell = 10;
/// Fewest columns or rows a folio may have: BorderTitleBlock raises
/// any lower count to 3 (MIN_COLUMN_COUNT, MIN_ROW_COUNT)
const int min_count = 3;
/**
@brief fitCells
Split @p available pixels into cells close to @p current pixels.
@@ -67,7 +71,7 @@ namespace {
for (double spread : {0.15, 0.30})
{
QPair<int, int> best(0, 0);
for (int count = 1 ; count <= max_count ; ++count)
for (int count = min_count ; count <= max_count ; ++count)
{
const int size = size_for(count, spread);
if (size && available - count * size <= exact_fit &&
@@ -79,7 +83,7 @@ namespace {
QPair<int, int> best(0, 0);
std::tuple<int, int> best_score(available, available);
for (int count = 1 ; count <= max_count ; ++count)
for (int count = min_count ; count <= max_count ; ++count)
{
const int size = size_for(count, 0.15);
const std::tuple<int, int> score(available - count * size,
@@ -92,7 +96,7 @@ namespace {
if (best.first) return best;
//No size near the current one when the cell count is capped
const int count = qBound(1, qRound(double(available) / current), max_count);
const int count = qBound(min_count, qRound(double(available) / current), max_count);
return qMakePair(count, available / count);
}
}
@@ -257,7 +261,8 @@ bool BorderPropertiesWidget::fitPaperSize(int index, bool landscape,
height -= m_titleblock_height;
else
width -= m_titleblock_height;
if (width < min_cell || height < min_cell) return false;
if (width < min_cell * min_count || height < min_cell * min_count)
return false;
const QPair<int, int> c = fitCells(width,
ui->m_columns_width_sp->value(),