diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2017-07-21 05:23:31 +0200 | 
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2017-07-21 05:25:21 +0200 | 
| commit | 4358241517f0c4740a729959855cab8db4c7f4c6 (patch) | |
| tree | 98a84fd12edcc3e8e30cc8dbee2bab78b029c95a | |
| parent | 0b2d3cff4d44656aac6001ef7bfecc94f91bdc57 (diff) | |
tracker/s2bot: reformat to indent as 4 spaces
| -rw-r--r-- | tracker-s2bot/ftnoir_tracker_s2bot.cpp | 106 | 
1 files changed, 53 insertions, 53 deletions
| diff --git a/tracker-s2bot/ftnoir_tracker_s2bot.cpp b/tracker-s2bot/ftnoir_tracker_s2bot.cpp index 48220c5a..66c4fecf 100644 --- a/tracker-s2bot/ftnoir_tracker_s2bot.cpp +++ b/tracker-s2bot/ftnoir_tracker_s2bot.cpp @@ -28,61 +28,61 @@ static const t bound(t datum, t least, t max)  }  void tracker_s2bot::run() { -	if (s.freq == 0) s.freq = 10; -	timer.setInterval(1000.0/s.freq); -	timer.setSingleShot(false); -	connect(&timer, &QTimer::timeout, [this]() { -		auto reply = m_nam->get(QNetworkRequest(QUrl("http://localhost:17317/poll"))); -		connect(reply, &QNetworkReply::finished, [this, reply]() { -			if (reply->error() == QNetworkReply::NoError) { -				qDebug() << "Request submitted OK"; -			} -			else { -				qWarning() << "Request bounced:" << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute) << reply->errorString(); -				return; -			} -			QByteArray ba = reply->readAll(); -			QStringList slist = QString(ba).split(QRegExp("[\r\n]"), QString::SkipEmptyParts); -			int order[] = { -				bound<int>(s.idx_x, 0, 3), -				bound<int>(s.idx_y, 0, 3), -				bound<int>(s.idx_z, 0, 3) -			}; -			double orient[4] = { 0, 0, 0, 0 }; -			static const int add_cbx[] = { -				0, -				90, -				-90, -				180, -				-180, -			}; -			int indices[] = { s.add_yaw, s.add_pitch, s.add_roll }; -			for (auto line : slist) { -				QStringList keyval = line.split(" "); -				if (keyval.count() < 2) continue; -				if (keyval[0].startsWith("accelerometerZ")) orient[0] = keyval[1].toInt(); -				else if (keyval[0].startsWith("accelerometerY")) orient[1] = keyval[1].toInt(); -				else if (keyval[0].startsWith("accelerometerX")) orient[2] = keyval[1].toInt(); -				else if (keyval[0].startsWith("bearing")) orient[3] = keyval[1].toInt(); -			} -			QMutexLocker foo(&mtx); -			static constexpr double r2d = 180 / M_PI; +    if (s.freq == 0) s.freq = 10; +    timer.setInterval(1000.0/s.freq); +    timer.setSingleShot(false); +    connect(&timer, &QTimer::timeout, [this]() { +        auto reply = m_nam->get(QNetworkRequest(QUrl("http://localhost:17317/poll"))); +        connect(reply, &QNetworkReply::finished, [this, reply]() { +            if (reply->error() == QNetworkReply::NoError) { +                qDebug() << "Request submitted OK"; +            } +            else { +                qWarning() << "Request bounced:" << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute) << reply->errorString(); +                return; +            } +            QByteArray ba = reply->readAll(); +            QStringList slist = QString(ba).split(QRegExp("[\r\n]"), QString::SkipEmptyParts); +            int order[] = { +                bound<int>(s.idx_x, 0, 3), +                bound<int>(s.idx_y, 0, 3), +                bound<int>(s.idx_z, 0, 3) +            }; +            double orient[4] = { 0, 0, 0, 0 }; +            static const int add_cbx[] = { +                0, +                90, +                -90, +                180, +                -180, +            }; +            int indices[] = { s.add_yaw, s.add_pitch, s.add_roll }; +            for (auto line : slist) { +                QStringList keyval = line.split(" "); +                if (keyval.count() < 2) continue; +                if (keyval[0].startsWith("accelerometerZ")) orient[0] = keyval[1].toInt(); +                else if (keyval[0].startsWith("accelerometerY")) orient[1] = keyval[1].toInt(); +                else if (keyval[0].startsWith("accelerometerX")) orient[2] = keyval[1].toInt(); +                else if (keyval[0].startsWith("bearing")) orient[3] = keyval[1].toInt(); +            } +            QMutexLocker foo(&mtx); +            static constexpr double r2d = 180 / M_PI;                          (void)r2d; -			for (int i = 0; i < 3; i++) -			{ -				int val = 0; -				int idx = indices[order[i]]; -				if (idx >= 0 && idx < (int)(sizeof(add_cbx) / sizeof(*add_cbx))) -					val = add_cbx[idx]; -				pose[Yaw + i] = orient[order[i]] + val; // * r2d if it was radians -			} -			reply->close(); -			reply->deleteLater(); -		}); -	}); +            for (int i = 0; i < 3; i++) +            { +                int val = 0; +                int idx = indices[order[i]]; +                if (idx >= 0 && idx < (int)(sizeof(add_cbx) / sizeof(*add_cbx))) +                    val = add_cbx[idx]; +                pose[Yaw + i] = orient[order[i]] + val; // * r2d if it was radians +            } +            reply->close(); +            reply->deleteLater(); +        }); +    }); -	timer.start(); -	exec(); +    timer.start(); +    exec();          timer.stop();  } | 
