에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 5228da630215e406a6d12789a861dcca3b6761a9

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

딜레이 변경

Showing 5 changed files with 10 additions and 10 deletions   Show diff stats
app/gui/oven_control/autocookwindow.cpp
  Diff comments   View file @5228da6
@@ -69,11 +69,11 @@ AutoCookWindow::AutoCookWindow(QWidget *parent, Cook cook) : @@ -69,11 +69,11 @@ AutoCookWindow::AutoCookWindow(QWidget *parent, Cook cook) :
69 connect(&returnToCurrentStepTimer, SIGNAL(timeout()), SLOT(returnToCurrentStep())); 69 connect(&returnToCurrentStepTimer, SIGNAL(timeout()), SLOT(returnToCurrentStep()));
70 70
71 showCurrentHumidityTimer.setSingleShot(true); 71 showCurrentHumidityTimer.setSingleShot(true);
72 - showCurrentHumidityTimer.setInterval(3000); 72 + showCurrentHumidityTimer.setInterval(1000);
73 connect(&showCurrentHumidityTimer, SIGNAL(timeout()), SLOT(showCurrentHumidity())); 73 connect(&showCurrentHumidityTimer, SIGNAL(timeout()), SLOT(showCurrentHumidity()));
74 74
75 showCurrentTempTimer.setSingleShot(true); 75 showCurrentTempTimer.setSingleShot(true);
76 - showCurrentTempTimer.setInterval(3000); 76 + showCurrentTempTimer.setInterval(1000);
77 connect(&showCurrentTempTimer, SIGNAL(timeout()), SLOT(showCurrentTemp())); 77 connect(&showCurrentTempTimer, SIGNAL(timeout()), SLOT(showCurrentTemp()));
78 78
79 connect(&checkCookTimer, SIGNAL(timeout()), SLOT(checkCook())); 79 connect(&checkCookTimer, SIGNAL(timeout()), SLOT(checkCook()));
app/gui/oven_control/cookpanelbutton.cpp
  Diff comments   View file @5228da6
@@ -19,7 +19,7 @@ CookPanelButton::CookPanelButton(CookRecord record, QWidget *parent) : @@ -19,7 +19,7 @@ CookPanelButton::CookPanelButton(CookRecord record, QWidget *parent) :
19 connect(button, &QPushButton::pressed, SoundPlayer::playClick); 19 connect(button, &QPushButton::pressed, SoundPlayer::playClick);
20 20
21 longPressedTimer.setSingleShot(true); 21 longPressedTimer.setSingleShot(true);
22 - longPressedTimer.setInterval(2000); 22 + longPressedTimer.setInterval(3000);
23 connect(&longPressedTimer, SIGNAL(timeout()), SLOT(emitLongPressed())); 23 connect(&longPressedTimer, SIGNAL(timeout()), SLOT(emitLongPressed()));
24 } 24 }
25 25
app/gui/oven_control/cooldownpopup.cpp
  Diff comments   View file @5228da6
@@ -39,11 +39,11 @@ CooldownPopup::CooldownPopup(QWidget *parent, Oven *oven) : @@ -39,11 +39,11 @@ CooldownPopup::CooldownPopup(QWidget *parent, Oven *oven) :
39 connect(oven, SIGNAL(changed(Oven*)), SLOT(updateView())); 39 connect(oven, SIGNAL(changed(Oven*)), SLOT(updateView()));
40 40
41 cooldownStartTimer.setSingleShot(true); 41 cooldownStartTimer.setSingleShot(true);
42 - cooldownStartTimer.setInterval(2000); 42 + cooldownStartTimer.setInterval(3000);
43 connect(&cooldownStartTimer, SIGNAL(timeout()), SLOT(start())); 43 connect(&cooldownStartTimer, SIGNAL(timeout()), SLOT(start()));
44 44
45 showCurrentTempTimer.setSingleShot(true); 45 showCurrentTempTimer.setSingleShot(true);
46 - showCurrentTempTimer.setInterval(2000); 46 + showCurrentTempTimer.setInterval(1000);
47 connect(&showCurrentTempTimer, SIGNAL(timeout()), SLOT(showCurrentTemp())); 47 connect(&showCurrentTempTimer, SIGNAL(timeout()), SLOT(showCurrentTemp()));
48 48
49 checkOvenTimer.setInterval(100); 49 checkOvenTimer.setInterval(100);
app/gui/oven_control/manualcookwindow.cpp
  Diff comments   View file @5228da6
