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

Proof I can count :) Fix to the last bit

Browse Source
This commit is contained in:
Mark Watkins 2011-07-19 15:22:47 +10:00
parent e44f7bb6fb
commit 4f6eeaa5fb
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Graphs/graphwindow.cpp
View File

@ -258,15 +258,15 @@ void gGraphWindow::updateSelectionTime()
int hours,minutes,seconds; int hours,minutes,seconds;
hours=int(f*24.0); hours=int(f*24.0);
minutes=int(f*60.0) % 60; minutes=int(f*24*60.0) % 60;
seconds=int(f*3600.0) % 60; seconds=int(f*24*3600.0) % 60;
QString s; QString s;
if (f>1) { if (f>1) {
s.sprintf("%.1f days",f); s.sprintf("%.1f days",f);
} else if (f>(1.0/(24.0*12.0))) { } else if (f>(1.0/(24.0*12.0))) {
s.sprintf("%02i:%02i:%02i",hours,minutes,seconds); s.sprintf("%02i:%02i:%02i",hours,minutes,seconds);
} else { } else {
int milli=int(f*3600000.0) % 1000; int milli=int(f*24*3600000.0) % 1000;
s.sprintf("%02i:%02i:%02i:%04i",hours,minutes,seconds,milli); s.sprintf("%02i:%02i:%02i:%04i",hours,minutes,seconds,milli);
} }
qstatus2->setText(s); qstatus2->setText(s);

3
mainwindow.cpp
View File

@ -70,7 +70,6 @@ MainWindow::MainWindow(QWidget *parent) :
daily=NULL; daily=NULL;
overview=NULL; overview=NULL;
Profiles::Scan(); Profiles::Scan();
qstatusbar->showMessage("Foo Foo Foo",10);
//loader_progress->Show(); //loader_progress->Show();
@ -125,6 +124,7 @@ void MainWindow::Startup()
qstatus->setText(tr("Loading Data")); qstatus->setText(tr("Loading Data"));
qprogress->show(); qprogress->show();
qstatusbar->showMessage("Your computer loads faster than JediMark's",1900);
profile=Profiles::Get(pref["Profile"].toString()); profile=Profiles::Get(pref["Profile"].toString());
profile->LoadMachineData(); profile->LoadMachineData();
@ -140,6 +140,7 @@ void MainWindow::Startup()
qprogress->hide(); qprogress->hide();
qstatus->setText(tr("Ready")); qstatus->setText(tr("Ready"));
} }
void MainWindow::on_action_Import_Data_triggered() void MainWindow::on_action_Import_Data_triggered()