에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit f5daa9571abb0359724f3137861e51e8151128a4

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

INV 열기/닫기 동작 않는 문제 수정

Showing 3 changed files with 5 additions and 5 deletions   Show diff stats
app/gui/oven_control/valvetestwindow.cpp
  Diff comments   View file @f5daa95
@@ -116,12 +116,12 @@ void ValveTestWindow::on_steamPumpButton_clicked() @@ -116,12 +116,12 @@ void ValveTestWindow::on_steamPumpButton_clicked()
116 steamPumpOn(); 116 steamPumpOn();
117 } 117 }
118 118
119 -void ValveTestWindow::on_steamPumpButton_2_clicked() 119 +void ValveTestWindow::on_innerCleanValveButton_clicked()
120 { 120 {
121 if (udp->inv()) 121 if (udp->inv())
122 - steamPumpOff(); 122 + innerCleanValveClose();
123 else 123 else
124 - steamPumpOn(); 124 + innerCleanValveOpen();
125 } 125 }
126 126
127 127
app/gui/oven_control/valvetestwindow.h
  Diff comments   View file @f5daa95
@@ -39,6 +39,7 @@ private slots: @@ -39,6 +39,7 @@ private slots:
39 39
40 void on_steamValveButton_clicked(); 40 void on_steamValveButton_clicked();
41 void on_steamPumpButton_clicked(); 41 void on_steamPumpButton_clicked();
  42 + void on_innerCleanValveButton_clicked();
42 void on_quenchingValveButton_clicked(); 43 void on_quenchingValveButton_clicked();
43 void on_sideValveButton_clicked(); 44 void on_sideValveButton_clicked();
44 void on_cleanValveButton_clicked(); 45 void on_cleanValveButton_clicked();
@@ -46,7 +47,6 @@ private slots: @@ -46,7 +47,6 @@ private slots:
46 void on_backButton_clicked(); 47 void on_backButton_clicked();
47 48
48 49
49 - void on_steamPumpButton_2_clicked();  
50 50
51 private: 51 private:
52 Ui::ValveTestWindow *ui; 52 Ui::ValveTestWindow *ui;
app/gui/oven_control/valvetestwindow.ui
  Diff comments   View file @f5daa95
@@ -1194,7 +1194,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -1194,7 +1194,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
1194 <string>서비스단계(엔지니어모드) &gt; 기능테스트 &gt; 급수밸브</string> 1194 <string>서비스단계(엔지니어모드) &gt; 기능테스트 &gt; 급수밸브</string>
1195 </property> 1195 </property>
1196 </widget> 1196 </widget>
1197 - <widget class="QPushButton" name="steamPumpButton_2"> 1197 + <widget class="QPushButton" name="innerCleanValveButton">
1198 <property name="geometry"> 1198 <property name="geometry">
1199 <rect> 1199 <rect>
1200 <x>696</x> 1200 <x>696</x>