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

Profile==NULL assert fix

Browse Source
This commit is contained in:
Mark Watkins 2011-06-27 20:23:24 +10:00
parent 1368afa7c5
commit 4000d73edc
9 changed files with 201 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Graphs/gLineChart.cpp
View File

@ -72,7 +72,7 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
//TextMarkup...
GetTextExtent(msg,x,y,bigfont);
//w.renderText(start_px+(width/2.0)-(x/2.0),start_py+(height/2.0)-(y/2.0),msg,*bigfont);
DrawText(w,msg,start_px+(width/2.0)-(x/2.0),scry-w.GetBottomMargin()-height/2.0+y/2.0,0,QColor("dark grey"),bigfont);//-(y/2.0)
DrawText(w,msg,start_px+(width/2.0)-(x/2.0),scry-w.GetBottomMargin()-height/2.0+y/2.0,0,Qt::gray,bigfont);//-(y/2.0)
}
return;
}

26
Graphs/glcommon.cpp
View File

@ -44,7 +44,7 @@ void GetTextExtent(QString text, float & width, float & height, QFont *font)
width=fm.width(text); //fm.width(text);
height=fm.xHeight()+2; //fm.ascent();
}
void DrawText(gGraphWindow & wid, QString text, float x, float y, float angle, QColor color,QFont *font)
void DrawText(gGraphWindow & wid, QString text, int x, int y, float angle, QColor color,QFont *font)
{
//QFontMetrics fm(*font);
float w,h;
@ -56,22 +56,26 @@ void DrawText(gGraphWindow & wid, QString text, float x, float y, float angle, Q
abort();
return;
}
glColor4ub(color.red(),color.green(),color.blue(),color.alpha());
if (angle==0) {
wid.renderText(x,y,text,*font);
// DrawText2(text,x,y,font);
return;
}
// glEnable(GL_TEXTURE_2D);
glDisable(GL_DEPTH_TEST);
glFlush();
QPainter painter(&wid);
//painter.setFont(*font);
painter.setPen(Qt::black);
painter.setOpacity(1);
// painter.setCompositionMode(QPainter::CompositionMode_);
if (angle==0) {
painter.drawText(x,y,text);
} else {
GetTextExtent(text, w, h, font);
painter.translate(floor(x),floor(y));
painter.rotate(-90);
painter.setFont(*font);
painter.setPen(QPen(color));
painter.drawText(floor(-w/2.0),floor(-h/2.0),text);
painter.translate(floor(-x),floor(-y));
}
painter.end();
glDisable(GL_TEXTURE_2D);

2
Graphs/glcommon.h
View File

@ -22,7 +22,7 @@ extern QFont * bigfont;
class gGraphWindow;
void GetTextExtent(QString text, float & width, float & height, QFont *font=defaultfont);
void DrawText(gGraphWindow & wid, QString text, float x, float y, float angle=0, QColor color=QColor("black"),QFont *font=defaultfont);
void DrawText(gGraphWindow & wid, QString text, int x, int y, float angle=0, QColor color=QColor("black"),QFont *font=defaultfont);
void LinedRoundedRectangle(int x,int y,int w,int h,int radius,int lw,QColor color);
void RoundedRectangle(int x,int y,int w,int h,int radius,const QColor color);

2
SleepLib/profiles.cpp
View File

@ -255,7 +255,7 @@ Machine * Profile::GetMachine(MachineType t)
}
Profile *profile=NULL;
//Profile *profile=NULL;
QString SHA1(QString pass)
{
return pass;

27
daily.cpp
View File

@ -100,15 +100,27 @@ Daily::Daily(QWidget *parent,QGLContext *context) :
PRD->AddLayer(new gLineChart(pressure_eap,QColor("red"),4096,false,true,true));
PRD->setMinimumHeight(150);
AddCPAPData(leakdata=new EventData(CPAP_Leak,0));
//leakdata->ForceMinY(0);
//leakdata->ForceMaxY(120);
AddGraph(LEAK=new gGraphWindow(gSplitter,"Leaks",SF));
LEAK->AddLayer(new gXAxis());
LEAK->AddLayer(new gYAxis());
LEAK->AddLayer(new gFooBar());
LEAK->AddLayer(new gLineChart(leakdata,QColor("purple"),4096,false,false,false));
LEAK->setMinimumHeight(150);
AddGraph(FRW=new gGraphWindow(gSplitter,"Flow Rate",SF));
FRW->AddLayer(new gXAxis());
FRW->AddLayer(new gYAxis());
FRW->AddLayer(new gFooBar());
FRW->AddLayer(new gYAxis());
FRW->AddLayer(new gXAxis());
FRW->AddLayer(new gLineOverlayBar(flags[0],QColor("light green"),"CSR"));
gLineChart *g=new gLineChart(frw,QColor("black"),200000,true);
g->ReportEmpty(true);
FRW->AddLayer(g);
FRW->AddLayer(new gLineOverlayBar(flags[3],QColor("blue"),"H"));
FRW->AddLayer(new gLineOverlayBar(flags[7],QColor("red"),"PR",LOT_Dot));
@ -121,17 +133,6 @@ Daily::Daily(QWidget *parent,QGLContext *context) :
FRW->setMinimumHeight(190);
AddCPAPData(leakdata=new EventData(CPAP_Leak,0));
//leakdata->ForceMinY(0);
//leakdata->ForceMaxY(120);
AddGraph(LEAK=new gGraphWindow(gSplitter,"Leaks",SF));
LEAK->AddLayer(new gXAxis());
LEAK->AddLayer(new gYAxis());
LEAK->AddLayer(new gFooBar());
LEAK->AddLayer(new gLineChart(leakdata,QColor("purple"),4096,false,false,false));
LEAK->setMinimumHeight(150);
AddCPAPData(snore=new EventData(CPAP_SnoreGraph,0));
//snore->ForceMinY(0);
//snore->ForceMaxY(15);

2
mainwindow.cpp
View File

@ -79,7 +79,7 @@ void MainWindow::Startup()
qstatus->setText("Loading Data");
qprogress->show();
Profile *profile=Profiles::Get(pref["Profile"].toString());
profile=Profiles::Get(pref["Profile"].toString());
profile->LoadMachineData();
daily=new Daily(ui->tabWidget,shared_context);

1
mainwindow.h
View File

@ -68,6 +68,7 @@ private:
Overview * overview;
QGLContext *shared_context;
bool first_load;
Profile *profile;
};
#endif // MAINWINDOW_H

