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

Session Times chart fixes, HighRes Printing option in preferences

Browse Source
This commit is contained in:
Mark Watkins 2011-12-07 09:49:26 +10:00
parent a9c1b82c56
commit 3bb7d13e38
7 changed files with 75 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Graphs/gGraphView.h
View File

@ -350,10 +350,10 @@ public:
m_marginleft=left; m_marginright=right;
m_margintop=top; m_marginbottom=bottom;
}
inline short marginLeft();
inline short marginRight();
inline short marginTop();
inline short marginBottom();
short marginLeft();
short marginRight();
short marginTop();
short marginBottom();
GLShortBuffer * lines();
GLShortBuffer * backlines();

47
Graphs/gSummaryChart.cpp
View File

@ -24,11 +24,10 @@ SummaryChart::SummaryChart(QString label,GraphType type)
hl_day=-1;
m_machinetype=MT_CPAP;
QDateTime d=QDateTime::currentDateTime();
QTime t1=d.time();
QTime t2=d.toUTC().time();
tz_offset=t2.secsTo(t1);
QDateTime d1=QDateTime::currentDateTime();
QDateTime d2=d1;
d1.setTimeSpec(Qt::UTC);
tz_offset=d2.secsTo(d1);
tz_hours=tz_offset/3600.0;
}
@ -79,26 +78,38 @@ void SummaryChart::SetDay(Day * nullday)
day=d.value()[i];
if (!day) continue;
if (day->machine_type()!=m_machinetype) continue;
int ft=qint64(day->first())/1000L;
ft+=tz_offset; // convert to local time
int dz2=ft/86400;
dz2*=86400; // ft = first sessions time, rounded back to midnight..
for (int s=0;s<day->size();s++) {
tmp=(*day)[s]->hours();
m_values[dn][s]=tmp;
total+=tmp;
zt=(*day)[s]->first()/1000;
zt=qint64((*day)[s]->first())/1000L;
zt+=tz_offset;
zt %= 86400;
tmp2=zt/3600.0;
if (tmp2+tmp<16) {
tmp2+=12;
tmp2=zt-dn*86400;
//zt %= 86400;
tmp2/=3600.0;
//tmp2-=24.0;
//if (zdn>dn2) {
//if (tmp2<12) {
// tmp2-=24;
//m_times[dn][s]=(tmp2+12);
} else {
tmp2-=12;
//}/* else {
// tmp2-=12;
//m_times[dn][s]=(tmp2)-12;
}
//}*/
m_times[dn][s]=tmp2;
if (tmp2 < m_miny) m_miny=tmp2;
if (tmp2+tmp > m_maxy) m_maxy=tmp2+tmp;
if (tmp2 < m_miny)
m_miny=tmp2;
if (tmp2+tmp > m_maxy)
m_maxy=tmp2+tmp;
}
if (total>0) {
m_days[dn]=day;
@ -250,7 +261,9 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
/*if (m_codes[0]=="HumidSet") {
int i=1;
}*/
if (w.title()=="Session Times") {
int i=5;
}
w.roundY(miny,maxy);
EventDataType yy=maxy-miny;
@ -359,7 +372,7 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
QColor col2=brighten(col);
for (j=0;j<d.value().size();j++) {
tmp2=times.value()[j];
tmp2=times.value()[j]-miny;
py=top+height-(tmp2*ymult);
tmp=d.value()[j]; // length

2
Graphs/gYAxis.cpp
View File

@ -262,7 +262,7 @@ const QString gYAxisTime::Format(EventDataType v, int dp)
char pm[3]={"am"};
if (show_12hr) {
h>=12 ? pm[0]='p' : pm[0]='a'; // yes, inverted..
h>=12 ? pm[0]='a' : pm[0]='p';
h %= 12;
if (h==0) h=12;
} else {

13
SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -108,6 +108,13 @@ bool EDFParser::Parse()
return false;
}
startdate=qint64(startDate.toTime_t())*1000L;
QDateTime d=QDateTime::currentDateTime();
QTime t1=d.time();
QTime t2=d.toUTC().time();
qint64 tz_offset=t2.secsTo(t1);
//tz_hours=tz_offset/3600.0;
tz_offset*=1000L;
startdate-=tz_offset;
//qDebug() << startDate.toString("yyyy-MM-dd HH:mm:ss");
@ -287,8 +294,8 @@ int ResmedLoader::Open(QString & path,Profile *profile)
qint64 duration=stredf.GetNumDataRecords()*stredf.GetDuration();
int days=duration/86400000L;
QDateTime dt1=QDateTime::fromTime_t(stredf.startdate/1000L);
QDateTime dt2=QDateTime::fromTime_t(stredf.enddate/1000L);
//QDateTime dt1=QDateTime::fromTime_t(stredf.startdate/1000L);
//QDateTime dt2=QDateTime::fromTime_t(stredf.enddate/1000L);
//QDate dd1=dt1.date();
//QDate dd2=dt2.date();
for (int s=0;s<stredf.GetNumSignals();s++) {
@ -310,7 +317,7 @@ int ResmedLoader::Open(QString & path,Profile *profile)
QFileInfoList flist=dir.entryInfoList();
QMap<SessionID,QVector<QString> > sessfiles;
QString ext,rest,datestr,s,codestr;
QString ext,rest,datestr;//,s,codestr;
SessionID sessionid;
QDateTime date;
QString filename;

25
mainwindow.cpp
View File

@ -676,8 +676,16 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date)
QString username=PROFILE.Get("_{Username}_");
//QPrinter printer(QPrinter::ScreenResolution);
QPrinter printer(QPrinter::HighResolution);
QPrinter * zprinter;
if (PROFILE.ExistsAndTrue("HighResPrinting")) {
zprinter=new QPrinter(QPrinter::HighResolution);
} else {
zprinter=new QPrinter(QPrinter::ScreenResolution);
}
QPrinter & printer=*zprinter;;
//QPrinter printer(QPrinter::HighResolution);
#ifdef Q_WS_X11
printer.setPrinterName("Print to File (PDF)");
printer.setOutputFormat(QPrinter::PdfFormat);
@ -690,8 +698,9 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date)
printer.setFullPage(false); // This has nothing to do with scaling
printer.setNumCopies(1);
printer.setPageMargins(10,10,10,10,QPrinter::Millimeter);
QPrintDialog *dialog = new QPrintDialog(&printer);
if ( dialog->exec() != QDialog::Accepted) {
QPrintDialog dialog(&printer);
if (dialog.exec() != QDialog::Accepted) {
delete zprinter;
return;
}
@ -703,7 +712,7 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date)
qDebug() << "Printer Resolution is" << res.width() << "x" << res.height();
const int graphs_per_page=5;
const int footer_height=(res.height()/20);
const int footer_height=(res.height()/22);
float gw=res.width();
float gh=(res.height()-footer_height)/graphs_per_page;
float gw2=gv->width();
@ -824,8 +833,9 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date)
QRectF bounds=painter.boundingRect(QRectF(0,res.height()-footer_height,res.width(),footer_height),footer,QTextOption(Qt::AlignHCenter));
painter.drawText(bounds,footer,QTextOption(Qt::AlignHCenter));
QRectF pagebnds(res.width()-80*xscale,res.height()-footer_height,80*xscale,footer_height);
painter.drawText(pagebnds,"Page "+QString::number(page)+" of "+QString::number(pages),QTextOption(Qt::AlignRight));
QString pagestr="Page "+QString::number(page)+" of "+QString::number(pages);
QRectF pagebnds=painter.boundingRect(QRectF(0,res.height()-footer_height,res.width(),footer_height),pagestr,QTextOption(Qt::AlignRight));
painter.drawText(pagebnds,pagestr,QTextOption(Qt::AlignRight));
first=false;
}
gGraph *g=(*gv)[i];
@ -857,6 +867,7 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date)
qprogress->hide();
painter.end();
delete zprinter;
}
void MainWindow::on_action_Rebuild_Oximetry_Index_triggered()

