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-04 18:11:52 +02:00
parent 94e5bc8e6f df33598049
commit ce22916e92
Signed by: dorian
GPG Key ID: D3B255CB8BC7CD37
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ScStwLibraries/resources/qml/lib/de/itsblue/ScStw/Styling/Components/TimerColumn.qml
View File

@ -87,7 +87,7 @@ Column {
width: parent.width * 0.8
height: parent.height * 0.8
color: ([ScStwTimer.WON].indexOf(control.timers[index]["state"]) >= 0 ? control.colors.success :
color: ([ScStwTimer.WON,ScStwTimer.WILDCARD].indexOf(control.timers[index]["state"]) >= 0 ? control.colors.success :
[ScStwTimer.FAILED,ScStwTimer.LOST].indexOf(control.timers[index]["state"]) >= 0 ? control.colors.error:
control.colors.text)

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

@ -111,6 +111,8 @@ void ScStwRemoteRace::handleClientStateChange() {
this->timers = this->localTimers;
this->localTimers.clear();
emit this->timersChanged();
emit this->detailsChanged();
emit this->currentStartDelayChanged();
this->competitionMode = false;
this->setState(IDLE);
break;
@ -139,7 +141,6 @@ bool ScStwRemoteRace::local() {
* @param data
*/
void ScStwRemoteRace::handleBaseStationSignal(ScStw::SignalKey key, QVariant data) {
//qDebug() << "got signal: " << data;
switch (key) {
case ScStw::RaceDetailsChanged:
{
@ -154,6 +155,8 @@ void ScStwRemoteRace::handleBaseStationSignal(ScStw::SignalKey key, QVariant dat
void ScStwRemoteRace::refreshDetails(QVariantMap details) {
// the details of the race have changed:
qDebug() << "RACE DETAILS: " << details;
// state
this->setState(ScStwRace::RaceState(details["state"].toInt()));

3
ScStwLibraries/sources/client/scstwremotetimer.cpp
View File

@ -19,6 +19,7 @@ void ScStwRemoteTimer::setStopTime(double stopTime) {
void ScStwRemoteTimer::setReactionTime(double reactionTime) {
this->reactionTime = reactionTime;
emit this->reactionTimeChanged();
}
void ScStwRemoteTimer::setLetter(QString newLetter) {
@ -36,6 +37,6 @@ void ScStwRemoteTimer::setState(TimerState newState){
if(this->state != newState) {
this->state = newState;
qDebug() << "+ [INFO][REMOTETIMER] timer state changed: " << newState;
emit this->stateChanged();
emit this->stateChanged(this->state);
}
}

14
ScStwLibraries/sources/scstwtimer.cpp
View File

@ -237,26 +237,32 @@ QString ScStwTimer::getText() {
case ScStwTimer::STARTING:
newTime = 0;
break;
case ScStwTimer::WAITING:
newText = "please wait...";
break;
case ScStwTimer::RUNNING:
newTime = this->getCurrentTime();
break;
case ScStwTimer::WAITING:
newText = "please wait...";
break;
case ScStwTimer::WON:
newTime = this->getCurrentTime();
break;
case ScStwTimer::LOST:
newTime = this->getCurrentTime();
break;
case ScStwTimer::FAILING:
newText = "please wait...";
break;
case ScStwTimer::FAILED:
newText = "false start";
break;
case ScStwTimer::WILDCARD:
newText = "wildcard";
break;
case ScStwTimer::CANCELLED:
newText = "cancelled";
break;
case ScStwTimer::INCIDENT:
newText = "Technical incident!";
newText = "Technical\nincident!";
break;
case ScStwTimer::DISABLED:
newText = "---";