mirror of
https://gitlab.com/pholy/OSCAR-code.git
synced 2025-04-16 10:40:45 +00:00
Clean up a few warnings, fix case sensitivity issue
This commit is contained in:
parent
d1ffafb409
commit
126e78cddc
@ -299,8 +299,10 @@ gGraphView::gGraphView(QWidget *parent, gGraphView *shared)
|
|||||||
setAutoBufferSwap(false);
|
setAutoBufferSwap(false);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void gGraphView::closeEvent(QCloseEvent * event)
|
void gGraphView::closeEvent(QCloseEvent * event)
|
||||||
{
|
{
|
||||||
|
|
||||||
timer->stop();
|
timer->stop();
|
||||||
redrawtimer->stop();
|
redrawtimer->stop();
|
||||||
disconnect(redrawtimer, 0, 0, 0);
|
disconnect(redrawtimer, 0, 0, 0);
|
||||||
@ -311,7 +313,11 @@ void gGraphView::closeEvent(QCloseEvent * event)
|
|||||||
if (m_scrollbar) {
|
if (m_scrollbar) {
|
||||||
this->disconnect(m_scrollbar, SIGNAL(sliderMoved(int)), 0, 0);
|
this->disconnect(m_scrollbar, SIGNAL(sliderMoved(int)), 0, 0);
|
||||||
}
|
}
|
||||||
|
#ifdef BROKEN_OPENGL_BUILD
|
||||||
|
QWidget::closeEvent(event);
|
||||||
|
#else
|
||||||
|
QGLWidget::closeEvent(event);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
gGraphView::~gGraphView()
|
gGraphView::~gGraphView()
|
||||||
@ -408,7 +414,7 @@ void gGraphView::DrawTextQue(QPainter &painter)
|
|||||||
if (!QPixmapCache::find(hstr, &pm)) {
|
if (!QPixmapCache::find(hstr, &pm)) {
|
||||||
|
|
||||||
QFontMetrics fm(*q.font);
|
QFontMetrics fm(*q.font);
|
||||||
QRect rect=fm.tightBoundingRect(q.text);
|
// QRect rect=fm.tightBoundingRect(q.text);
|
||||||
w = fm.width(q.text);
|
w = fm.width(q.text);
|
||||||
h = fm.height()+buf;
|
h = fm.height()+buf;
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
|
|
||||||
#include "SleepLib/profiles.h"
|
#include "SleepLib/profiles.h"
|
||||||
#include "gsessiontimeschart.h"
|
#include "gSessionTimesChart.h"
|
||||||
|
|
||||||
#include "gYAxis.h"
|
#include "gYAxis.h"
|
||||||
|
|
||||||
@ -92,12 +92,16 @@ void gSessionTimesChart::SetDay(Day *unused_day)
|
|||||||
|
|
||||||
void gSessionTimesChart::paint(QPainter &painter, gGraph &w, const QRegion ®ion)
|
void gSessionTimesChart::paint(QPainter &painter, gGraph &w, const QRegion ®ion)
|
||||||
{
|
{
|
||||||
|
Q_UNUSED(painter)
|
||||||
|
Q_UNUSED(w)
|
||||||
|
Q_UNUSED(region)
|
||||||
|
|
||||||
QMap<quint32, QList<TimeSpan> >::iterator st_end = sessiontimes.end();
|
QMap<quint32, QList<TimeSpan> >::iterator st_end = sessiontimes.end();
|
||||||
QMap<quint32, QList<TimeSpan> >::iterator it;
|
QMap<quint32, QList<TimeSpan> >::iterator it;
|
||||||
|
|
||||||
|
|
||||||
for (it = sessiontimes.begin(); it != st_end; ++it) {
|
for (it = sessiontimes.begin(); it != st_end; ++it) {
|
||||||
int dn = it.key();
|
// int dn = it.key();
|
||||||
QList<TimeSpan> & st = it.value();
|
QList<TimeSpan> & st = it.value();
|
||||||
int stsize = st.size();
|
int stsize = st.size();
|
||||||
|
|
||||||
@ -110,21 +114,29 @@ void gSessionTimesChart::paint(QPainter &painter, gGraph &w, const QRegion ®i
|
|||||||
|
|
||||||
bool gSessionTimesChart::keyPressEvent(QKeyEvent *event, gGraph *graph)
|
bool gSessionTimesChart::keyPressEvent(QKeyEvent *event, gGraph *graph)
|
||||||
{
|
{
|
||||||
|
Q_UNUSED(event)
|
||||||
|
Q_UNUSED(graph)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool gSessionTimesChart::mouseMoveEvent(QMouseEvent *event, gGraph *graph)
|
bool gSessionTimesChart::mouseMoveEvent(QMouseEvent *event, gGraph *graph)
|
||||||
{
|
{
|
||||||
|
Q_UNUSED(event)
|
||||||
|
Q_UNUSED(graph)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool gSessionTimesChart::mousePressEvent(QMouseEvent *event, gGraph *graph)
|
bool gSessionTimesChart::mousePressEvent(QMouseEvent *event, gGraph *graph)
|
||||||
{
|
{
|
||||||
|
Q_UNUSED(event)
|
||||||
|
Q_UNUSED(graph)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool gSessionTimesChart::mouseReleaseEvent(QMouseEvent *event, gGraph *graph)
|
bool gSessionTimesChart::mouseReleaseEvent(QMouseEvent *event, gGraph *graph)
|
||||||
{
|
{
|
||||||
|
Q_UNUSED(event)
|
||||||
|
Q_UNUSED(graph)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -35,6 +35,7 @@ SummaryChart::~SummaryChart()
|
|||||||
}
|
}
|
||||||
void SummaryChart::SetDay(Day * nullday)
|
void SummaryChart::SetDay(Day * nullday)
|
||||||
{
|
{
|
||||||
|
Q_UNUSED(nullday)
|
||||||
Day *day = nullptr;
|
Day *day = nullptr;
|
||||||
Layer::SetDay(day);
|
Layer::SetDay(day);
|
||||||
|
|
||||||
@ -834,10 +835,9 @@ jumpnext:
|
|||||||
bool ishours = false;
|
bool ishours = false;
|
||||||
int good = 0;
|
int good = 0;
|
||||||
|
|
||||||
if (w.title().compare("Resp. Rate")==0) {
|
// if (w.title().compare("Resp. Rate")==0) {
|
||||||
int i=5;
|
// int i=5;
|
||||||
int b = i;
|
// }
|
||||||
}
|
|
||||||
|
|
||||||
for (int j = 0; j < m_codes.size(); j++) {
|
for (int j = 0; j < m_codes.size(); j++) {
|
||||||
if (!goodcodes[j]) { continue; }
|
if (!goodcodes[j]) { continue; }
|
||||||
|
@ -379,9 +379,6 @@ void FlowParser::calc(bool calcResp, bool calcTv, bool calcTi, bool calcTe, bool
|
|||||||
|
|
||||||
double len, st2, et2, adj, stmin, b, rr = 0;
|
double len, st2, et2, adj, stmin, b, rr = 0;
|
||||||
double len2;
|
double len2;
|
||||||
int idx;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////////
|
||||||
// Inspiratory / Expiratory Time setup
|
// Inspiratory / Expiratory Time setup
|
||||||
|
@ -244,7 +244,6 @@ EventDataType Day::percentile(ChannelID code, EventDataType percentile)
|
|||||||
|
|
||||||
lastgain = gain;
|
lastgain = gain;
|
||||||
|
|
||||||
int value;
|
|
||||||
qint64 weight;
|
qint64 weight;
|
||||||
|
|
||||||
//qint64 tval;
|
//qint64 tval;
|
||||||
|
@ -311,10 +311,10 @@ quint32 convertDate(quint32 timestamp)
|
|||||||
QDateTime dt = QDateTime(QDate(year, month, day), QTime(hour, minute, second),Qt::UTC);
|
QDateTime dt = QDateTime(QDate(year, month, day), QTime(hour, minute, second),Qt::UTC);
|
||||||
|
|
||||||
Q_ASSERT(dt.isValid());
|
Q_ASSERT(dt.isValid());
|
||||||
if ((year == 2013) && (month == 9) && (day == 18)) {
|
// if ((year == 2013) && (month == 9) && (day == 18)) {
|
||||||
// this is for testing.. set a breakpoint on here and
|
// // this is for testing.. set a breakpoint on here and
|
||||||
int i=5;
|
// int i=5;
|
||||||
}
|
// }
|
||||||
|
|
||||||
|
|
||||||
// From Rudd's data set compared to times reported from his F&P software's report (just the time bits left over)
|
// From Rudd's data set compared to times reported from his F&P software's report (just the time bits left over)
|
||||||
@ -348,9 +348,9 @@ quint32 convertFLWDate(quint32 timestamp)
|
|||||||
// hour = (timestamp >> 12) & 0x1f;
|
// hour = (timestamp >> 12) & 0x1f;
|
||||||
QDateTime dt = QDateTime(QDate(year, month, day), QTime(hour, minute, second), Qt::UTC);
|
QDateTime dt = QDateTime(QDate(year, month, day), QTime(hour, minute, second), Qt::UTC);
|
||||||
Q_ASSERT(dt.isValid());
|
Q_ASSERT(dt.isValid());
|
||||||
if ((year == 2013) && (month == 9) && (day == 18)) {
|
// if ((year == 2013) && (month == 9) && (day == 18)) {
|
||||||
int i=5;
|
// int i=5;
|
||||||
}
|
// }
|
||||||
// 87922 23:23:50 WET
|
// 87922 23:23:50 WET
|
||||||
return dt.addSecs(-360).toTime_t();
|
return dt.addSecs(-360).toTime_t();
|
||||||
}
|
}
|
||||||
@ -498,7 +498,6 @@ bool FPIconLoader::OpenFLW(Machine *mach, QString filename, Profile *profile)
|
|||||||
sess = nullptr;
|
sess = nullptr;
|
||||||
|
|
||||||
sit = Sessions.end();
|
sit = Sessions.end();
|
||||||
int cnt=0;
|
|
||||||
if (Sessions.begin() != sit) {
|
if (Sessions.begin() != sit) {
|
||||||
do {
|
do {
|
||||||
sit--;
|
sit--;
|
||||||
|
@ -110,6 +110,7 @@ int MD300W1Loader::Open(QString path, Profile *profile)
|
|||||||
|
|
||||||
void MD300W1Loader::processBytes(QByteArray bytes)
|
void MD300W1Loader::processBytes(QByteArray bytes)
|
||||||
{
|
{
|
||||||
|
Q_UNUSED(bytes);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
#include "SleepLib/calcs.h"
|
#include "SleepLib/calcs.h"
|
||||||
|
|
||||||
|
|
||||||
const int PRS1_MAGIC_NUMBER = 2;
|
//const int PRS1_MAGIC_NUMBER = 2;
|
||||||
//const int PRS1_SUMMARY_FILE=1;
|
//const int PRS1_SUMMARY_FILE=1;
|
||||||
//const int PRS1_EVENT_FILE=2;
|
//const int PRS1_EVENT_FILE=2;
|
||||||
//const int PRS1_WAVEFORM_FILE=5;
|
//const int PRS1_WAVEFORM_FILE=5;
|
||||||
@ -358,6 +358,7 @@ bool PRS1Loader::ParseProperties(Machine *m, QString filename)
|
|||||||
|
|
||||||
int PRS1Loader::OpenMachine(Machine *m, QString path, Profile *profile)
|
int PRS1Loader::OpenMachine(Machine *m, QString path, Profile *profile)
|
||||||
{
|
{
|
||||||
|
Q_UNUSED(profile)
|
||||||
|
|
||||||
qDebug() << "Opening PRS1 " << path;
|
qDebug() << "Opening PRS1 " << path;
|
||||||
QDir dir(path);
|
QDir dir(path);
|
||||||
@ -422,7 +423,6 @@ int PRS1Loader::OpenMachine(Machine *m, QString path, Profile *profile)
|
|||||||
long ext;
|
long ext;
|
||||||
QHash<SessionID, QStringList> sessfiles;
|
QHash<SessionID, QStringList> sessfiles;
|
||||||
int size = paths.size();
|
int size = paths.size();
|
||||||
int cnt = 0;
|
|
||||||
|
|
||||||
prs1sessions.clear();
|
prs1sessions.clear();
|
||||||
new_sessions.clear(); // this hash is used by OpenFile
|
new_sessions.clear(); // this hash is used by OpenFile
|
||||||
@ -488,7 +488,9 @@ int PRS1Loader::OpenMachine(Machine *m, QString path, Profile *profile)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int tasks = countTasks();
|
||||||
runTasks(p_profile->session->multithreading());
|
runTasks(p_profile->session->multithreading());
|
||||||
|
return tasks;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool PRS1SessionData::ParseF5Events()
|
bool PRS1SessionData::ParseF5Events()
|
||||||
@ -840,7 +842,7 @@ bool PRS1SessionData::ParseF0Events()
|
|||||||
int cnt = 0;
|
int cnt = 0;
|
||||||
short delta;
|
short delta;
|
||||||
int tdata;
|
int tdata;
|
||||||
quint64 pos;
|
int pos;
|
||||||
qint64 t = qint64(event->timestamp) * 1000L, tt;
|
qint64 t = qint64(event->timestamp) * 1000L, tt;
|
||||||
|
|
||||||
session->updateFirst(t);
|
session->updateFirst(t);
|
||||||
@ -1188,7 +1190,7 @@ bool PRS1SessionData::ParseSummary()
|
|||||||
//////////////////////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|
||||||
quint8 rectype = data[0x00];
|
//quint8 rectype = data[0x00];
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -194,7 +194,6 @@ void ResmedLoader::ParseSTR(Machine *mach, QStringList strfiles)
|
|||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
bool skip = false;
|
|
||||||
|
|
||||||
QMap<quint32, STRRecord>::iterator sid = strsess.find(ontime);
|
QMap<quint32, STRRecord>::iterator sid = strsess.find(ontime);
|
||||||
// Record already exists?
|
// Record already exists?
|
||||||
|
@ -63,6 +63,8 @@ class MachineLoader: public QObject
|
|||||||
//! \brief Process Task list using all available threads.
|
//! \brief Process Task list using all available threads.
|
||||||
void runTasks(bool threaded=true);
|
void runTasks(bool threaded=true);
|
||||||
|
|
||||||
|
int countTasks() { return m_tasklist.size(); }
|
||||||
|
|
||||||
inline bool isAborted() { return m_abort; }
|
inline bool isAborted() { return m_abort; }
|
||||||
void abort() { m_abort = true; }
|
void abort() { m_abort = true; }
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user