@@ -114,15 +114,15 @@ ManualCookWindow::ManualCookWindow(QWidget *parent, Define::Mode mode) : @@ -114,15 +114,15 @@ ManualCookWindow::ManualCookWindow(QWidget *parent, Define::Mode mode) :
114 connect(ui->interTempSlider, SIGNAL(sliderMoved(int)), this, SLOT(updateView())); 114 connect(ui->interTempSlider, SIGNAL(sliderMoved(int)), this, SLOT(updateView()));
115 115
116 startCookingTimer.setSingleShot(true); 116 startCookingTimer.setSingleShot(true);
117 - startCookingTimer.setInterval(2000); 117 + startCookingTimer.setInterval(3000);
118 connect(&startCookingTimer, SIGNAL(timeout()), SLOT(start())); 118 connect(&startCookingTimer, SIGNAL(timeout()), SLOT(start()));
119 119
120 showCurrentHumidityTimer.setSingleShot(true); 120 showCurrentHumidityTimer.setSingleShot(true);
121 - showCurrentHumidityTimer.setInterval(2000); 121 + showCurrentHumidityTimer.setInterval(1000);
122 connect(&showCurrentHumidityTimer, SIGNAL(timeout()), SLOT(showCurrentHumidity())); 122 connect(&showCurrentHumidityTimer, SIGNAL(timeout()), SLOT(showCurrentHumidity()));
123 123
124 showCurrentTempTimer.setSingleShot(true); 124 showCurrentTempTimer.setSingleShot(true);
125 - showCurrentTempTimer.setInterval(2000); 125 + showCurrentTempTimer.setInterval(1000);
126 connect(&showCurrentTempTimer, SIGNAL(timeout()), SLOT(showCurrentTemp())); 126 connect(&showCurrentTempTimer, SIGNAL(timeout()), SLOT(showCurrentTemp()));
127 127
128 connect(oven, SIGNAL(changed(Oven*)), this, SLOT(onOvenUpdated(Oven*))); 128 connect(oven, SIGNAL(changed(Oven*)), this, SLOT(onOvenUpdated(Oven*)));
app/gui/oven_control/preheatpopup.cpp
  Diff comments   View file @5228da6
@@ -17,11 +17,11 @@ PreheatPopup::PreheatPopup(QWidget *parent, Oven *oven) : @@ -17,11 +17,11 @@ PreheatPopup::PreheatPopup(QWidget *parent, Oven *oven) :
17 connect(oven, SIGNAL(changed(Oven*)), SLOT(onOvenChanged())); 17 connect(oven, SIGNAL(changed(Oven*)), SLOT(onOvenChanged()));
18 18
19 showCurrentHumidityTimer.setSingleShot(true); 19 showCurrentHumidityTimer.setSingleShot(true);
20 - showCurrentHumidityTimer.setInterval(3000); 20 + showCurrentHumidityTimer.setInterval(1000);
21 connect(&showCurrentHumidityTimer, SIGNAL(timeout()), SLOT(showCurrentHumidity())); 21 connect(&showCurrentHumidityTimer, SIGNAL(timeout()), SLOT(showCurrentHumidity()));
22 22
23 showCurrentTempTimer.setSingleShot(true); 23 showCurrentTempTimer.setSingleShot(true);
24 - showCurrentTempTimer.setInterval(3000); 24 + showCurrentTempTimer.setInterval(1000);
25 connect(&showCurrentTempTimer, SIGNAL(timeout()), SLOT(showCurrentTemp())); 25 connect(&showCurrentTempTimer, SIGNAL(timeout()), SLOT(showCurrentTemp()));
26 26
27 ui->preheatGauge->setMaximum(oven->temp()); 27 ui->preheatGauge->setMaximum(oven->temp());