diff --git a/Graphs/gLineOverlay.cpp b/Graphs/gLineOverlay.cpp index 6ae8c93f..334f5988 100644 --- a/Graphs/gLineOverlay.cpp +++ b/Graphs/gLineOverlay.cpp @@ -103,8 +103,8 @@ void gLineOverlayBar::Plot(gGraphWindow & w,float scrx,float scry) vertarray[vertcnt++]=bottom; if (xx<(1800.0/86400.0)) { GetTextExtent(label,x,y); - //DrawText(label,x1-(x/2),start_py+height-30+y); - w.renderText(x1-(x/2),start_py+height-30+y,label); + DrawText(w,label,x1-(x/2),scry-(start_py+height-30+y)); + //w.renderText(x1-(x/2),start_py+height-30+y,label); } } } diff --git a/SleepLib/loader_plugins/cms50_loader.cpp b/SleepLib/loader_plugins/cms50_loader.cpp index 7c3a67cb..1d1bcfc7 100644 --- a/SleepLib/loader_plugins/cms50_loader.cpp +++ b/SleepLib/loader_plugins/cms50_loader.cpp @@ -12,8 +12,7 @@ License: GPL // that change loader behaviour or modify channels. //******************************************************************************************** -//#include -//#include +#include #include #include #include @@ -26,7 +25,7 @@ using namespace std; #include "SleepLib/machine.h" #include "SleepLib/session.h" -//extern wxProgressDialog *loader_progress; +extern QProgressBar *qprogress; CMS50Loader::CMS50Loader() { @@ -73,7 +72,7 @@ bool CMS50Loader::OpenCMS50(QString & path, Profile *profile) if (!dir.exists()) return false; - // if(loader_progress) loader_progress->Update(0); + if(qprogress) qprogress->setValue(0); dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks); dir.setSorting(QDir::Name); @@ -94,11 +93,11 @@ bool CMS50Loader::OpenCMS50(QString & path, Profile *profile) Machine *mach=CreateMachine(profile); int cnt=0; for (list::iterator n=files.begin();n!=files.end();n++,++cnt) { - //if (loader_progress) loader_progress->Update((float(cnt)/float(size)*50.0)); + if (qprogress) qprogress->setValue((float(cnt)/float(size)*50.0)); OpenSPORFile((*n),mach,profile); } mach->Save(); - //if (loader_progress) loader_progress->Update(100); + if (qprogress) qprogress->setValue(100); return true; } bool CMS50Loader::OpenSPORFile(QString path,Machine *mach,Profile *profile) diff --git a/daily.cpp b/daily.cpp index 7c1e7fa7..2be811da 100644 --- a/daily.cpp +++ b/daily.cpp @@ -77,7 +77,7 @@ Daily::Daily(QWidget *parent,QGLContext *context) : SF->AddLayer(new gFlagsLine(flags[9],QColor("dark green"),"U0E",8,sfc)); SF->AddLayer(new gFlagsLine(flags[8],QColor("red"),"VS2",7,sfc)); } - SF->AddLayer(new gFlagsLine(flags[6],QColor("yellow"),"RE",6,sfc)); + SF->AddLayer(new gFlagsLine(flags[6],QColor("gold"),"RE",6,sfc)); SF->AddLayer(new gFlagsLine(flags[5],QColor("red"),"VS",5,sfc)); SF->AddLayer(new gFlagsLine(flags[4],QColor("black"),"FL",4,sfc)); SF->AddLayer(new gFlagsLine(flags[3],QColor("blue"),"H",3,sfc)); @@ -112,7 +112,7 @@ Daily::Daily(QWidget *parent,QGLContext *context) : FRW->AddLayer(g); FRW->AddLayer(new gLineOverlayBar(flags[3],QColor("blue"),"H")); FRW->AddLayer(new gLineOverlayBar(flags[7],QColor("red"),"PR",LOT_Dot)); - FRW->AddLayer(new gLineOverlayBar(flags[6],QColor("yellow"),"RE")); + FRW->AddLayer(new gLineOverlayBar(flags[6],QColor("gold"),"RE")); FRW->AddLayer(new gLineOverlayBar(flags[9],QColor("dark green"),"U0E")); FRW->AddLayer(new gLineOverlayBar(flags[5],QColor("red"),"VS")); FRW->AddLayer(new gLineOverlayBar(flags[4],QColor("black"),"FL"));