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

Yellow colour fix and cms50 progress bar

Browse Source
This commit is contained in:
Mark Watkins 2011-06-27 00:40:06 +10:00
parent 00ea594e0d
commit 84e7e94e49
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Graphs/gLineOverlay.cpp
View File

@ -103,8 +103,8 @@ void gLineOverlayBar::Plot(gGraphWindow & w,float scrx,float scry)
vertarray[vertcnt++]=bottom; vertarray[vertcnt++]=bottom;
if (xx<(1800.0/86400.0)) { if (xx<(1800.0/86400.0)) {
GetTextExtent(label,x,y); GetTextExtent(label,x,y);
//DrawText(label,x1-(x/2),start_py+height-30+y); DrawText(w,label,x1-(x/2),scry-(start_py+height-30+y));
w.renderText(x1-(x/2),start_py+height-30+y,label); //w.renderText(x1-(x/2),start_py+height-30+y,label);
} }
} }
} }

11
SleepLib/loader_plugins/cms50_loader.cpp
View File

@ -12,8 +12,7 @@ License: GPL
// that change loader behaviour or modify channels. // that change loader behaviour or modify channels.
//******************************************************************************************** //********************************************************************************************
//#include <wx/log.h> #include <QProgressBar>
//#include <wx/progdlg.h>
#include <QDir> #include <QDir>
#include <QString> #include <QString>
#include <QDateTime> #include <QDateTime>
@ -26,7 +25,7 @@ using namespace std;
#include "SleepLib/machine.h" #include "SleepLib/machine.h"
#include "SleepLib/session.h" #include "SleepLib/session.h"
//extern wxProgressDialog *loader_progress; extern QProgressBar *qprogress;
CMS50Loader::CMS50Loader() CMS50Loader::CMS50Loader()
{ {
@ -73,7 +72,7 @@ bool CMS50Loader::OpenCMS50(QString & path, Profile *profile)
if (!dir.exists()) if (!dir.exists())
return false; return false;
// if(loader_progress) loader_progress->Update(0); if(qprogress) qprogress->setValue(0);
dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks); dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
dir.setSorting(QDir::Name); dir.setSorting(QDir::Name);
@ -94,11 +93,11 @@ bool CMS50Loader::OpenCMS50(QString & path, Profile *profile)
Machine *mach=CreateMachine(profile); Machine *mach=CreateMachine(profile);
int cnt=0; int cnt=0;
for (list<QString>::iterator n=files.begin();n!=files.end();n++,++cnt) { for (list<QString>::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); OpenSPORFile((*n),mach,profile);
} }
mach->Save(); mach->Save();
//if (loader_progress) loader_progress->Update(100); if (qprogress) qprogress->setValue(100);
return true; return true;
} }
bool CMS50Loader::OpenSPORFile(QString path,Machine *mach,Profile *profile) bool CMS50Loader::OpenSPORFile(QString path,Machine *mach,Profile *profile)

4
daily.cpp
View File

@ -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[9],QColor("dark green"),"U0E",8,sfc));
SF->AddLayer(new gFlagsLine(flags[8],QColor("red"),"VS2",7,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[5],QColor("red"),"VS",5,sfc));
SF->AddLayer(new gFlagsLine(flags[4],QColor("black"),"FL",4,sfc)); SF->AddLayer(new gFlagsLine(flags[4],QColor("black"),"FL",4,sfc));
SF->AddLayer(new gFlagsLine(flags[3],QColor("blue"),"H",3,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(g);
FRW->AddLayer(new gLineOverlayBar(flags[3],QColor("blue"),"H")); 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[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[9],QColor("dark green"),"U0E"));
FRW->AddLayer(new gLineOverlayBar(flags[5],QColor("red"),"VS")); FRW->AddLayer(new gLineOverlayBar(flags[5],QColor("red"),"VS"));
FRW->AddLayer(new gLineOverlayBar(flags[4],QColor("black"),"FL")); FRW->AddLayer(new gLineOverlayBar(flags[4],QColor("black"),"FL"));