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

Using qAbs instead

Browse Source
This commit is contained in:
Mark Watkins 2011-12-02 10:38:32 +10:00
parent 02393b0512
commit 203b733281
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Graphs/gGraphView.cpp
View File

@ -13,6 +13,7 @@
#include <QDir> #include <QDir>
#include "mainwindow.h" #include "mainwindow.h"
extern MainWindow *mainwin; extern MainWindow *mainwin;
#ifdef Q_WS_MAC #ifdef Q_WS_MAC
@ -2257,7 +2258,7 @@ void gGraphView::mouseMoveEvent(QMouseEvent * event)
if (m_button_down || ((y >= py) && (y < py + h))) { if (m_button_down || ((y >= py) && (y < py + h))) {
if (m_button_down || (x >= titleWidth)) { if (m_button_down || (x >= titleWidth)) {
this->setCursor(Qt::ArrowCursor); this->setCursor(Qt::ArrowCursor);
m_horiz_travel+=abs(x-m_lastxpos)+abs(y-m_lastypos); m_horiz_travel+=qAbs(x-m_lastxpos)+qAbs(y-m_lastypos);
m_lastxpos=x; m_lastxpos=x;
m_lastypos=y; m_lastypos=y;
QPoint p(x-titleWidth,y-py); QPoint p(x-titleWidth,y-py);

10
SleepLib/calcs.cpp
View File

@ -3,7 +3,6 @@
Copyright (c)2011 Mark Watkins <jedimark@users.sourceforge.net> Copyright (c)2011 Mark Watkins <jedimark@users.sourceforge.net>
License: GPL License: GPL
*/ */
#include <cmath>
#include "calcs.h" #include "calcs.h"
#include "profiles.h" #include "profiles.h"
@ -132,7 +131,6 @@ int CalcRespRate::filterFlow(EventList *in, EventList *out, EventList *tv, Event
QVector<EventDataType> TV; QVector<EventDataType> TV;
QVector<qint64> breaths_start; QVector<qint64> breaths_start;
int lasti=0; int lasti=0;
long tmp32;
for (i=0;i<size;i++) { for (i=0;i<size;i++) {
c=stage1[i]; c=stage1[i];
@ -142,8 +140,7 @@ int CalcRespRate::filterFlow(EventList *in, EventList *out, EventList *tv, Event
u1=time; u1=time;
if (u2>0) { if (u2>0) {
z2=i; z2=i;
tmp32=u2-u1; len=qAbs(u2-u1);
len=abs(tmp32);
if (tv) { // && z1>0) { // Tidal Volume Calculations if (tv) { // && z1>0) { // Tidal Volume Calculations
EventDataType t=0; EventDataType t=0;
for (int g=z1;g<z2;g++) { for (int g=z1;g<z2;g++) {
@ -162,8 +159,7 @@ int CalcRespRate::filterFlow(EventList *in, EventList *out, EventList *tv, Event
l1=time; l1=time;
if (l2>0) { if (l2>0) {
z1=i; z1=i;
tmp32=l2-l1; len=qAbs(l2-l1);
len=abs(tmp32);
if (tv) { if (tv) {
// Average the other half of the breath to increase accuracy. // Average the other half of the breath to increase accuracy.
EventDataType t=0; EventDataType t=0;
@ -435,7 +431,7 @@ int calcPulseChange(Session *session)
time2=el.time(j); time2=el.time(j);
if (time2 > time+window) break; if (time2 > time+window) break;
val2=el.data(j); val2=el.data(j);
tmp=fabs(val2-val); tmp=qAbs(val2-val);
if (tmp > lv) { if (tmp > lv) {
lastt=time2; lastt=time2;
//lv=tmp; //lv=tmp;

2
SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -1192,7 +1192,7 @@ bool PRS1Loader::OpenWaveforms(Session *session,QString filename)
duration=m_buffer[pos+0xf] | m_buffer[pos+0x10] << 8; // block duration in seconds duration=m_buffer[pos+0xf] | m_buffer[pos+0x10] << 8; // block duration in seconds
if (diff<0) { if (diff<0) {
qDebug() << "Padding waveform to keep sync" << block; qDebug() << "Padding waveform to keep sync" << block;
//diff=abs(diff); //diff=qAbs(diff);
for (int i=0;i<num_signals;i++) { for (int i=0;i<num_signals;i++) {
for (int j=0;j<diff;j++) { for (int j=0;j<diff;j++) {
for (int k=0;k<whl[i].interleave;k++) for (int k=0;k<whl[i].interleave;k++)