medvedych/harbour-seaprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Adjust raster resolution according to printer needs

Browse source
This commit is contained in:
Anton Thomasson 2021-06-27 16:23:27 +02:00
parent deaf63eb82
commit 55f6971e6a
1 changed files with 48 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/ippprinter.cpp
View file

@ -353,16 +353,59 @@ void IppPrinter::adjustRasterSettings(QString documentFormat, QJsonObject& jobAt
return; return;
} }
//TODO? jobAttrs.remove("printer-resolution");
if(documentFormat == Mimer::PWG)
{
quint32 diff = std::numeric_limits<quint32>::max();
quint32 AdjustedHwResX = HwResX;
quint32 AdjustedHwResY = HwResY;
foreach(QJsonValue res, _attrs["pwg-raster-document-resolution-supported"].toObject()["value"].toArray())
{
QJsonObject resObj = res.toObject();
if(resObj["units"] != 3)
{
continue;
}
quint32 tmpDiff = std::abs(int(HwResX-resObj["x"].toInt())) + std::abs(int(HwResY-resObj["y"].toInt()));
if(tmpDiff < diff)
{
diff = tmpDiff;
AdjustedHwResX = resObj["x"].toInt();
AdjustedHwResY = resObj["y"].toInt();
}
}
HwResX = AdjustedHwResX;
HwResY = AdjustedHwResY;
}
if(documentFormat == Mimer::URF) if(documentFormat == Mimer::URF)
{ // Ensure symmetric resolution for URF { // Ensure symmetric resolution for URF
HwResX = HwResY = std::min(HwResX, HwResY); HwResX = HwResY = std::min(HwResX, HwResY);
if(jobAttrs.contains("printer-resolution")) quint32 diff = std::numeric_limits<quint32>::max();
quint32 AdjustedHwRes = HwResX;
QJsonArray urfSupported = _attrs["urf-supported"].toObject()["value"].toArray();
foreach(QJsonValue us, urfSupported)
{ {
QJsonObject tmpObj {{"units", getAttrOrDefault(jobAttrs, "printer-resolution").toObject()["units"]}, if(us.toString().startsWith("RS"))
{"x", (int)HwResX}, { //RS300[-600]
{"y", (int)HwResY}}; QStringList resolutions = us.toString().mid(2).split("-");
jobAttrs["printer-resolution"] = QJsonObject { {"tag", IppMsg::Resolution}, {"value", tmpObj} }; foreach(QString res, resolutions)
{
int intRes = res.toInt();
quint32 tmpDiff = std::abs(int(HwResX - intRes));
if(tmpDiff < diff)
{
diff = tmpDiff;
AdjustedHwRes = intRes;
}
}
HwResX = HwResY = AdjustedHwRes;
break;
}
} }
} }