146
mainwindow.ui
View File

@ -255,13 +255,13 @@
</property>
<property name="minimumSize">
<size>
<width>100</width>
<width>115</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<width>115</width>
<height>16777215</height>
</size>
</property>
@ -338,21 +338,21 @@
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<widget class="QToolButton" name="overviewButton">
<property name="geometry">
<rect>
<x>2</x>
<y>194</y>
<width>92</width>
<height>90</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QToolButton" name="importButton">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
@ -360,11 +360,11 @@
</size>
</property>
<property name="text">
<string>Overview</string>
<string>Import</string>
</property>
<property name="icon">
<iconset resource="Resources.qrc">
<normaloff>:/icons/overview.png</normaloff>:/icons/overview.png</iconset>
<normaloff>:/icons/sdcard.png</normaloff>:/icons/sdcard.png</iconset>
</property>
<property name="iconSize">
<size>
@ -372,22 +372,22 @@
<height>64</height>
</size>
</property>
<property name="checkable">
<bool>false</bool>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextUnderIcon</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
<widget class="QToolButton" name="dailyButton">
<property name="geometry">
<rect>
<x>2</x>
<y>98</y>
<width>92</width>
<height>90</height>
</rect>
<property name="arrowType">
<enum>Qt::NoArrow</enum>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="dailyButton">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
@ -426,15 +426,44 @@
<bool>true</bool>
</property>
</widget>
<widget class="QToolButton" name="preferencesButton">
<property name="geometry">
<rect>
<x>2</x>
<y>290</y>
<width>92</width>
<height>90</height>
</rect>
</item>
<item>
<widget class="QToolButton" name="overviewButton">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>90</height>
</size>
</property>
<property name="text">
<string>Overview</string>
</property>
<property name="icon">
<iconset resource="Resources.qrc">
<normaloff>:/icons/overview.png</normaloff>:/icons/overview.png</iconset>
</property>
<property name="iconSize">
<size>
<width>64</width>
<height>64</height>
</size>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextUnderIcon</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="preferencesButton">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
@ -467,59 +496,8 @@
<bool>true</bool>
</property>
</widget>
<widget class="QToolButton" name="importButton">
<property name="geometry">
<rect>
<x>2</x>
<y>2</y>
<width>92</width>
<height>90</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>90</height>
</size>
</property>
<property name="text">
<string>Import Data</string>
</property>
<property name="icon">
<iconset resource="Resources.qrc">
<normaloff>:/icons/sdcard.png</normaloff>:/icons/sdcard.png</iconset>
</property>
<property name="iconSize">
<size>
<width>64</width>
<height>64</height>
</size>
</property>
<property name="checkable">
<bool>false</bool>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextUnderIcon</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
<property name="arrowType">
<enum>Qt::NoArrow</enum>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
@ -535,7 +513,7 @@
<x>0</x>
<y>0</y>
<width>1089</width>
<height>25</height>
<height>29</height>
</rect>
</property>
<property name="sizePolicy">

3
overview.cpp
View File

@ -181,8 +181,7 @@ void UpdateCal(QCalendarWidget *cal)
QDate d1=cal->minimumDate();
d1.setYMD(d1.year(),d1.month(),1);
QTextCharFormat fmt=cal->weekdayTextFormat(Qt::Monday);
QBrush b(QColor("light grey"));
fmt.setForeground(b);
fmt.setForeground(QBrush(Qt::gray));
for (QDate d=d1;d < cal->minimumDate();d=d.addDays(1)) {
cal->setDateTextFormat(d,fmt);
}