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

Windows compile fixes, windows layout fixes.. Report page count wrong, and was missing graphs

Browse Source
This commit is contained in:
Mark Watkins 2011-12-13 20:20:22 +10:00
parent 22142232e0
commit 3fbee264dd
5 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Graphs/gGraphView.cpp
View File

@ -98,13 +98,14 @@ void GetTextExtent(QString text, int & width, int & height, QFont *font)
mut.lock();
#endif
QFontMetrics fm(*font);
//QRect r=fm.tightBoundingRect(text);
width=fm.width(text);
#ifdef Q_WS_WIN32
height=fm.ascent();
#else
height=fm.xHeight()+2; // doesn't work properly on windows..
#endif
//#ifdef Q_WS_WIN32
QRect r=fm.tightBoundingRect(text);
width=r.width();
height=r.height();
//#else
// width=fm.width(text);
// height=fm.xHeight()+2; // doesn't work properly on windows..
//#endif
#ifdef ENABLE_THREADED_DRAWING
mut.unlock();
#endif

12
Graphs/gXAxis.cpp
View File

@ -77,17 +77,17 @@ void gXAxis::paint(gGraph & w,int left,int top, int width, int height)
divmax=10;
fitmode=0;
} else if (xx>600000) { // Minutes
fd="00:00";
fd="j0:00";
dividx=10;
divmax=27;
fitmode=1;
} else if (xx>5000) { // Seconds
fd="00:00:00";
fd="j0:00:00";
dividx=16;
divmax=27;
fitmode=2;
} else { // Microseconds
fd="00:00:00:000";
fd="j0:00:00:000";
dividx=28;
divmax=divcnt;
fitmode=3;
@ -157,9 +157,9 @@ void gXAxis::paint(gGraph & w,int left,int top, int width, int height)
py=left+float(aligned_start-minx)*xmult;
int texttop=top+9.0*(y/7.0)+y; // 18*w.printScaleY();
int mintop=top+4.0*(y/7.0);
int majtop=top+6.0*(y/7.0);
int mintop=top+4.0*(float(y)/10.0);
int majtop=top+6.0*(float(y)/10.0);
int texttop=majtop+y; // 18*w.printScaleY();
for (int i=0;i<num_minor_ticks;i++) {
py-=step_pixels;
if (py<start_px) continue;

2
Graphs/gXAxis.h
View File

@ -14,7 +14,7 @@ class gXAxis:public Layer
gXAxis(QColor col=QColor("black"),bool fadeout=true);
virtual ~gXAxis();
virtual void paint(gGraph & w,int left,int top, int width, int height);
static const int Margin=25; // How much room does this take up. (Bottom margin)
static const int Margin=20; // How much room does this take up. (Bottom margin)
void SetShowMinorLines(bool b) { m_show_minor_lines=b; }
void SetShowMajorLines(bool b) { m_show_major_lines=b; }
bool ShowMinorLines() { return m_show_minor_lines; }

5
main.cpp
View File

@ -90,7 +90,12 @@ int main(int argc, char *argv[])
for (int i=1;i<args.size();i++) {
if (args[i]=="-l") force_login_screen=true;
if (args[i]=="-p") {
#ifdef Q_WS_WIN32
Sleep(1);
#else
sleep(1);
#endif
}
}

9
mainwindow.cpp
View File

@ -778,7 +778,11 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date)
float full_graph_height=(printer_height-(normal_height*graphs_per_page)) / float(graphs_per_page);
GLint gw;
#ifdef Q_WS_WIN32
gw=2048; // Rough guess.. No GL_MAX_RENDERBUFFER_SIZE in mingw.. :(
#else
glGetIntegerv(GL_MAX_RENDERBUFFER_SIZE,&gw);
#endif
bool no_scaling;
if (printer_width <= gw) {
@ -987,7 +991,7 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date)
labels.push_back("");
}
}
int pages=ceil(float(graphs.size()+1)/float(graphs_per_page));
int pages=ceil(float(graphs.size()+2)/float(graphs_per_page));
if (qprogress) {
qprogress->setValue(0);
@ -1002,8 +1006,9 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date)
if ((top+full_graph_height+normal_height) > printer_height) {
top=0;
gcnt=0;
if (page > pages) break;
first=true;
if (page > pages)
break;
if (!printer->newPage()) {
qWarning("failed in flushing page to disk, disk full?");
break;