chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 03:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Yet more layout fixes..

Browse Source
This commit is contained in:
Mark Watkins 2011-12-13 01:02:24 +10:00
parent eb83731a3e
commit 6e07522dbe
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Graphs/gXAxis.cpp
View File

@ -157,9 +157,9 @@ void gXAxis::paint(gGraph & w,int left,int top, int width, int height)
py=left+float(aligned_start-minx)*xmult; py=left+float(aligned_start-minx)*xmult;
int texttop=top+18*w.printScaleY(); int texttop=top+9.0*(y/7.0)+y; // 18*w.printScaleY();
int mintop=top+4*w.printScaleY(); int mintop=top+4.0*(y/7.0);
int majtop=top+6*w.printScaleY(); int majtop=top+6.0*(y/7.0);
for (int i=0;i<num_minor_ticks;i++) { for (int i=0;i<num_minor_ticks;i++) {
py-=step_pixels; py-=step_pixels;
if (py<start_px) continue; if (py<start_px) continue;

21
mainwindow.cpp
View File

@ -767,7 +767,7 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date)
qDebug() << "Printer Resolution is" << res.width() << "x" << res.height(); qDebug() << "Printer Resolution is" << res.width() << "x" << res.height();
qDebug() << "res:" << printer->resolution() << "dpi"; qDebug() << "res:" << printer->resolution() << "dpi" << float(res.width()) / float(res.height());
float printer_width=res.width(); float printer_width=res.width();
float printer_height=res.height()-normal_height; float printer_height=res.height()-normal_height;
@ -779,7 +779,7 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date)
glGetIntegerv(GL_MAX_RENDERBUFFER_SIZE,&gw); glGetIntegerv(GL_MAX_RENDERBUFFER_SIZE,&gw);
bool no_scaling; bool no_scaling;
if (printer_width<=gw) { if (printer_width <= gw) {
gw=printer_width; gw=printer_width;
no_scaling=true; no_scaling=true;
} else no_scaling=false; } else no_scaling=false;
@ -995,9 +995,9 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date)
QFont fc=*bigfont; QFont fc=*bigfont;
if (!no_scaling ) { if (!no_scaling ) {
fa.setPointSizeF(fa.pointSizeF()*1.7); fa.setPointSizeF(fa.pointSizeF()*2);
fb.setPointSizeF(fb.pointSizeF()*1.7); fb.setPointSizeF(fb.pointSizeF()*2);
fc.setPointSizeF(fc.pointSizeF()*1.7); fc.setPointSizeF(fc.pointSizeF()*2);
} }
defaultfont=&fa; defaultfont=&fa;
@ -1012,9 +1012,14 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date)
g->m_marginbottom=tmb; g->m_marginbottom=tmb;
PROFILE["UseAntiAliasing"]=aa_setting; PROFILE["UseAntiAliasing"]=aa_setting;
QPixmap pm2=pm.scaledToWidth(printer_width); if (!no_scaling) {
painter.drawPixmap(0,top,pm2.width(),pm2.height(),pm2); QPixmap pm2=pm.scaledToWidth(printer_width);
top+=pm2.height(); painter.drawPixmap(0,top,pm2.width(),pm2.height(),pm2);
top+=pm2.height();
} else {
painter.drawPixmap(0,top,pm.width(),pm.height(),pm);
top+=gh;
}
gcnt++; gcnt++;
if (qprogress) { if (qprogress) {