mirror of
https://gitlab.com/pholy/OSCAR-code.git
synced 2025-04-08 12:10:43 +00:00
Resored TAP graph
This commit is contained in:
parent
36bdde4078
commit
61520a33f3
@ -23,8 +23,8 @@ gYAxis::~gYAxis()
|
||||
}
|
||||
void gYAxis::Plot(gGraphWindow &w,float scrx,float scry)
|
||||
{
|
||||
static QColor DARK_GREY(0xb8,0xb8,0xb8,0xa0);
|
||||
static QColor LIGHT_GREY(0xd8,0xd8,0xd8,0xa0);
|
||||
static QColor DARK_GREY(0xc0,0xc0,0xc0,0x80);
|
||||
static QColor LIGHT_GREY(0xd8,0xd8,0xd8,0x80);
|
||||
float x,y;
|
||||
int labelW=0;
|
||||
|
||||
|
@ -43,6 +43,8 @@ gGraphWindow::gGraphWindow(QWidget *parent, const QString & title, QGLWidget * s
|
||||
setFocusPolicy(Qt::StrongFocus);
|
||||
rmin_x=rmax_x=0;
|
||||
min_x=max_x=0;
|
||||
rmin_y=rmax_y=0;
|
||||
min_y=max_y=0;
|
||||
}
|
||||
|
||||
/*gGraphWindow::gGraphWindow(QWidget *parent, const QString & title, QGLContext * context,Qt::WindowFlags f)
|
||||
|
@ -314,7 +314,7 @@ bool Session::LoadEvents(QString filename)
|
||||
in >> s_last;
|
||||
|
||||
qint16 mcsize;
|
||||
in >> mcsize; // Summary size (number of Machine Code lists)
|
||||
in >> mcsize; // number of Machine Code lists
|
||||
|
||||
MachineCode code;
|
||||
qint64 ts1,ts2;
|
||||
|
@ -97,7 +97,6 @@ HEADERS += \
|
||||
Graphs/gFlagsLine.h \
|
||||
Graphs/glcommon.h \
|
||||
Graphs/gTitle.h \
|
||||
Graphs/gCandleStick.h \
|
||||
Graphs/gBarChart.h \
|
||||
Graphs/gSegmentChart.h\
|
||||
Graphs/gSessionTime.h \
|
||||
|
16
daily.cpp
16
daily.cpp
@ -223,7 +223,7 @@ Daily::Daily(QWidget *parent,QGLWidget * shared) :
|
||||
TAP_IAP->SetGradientBackground(false);
|
||||
|
||||
TAP->SetMargins(0,0,0,0);
|
||||
TAP->AddLayer(AddCPAP(seg=new gTAPGraph(CPAP_Pressure,GST_Line)));
|
||||
TAP->AddLayer(AddCPAP(seg=new gTAPGraph(CPAP_Pressure,GST_CandleStick)));
|
||||
TAP->hide();
|
||||
TAP->SetGradientBackground(false);
|
||||
|
||||
@ -573,7 +573,7 @@ void Daily::Load(QDate date)
|
||||
}
|
||||
html+="</tr>\n<tr><td colspan=4 align=center><i>"+tr("Event Breakdown")+"</i></td></tr>\n";
|
||||
if (1) { // AHI Pie Chart
|
||||
G_AHI->setFixedSize(gwwidth,gwheight);
|
||||
G_AHI->setFixedSize(gwwidth,120);
|
||||
QPixmap pixmap=G_AHI->renderPixmap(gwwidth,120,false); //gwwidth,gwheight,false);
|
||||
QByteArray byteArray;
|
||||
QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray
|
||||
@ -669,8 +669,8 @@ void Daily::Load(QDate date)
|
||||
if (mode==MODE_BIPAP) {
|
||||
{
|
||||
html+=("<tr><td colspan=4 align=center><i>")+tr("Time@EPAP")+("</i></td></tr>\n");
|
||||
TAP_EAP->setFixedSize(gwwidth,gwheight);
|
||||
QPixmap pixmap=TAP_EAP->renderPixmap(gwwidth,gwheight,false);
|
||||
TAP_EAP->setFixedSize(gwwidth,30);
|
||||
QPixmap pixmap=TAP_EAP->renderPixmap(gwwidth,30,false);
|
||||
QByteArray byteArray;
|
||||
QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray
|
||||
buffer.open(QIODevice::WriteOnly);
|
||||
@ -679,8 +679,8 @@ void Daily::Load(QDate date)
|
||||
}
|
||||
{
|
||||
html+=("<tr><td colspan=4 align=center><i>")+tr("Time@IPAP")+("</i></td></tr>\n");
|
||||
TAP_IAP->setFixedSize(gwwidth,gwheight);
|
||||
QPixmap pixmap=TAP_IAP->renderPixmap(gwwidth,gwheight,false);
|
||||
TAP_IAP->setFixedSize(gwwidth,30);
|
||||
QPixmap pixmap=TAP_IAP->renderPixmap(gwwidth,30,false);
|
||||
QByteArray byteArray;
|
||||
QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray
|
||||
buffer.open(QIODevice::WriteOnly);
|
||||
@ -690,8 +690,8 @@ void Daily::Load(QDate date)
|
||||
} else if (mode==MODE_APAP) {
|
||||
html+=("<tr><td colspan=4 align=center><i>")+tr("Time@Pressure")+("</i></td></tr>\n");
|
||||
|
||||
TAP->setFixedSize(gwwidth,gwheight);
|
||||
QPixmap pixmap=TAP->renderPixmap(gwwidth,gwheight,false);
|
||||
TAP->setFixedSize(gwwidth,30);
|
||||
QPixmap pixmap=TAP->renderPixmap(gwwidth,30,false);
|
||||
QByteArray byteArray;
|
||||
QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray
|
||||
buffer.open(QIODevice::WriteOnly);
|
||||
|
Loading…
Reference in New Issue
Block a user