Skip to content

Commit

Permalink
Nomenclature update #304
Browse files Browse the repository at this point in the history
  • Loading branch information
@trevorsandy
trevorsandy committed Jul 6, 2019
1 parent b90bbc3 commit 0d2662e
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion builds/linux/obs/alldeps/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Last Update: March 23, 2019
# Copyright (c) 2017 - 2019 by Trevor SANDY
pkgname=lpub3d
pkgver=2.3.13.1390
pkgver=2.3.13.1391
pkgrel=1
pkgdesc="An LDraw Building Instruction Editor"
url="https://github.com/trevorsandy/lpub3d.git"
Expand Down
6 changes: 3 additions & 3 deletions builds/linux/obs/alldeps/debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
lpub3d (2.3.13.1390) debian; urgency=medium
lpub3d (2.3.13.1391) debian; urgency=medium

* LPub3D version 2.3.13.1.1390_20190706 for Linux
* LPub3D version 2.3.13.1.1391_20190706 for Linux

-- Trevor SANDY <trevor.sandy@gmail.com> Sat, 06 Jul 2019 22:55:18 +0200
-- Trevor SANDY <trevor.sandy@gmail.com> Sat, 06 Jul 2019 22:57:14 +0200
2 changes: 1 addition & 1 deletion builds/linux/obs/alldeps/debian/lpub3d.dsc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Format: 1.0
Source: lpub3d
Binary: lpub3d
Architecture: any
Version: 2.3.13.1390
Version: 2.3.13.1391
Maintainer: Trevor SANDY <trevor.sandy@gmail.com>
Homepage: https://trevorsandy.github.io/lpub3d/
Standards-Version: 3.9.7
Expand Down
4 changes: 2 additions & 2 deletions builds/linux/obs/alldeps/lpub3d.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ BuildRequires: fdupes
Summary: An LDraw Building Instruction Editor
Name: lpub3d
Icon: lpub3d.xpm
Version: 2.3.13.1390
Version: 2.3.13.1391
Release: <B_CNT>%{?dist}
URL: https://trevorsandy.github.io/lpub3d
Vendor: Trevor SANDY
Expand Down Expand Up @@ -717,5 +717,5 @@ update-mime-database /usr/share/mime >/dev/null || true
update-desktop-database || true
%endif

* Sat Jul 06 2019 - trevor.dot.sandy.at.gmail.dot.com 2.3.13.1390
* Sat Jul 06 2019 - trevor.dot.sandy.at.gmail.dot.com 2.3.13.1391
- LPub3D Linux package (rpm) release
Binary file modified builds/utilities/ci/secure/.secrets.tar.enc
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion builds/utilities/version.info
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2 3 13 1 1390 d5a6ef3
2 3 13 1 1391 b90bbc3
2 changes: 1 addition & 1 deletion mainApp/docs/README.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LPub3D 2.3.13.1.1390 (06 07 2019 22:55:18)
LPub3D 2.3.13.1.1391 (06 07 2019 22:57:14)

Features, enhancements, fixes and changes
------------
Expand Down
2 changes: 1 addition & 1 deletion mainApp/docs/RELEASE_NOTES.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<table class="tg">
<tr>
<th class="tg-0pky">
<h4><a id="LPub3D_0"></a>LPub3D 2.3.13.1.1390 (06 07 2019 22:55:18)</h4>
<h4><a id="LPub3D_0"></a>LPub3D 2.3.13.1.1391 (06 07 2019 22:57:14)</h4>
<hr>
<p>
LPub3D version 2.3.13 adds some updates and a top priority fix for #280 Add substitute<br>
Expand Down
2 changes: 1 addition & 1 deletion mainApp/org.trevorsandy.lpub3d.appdata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<binary>lpub3d23</binary>
​</provides>
<releases>
<release version="2.3.13.1390" date="2019-07-06">
<release version="2.3.13.1391" date="2019-07-06">
<description>
<p>LPub3D Linux AppImage package</p>
</description>
Expand Down
54 changes: 27 additions & 27 deletions mainApp/printfile.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ void Gui::exportAsPdf()
// determine size of output pages, in pixels
float pageWidthPx, pageHeightPx;
float pageWidthIn, pageHeightIn;
int adjPageWidth, adjPageHeight;
int adjPageWidthPx, adjPageHeightPx;

// create a PDF pdfWriter
QPdfWriter pdfWriter(fileName);
Expand Down Expand Up @@ -861,21 +861,21 @@ void Gui::exportAsPdf()

// get size of output image, in pixels
getExportPageSize(pageWidthPx, pageHeightPx);
adjPageWidth = int(double(pageWidthPx) * dpr);
adjPageHeight = int(double(pageHeightPx) * dpr);
adjPageWidthPx = int(double(pageWidthPx) * dpr);
adjPageHeightPx = int(double(pageHeightPx) * dpr);

bool ls = getPageOrientation() == Landscape;
logNotice() << QString(" Step 1. Creating image for page %3 of %4, size(pixels) W %1 x H %2, orientation %5, DPI %6, pixel ratio %7...")
.arg(adjPageWidth)
.arg(adjPageHeight)
.arg(adjPageWidthPx)
.arg(adjPageHeightPx)
.arg(displayPageNum)
.arg(_maxPages)
.arg(ls ? "Landscape" : "Portrait")
.arg(exportPixelRatio)
.arg(int(resolution()))
.arg(dpr);

