From eb617c9027cacc9efb4ea9762e011717082c205b Mon Sep 17 00:00:00 2001 From: byloveletter Date: Fri, 28 Jul 2017 20:48:01 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B3=A0=EA=B0=9D=EC=82=AC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EC=9A=94=EC=B2=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 실시간 센서 기능 수정 : B4 센서 추가 - UI 변경 및 기능 추가 --- app/gui/oven_control/realtimesensorwindow.cpp | 4 + app/gui/oven_control/realtimesensorwindow.h | 6 +- app/gui/oven_control/realtimesensorwindow.ui | 2508 +++++++++++++------------ 3 files changed, 1346 insertions(+), 1172 deletions(-) diff --git a/app/gui/oven_control/realtimesensorwindow.cpp b/app/gui/oven_control/realtimesensorwindow.cpp index df345f4..bed32b3 100644 --- a/app/gui/oven_control/realtimesensorwindow.cpp +++ b/app/gui/oven_control/realtimesensorwindow.cpp @@ -30,6 +30,7 @@ RealtimeSensorWindow::RealtimeSensorWindow(QWidget *parent) : m_arrLbState[0][6] = ui->m_ctrlLbListState_1_7; m_arrLbState[0][7] = ui->m_ctrlLbListState_1_8; m_arrLbState[0][8] = ui->m_ctrlLbListState_1_9; + m_arrLbState[0][9] = ui->m_ctrlLbListState_1_10; m_arrLbState[1][0] = ui->m_ctrlLbListState_2_1; m_arrLbState[1][1] = ui->m_ctrlLbListState_2_2; @@ -40,6 +41,7 @@ RealtimeSensorWindow::RealtimeSensorWindow(QWidget *parent) : m_arrLbState[1][6] = ui->m_ctrlLbListState_2_7; m_arrLbState[1][7] = ui->m_ctrlLbListState_2_8; m_arrLbState[1][8] = ui->m_ctrlLbListState_2_9; + m_arrLbState[1][9] = ui->m_ctrlLbListState_2_10; m_arrLbState[2][0] = ui->m_ctrlLbListState_3_1; m_arrLbState[2][1] = ui->m_ctrlLbListState_3_2; @@ -50,6 +52,7 @@ RealtimeSensorWindow::RealtimeSensorWindow(QWidget *parent) : m_arrLbState[2][6] = ui->m_ctrlLbListState_3_7; m_arrLbState[2][7] = ui->m_ctrlLbListState_3_8; m_arrLbState[2][8] = ui->m_ctrlLbListState_3_9; + m_arrLbState[2][9] = ui->m_ctrlLbListState_3_10; m_arrLbState[3][0] = ui->m_ctrlLbListState_4_1; m_arrLbState[3][1] = ui->m_ctrlLbListState_4_2; @@ -60,6 +63,7 @@ RealtimeSensorWindow::RealtimeSensorWindow(QWidget *parent) : m_arrLbState[3][6] = ui->m_ctrlLbListState_4_7; m_arrLbState[3][7] = ui->m_ctrlLbListState_4_8; m_arrLbState[3][8] = ui->m_ctrlLbListState_4_9; + m_arrLbState[3][9] = ui->m_ctrlLbListState_4_10; for(i=0;isrvdata->sensor_log.values[m_arrSensorItemIdxs[i]]); diff --git a/app/gui/oven_control/realtimesensorwindow.h b/app/gui/oven_control/realtimesensorwindow.h index d7558be..de815e8 100644 --- a/app/gui/oven_control/realtimesensorwindow.h +++ b/app/gui/oven_control/realtimesensorwindow.h @@ -6,7 +6,7 @@ #include "servicedata.h" #define REALSENSOR_CONTROL_LIST_COL_MAX 4 -#define REALSENSOR_CONTROL_LIST_ITEM_MAX 9 +#define REALSENSOR_CONTROL_LIST_ITEM_MAX 10 namespace Ui { class RealtimeSensorWindow; @@ -32,10 +32,10 @@ private slots: private: const uint16_t m_arrSensorItemIdxs[REALSENSOR_CONTROL_LIST_ITEM_MAX]={ - 0,1,4,5,6,7,8,12,13 + 0,1,3,4,5,6,7,8,12,13 }; const uint16_t m_arrCriticalValue[REALSENSOR_CONTROL_LIST_ITEM_MAX] = { - 320,120,270,300,300,300,300,80,80 + 320,120,120,270,300,300,300,300,80,80 }; Ui::RealtimeSensorWindow *ui; diff --git a/app/gui/oven_control/realtimesensorwindow.ui b/app/gui/oven_control/realtimesensorwindow.ui index 7329173..fe1a096 100644 --- a/app/gui/oven_control/realtimesensorwindow.ui +++ b/app/gui/oven_control/realtimesensorwindow.ui @@ -13,7 +13,7 @@ #centralwidget { background-image: url(:/images/background/config_service.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } -#midwidget { background-image: url(:/images/config/service/realtime_sensor_bgnd.png); } + @@ -200,1217 +200,1387 @@ QPushButton:pressed , QPushButton:focus{ border-image: url(:/images/bottom_bar/0 QLabel { - color:white; + color:white; } - - - - 3 - 0 - 261 - 71 - - - - - 나눔고딕 - 8 - - - - 목록 - - - Qt::AlignCenter - - - - - - 269 - 0 - 111 - 70 - - - - - 나눔고딕 - 8 - - - - 현재온도 - - - Qt::AlignCenter - - - + 0 - 87 - 256 - 62 + 0 + 793 + 916 - - - 0 - 0 - - - - - Roboto - 10 - 75 - true - false - - - - Qt::NoFocus - - - QPushButton { border-image: url(:/images/button/379_63.png); + + + + 0 + 0 + 793 + 916 + + + + + 2 + + + 0 + + + + + + 0 + 0 + + + + + 0 + 50 + + + + + 나눔고딕 + 8 + + + + 목록 + + + Qt::AlignCenter + + + + + + + + 나눔고딕 + 8 + + + + 최대온도 +도달시간 + + + Qt::AlignCenter + + + + + + + + 나눔고딕 + 8 + + + + 현재온도 + + + Qt::AlignCenter + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 61 + + + + + 16777215 + 60 + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + + 16777215 + 60 + + + + + Roboto + 10 + 75 + true + false + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/button/379_63.png); color: rgb(55, 55, 55); } QPushButton:pressed { border-image: url(:/images/button/379_ov_63.png); } QPushButton { text-align: center;} - - - 실내온도 - - - - - - 269 - 78 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 0 - 182 - 256 - 62 - - - - - 0 - 0 - - - - - Roboto - 10 - 75 - true - false - - - - Qt::NoFocus - - - QPushButton { border-image: url(:/images/button/379_63.png); + + + 벽면온도 + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 61 + + + + + 16777215 + 60 + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 16777215 + 60 + + + + + Roboto + 10 + 75 + true + false + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/button/379_63.png); color: rgb(55, 55, 55); } QPushButton:pressed { border-image: url(:/images/button/379_ov_63.png); } QPushButton { text-align: center;} - - - 퀀칭온도 - - - - - - 0 - 277 - 256 - 62 - - - - - 0 - 0 - - - - - Roboto - 10 - 75 - true - false - - - - Qt::NoFocus - - - QPushButton { border-image: url(:/images/button/379_63.png); + + + 스팀제네레이터온도 + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + + 16777215 + 60 + + + + + Roboto + 10 + 75 + true + false + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/button/379_63.png); color: rgb(55, 55, 55); } QPushButton:pressed { border-image: url(:/images/button/379_ov_63.png); } QPushButton { text-align: center;} - - - 스팀제네레이터온도 - - - - - - 0 - 372 - 256 - 62 - - - - - 0 - 0 - - - - - Roboto - 10 - 75 - true - false - - - - Qt::NoFocus - - - QPushButton { border-image: url(:/images/button/379_63.png); + + + 미트프로브온도2 + + + + + + + + 0 + 0 + + + + + 16777215 + 60 + + + + + Roboto + 10 + 75 + true + false + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/button/379_63.png); color: rgb(55, 55, 55); } QPushButton:pressed { border-image: url(:/images/button/379_ov_63.png); } QPushButton { text-align: center;} - - - 미트프로브온도1 - - - - - - 0 - 467 - 256 - 62 - - - - - 0 - 0 - - - - - Roboto - 10 - 75 - true - false - - - - Qt::NoFocus - - - QPushButton { border-image: url(:/images/button/379_63.png); + + + 기계식온도 + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 16777215 + 60 + + + + + Roboto + 10 + 75 + true + false + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/button/379_63.png); color: rgb(55, 55, 55); } QPushButton:pressed { border-image: url(:/images/button/379_ov_63.png); } QPushButton { text-align: center;} - - - 미트프로브온도2 - - - - - - 0 - 562 - 256 - 62 - - - - - 0 - 0 - - - - - Roboto - 10 - 75 - true - false - - - - Qt::NoFocus - - - QPushButton { border-image: url(:/images/button/379_63.png); + + + 미트프로브온도4 + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + + 16777215 + 60 + + + + + Roboto + 10 + 75 + true + false + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/button/379_63.png); color: rgb(55, 55, 55); } QPushButton:pressed { border-image: url(:/images/button/379_ov_63.png); } QPushButton { text-align: center;} - - - 미트프로브온도3 - - - - - - 0 - 657 - 256 - 62 - - - - - 0 - 0 - - - - - Roboto - 10 - 75 - true - false - - - - Qt::NoFocus - - - QPushButton { border-image: url(:/images/button/379_63.png); + + + PCB 온도 + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + Qt::Vertical + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 16777215 + 60 + + + + + Roboto + 10 + 75 + true + false + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/button/379_63.png); color: rgb(55, 55, 55); } QPushButton:pressed { border-image: url(:/images/button/379_ov_63.png); } QPushButton { text-align: center;} - - - 미트프로브온도4 - - - - - - 0 - 752 - 256 - 62 - - - - - 0 - 0 - - - - - Roboto - 10 - 75 - true - false - - - - Qt::NoFocus - - - QPushButton { border-image: url(:/images/button/379_63.png); + + + 미트프로브온도1 + + + + + + + + 0 + 0 + + + + + 16777215 + 60 + + + + + Roboto + 10 + 75 + true + false + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/button/379_63.png); color: rgb(55, 55, 55); } QPushButton:pressed { border-image: url(:/images/button/379_ov_63.png); } QPushButton { text-align: center;} - - - PCB온도 - - - - - - 382 - 0 - 111 - 70 - - - - - 나눔고딕 - 8 - - - - 최대온도 - - - Qt::AlignCenter - - - - - - 495 - 0 - 111 - 70 - - - - - 나눔고딕 - 8 - - - - 허용범위 - - - Qt::AlignCenter - - - - - - 269 - 173 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 269 - 268 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 269 - 363 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 269 - 458 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 269 - 553 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 269 - 648 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 269 - 743 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 0 - 842 - 256 - 62 - - - - - 0 - 0 - - - - - Roboto - 10 - 75 - true - false - - - - Qt::NoFocus - - - QPushButton { border-image: url(:/images/button/379_63.png); + + + 퀀칭온도 + + + + + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + + 16777215 + 60 + + + + + Roboto + 10 + 75 + true + false + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/button/379_63.png); color: rgb(55, 55, 55); } QPushButton:pressed { border-image: url(:/images/button/379_ov_63.png); } QPushButton { text-align: center;} - - - 기계식온도 - - - - - - 269 - 838 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 382 - 363 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 382 - 648 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 382 - 838 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 382 - 78 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 382 - 553 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 382 - 268 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 382 - 743 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 382 - 173 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 382 - 458 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 496 - 363 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 496 - 648 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 496 - 78 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 496 - 838 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 496 - 553 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 496 - 268 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 496 - 743 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 496 - 173 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 496 - 458 - 111 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 610 - 363 - 181 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 610 - 648 - 181 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 610 - 78 - 181 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 610 - 838 - 181 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 610 - 553 - 181 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 610 - 268 - 181 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 610 - 743 - 181 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 610 - 173 - 181 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 610 - 458 - 181 - 81 - - - - - 10 - - - - - - - Qt::AlignCenter - - - - - - 609 - 0 - 181 - 70 - - - - - 나눔고딕 - 8 - - - - 최대온도 -도달시간 - - - Qt::AlignCenter - + + + 미트프로브온도3 + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 61 + + + + + 16777215 + 60 + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 61 + + + + + 16777215 + 60 + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 61 + + + + + 16777215 + 60 + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 61 + + + + + 16777215 + 60 + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 61 + + + + + 16777215 + 60 + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 61 + + + + + 16777215 + 60 + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 61 + + + + + 16777215 + 60 + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + + + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + + 0 + 61 + + + + + 16777215 + 60 + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + + 나눔고딕 + 8 + + + + 허용범위 + + + Qt::AlignCenter + + + + + + + + 나눔고딕 + 8 + + + + 최대온도 + + + Qt::AlignCenter + + + + + + + + 10 + + + + + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + + 16777215 + 60 + + + + + Roboto + 10 + 75 + true + false + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/button/379_63.png); +color: rgb(55, 55, 55); } +QPushButton:pressed { border-image: url(:/images/button/379_ov_63.png); } +QPushButton { text-align: center;} + + + + 실내온도 + + + + + + + Qt::Horizontal + + + + + + + Qt::Horizontal + + + + + + + Qt::Horizontal + + + + + + + Qt::Vertical + + + + + + + Qt::Vertical + + + + + + + Qt::Vertical + + + + + -- 2.1.4