mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2025-01-12 17:00:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

replaced some deprecated constructs for Qt 5.15

Browse Source
This commit is contained in:
jkriege2 2022-04-18 22:45:02 +02:00
parent 5abac3b3db
commit 052fc27cfb
2 changed files with 52 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lib/jkqtplotter/gui/jkqtpenhancedtableview.cpp
View File

@ -165,9 +165,17 @@ void JKQTPEnhancedTableView::copySelectionToExcel(int copyrole, bool storeHead)
if (r<rowmin) rowmin=r; if (r<rowmin) rowmin=r;
} }
} }
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
QList<int> rowlist(rows.begin(), rows.end());
#else
QList<int> rowlist=QList<int>::fromSet(rows); QList<int> rowlist=QList<int>::fromSet(rows);
#endif
std::sort(rowlist.begin(), rowlist.end()); std::sort(rowlist.begin(), rowlist.end());
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
QList<int> collist(cols.begin(), cols.end());
#else
QList<int> collist=QList<int>::fromSet(cols); QList<int> collist=QList<int>::fromSet(cols);
#endif
std::sort(collist.begin(), collist.end()); std::sort(collist.begin(), collist.end());
int rowcnt=rowlist.size(); int rowcnt=rowlist.size();
int colcnt=collist.size(); int colcnt=collist.size();
@ -284,9 +292,17 @@ void JKQTPEnhancedTableView::copySelectionToCSV(int copyrole, bool storeHead, co
if (r<rowmin) rowmin=r; if (r<rowmin) rowmin=r;
} }
} }
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
QList<int> rowlist(rows.begin(), rows.end());
#else
QList<int> rowlist=QList<int>::fromSet(rows); QList<int> rowlist=QList<int>::fromSet(rows);
#endif
std::sort(rowlist.begin(), rowlist.end()); std::sort(rowlist.begin(), rowlist.end());
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
QList<int> collist(cols.begin(), cols.end());
#else
QList<int> collist=QList<int>::fromSet(cols); QList<int> collist=QList<int>::fromSet(cols);
#endif
std::sort(collist.begin(), collist.end()); std::sort(collist.begin(), collist.end());
int rowcnt=rowlist.size(); int rowcnt=rowlist.size();
int colcnt=collist.size(); int colcnt=collist.size();
@ -405,12 +421,12 @@ void JKQTPEnhancedTableView::print(QPrinter *printer, bool onePageWide, bool one
QPrinter* p=printer; QPrinter* p=printer;
//p->setPageMargins(10,10,10,10,QPrinter::Millimeter); //p->setPageMargins(10,10,10,10,QPageLayout::Millimeter);
/*if (width()>height()) { /*if (width()>height()) {
p->setOrientation(QPrinter::Landscape); p->setPageOrientation(QPageLayout::Landscape);
} else { } else {
p->setOrientation(QPrinter::Portrait); p->setPageOrientation(QPageLayout::Portrait);
}*/ }*/
clearSelection(); clearSelection();
@ -444,13 +460,14 @@ void JKQTPEnhancedTableView::print(QPrinter *printer, bool onePageWide, bool one
} }
double scale=1.0; double scale=1.0;
// adjust scale, so the widest/highest column fits on one page // adjust scale, so the widest/highest column fits on one page
/*if (maxWidth*scale>p->pageRect().width()) scale=p->pageRect().width()/maxWidth; /*if (maxWidth*scale>p->pageLayout().paintRectPixels(p->resolution()).width()) scale=p->pageLayout().paintRectPixels(p->resolution()).width()/maxWidth;
if (maxHeight*scale>p->pageRect().height()) scale=p->pageRect().height()/maxHeight;*/ if (maxHeight*scale>p->pageLayout().paintRectPixels(p->resolution()).height()) scale=p->pageLayout().paintRectPixels(p->resolution()).height()/maxHeight;*/
if (onePageWide) { if (onePageWide) {
if (totalWidth>p->pageRect().width()) scale=p->pageRect().width()/totalWidth;
if (totalWidth>p->pageLayout().paintRectPixels(p->resolution()).width()) scale=p->pageLayout().paintRectPixels(p->resolution()).width()/totalWidth;
} }
if (onePageHigh) { if (onePageHigh) {
if (totalHeight>p->pageRect().height()) scale=qMin(scale, p->pageRect().height()/totalHeight); if (totalHeight>p->pageLayout().paintRectPixels(p->resolution()).height()) scale=qMin(scale, p->pageLayout().paintRectPixels(p->resolution()).height()/totalHeight);
} }
//qDebug()<<scale; //qDebug()<<scale;
@ -467,7 +484,7 @@ void JKQTPEnhancedTableView::print(QPrinter *printer, bool onePageWide, bool one
if (!onePageWide) { if (!onePageWide) {
for (int c=0; c<cols; c++) { for (int c=0; c<cols; c++) {
double cw=columnWidth(c); double cw=columnWidth(c);
if (x+cw>p->pageRect().width()/scale) { if (x+cw>p->pageLayout().paintRectPixels(p->resolution()).width()/scale) {
pagesWide++; pagesWide++;
x=0; x=0;
pageCols<<c; pageCols<<c;
@ -483,7 +500,7 @@ void JKQTPEnhancedTableView::print(QPrinter *printer, bool onePageWide, bool one
if (!onePageHigh) { if (!onePageHigh) {
for (int r=0; r<rows; r++) { for (int r=0; r<rows; r++) {
double rh=rowHeight(r); double rh=rowHeight(r);
if (y+rh>p->pageRect().height()/scale) { if (y+rh>p->pageLayout().paintRectPixels(p->resolution()).height()/scale) {
pagesHigh++; pagesHigh++;
pageRows<<r; pageRows<<r;
y=hhh; y=hhh;
@ -561,13 +578,13 @@ void JKQTPEnhancedTableView::paint(QPainter &painter, double scale, int page, do
headerFont.setBold(true); headerFont.setBold(true);
int pagesWide=pageCols.size()-1; int pagesWide=pageCols.size()-1;
int pagesHigh=pageRows.size()-1; int pagesHigh=pageRows.size()-1;
//painter.translate(p->pageRect().topLeft()); //painter.translate(p->pageLayout().paintRectPixels(p->resolution()).topLeft());
int pageCnt=0; int pageCnt=0;
for (int ph=0; ph<pageRows.size()-1; ph++) { for (int ph=0; ph<pageRows.size()-1; ph++) {
for (int pw=0; pw<pageCols.size()-1; pw++) { for (int pw=0; pw<pageCols.size()-1; pw++) {
if (page<0 || page==pageCnt) { if (page<0 || page==pageCnt) {
//qDebug()<<"print page "<<ph<<"/"<<pageRows.size()<<pagesHigh<<" "<<pw<<"/"<<pageCols.size()<<pagesWide; //qDebug()<<"print page "<<ph<<"/"<<pageRows.size()<<pagesHigh<<" "<<pw<<"/"<<pageCols.size()<<pagesWide;
//painter.drawPicture(p->pageRect().topLeft(), pic); //painter.drawPicture(p->pageLayout().paintRectPixels(p->resolution()).topLeft(), pic);
double y=0; double y=0;
if (ph==0) { if (ph==0) {
y=hhh; y=hhh;
@ -607,7 +624,7 @@ void JKQTPEnhancedTableView::paint(QPainter &painter, double scale, int page, do
painter.setPen(headerPen); painter.setPen(headerPen);
painter.drawText(QRect(rec.x()+4, rec.y()+4, rec.width()-8, rec.height()-8), model()->headerData(c, Qt::Horizontal).toString()); painter.drawText(QRect(rec.x()+4, rec.y()+4, rec.width()-8, rec.height()-8), model()->headerData(c, Qt::Horizontal).toString());
painter.drawRect(rec); painter.drawRect(rec);
//if (x==vhw &&) painter.drawLine(rec.topLeft(), QPoint(rec.left(), p->pageRect().height())); //if (x==vhw &&) painter.drawLine(rec.topLeft(), QPoint(rec.left(), p->pageLayout().paintRectPixels(p->resolution()).height()));
x=x+columnWidth(c); x=x+columnWidth(c);
} }
@ -623,7 +640,7 @@ void JKQTPEnhancedTableView::paint(QPainter &painter, double scale, int page, do
painter.setFont(headerFont); painter.setFont(headerFont);
painter.drawText(QRect(rec.x()+4, rec.y()+4, rec.width()-8, rec.height()-8), model()->headerData(r, Qt::Vertical).toString()); painter.drawText(QRect(rec.x()+4, rec.y()+4, rec.width()-8, rec.height()-8), model()->headerData(r, Qt::Vertical).toString());
painter.drawRect(rec); painter.drawRect(rec);
//if (x==vhw &&) painter.drawLine(rec.topLeft(), QPoint(rec.left(), p->pageRect().height())); //if (x==vhw &&) painter.drawLine(rec.topLeft(), QPoint(rec.left(), p->pageLayout().paintRectPixels(p->resolution()).height()));
y=y+rowHeight(r); y=y+rowHeight(r);
} }

44
lib/jkqtplotter/jkqtpbaseplotter.cpp
View File

@ -1485,12 +1485,12 @@ void JKQTBasePlotter::print(QPrinter* printer, bool displayPreview) {
delete dialog; delete dialog;
} }
p->setPageMargins(10,10,10,10,QPrinter::Millimeter); p->setPageMargins(QMarginsF(10,10,10,10),QPageLayout::Millimeter);
if (widgetWidth>widgetHeight) { if (widgetWidth>widgetHeight) {
p->setOrientation(QPrinter::Landscape); p->setPageOrientation(QPageLayout::Landscape);
} else { } else {
p->setOrientation(QPrinter::Portrait); p->setPageOrientation(QPageLayout::Portrait);
} }
printpreviewNew(p, false, -1.0, -1.0, displayPreview); printpreviewNew(p, false, -1.0, -1.0, displayPreview);
@ -1520,8 +1520,8 @@ bool JKQTBasePlotter::printpreviewNew(QPaintDevice* paintDevice, bool setAbsolut
//if (printer) resolution=printer->resolution(); //if (printer) resolution=printer->resolution();
printAspect=gridPrintingSize.height()/gridPrintingSize.width(); printAspect=gridPrintingSize.height()/gridPrintingSize.width();
if (printer) printPageSizeMM=printer->pageRect(QPrinter::Millimeter).size(); if (printer) printPageSizeMM=printer->pageLayout().pageSize().size(QPageSize::Millimeter);
else printPageSizeMM=QSizeF(paintDevice->widthMM(), paintDevice->heightMM()); else if (paintDevice) printPageSizeMM=QSizeF(paintDevice->widthMM(), paintDevice->heightMM());
printSizeX_Millimeter=double(gridPrintingSize.width())/96.0*25.4;//double(resolution)*25.4; // convert current widget size in pt to millimeters, assuming 96dpi (default screen resolution) printSizeX_Millimeter=double(gridPrintingSize.width())/96.0*25.4;//double(resolution)*25.4; // convert current widget size in pt to millimeters, assuming 96dpi (default screen resolution)
printSizeY_Millimeter=double(gridPrintingSize.height())/96.0*25.4;//double(resolution)*25.4; printSizeY_Millimeter=double(gridPrintingSize.height())/96.0*25.4;//double(resolution)*25.4;
if (printsizeX_inMM>0) printSizeX_Millimeter=printsizeX_inMM; if (printsizeX_inMM>0) printSizeX_Millimeter=printsizeX_inMM;
@ -1554,14 +1554,14 @@ bool JKQTBasePlotter::printpreviewNew(QPaintDevice* paintDevice, bool setAbsolut
printer->setColorMode(QPrinter::Color); printer->setColorMode(QPrinter::Color);
printer->setOutputFormat(QPrinter::PdfFormat); printer->setOutputFormat(QPrinter::PdfFormat);
printer->setResolution(svg->logicalDpiX()); printer->setResolution(svg->logicalDpiX());
printer->setPageMargins(0,0,0,0,QPrinter::Millimeter); printer->setPageMargins(QMarginsF(0,0,0,0),QPageLayout::Millimeter);
printer->setColorMode(QPrinter::Color); printer->setColorMode(QPrinter::Color);
delPrinter=true; delPrinter=true;
} else if (!printer) { } else if (!printer) {
printer=new QPrinter(); printer=new QPrinter();
printer->setOutputFormat(QPrinter::PdfFormat); printer->setOutputFormat(QPrinter::PdfFormat);
printer->setResolution(paintDevice->logicalDpiX()); printer->setResolution(paintDevice->logicalDpiX());
printer->setPageMargins(0,0,0,0,QPrinter::Millimeter); printer->setPageMargins(QMarginsF(0,0,0,0),QPageLayout::Millimeter);
printer->setColorMode(QPrinter::Color); printer->setColorMode(QPrinter::Color);
delPrinter=true; delPrinter=true;
} }
@ -1612,7 +1612,7 @@ bool JKQTBasePlotter::printpreviewNew(QPaintDevice* paintDevice, bool setAbsolut
layout->addWidget(spinSizeY, 0,layout->columnCount()); layout->addWidget(spinSizeY, 0,layout->columnCount());
layout->addWidget(chkAspect, 0,layout->columnCount()); layout->addWidget(chkAspect, 0,layout->columnCount());
if (!setAbsolutePaperSize && printer && !svg) { if (!setAbsolutePaperSize && printer && !svg) {
layout->addWidget(new QLabel(tr("%1x%2 mm^2").arg(printer->pageRect(QPrinter::Millimeter).width()).arg(printer->pageRect(QPrinter::Millimeter).height())), 1,layout->columnCount()-4, 1, 4); layout->addWidget(new QLabel(tr("%1x%2 mm^2").arg(printer->pageLayout().pageSize().size(QPageSize::Millimeter).width()).arg(printer->pageLayout().pageSize().size(QPageSize::Millimeter).height())), 1,layout->columnCount()-4, 1, 4);
QCheckBox* chkSetMagnification=new QCheckBox(tr("set by magnification: "), dlg); QCheckBox* chkSetMagnification=new QCheckBox(tr("set by magnification: "), dlg);
chkSetMagnification->setChecked(false); chkSetMagnification->setChecked(false);
@ -1930,9 +1930,9 @@ void JKQTBasePlotter::printpreviewPaintRequested(QPrinter* printer) {
#ifdef SHOW_JKQTPLOTTER_DEBUG #ifdef SHOW_JKQTPLOTTER_DEBUG
qDebug()<<"set printing abs. size to "<<QSizeF(printSizeX_Millimeter, printSizeY_Millimeter)<<" mm^2"; qDebug()<<"set printing abs. size to "<<QSizeF(printSizeX_Millimeter, printSizeY_Millimeter)<<" mm^2";
#endif #endif
//printer->setPaperSize(QPrinter::Custom); //printer->setPageSize(QPrinter::Custom);
printer->setOrientation(QPrinter::Portrait); printer->setPageOrientation(QPageLayout::Portrait);
printer->setPaperSize(QSizeF(printSizeX_Millimeter, printSizeY_Millimeter), QPrinter::Millimeter); printer->setPageSize(QPageSize(QSizeF(printSizeX_Millimeter, printSizeY_Millimeter), QPageSize::Millimeter));
if (!gridPrinting) widgetHeight=jkqtp_roundTo<int>(widgetWidth*printSizeY_Millimeter/printSizeX_Millimeter); if (!gridPrinting) widgetHeight=jkqtp_roundTo<int>(widgetWidth*printSizeY_Millimeter/printSizeX_Millimeter);
} }
@ -1957,8 +1957,8 @@ void JKQTBasePlotter::printpreviewPaintRequested(QPrinter* printer) {
qDebug()<<"printScaleToPagesize = "<<printScaleToPagesize; qDebug()<<"printScaleToPagesize = "<<printScaleToPagesize;
qDebug()<<"printKeepAbsoluteFontSizes = "<<printKeepAbsoluteFontSizes; qDebug()<<"printKeepAbsoluteFontSizes = "<<printKeepAbsoluteFontSizes;
qDebug()<<"print with widget size "<<widgetWidth<<widgetHeight; qDebug()<<"print with widget size "<<widgetWidth<<widgetHeight;
qDebug()<<"print with paper size "<<printer->pageRect().size()<<" "; qDebug()<<"print with paper size "<<printer->pageLayout().paintRectPixels(printer->resolution()).size()<<" ";
QSizeF sl=QSizeF(QSizeF(printer->pageRect().size()).width()/printer->logicalDpiX()*25.4, QSizeF(printer->pageRect().size()).height()/printer->logicalDpiY()*25.4); QSizeF sl=QSizeF(QSizeF(printer->pageLayout().paintRectPixels(printer->resolution()).size()).width()/printer->logicalDpiX()*25.4, QSizeF(printer->pageLayout().paintRectPixels(printer->resolution()).size()).height()/printer->logicalDpiY()*25.4);
qDebug()<<"print with paper size "<<sl<<" mm^2"; qDebug()<<"print with paper size "<<sl<<" mm^2";
qDebug()<<"paintMagnification = "<<paintMagnification; qDebug()<<"paintMagnification = "<<paintMagnification;
qDebug()<<"lineWidthMultiplier = "<<lineWidthMultiplier; qDebug()<<"lineWidthMultiplier = "<<lineWidthMultiplier;
@ -1969,7 +1969,7 @@ void JKQTBasePlotter::printpreviewPaintRequested(QPrinter* printer) {
qDebug()<<"x-axis label fontsize = "<<xAxis->getLabelFontSize()<<" pt"; qDebug()<<"x-axis label fontsize = "<<xAxis->getLabelFontSize()<<" pt";
qDebug()<<"y-axis label fontsize = "<<yAxis->getLabelFontSize()<<" pt"; qDebug()<<"y-axis label fontsize = "<<yAxis->getLabelFontSize()<<" pt";
#endif #endif
gridPaint(painter, printer->pageRect().size(), printScaleToPagesize, printScaleToPagesize); gridPaint(painter, printer->pageLayout().paintRectPixels(printer->resolution()).size(), printScaleToPagesize, printScaleToPagesize);
painter.end(); painter.end();
widgetWidth=oldWidgetWidth; widgetWidth=oldWidgetWidth;
widgetHeight=oldWidgetHeight; widgetHeight=oldWidgetHeight;
@ -2017,8 +2017,8 @@ void JKQTBasePlotter::printpreviewPaintRequestedNew(QPaintDevice *paintDevice)
qDebug()<<"set printing abs. size to "<<QSizeF(printSizeX_Millimeter, printSizeY_Millimeter)<<" mm^2"; qDebug()<<"set printing abs. size to "<<QSizeF(printSizeX_Millimeter, printSizeY_Millimeter)<<" mm^2";
#endif #endif
if (printer) { if (printer) {
printer->setOrientation(QPrinter::Portrait); printer->setPageOrientation(QPageLayout::Portrait);
printer->setPaperSize(QSizeF(printSizeX_Millimeter, printSizeY_Millimeter), QPrinter::Millimeter); printer->setPageSize(QPageSize(QSizeF(printSizeX_Millimeter, printSizeY_Millimeter), QPageSize::Millimeter));
} else if (svg) { } else if (svg) {
QRectF siz=QRectF(0,0,printSizeX_Millimeter,printSizeY_Millimeter); QRectF siz=QRectF(0,0,printSizeX_Millimeter,printSizeY_Millimeter);
svg->setSize(QSizeF(ceil(siz.width()*svg->resolution()/25.4), ceil(siz.height()*svg->resolution()/25.4)).toSize()); svg->setSize(QSizeF(ceil(siz.width()*svg->resolution()/25.4), ceil(siz.height()*svg->resolution()/25.4)).toSize());
@ -2051,8 +2051,8 @@ void JKQTBasePlotter::printpreviewPaintRequestedNew(QPaintDevice *paintDevice)
qDebug()<<"printKeepAbsoluteFontSizes = "<<printKeepAbsoluteFontSizes; qDebug()<<"printKeepAbsoluteFontSizes = "<<printKeepAbsoluteFontSizes;
qDebug()<<"print with widget size "<<widgetWidth<<widgetHeight; qDebug()<<"print with widget size "<<widgetWidth<<widgetHeight;
if (printer) { if (printer) {
qDebug()<<"print with paper size "<<printer->pageRect().size()<<" "; qDebug()<<"print with paper size "<<printer->pageLayout().paintRectPixels(printer->resolution()).size()<<" ";
QSizeF sl=QSizeF(QSizeF(printer->pageRect().size()).width()/printer->logicalDpiX()*25.4, QSizeF(printer->pageRect().size()).height()/printer->logicalDpiY()*25.4); QSizeF sl=QSizeF(QSizeF(printer->pageLayout().paintRectPixels(printer->resolution()).size()).width()/printer->logicalDpiX()*25.4, QSizeF(printer->pageLayout().paintRectPixels(printer->resolution()).size()).height()/printer->logicalDpiY()*25.4);
qDebug()<<"print with paper size "<<sl<<" mm^2"; qDebug()<<"print with paper size "<<sl<<" mm^2";
} else if (svg) { } else if (svg) {
qDebug()<<"print with paper size "<<svg->size()<<" "; qDebug()<<"print with paper size "<<svg->size()<<" ";
@ -2069,7 +2069,7 @@ void JKQTBasePlotter::printpreviewPaintRequestedNew(QPaintDevice *paintDevice)
qDebug()<<"x-axis label fontsize = "<<xAxis->getLabelFontSize()<<" pt"; qDebug()<<"x-axis label fontsize = "<<xAxis->getLabelFontSize()<<" pt";
qDebug()<<"y-axis label fontsize = "<<yAxis->getLabelFontSize()<<" pt"; qDebug()<<"y-axis label fontsize = "<<yAxis->getLabelFontSize()<<" pt";
#endif #endif
if (printer) gridPaint(painter, printer->pageRect().size(), printScaleToPagesize, printScaleToPagesize); if (printer) gridPaint(painter, printer->pageLayout().paintRectPixels(printer->resolution()).size(), printScaleToPagesize, printScaleToPagesize);
else if (svg) gridPaint(painter, svg->size(), printScaleToPagesize, printScaleToPagesize); else if (svg) gridPaint(painter, svg->size(), printScaleToPagesize, printScaleToPagesize);
else gridPaint(painter, QSizeF(paintDevice->width(), paintDevice->height()), printScaleToPagesize, printScaleToPagesize); else gridPaint(painter, QSizeF(paintDevice->width(), paintDevice->height()), printScaleToPagesize, printScaleToPagesize);
painter.end(); painter.end();
@ -3577,14 +3577,14 @@ void JKQTBasePlotter::saveAsPDF(const QString& filename, bool displayPreview) {
doLandscape=gridPrintingSize.width()>gridPrintingSize.height(); doLandscape=gridPrintingSize.width()>gridPrintingSize.height();
} }
if (doLandscape) { if (doLandscape) {
printer->setOrientation(QPrinter::Landscape); printer->setPageOrientation(QPageLayout::Landscape);
} else { } else {
printer->setOrientation(QPrinter::Portrait); printer->setPageOrientation(QPageLayout::Portrait);
} }
printer->setOutputFormat(QPrinter::PdfFormat); printer->setOutputFormat(QPrinter::PdfFormat);
printer->setColorMode(QPrinter::Color); printer->setColorMode(QPrinter::Color);
printer->setOutputFileName(fn); printer->setOutputFileName(fn);
printer->setPageMargins(0,0,0,0,QPrinter::Millimeter); printer->setPageMargins(QMarginsF(0,0,0,0),QPageLayout::Millimeter);
printer->setColorMode(QPrinter::Color); printer->setColorMode(QPrinter::Color);
printpreviewNew(printer, true, -1.0, -1.0, displayPreview); printpreviewNew(printer, true, -1.0, -1.0, displayPreview);
delete printer; delete printer;