// initiialize the pixmap
QPixmap pixmap(adjPageWidth,adjPageHeight);
QPixmap pixmap(adjPageWidthPx,adjPageHeightPx);
pixmap.setDevicePixelRatio(dpr);

// paint to the pixmap the scene we view
Expand Down Expand Up @@ -957,7 +957,7 @@ void Gui::exportAsPdf()
painter.drawPixmap(QRect(0,0,
int(pdfWriter.logicalDpiX()*pages[page].pageWidthIn),
int(pdfWriter.logicalDpiY()*pages[page].pageHeightIn)),
pages[page].pixmap);
pages[page].pixmap);

// prepare to render next page
if(page < pages.count()) {
Expand Down Expand Up @@ -1026,22 +1026,22 @@ void Gui::exportAsPdf()

// get size of output image, in pixels
getExportPageSize(pageWidthPx, pageHeightPx);
adjPageWidth = int(double(pageWidthPx) * dpr);
adjPageHeight = int(double(pageHeightPx) * dpr);
adjPageWidthPx = int(double(pageWidthPx) * dpr);
adjPageHeightPx = int(double(pageHeightPx) * dpr);

bool ls = getPageOrientation() == Landscape;
logNotice() << QString("Step 1. Creating image for page %1 (%2 of %3) from the range of %4, size(in pixels) W %5 x H %6, orientation %7, DPI %8")
.arg(displayPageNum) //1
.arg(_pageCount) //2
.arg(printPages.count()) //3
.arg(pageRanges.join(" ")) //4
.arg(adjPageWidth) //5
.arg(adjPageHeight) //6
.arg(adjPageWidthPx) //5
.arg(adjPageHeightPx) //6
.arg(ls ? "Landscape" : "Portrait") //7
.arg(exportPixelRatio); //8
.arg(int(resolution())); //8

// initiialize the pixmap
QPixmap pixmap(adjPageWidth,adjPageHeight);
QPixmap pixmap(adjPageWidthPx,adjPageHeightPx);
pixmap.setDevicePixelRatio(dpr);

// paint to the pixmap the scene we view
Expand Down Expand Up @@ -1255,7 +1255,7 @@ void Gui::exportAs(const QString &_suffix)
LGraphicsView view(&scene);

float pageWidthPx, pageHeightPx;
int adjPageWidth, adjPageHeight;
int adjPageWidthPx, adjPageHeightPx;

int _displayPageNum = 0;
int _maxPages = 0;
Expand Down Expand Up @@ -1326,23 +1326,23 @@ void Gui::exportAs(const QString &_suffix)

// determine size of output image, in pixels
getExportPageSize(pageWidthPx, pageHeightPx);
adjPageWidth = int(double(pageWidthPx) * dpr);
adjPageHeight = int(double(pageHeightPx) * dpr);
adjPageWidthPx = int(double(pageWidthPx) * dpr);
adjPageHeightPx = int(double(pageHeightPx) * dpr);

bool ls = getPageOrientation() == Landscape;
logNotice() << QString("Exporting %9 %6 %3 of %4, size(in pixels) W %1 x H %2, orientation %5, DPI %7, pixel ratio %8")
.arg(adjPageWidth)
.arg(adjPageHeight)
.arg(adjPageWidthPx)
.arg(adjPageHeightPx)
.arg(displayPageNum)
.arg(_maxPages)
.arg(ls ? "Landscape" : "Portrait")
.arg(type)
.arg(exportPixelRatio)
.arg(int(resolution()))
.arg(dpr)
.arg(suffix);

// paint to the pixmap the scene we view
QPixmap pixmap(adjPageWidth, adjPageHeight);
QPixmap pixmap(adjPageWidthPx, adjPageHeightPx);
pixmap.setDevicePixelRatio(dpr);

QPainter painter;
Expand Down Expand Up @@ -1445,23 +1445,23 @@ void Gui::exportAs(const QString &_suffix)

// determine size of output image, in pixels
getExportPageSize(pageWidthPx, pageHeightPx);
adjPageWidth = int(double(pageWidthPx) * dpr);
adjPageHeight = int(double(pageHeightPx) * dpr);
adjPageWidthPx = int(double(pageWidthPx) * dpr);
adjPageHeightPx = int(double(pageHeightPx) * dpr);

bool ls = getPageOrientation() == Landscape;
logNotice() << QString("Exporting %9 %6 %3 of range %4, size(in pixels) W %1 x H %2, orientation %5, DPI %7, pixel ratio %8")
.arg(adjPageWidth)
.arg(adjPageHeight)
.arg(adjPageWidthPx)
.arg(adjPageHeightPx)
.arg(displayPageNum)
.arg(pageRanges.join(" "))
.arg(ls ? "Landscape" : "Portrait")
.arg(type)
.arg(exportPixelRatio)
.arg(int(resolution()))
.arg(dpr)
.arg(suffix);

// paint to the pixmap the scene we view
QPixmap pixmap(adjPageWidth, adjPageHeight);
QPixmap pixmap(adjPageWidthPx, adjPageHeightPx);
pixmap.setDevicePixelRatio(dpr);

QPainter painter;
Expand Down

0 comments on commit 0d2662e

Please sign in to comment.