diff --git a/app/gui/oven_control/autocookcheckwindow.cpp b/app/gui/oven_control/autocookcheckwindow.cpp index 001126e..79fb5e5 100644 --- a/app/gui/oven_control/autocookcheckwindow.cpp +++ b/app/gui/oven_control/autocookcheckwindow.cpp @@ -189,7 +189,7 @@ void AutoCookCheckWindow::updateView() ui->doorStepLabel->setText(tr("중심 온도계 삽입")); ui->cookStepAnimation->load(":/images/animation/thermometer_01.png"); ui->cookStepAnimation->load(":/images/animation/thermometer_02.png"); - ui->cookStepAnimation->setGeometry((900-210)/2, 800, 210, 307); + ui->cookStepAnimation->setGeometry((1080-252)/2, 960, 252, 368); ui->cookStepAnimation->start(300); break; case Define::Load: @@ -201,7 +201,7 @@ void AutoCookCheckWindow::updateView() ui->cookStepAnimation->load(":/images/animation/load_03.png"); ui->cookStepAnimation->load(":/images/animation/load_02.png"); ui->cookStepAnimation->load(":/images/animation/load_01.png"); - ui->cookStepAnimation->setGeometry((900-264)/2, 800, 264, 307); + ui->cookStepAnimation->setGeometry((1080-317)/2, 960, 317, 368); ui->cookStepAnimation->start(300); break; case Define::Cut: @@ -209,7 +209,7 @@ void AutoCookCheckWindow::updateView() ui->cookStepAnimation->load(":/images/animation/cut_01.png"); ui->cookStepAnimation->load(":/images/animation/cut_02.png"); ui->cookStepAnimation->load(":/images/animation/cut_03.png"); - ui->cookStepAnimation->setGeometry((900-264)/2, 800, 264, 307); + ui->cookStepAnimation->setGeometry((1080-317)/2, 960, 317, 368); ui->cookStepAnimation->start(300); break; case Define::Pour: @@ -218,7 +218,7 @@ void AutoCookCheckWindow::updateView() ui->cookStepAnimation->load(":/images/animation/pour_02.png"); ui->cookStepAnimation->load(":/images/animation/pour_03.png"); ui->cookStepAnimation->load(":/images/animation/pour_04.png"); - ui->cookStepAnimation->setGeometry((900-264)/2, 800, 264, 307); + ui->cookStepAnimation->setGeometry((1080-317)/2, 960, 317, 368); ui->cookStepAnimation->start(300); break; default: diff --git a/app/gui/oven_control/autocookselectionwindow.cpp b/app/gui/oven_control/autocookselectionwindow.cpp index 1a2d2e3..a8c4386 100644 --- a/app/gui/oven_control/autocookselectionwindow.cpp +++ b/app/gui/oven_control/autocookselectionwindow.cpp @@ -33,7 +33,7 @@ AutoCookSelectionWindow::AutoCookSelectionWindow(QWidget *parent, Define::CookTy connect(sm, SIGNAL(mapped(int)), SLOT(onCookSelected(int))); QFont font = this->font(); - font.setPointSize(10); + font.setPointSize(12); font.setBold(true); font.setWeight(75); @@ -51,11 +51,11 @@ AutoCookSelectionWindow::AutoCookSelectionWindow(QWidget *parent, Define::CookTy QWidget *last = this; for (int idx = 0; idx < cnt; idx++) { - int x = 12 + (idx % 3) * 294; - int y = 615 + (idx / 3) * 80; + int x = 14 + (idx % 3) * 352; + int y = 738 + (idx / 3) * 96; QPushButton *pb = new QPushButton(this); - pb->setGeometry(QRect(x, y, 288, 70)); + pb->setGeometry(QRect(x, y, 345, 84)); pb->setFont(font); pb->setStyleSheet(stylesheet); pb->setText(book.list.at(idx)); diff --git a/app/gui/oven_control/autocookwindow.cpp b/app/gui/oven_control/autocookwindow.cpp index cfd60ca..3a22014 100644 --- a/app/gui/oven_control/autocookwindow.cpp +++ b/app/gui/oven_control/autocookwindow.cpp @@ -525,7 +525,7 @@ void AutoCookWindow::updateView() ui->cookStepAnimation->load(":/images/animation/load_03.png"); ui->cookStepAnimation->load(":/images/animation/load_02.png"); ui->cookStepAnimation->load(":/images/animation/load_01.png"); - ui->cookStepAnimation->setGeometry((900-264)/2, 800, 264, 307); + ui->cookStepAnimation->setGeometry((1080-317)/2, 960, 317, 368); ui->cookStepAnimation->start(300); break; case Define::Cut: @@ -533,7 +533,7 @@ void AutoCookWindow::updateView() ui->cookStepAnimation->load(":/images/animation/cut_01.png"); ui->cookStepAnimation->load(":/images/animation/cut_02.png"); ui->cookStepAnimation->load(":/images/animation/cut_03.png"); - ui->cookStepAnimation->setGeometry((900-264)/2, 800, 264, 307); + ui->cookStepAnimation->setGeometry((1080-317)/2, 960, 317, 368); ui->cookStepAnimation->start(300); break; case Define::Pour: @@ -542,7 +542,7 @@ void AutoCookWindow::updateView() ui->cookStepAnimation->load(":/images/animation/pour_02.png"); ui->cookStepAnimation->load(":/images/animation/pour_03.png"); ui->cookStepAnimation->load(":/images/animation/pour_04.png"); - ui->cookStepAnimation->setGeometry((900-264)/2, 800, 264, 307); + ui->cookStepAnimation->setGeometry((1080-317)/2, 960, 317, 368); ui->cookStepAnimation->start(300); break; default: diff --git a/app/gui/oven_control/circulargauge.cpp b/app/gui/oven_control/circulargauge.cpp index c733bec..82fd97c 100644 --- a/app/gui/oven_control/circulargauge.cpp +++ b/app/gui/oven_control/circulargauge.cpp @@ -47,12 +47,12 @@ void CircularGauge::paintEvent(QPaintEvent */*event*/) painter.save(); - QRect rect((291-283)/2, (290-282)/2, 283, 282); + QRect rect((349-339)/2, (348-338)/2, 339, 338); qreal degree = (qreal) qMax(value - minimum, 0) / qMax(maximum - minimum, 1) * 345; QBrush barBrush(bar); - barBrush.setTransform(QTransform().translate(4, 3)); + barBrush.setTransform(QTransform().translate(5, 5)); painter.setPen(Qt::NoPen); painter.setBrush(barBrush); @@ -61,7 +61,7 @@ void CircularGauge::paintEvent(QPaintEvent */*event*/) painter.restore(); painter.save(); - rect = QRect((291-25)/2 + 2, 2, indicator.size().width() - 2, indicator.size().height() - 2); + rect = QRect((349-30)/2 + 2, 2, indicator.size().width() - 2, indicator.size().height() - 2); rect.translate(-size().width() / 2, -size().height() / 2); painter.translate(size().width() / 2, size().height() / 2); @@ -75,10 +75,10 @@ void CircularGauge::paintEvent(QPaintEvent */*event*/) white.setWidth(3); painter.setPen(white); - painter.drawLine(54, 167, 238, 167); + painter.drawLine(64.8, 200.4, 285.6, 200.4); rect.setSize(icon.size()); - rect.moveCenter(QPoint(291/2, 290/3 + 15)); + rect.moveCenter(QPoint(349.2/2, 348/3 + 18)); painter.drawImage(rect, icon); } diff --git a/app/gui/oven_control/configpanelbutton.cpp b/app/gui/oven_control/configpanelbutton.cpp index 0849650..99f9c87 100644 --- a/app/gui/oven_control/configpanelbutton.cpp +++ b/app/gui/oven_control/configpanelbutton.cpp @@ -19,8 +19,8 @@ ConfigPanelButton::ConfigPanelButton(QWidget *parent, uint16_t btn_id) : showingFavoriteButton = false; ui->favoriteButton->hide(); - textRect = QRect(20, 0, 556, 65); - valueRect = QRect(556, 0, 265, 65); + textRect = QRect(24, 0, 667, 78); + valueRect = QRect(667, 0, 318, 78); // connect(ui->pushButton, SIGNAL(pressed()), SIGNAL(pressed())); // connect(ui->pushButton, SIGNAL(released()), SIGNAL(released())); // connect(ui->pushButton, SIGNAL(clicked()), SIGNAL(clicked())); @@ -78,7 +78,7 @@ void ConfigPanelButton::showFavoriteButton() showingFavoriteButton = true; ui->favoriteButton->show(); - textRect = QRect(20 + 77, 0, 556 - 77, 65); + textRect = QRect(24 + 92, 0, 667 - 92, 78); updateIcon(); } @@ -90,7 +90,7 @@ void ConfigPanelButton::hideFavoriteButton() showingFavoriteButton = false; ui->favoriteButton->hide(); - textRect = QRect(20, 0, 556, 65); + textRect = QRect(24, 0, 667, 78); updateIcon(); } diff --git a/app/gui/oven_control/configsteamwashdlg.cpp b/app/gui/oven_control/configsteamwashdlg.cpp index aa19db5..7ad46cb 100644 --- a/app/gui/oven_control/configsteamwashdlg.cpp +++ b/app/gui/oven_control/configsteamwashdlg.cpp @@ -35,7 +35,7 @@ void ConfigSteamWashDlg::updateView() ui->ctrLbBody->setText(tr("시작하시겠습니까?")); ui->ctrLbBody->show(); ui->ctrGauge->hide(); - ui->ctrBtnOk->setGeometry(300, 350, 150, 100); + ui->ctrBtnOk->setGeometry(360, 420, 180, 120); ui->ctrBtnOk->show(); ui->ctrBtnCancel->show(); break; @@ -104,7 +104,7 @@ void ConfigSteamWashDlg::updateView() ui->ctrGauge->setMaximum(1); ui->ctrGauge->setValue(1); ui->ctrGauge->show(); - ui->ctrBtnOk->setGeometry(300, 350, 300, 100); + ui->ctrBtnOk->setGeometry(360, 420, 360, 120); ui->ctrBtnOk->show(); ui->ctrBtnCancel->hide(); } diff --git a/app/gui/oven_control/cook.cpp b/app/gui/oven_control/cook.cpp index 21e75ee..cf70d5a 100644 --- a/app/gui/oven_control/cook.cpp +++ b/app/gui/oven_control/cook.cpp @@ -9,7 +9,7 @@ static void showError(QString errorMessage) { errorDialog = new QErrorMessage; errorDialog->setWindowModality(Qt::ApplicationModal); - errorDialog->setGeometry(QRect(0, 426, 900, 426)); + errorDialog->setGeometry(QRect(0, 511, 1080, 511)); } errorDialog->showMessage(errorMessage); diff --git a/app/gui/oven_control/cookbook.cpp b/app/gui/oven_control/cookbook.cpp index 80f1b79..539a18d 100644 --- a/app/gui/oven_control/cookbook.cpp +++ b/app/gui/oven_control/cookbook.cpp @@ -12,7 +12,7 @@ static void showError(QString errorMessage) { errorDialog = new QErrorMessage; errorDialog->setWindowModality(Qt::ApplicationModal); - errorDialog->setGeometry(QRect(0, 426, 900, 426)); + errorDialog->setGeometry(QRect(0, 511, 1080, 511)); } errorDialog->showMessage(errorMessage); diff --git a/app/gui/oven_control/cookhistory.cpp b/app/gui/oven_control/cookhistory.cpp index 5013f87..936fc4e 100644 --- a/app/gui/oven_control/cookhistory.cpp +++ b/app/gui/oven_control/cookhistory.cpp @@ -1274,7 +1274,7 @@ QPixmap CookHistory::render(CookRecord record) { ManualCookSettingWidget *w = new ManualCookSettingWidget(record.manualRecord.setting); - QPixmap p = w->grab().scaledToHeight(630, Qt::SmoothTransformation); + QPixmap p = w->grab().scaledToHeight(756, Qt::SmoothTransformation); w->deleteLater(); @@ -1284,7 +1284,7 @@ QPixmap CookHistory::render(CookRecord record) { AutoCookSettingWidget *w = new AutoCookSettingWidget(record.autoRecord.setting); - QPixmap p = w->grab().scaledToHeight(630, Qt::SmoothTransformation); + QPixmap p = w->grab().scaledToHeight(756, Qt::SmoothTransformation); w->deleteLater(); diff --git a/app/gui/oven_control/cookpanelbutton.cpp b/app/gui/oven_control/cookpanelbutton.cpp index 44a0032..7535877 100644 --- a/app/gui/oven_control/cookpanelbutton.cpp +++ b/app/gui/oven_control/cookpanelbutton.cpp @@ -46,7 +46,7 @@ void CookPanelButton::showInfo() label = new QLabel(this); label->setPixmap(p); - label->setGeometry((width() - p.width()) / 2, 65, p.width(), p.height()); + label->setGeometry((width() - p.width()) / 2, 93, p.width(), p.height()); } label->show(); diff --git a/app/gui/oven_control/fileprocessgauge.cpp b/app/gui/oven_control/fileprocessgauge.cpp index 0c586d9..8b80f73 100644 --- a/app/gui/oven_control/fileprocessgauge.cpp +++ b/app/gui/oven_control/fileprocessgauge.cpp @@ -16,7 +16,7 @@ void FileProcessGauge::paintEvent(QPaintEvent */*event*/){ QPainter painter(this); painter.setBrush(Qt::NoBrush); painter.setPen(Qt::NoPen); - QRect textRect(0,0,72,40); + QRect textRect(0,0,86,48); qreal percentage = (qreal) (val - min) / qMax(max - min, 1); percentage = qBound((qreal) 0.0, percentage, (qreal) 1.0); @@ -29,12 +29,12 @@ void FileProcessGauge::paintEvent(QPaintEvent */*event*/){ QRect sourceRect(0, 0, body.size().width() * percentage, body.height()); QFont font; font.setFamily("나눔맑은고딕"); - font.setPixelSize(30); + font.setPixelSize(36); painter.setFont(font); painter.setPen(Qt::white); painter.drawPixmap(targetRect, body, sourceRect); painter.drawPixmap(textRect.width()/ 2, textRect.height()+indicator.size().height(), border); painter.drawPixmap(targetRect.right() - indicator.size().width() / 2, textRect.height(), indicator); - textRect.setRect(targetRect.right() - textRect.size().width()/2, textRect.top(),72,40); + textRect.setRect(targetRect.right() - textRect.size().width()/2, textRect.top(),86,48); painter.drawText(textRect,Qt::AlignCenter, QString("%1%").arg(val)); } diff --git a/app/gui/oven_control/manualcookwindow.cpp b/app/gui/oven_control/manualcookwindow.cpp index 87c8ea1..b55f233 100644 --- a/app/gui/oven_control/manualcookwindow.cpp +++ b/app/gui/oven_control/manualcookwindow.cpp @@ -160,8 +160,8 @@ ManualCookWindow::ManualCookWindow(QWidget *parent, Define::Mode mode) : oven->setDefault(mode); QGraphicsDropShadowEffect *effect = new QGraphicsDropShadowEffect(this); - effect->setBlurRadius(10); - effect->setOffset(3, 3); + effect->setBlurRadius(12); + effect->setOffset(4, 4); ui->infoTextLabel->setAttribute(Qt::WA_TransparentForMouseEvents); ui->infoTextLabel->setGraphicsEffect(effect); diff --git a/app/gui/oven_control/multicookautowindow.cpp b/app/gui/oven_control/multicookautowindow.cpp index fef3c24..fac77c9 100644 --- a/app/gui/oven_control/multicookautowindow.cpp +++ b/app/gui/oven_control/multicookautowindow.cpp @@ -39,7 +39,7 @@ void MultiCookAutoWindow::setBook(MultiCookBook *book) connect(sm, SIGNAL(mapped(int)), SLOT(select(int))); QFont font = this->font(); - font.setPointSize(10); + font.setPointSize(12); font.setBold(true); font.setWeight(75); @@ -55,11 +55,11 @@ void MultiCookAutoWindow::setBook(MultiCookBook *book) QWidget *last = this; for (int idx = 0; idx < list.size(); idx++) { - int x = 12 + (idx % 3) * 294; - int y = 615 + (idx / 3) * 80; + int x = 14 + (idx % 3) * 353; + int y = 738 + (idx / 3) * 96; QPushButton *pb = new QPushButton(this); - pb->setGeometry(QRect(x, y, 288, 70)); + pb->setGeometry(QRect(x, y, 345, 84)); pb->setFont(font); pb->setStyleSheet(stylesheet); pb->setText(list.at(idx)); diff --git a/app/gui/oven_control/multicookbook.cpp b/app/gui/oven_control/multicookbook.cpp index abd4b44..610c56d 100644 --- a/app/gui/oven_control/multicookbook.cpp +++ b/app/gui/oven_control/multicookbook.cpp @@ -12,7 +12,7 @@ void showError(QString errorMessage) { errorDialog = new QErrorMessage; errorDialog->setWindowModality(Qt::ApplicationModal); - errorDialog->setGeometry(QRect(0, 426, 900, 426)); + errorDialog->setGeometry(QRect(0, 511, 1080, 511)); } errorDialog->showMessage(errorMessage); diff --git a/app/gui/oven_control/multicookview.cpp b/app/gui/oven_control/multicookview.cpp index 197f58d..3495c2b 100644 --- a/app/gui/oven_control/multicookview.cpp +++ b/app/gui/oven_control/multicookview.cpp @@ -122,7 +122,7 @@ QList MultiCookView::calcRects() int w = width(); int h = height(); int x = w * (2-timePosition) / 10 + 1; - int y = (h / 10 - 56) / 2; + int y = (h / 10 - 67) / 2; QList list; for (int i = 0; i < 10; i++) @@ -142,7 +142,7 @@ QList MultiCookView::calcRects() if (remainingTime > 0) barW = qCeil(remainingTime / 2000000.0 * w); - list.append(QRect(x, barY, barW, 56)); + list.append(QRect(x, barY, barW, 67)); } return list; @@ -165,7 +165,7 @@ int MultiCookView::calcSlot(int x, int y) void MultiCookView::paintGrids(QPainter &painter) { - static const int padding = 10; + static const int padding = 12; int w = width(); int h = height(); @@ -192,10 +192,10 @@ void MultiCookView::paintBars(QPainter &painter) if (!r.isNull()) paintBar(painter, r); - r.translate(10, 0); + r.translate(12, 0); - if (r.left() < 10) - r.moveLeft(10); + if (r.left() < 12) + r.moveLeft(12); painter.setBrush(Qt::NoBrush); painter.setPen(Qt::white); @@ -205,14 +205,14 @@ void MultiCookView::paintBars(QPainter &painter) void MultiCookView::paintCurrentTime(QPainter &painter) { - static const int padding = 10; + static const int padding = 12; int w = width(); int h = height(); int x = w * (2-timePosition) / 10; QPen pen(Qt::yellow); - pen.setWidth(3); + pen.setWidth(4); painter.setPen(pen); painter.setBrush(Qt::NoBrush); painter.drawLine(x, padding, x, h - padding); @@ -220,11 +220,11 @@ void MultiCookView::paintCurrentTime(QPainter &painter) void MultiCookView::paintBar(QPainter &painter, QRect r) { - static const int fullWidth = 281; - static const int headWidth = 7; - static const int tailWidth = fullWidth - 255; + static const int fullWidth = 337; + static const int headWidth = 8; + static const int tailWidth = fullWidth - 306; static const int bodyWidth = fullWidth - headWidth - tailWidth; - static const int height = 56; + static const int height = 67; static const int bodyOffset = headWidth; static const int tailOffset = fullWidth - tailWidth; diff --git a/app/gui/oven_control/programmingautoselectionwindow.cpp b/app/gui/oven_control/programmingautoselectionwindow.cpp index 89592b3..e7355ca 100644 --- a/app/gui/oven_control/programmingautoselectionwindow.cpp +++ b/app/gui/oven_control/programmingautoselectionwindow.cpp @@ -29,7 +29,7 @@ ProgrammingAutoSelectionWindow::ProgrammingAutoSelectionWindow(QWidget *parent, QFont font; font.setFamily(QStringLiteral("Roboto")); - font.setPointSize(10);; + font.setPointSize(12); font.setBold(true); font.setWeight(75); @@ -44,11 +44,11 @@ QPushButton:pressed, QPushButton:focus {\ QWidget *last = this; for (int idx = 0; idx < book.list.size(); idx++) { - int x = 12 + (idx % 3) * 294; - int y = 615 + (idx / 3) * 80; + int x = 14 + (idx % 3) * 352; + int y = 738 + (idx / 3) * 96; QPushButton *pb = new QPushButton(this); - pb->setGeometry(QRect(x, y, 288, 70)); + pb->setGeometry(QRect(x, y, 345, 84)); pb->setFont(font); pb->setStyleSheet(stylesheet); pb->setText(book.list.at(idx)); diff --git a/app/gui/oven_control/programmingwindow.cpp b/app/gui/oven_control/programmingwindow.cpp index b8d1ada..cb8131f 100644 --- a/app/gui/oven_control/programmingwindow.cpp +++ b/app/gui/oven_control/programmingwindow.cpp @@ -106,13 +106,13 @@ void ProgrammingWindow::setupUi() ui->verticalScrollLayout->setAlignment(Qt::AlignTop); QFont font = ui->addButton->font(); - font.setPixelSize(30); + font.setPixelSize(36); int textWidth = QFontMetrics(font).width(tr("추가하기")); QPixmap iconPix(":/images/etc/bar_icon_03.png"); - QPixmap pixmap(QSize(iconPix.width() + 20 + textWidth, ui->addButton->height())); + QPixmap pixmap(QSize(iconPix.width() + 24 + textWidth, ui->addButton->height())); pixmap.fill(Qt::transparent); QRect textRect(iconPix.width() + 20, 0, textWidth, pixmap.height()); diff --git a/app/gui/oven_control/slider.cpp b/app/gui/oven_control/slider.cpp index 4bc62de..9457711 100644 --- a/app/gui/oven_control/slider.cpp +++ b/app/gui/oven_control/slider.cpp @@ -203,26 +203,26 @@ void Slider::paintEvent(QPaintEvent */*event*/) for (int tick = minimum_; tick <= maximum_; tick += tickInterval) { int x = subLeftTop.x() + calcSubLength(tick); - painter.drawLine(x, grooveLeftTop.y() + 22, x, grooveLeftTop.y() + 28); + painter.drawLine(x, grooveLeftTop.y() + 26, x, grooveLeftTop.y() + 33); } else foreach (int tick, ticks) { int x = subLeftTop.x() + calcSubLength(tick); - painter.drawLine(x, grooveLeftTop.y() + 22, x, grooveLeftTop.y() + 28); + painter.drawLine(x, grooveLeftTop.y() + 26, x, grooveLeftTop.y() + 33); } if (bigTickInterval) for (int tick = minimum_; tick <= maximum_; tick += bigTickInterval) { int x = subLeftTop.x() + calcSubLength(tick); - painter.drawLine(x, grooveLeftTop.y() + 22, x, grooveLeftTop.y() + 33); + painter.drawLine(x, grooveLeftTop.y() + 26, x, grooveLeftTop.y() + 39); } else foreach (int tick, bigTicks) { int x = subLeftTop.x() + calcSubLength(tick); - painter.drawLine(x, grooveLeftTop.y() + 22, x, grooveLeftTop.y() + 33); + painter.drawLine(x, grooveLeftTop.y() + 26, x, grooveLeftTop.y() + 39); } if (subVisible_)