ScStw/shared-libraries
ScStw
/
shared-libraries
2
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Dorian Zedler 2020-10-05 22:21:54 +02:00
parent 9bd3e53fae c9bf812615
commit 1ee5a059ac
Signed by: dorian
GPG Key ID: D3B255CB8BC7CD37
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ScStwLibraries/headers/scstwrace.h
View File

@ -53,7 +53,7 @@ class ScStwRace : public QObject
{
Q_OBJECT
Q_PROPERTY(RaceState state READ getState NOTIFY stateChanged)
Q_PROPERTY(QVariantList timers READ getTimerDetailList NOTIFY timersChanged)
Q_PROPERTY(QVariantList timers READ getTimerDetailList NOTIFY timersChanged)
Q_PROPERTY(QVariantMap currentStartDelay READ getCurrentStartDelay NOTIFY currentStartDelayChanged)
Q_PROPERTY(bool isReadyForNextState READ getIsReadyForNextState NOTIFY isReadyForNextStateChanged)
Q_PROPERTY(bool competitionMode READ getCompetitionMode NOTIFY competitionModeChanged)

1
ScStwLibraries/headers/scstwtimer.h
View File

@ -105,6 +105,7 @@ public:
ExtensionBatteryNotFine, /*!< The battery level of one or more extension is critical or unknown */
ClimberIsNotReady /*!< The startpad of the timer is not triggered */
};
Q_ENUM(ReadyState)
protected:
/*!

10
ScStwLibraries/sources/client/scstwremoterace.cpp
View File

@ -157,9 +157,6 @@ void ScStwRemoteRace::refreshDetails(QVariantMap details) {
qDebug() << "RACE DETAILS: " << details;
// state
this->setState(ScStwRace::RaceState(details["state"].toInt()));
// competition mode
if(this->competitionMode != details["competitionMode"].toBool()) {
this->competitionMode = details["competitionMode"].toBool();
@ -182,6 +179,9 @@ void ScStwRemoteRace::refreshDetails(QVariantMap details) {
// timers
this->refreshRemoteTimers(details["timers"].toList());
// state
this->setState(ScStwRace::RaceState(details["state"].toInt()));
// isReady
if(this->state == WAITING) {
this->isReadyForNextState = details["isReadyForNextState"].toBool();
@ -212,6 +212,8 @@ void ScStwRemoteRace::rebuildRemoteTimers(QVariantList remoteTimers) {
bool ScStwRemoteRace::refreshRemoteTimers(QVariantList remoteTimers) {
qDebug() << "REFRESHING TIMERS";
if(remoteTimers.length() != this->remoteTimers.length()){
// local timers are out of sync
this->rebuildRemoteTimers(remoteTimers);
@ -242,6 +244,8 @@ bool ScStwRemoteRace::refreshRemoteTimers(QVariantList remoteTimers) {
this->remoteTimers[currId]->setState(newState);
}
emit this->timersChanged();
return true;
}

2
ScStwLibraries/sources/scstwtimer.cpp
View File

@ -262,7 +262,7 @@ QString ScStwTimer::getText() {
newText = "cancelled";
break;
case ScStwTimer::INCIDENT:
newText = "Technical\nincident!";
newText = "Technical incident!";
break;
case ScStwTimer::DISABLED:
newText = "---";