디버깅 요청 사항 반영

- 원형 게이지 라벨에서 현재 값 출력할 때 게이지도 출력하도록 수정 - 처음 시작할 때 메인 보드에 System On 명령 보내도록 추가

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