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

Windows build fixes, bump build number

Browse Source
This commit is contained in:
Mark Watkins 2014-10-02 17:56:57 +10:00
parent 62b4b421f6
commit ffeb0149c0
17 changed files with 57 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sleepyhead/Graphs/gFlagsLine.cpp
View File

@ -176,7 +176,7 @@ void gFlagsGroup::paint(QPainter &painter, gGraph &g, const QRegion &region)
QColor barcol;
for (int i = 0; i < visflags.size(); i++) {
schema::Channel & chan = schema::channel[visflags.at(i)->code()];
//schema::Channel & chan = schema::channel[visflags.at(i)->code()];
// Alternating box color
if (i & 1) { barcol = COLOR_ALT_BG1; }

14
sleepyhead/Graphs/gGraph.cpp
View File

@ -482,11 +482,11 @@ QPixmap gGraph::renderPixmap(int w, int h, bool printing)
fa.setPixelSize(28);
fb.setPixelSize(32);
fc.setPixelSize(70);
graphView()->setPrintScaleX(2.5);
graphView()->setPrintScaleY(2.2);
graphView()->setPrintScaleX(2.5f);
graphView()->setPrintScaleY(2.2f);
} else {
graphView()->setPrintScaleX(1);
graphView()->setPrintScaleY(1);
graphView()->setPrintScaleX(1.0f);
graphView()->setPrintScaleY(1.0f);
}
defaultfont = &fa;
@ -1415,9 +1415,9 @@ int gGraph::minHeight()
{
int minheight = m_min_height;
int top = 0;
int center = 0;
int bottom = 0;
// int top = 0;
// int center = 0;
// int bottom = 0;
for (int i=0; i<m_layers.size(); ++i) {
int mh = m_layers[i]->minimumHeight();
mh += m_margintop + m_marginbottom;

6
sleepyhead/Graphs/gGraphView.cpp
View File

@ -1712,7 +1712,7 @@ class MyWidgetAction : public QWidgetAction
public:
MyWidgetAction(ChannelID code, QObject * parent = nullptr) :QWidgetAction(parent), code(code) { chbox = nullptr; }
protected:
virtual QWidget * createWidget(QWidget * parent) {
virtual QWidget * createWidget(QWidget * /*parent*/) {
connect(chbox, SIGNAL(toggled(bool)), this, SLOT(setChecked(bool)));
connect(chbox, SIGNAL(clicked()), this, SLOT(trigger()));
@ -2793,7 +2793,7 @@ void gGraphView::wheelEvent(QWheelEvent *event)
gGraph *graph = nullptr;
int group = 0;
int x = event->x();
//int x = event->x();
int y = event->y();
float h, py = 0, pinned_height = 0;
@ -2982,7 +2982,7 @@ void gGraphView::keyPressEvent(QKeyEvent *event)
}
if ((m_metaselect) && (event->key() >= Qt::Key_0) && (event->key() <= Qt::Key_9)) {
int bk = (int)event->key()-Qt::Key_0;
//int bk = (int)event->key()-Qt::Key_0;
m_metaselect = false;
timedRedraw(0);

2
sleepyhead/Graphs/gLineOverlay.cpp
View File

@ -41,7 +41,7 @@ void gLineOverlayBar::paint(QPainter &painter, gGraph &w, const QRegion &region)
int start_py = topp;
double xx = w.max_x - w.min_x;
double yy = w.max_y - w.min_y;
//double yy = w.max_y - w.min_y;
double jj = double(width) / double(xx);

14
sleepyhead/Graphs/gSessionTimesChart.cpp
View File

@ -43,10 +43,10 @@ gSummaryChart::gSummaryChart(ChannelID code, MachineType machtype)
tz_hours = tz_offset / 3600.0;
expected_slices = 5;
addCalc(code, ST_MIN, brighten(schema::channel[code].defaultColor() ,0.60));
addCalc(code, ST_MID, brighten(schema::channel[code].defaultColor() ,1.20));
addCalc(code, ST_90P, brighten(schema::channel[code].defaultColor() ,1.70));
addCalc(code, ST_MAX, brighten(schema::channel[code].defaultColor() ,2.30));
addCalc(code, ST_MIN, brighten(schema::channel[code].defaultColor() ,0.60f));
addCalc(code, ST_MID, brighten(schema::channel[code].defaultColor() ,1.20f));
addCalc(code, ST_90P, brighten(schema::channel[code].defaultColor() ,1.70f));
addCalc(code, ST_MAX, brighten(schema::channel[code].defaultColor() ,2.30f));
}
gSummaryChart::~gSummaryChart()
@ -1284,7 +1284,7 @@ gPressureChart::gPressureChart()
// Do not reorder these!!! :P
addCalc(CPAP_Pressure, ST_SETMAX, schema::channel[CPAP_Pressure].defaultColor()); // 00
addCalc(CPAP_Pressure, ST_MID, schema::channel[CPAP_Pressure].defaultColor()); // 01
addCalc(CPAP_Pressure, ST_90P, brighten(schema::channel[CPAP_Pressure].defaultColor(), 1.33)); // 02
addCalc(CPAP_Pressure, ST_90P, brighten(schema::channel[CPAP_Pressure].defaultColor(), 1.33f)); // 02
addCalc(CPAP_PressureMin, ST_SETMIN, schema::channel[CPAP_PressureMin].defaultColor()); // 03
addCalc(CPAP_PressureMax, ST_SETMAX, schema::channel[CPAP_PressureMax].defaultColor()); // 04
@ -1294,9 +1294,9 @@ gPressureChart::gPressureChart()
addCalc(CPAP_IPAPHi, ST_SETMAX, schema::channel[CPAP_IPAPHi].defaultColor()); // 08
addCalc(CPAP_EPAP, ST_MID, schema::channel[CPAP_EPAP].defaultColor()); // 09
addCalc(CPAP_EPAP, ST_90P, brighten(schema::channel[CPAP_EPAP].defaultColor(),1.33)); // 10
addCalc(CPAP_EPAP, ST_90P, brighten(schema::channel[CPAP_EPAP].defaultColor(),1.33f)); // 10
addCalc(CPAP_IPAP, ST_MID, schema::channel[CPAP_IPAP].defaultColor()); // 11
addCalc(CPAP_IPAP, ST_90P, brighten(schema::channel[CPAP_IPAP].defaultColor(),1.33)); // 12
addCalc(CPAP_IPAP, ST_90P, brighten(schema::channel[CPAP_IPAP].defaultColor(),1.33f)); // 12
}
void gPressureChart::afterDraw(QPainter &, gGraph &graph, QRect rect)

2
sleepyhead/Graphs/gSummaryChart.cpp
View File

@ -627,7 +627,7 @@ void SummaryChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
}
QColor col1 = col;
QColor col2 = brighten(col,2.37);
QColor col2 = brighten(col,2.37f);
//outlines->setColor(Qt::black);
int np = d.value().size();

2
sleepyhead/Graphs/gXAxis.cpp
View File

@ -385,7 +385,7 @@ void gXAxisDay::paint(QPainter &painter, gGraph &graph, const QRegion &region)
float left = region.boundingRect().left();
float top = region.boundingRect().top();
float width = region.boundingRect().width();
float height = region.boundingRect().height();
//float height = region.boundingRect().height();
QString months[] = {
QObject::tr("Jan"), QObject::tr("Feb"), QObject::tr("Mar"), QObject::tr("Apr"), QObject::tr("May"), QObject::tr("Jun"),

8
sleepyhead/SleepLib/common.h
View File

@ -73,12 +73,12 @@ class median_of_empty_list_exception:public std::exception{
///
///The numbers must be convertible to double.
template<class RandAccessIter>
double median(RandAccessIter begin, RandAccessIter end)
throw (median_of_empty_list_exception)
float median(RandAccessIter begin, RandAccessIter end)
// throw (median_of_empty_list_exception)
{
if (begin == end) { throw median_of_empty_list_exception(); }
std::size_t size = end - begin;
std::size_t middleIdx = size/2;
int size = end - begin;
int middleIdx = size/2;
RandAccessIter target = begin + middleIdx;
std::nth_element(begin, target, end);

2
sleepyhead/SleepLib/day.cpp
View File

@ -136,7 +136,7 @@ EventDataType Day::calcMiddle(ChannelID code)
}
EventDataType Day::calcMax(ChannelID code)
{
return p_profile->general->prefCalcMax() ? percentile(code, 0.995) : Max(code);
return p_profile->general->prefCalcMax() ? percentile(code, 0.995f) : Max(code);
}
EventDataType Day::calcPercentile(ChannelID code)
{

2
sleepyhead/SleepLib/loader_plugins/cms50_loader.cpp
View File

@ -267,6 +267,8 @@ int CMS50Loader::doImportMode()
info.serial = QString();
Machine * mach = CreateMachine(info);
Q_UNUSED(mach);
qDebug() << QString("Receiving Oximeter transmission %1:%2").arg(hour).arg(minute);
// set importing to true or whatever..

4
sleepyhead/SleepLib/loader_plugins/intellipap_loader.cpp
View File

@ -377,7 +377,7 @@ int IntellipapLoader::Open(QString path)
sid = 0;
SessionID lastsid = 0;
int last_minp=0, last_maxp=0, last_ps=0, last_pres = 0;
//int last_minp=0, last_maxp=0, last_ps=0, last_pres = 0;
for (int i = 0; i < recs; i++) {
// convert timestamp to real epoch
@ -543,7 +543,7 @@ int IntellipapLoader::Open(QString path)
if (!sess) continue;
// quint64 first = qint64(sid) * 1000L;
quint64 last = qint64(SessionEnd[i]) * 1000L;
//quint64 last = qint64(SessionEnd[i]) * 1000L;
if (sess->last() > 0) {
// sess->really_set_last(last);

3
sleepyhead/SleepLib/machine.cpp
View File

@ -210,9 +210,6 @@ bool Machine::AddSession(Session *s)
Q_ASSERT(p_profile);
Q_ASSERT(p_profile->isOpen());
if (s->type() == MT_OXIMETER) {
int i=5;
}
updateChannels(s);
if (p_profile->session->ignoreOlderSessions()) {

2
sleepyhead/SleepLib/session.cpp
View File

@ -41,7 +41,7 @@ Session::Session(Machine *m, SessionID session)
s_events_loaded = false;
s_summary_loaded = false;
_first_session = true;
s_enabled = -1;
s_enabled = true;
s_first = s_last = 0;
s_evchecksum_checked = false;

2
sleepyhead/build_number.h
View File

@ -1 +1 @@
const int build_number = 0;
const int build_number = 1;

1
sleepyhead/docs/changelog.txt
View File

@ -1 +0,0 @@
ghttp://mobile-phones.smh.com.au/MobilePhones?utm_source=Widget_Fairfax_SMH_CompareAndSave&utm_medium=Widget&utm_campaign=New_BYO_Phone_Prices

35
sleepyhead/docs/release_notes.html
View File

@ -1,7 +1,7 @@
<html>
<head><meta charset="UTF-8"></head>
<body>
<h1><image src="qrc:/docs/sheep.png" width=64 height=64>SleepyHead v0.9.8 <b>Testing</b></h1>
<h1><image src="qrc:/docs/sheep.png" width=64 height=64>SleepyHead v0.9.8-1 <b>Testing</b></h1>
<p><h2><b>Release Notes</b></h2></p>
<p>Greetings!</p>
@ -11,21 +11,34 @@
<p>This is the first public test build in a while, so there is a lot of new stuff to take in.</p>
<p>First up, a warning: Some new stuff is going down that might break on you.. Overview overhead figures aren't completely finished yet. I know about these and am working on them.
You will likely have to Rebuild CPAP data to get this to behave properly.. If you have to do it more than once, somethings not right, and I need to know.</p>
<p>Right clicky menu has tons of new stuff for you to play with... some of this you're hopefully going to love! :)</p>
<p>New Graph Clone ability allows you to make a temporary copy of a graph, and operate it completely independently...
<b>Some highlights from the new series</b><br/>
<list>
<li>Right click menu has tons of new stuff for you to play with... some of this you're hopefully going to love! :)</li>
<li>New Graph Clone ability allows you to make a temporary copy of a graph, and operate it completely independently...
You can even take these graph clones with you to another day! They aren't saved though. they are gone when you close SleepyHead.</li>
<p>Y-Axis menu allows for better control of Y-Axis scaling, all of this has been improved greatly... no more having to go into preferences
to set minimum/maximum values (that SleepyHead wasn't honouring properly anyway). Now you can adjust these settings live for each graph!</p>
<p>Line Cursor mode (F3 to toggles) is a very powerful new feature.. Play with it and see what it does. It's off by default because it takes a lot more CPU power to work.</p>
<li>Y-Axis menu allows for better control of Y-Axis scaling, all of this has been improved greatly... no more having to go into preferences
to set minimum/maximum values (that SleepyHead wasn't honouring properly anyway). Now you can adjust these settings live for each graph!</li>
<li>Line Cursor mode (F3 to toggles) is a very powerful new feature.. Play with it and see what it does. It's off by default because it takes a lot more CPU power to work.</li>
</list>
<p>There is loads more waiting for you in the 0.9.8 series!</p>
<p><b>Sleep Well, and good luck!</b></p>
<p><b><i>JediMark</i></b></p>
<br/>
<b>New features & bug fixes in v0.9.8</b><br/>
<b>Bug fixes in v0.9.8-1</b>
<list>
<li>Windows build related fixes</li>
<li>Increase brightness steps between barchart segments</li>
<li>Put Export CSV back</li>
<li>Do not save over machine.xml if profiles has an machines section but machines.xml is present</li>
<li>Fix PRS1 model numbers not ending in 'P' refusing to import</li>
<li>Show Model number in rx changes list instead of loader name</li>
<li>Only Resmed CPAP/APAP modes have EPR</li>
<li>Fix PRS1 4x0P models accidentally being called Plus instead of Pro</li>
<li>Fix Profile delete not removing row properly</li>
</list>
<br/>
<b>New features & bug fixes in v0.9.8-0</b><br/>
<list>
<li>Rework of Records box</li>
<li>Initial support for Philips Respironics System One Oximetery attachment</li>

1
sleepyhead/scripts/build_number
View File

@ -1 +1,2 @@
0
1