Commit ecfb5801a854f2beaaef5ddca2b57223675c7f55

Authored by 김태훈
1 parent b857261320
Exists in master and in 2 other branches fhd, fhd-demo

디버깅 요청 사항 반영

- 원형 게이지 라벨에서 현재 값 출력할 때 게이지도 출력하도록 수정
 - 처음 시작할 때 메인 보드에 System On 명령 보내도록 추가
app/gui/oven_control/autocookwindow.cpp
@@ -484,8 +484,6 @@ void AutoCookWindow::updateView() @@ -484,8 +484,6 @@ void AutoCookWindow::updateView()
484 } 484 }
485 } 485 }
486 486
487 - ui->humidityGauge->setValue(showingStep.humidity);  
488 -  
489 int humidity; 487 int humidity;
490 if (showingCurrentHumidity) 488 if (showingCurrentHumidity)
491 humidity = oven->currentHumidity(); 489 humidity = oven->currentHumidity();
@@ -496,10 +494,9 @@ void AutoCookWindow::updateView() @@ -496,10 +494,9 @@ void AutoCookWindow::updateView()
496 { 494 {
497 lastViewHumidity = humidity; 495 lastViewHumidity = humidity;
498 ui->humidityLabel->setText(QString("%1%").arg(humidity)); 496 ui->humidityLabel->setText(QString("%1%").arg(humidity));
  497 + ui->humidityGauge->setValue(humidity);
499 } 498 }
500 499
501 - ui->heatGauge->setValue(showingStep.temp);  
502 -  
503 int temp; 500 int temp;
504 if (showingCurrentTemp) 501 if (showingCurrentTemp)
505 temp = oven->currentTemp(); 502 temp = oven->currentTemp();
@@ -510,6 +507,7 @@ void AutoCookWindow::updateView() @@ -510,6 +507,7 @@ void AutoCookWindow::updateView()
510 { 507 {
511 lastViewTemp = temp; 508 lastViewTemp = temp;
512 ui->heatLabel->setText(QString("%1℃").arg(temp)); 509 ui->heatLabel->setText(QString("%1℃").arg(temp));
  510 + ui->heatGauge->setValue(temp);
513 } 511 }
514 } 512 }
515 } 513 }
app/gui/oven_control/main.cpp
@@ -22,5 +22,7 @@ int main(int argc, char *argv[]) @@ -22,5 +22,7 @@ int main(int argc, char *argv[])
22 MainWindow w; 22 MainWindow w;
23 w.showFullScreen(); 23 w.showFullScreen();
24 24
  25 + udp->turnOn(TG_SYSTEM);
  26 +
25 return a.exec(); 27 return a.exec();
26 } 28 }
app/gui/oven_control/preheatpopup.cpp
@@ -66,7 +66,9 @@ void PreheatPopup::updateView() @@ -66,7 +66,9 @@ void PreheatPopup::updateView()
66 temp = oven->temp(); 66 temp = oven->temp();
67 67
68 ui->humidityLabel->setText(QString().sprintf("%d%%", humidity)); 68 ui->humidityLabel->setText(QString().sprintf("%d%%", humidity));
  69 + ui->humidityGauge->setValue(humidity);
69 ui->heatLabel->setText(QString().sprintf("%d℃", temp)); 70 ui->heatLabel->setText(QString().sprintf("%d℃", temp));
  71 + ui->heatGauge->setValue(temp);
70 72
71 ui->preheatGauge->setValue(oven->currentTemp()); 73 ui->preheatGauge->setValue(oven->currentTemp());
72 } 74 }