4
preferencesdialog.cpp
View File

@ -167,6 +167,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) :
general["MemoryHog"]=Preference(p_profile,"MemoryHog",PT_Checkbox,"Cache Session Data","Keep session data in memory to improve load speed revisiting the date.",false);
general["GraphHeight"]=Preference(p_profile,"GraphHeight",PT_Checkbox,"Graph Height","Default Graph Height",160);
general["MaskDescription"]=Preference(p_profile,"MaskDescription",PT_Checkbox,"Mask Description","Whatever you want to record about your mask.",QString());
general["HighResPrinting"]=Preference(p_profile,"HighResPrinting",PT_Checkbox,"High Resolution Printing","Use much slower but better quality high resolution printing.",QString());
if (!(p_profile)->Exists("MaskStartDate")) {
(PROFILE["MaskStartDate"]=PROFILE.FirstDay());
@ -194,6 +195,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) :
ui->skipEmptyDays->setChecked(general["SkipEmptyDays"].value().toBool());
ui->enableMultithreading->setChecked(general["EnableMultithreading"].value().toBool());
ui->cacheSessionData->setChecked(general["MemoryHog"].value().toBool());
ui->highResolutionPrinting->setChecked(general["HighResPrinting"].value().toBool());
ui->graphHeight->setValue(general["GraphHeight"].value().toInt());
if (!PREF.Exists("Updates_AutoCheck")) PREF["Updates_AutoCheck"]=true;
@ -312,6 +314,8 @@ void PreferencesDialog::Save()
general["EnableMultithreading"].setValue(ui->enableMultithreading->isChecked());
general["MemoryHog"].setValue(ui->cacheSessionData->isChecked());
general["MaskDescription"].setValue(ui->maskDescription->text());
general["HighResPrinting"].setValue(ui->highResolutionPrinting->isChecked());
(*profile)["MaskStartDate"]=ui->startedUsingMask->date();
(*profile)["GraphHeight"]=ui->graphHeight->value();

9
preferencesdialog.ui
View File

@ -38,7 +38,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
<number>5</number>
</property>
<widget class="QWidget" name="importTab">
<attribute name="title">
@ -998,6 +998,13 @@ this application to be unstable with this feature enabled.</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QCheckBox" name="highResolutionPrinting">
<property name="text">
<string>High Resolution Printing (Slow)</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>