chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +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(); mut.lock();
#endif #endif
QFontMetrics fm(*font); QFontMetrics fm(*font);
//QRect r=fm.tightBoundingRect(text); //#ifdef Q_WS_WIN32
width=fm.width(text); QRect r=fm.tightBoundingRect(text);
#ifdef Q_WS_WIN32 width=r.width();
height=fm.ascent(); height=r.height();
#else //#else
height=fm.xHeight()+2; // doesn't work properly on windows.. // width=fm.width(text);
#endif // height=fm.xHeight()+2; // doesn't work properly on windows..
//#endif
#ifdef ENABLE_THREADED_DRAWING #ifdef ENABLE_THREADED_DRAWING
mut.unlock(); mut.unlock();
#endif #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; divmax=10;
fitmode=0; fitmode=0;
} else if (xx>600000) { // Minutes } else if (xx>600000) { // Minutes
fd="00:00"; fd="j0:00";
dividx=10; dividx=10;
divmax=27; divmax=27;
fitmode=1; fitmode=1;
} else if (xx>5000) { // Seconds } else if (xx>5000) { // Seconds
fd="00:00:00"; fd="j0:00:00";
dividx=16; dividx=16;
divmax=27; divmax=27;
fitmode=2; fitmode=2;
} else { // Microseconds } else { // Microseconds
fd="00:00:00:000"; fd="j0:00:00:000";
dividx=28; dividx=28;
divmax=divcnt; divmax=divcnt;
fitmode=3; 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; py=left+float(aligned_start-minx)*xmult;
int texttop=top+9.0*(y/7.0)+y; // 18*w.printScaleY(); int mintop=top+4.0*(float(y)/10.0);
int mintop=top+4.0*(y/7.0); int majtop=top+6.0*(float(y)/10.0);
int majtop=top+6.0*(y/7.0); int texttop=majtop+y; // 18*w.printScaleY();
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;

2
Graphs/gXAxis.h
View File

@ -14,7 +14,7 @@ class gXAxis:public Layer
gXAxis(QColor col=QColor("black"),bool fadeout=true); gXAxis(QColor col=QColor("black"),bool fadeout=true);
virtual ~gXAxis(); virtual ~gXAxis();
virtual void paint(gGraph & w,int left,int top, int width, int height); 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 SetShowMinorLines(bool b) { m_show_minor_lines=b; }
void SetShowMajorLines(bool b) { m_show_major_lines=b; } void SetShowMajorLines(bool b) { m_show_major_lines=b; }
bool ShowMinorLines() { return m_show_minor_lines; } 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++) { for (int i=1;i<args.size();i++) {
if (args[i]=="-l") force_login_screen=true; if (args[i]=="-l") force_login_screen=true;
if (args[i]=="-p") { if (args[i]=="-p") {
#ifdef Q_WS_WIN32
Sleep(1);
#else
sleep(1); 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); float full_graph_height=(printer_height-(normal_height*graphs_per_page)) / float(graphs_per_page);
GLint gw; GLint gw;
#ifdef Q_WS_WIN32
gw=2048; // Rough guess.. No GL_MAX_RENDERBUFFER_SIZE in mingw.. :(
#else
glGetIntegerv(GL_MAX_RENDERBUFFER_SIZE,&gw); glGetIntegerv(GL_MAX_RENDERBUFFER_SIZE,&gw);
#endif
bool no_scaling; bool no_scaling;
if (printer_width <= gw) { if (printer_width <= gw) {
@ -987,7 +991,7 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date)
labels.push_back(""); 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) { if (qprogress) {
qprogress->setValue(0); 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) { if ((top+full_graph_height+normal_height) > printer_height) {
top=0; top=0;
gcnt=0; gcnt=0;
if (page > pages) break;
first=true; first=true;
if (page > pages)
break;
if (!printer->newPage()) { if (!printer->newPage()) {
qWarning("failed in flushing page to disk, disk full?"); qWarning("failed in flushing page to disk, disk full?");
break; break;