]> rtime.felk.cvut.cz Git - eurobot/public.git/commitdiff
displa-qt: Match timing display background color set according to status.
authorMichal Vokac <vokac.m@gmail.com>
Tue, 24 May 2011 14:05:20 +0000 (16:05 +0200)
committerMichal Vokac <vokac.m@gmail.com>
Tue, 24 May 2011 14:05:20 +0000 (16:05 +0200)
src/display-qt/display_orte.cpp
src/display-qt/displayqt.cpp
src/display-qt/promene.h

index ea37bfd60b45f5a3af4220ed55bd99adfcc59834..272b94537b5de18455a71a1ba250c406472c2b31 100644 (file)
@@ -66,12 +66,12 @@ void rcv_match_time_cb (const ORTERecvInfo *info, void *vinstance, void *recvCal
                        status = STATUS_FAILED;
                        break;
        }
-//     if (status != last_status ||
-//         miliseconds_elapsed_since(&last_sent, 1000)) {
-//             inst->status_con(PWR, status);
-//             clock_gettime(CLOCK_MONOTONIC, &last_sent);
-//     }
-//     last_status = status;
+       if (status != last_status ||
+           miliseconds_elapsed_since(&last_sent, 1000)) {
+               inst->status_con(TIM, status);
+               clock_gettime(CLOCK_MONOTONIC, &last_sent);
+       }
+       last_status = status;
 }
 
 void rcv_pwr_voltage_cb (const ORTERecvInfo *info, void *vinstance, void *recvCallBackParam)
index c59c138ebe5ba3e4d04c5d4dac7e6ac80cd95aaf..44bc6cd8314eb05020090b9474a7236c786151b8 100644 (file)
@@ -117,11 +117,9 @@ void DisplayQT::alive(void)
        }
 }
 
-void DisplayQT::display_time(double time) {
-
-       this->match_time = 90 - time;
-
-       ui->matchTime->display(match_time);
+void DisplayQT::display_time(double time)
+{
+       ui->matchTime->display(time);
 }
 
 // 0-modra
@@ -242,7 +240,15 @@ void DisplayQT::display_status(UDE_component_t c, UDE_hw_status_t s)
                                ui->comp_STA->setStyleSheet(RED);
                        else
                                ui->comp_STA->setStyleSheet(YELLOW);
-               break;
+                        break;
+                case TIM:
+                        if(s==STATUS_OK)
+                                ui->matchTime->setStyleSheet(GREEN);
+                        else if(s==STATUS_FAILED)
+                                ui->matchTime->setStyleSheet(RED);
+                        else
+                                ui->matchTime->setStyleSheet(YELLOW);
+                        break;
        }
 }
 
index 31863c3cbdfe03584dbbd8c3f02e92262dd12006..d38a988cadf62723aa692381b188dffd98efdd46 100644 (file)
@@ -21,7 +21,8 @@ typedef enum {
         HOK = 5,
         APP = 6,
         LFT = 7,
-        STA = 8
+        STA = 8,
+        TIM = 9
 } UDE_component_t;
 
 /**