diff --git a/app/gui/oven_control/autocookselectionwindow.cpp b/app/gui/oven_control/autocookselectionwindow.cpp index ffdaf4d..872d74d 100644 --- a/app/gui/oven_control/autocookselectionwindow.cpp +++ b/app/gui/oven_control/autocookselectionwindow.cpp @@ -76,28 +76,6 @@ void AutoCookSelectionWindow::onCookSelected(int idx) w->showFullScreen(); } -void AutoCookSelectionWindow::on_pushButton_clicked() -{ - AbstractCook *cook; - switch (type) - { - case Cook::Poultry: - cook = new ChickenCook; - break; - case Cook::Meat: - cook = new MeatPie; - break; - case Cook::Bread: - cook = new Croissant; - break; - default: - return; - } - - AutoCookWindow *w = new AutoCookWindow(this, oven, cook); - w->showFullScreen(); -} - void AutoCookSelectionWindow::on_backButton_clicked() { close(); diff --git a/app/gui/oven_control/autocookselectionwindow.h b/app/gui/oven_control/autocookselectionwindow.h index 3a4a937..086a063 100644 --- a/app/gui/oven_control/autocookselectionwindow.h +++ b/app/gui/oven_control/autocookselectionwindow.h @@ -20,7 +20,6 @@ public: private slots: void onCookSelected(int idx); - void on_pushButton_clicked(); void on_backButton_clicked(); diff --git a/app/gui/oven_control/oven_control.pro b/app/gui/oven_control/oven_control.pro index a5367ca..d1996f8 100644 --- a/app/gui/oven_control/oven_control.pro +++ b/app/gui/oven_control/oven_control.pro @@ -22,7 +22,6 @@ SOURCES += main.cpp\ manualcookwindow.cpp \ udphandler.cpp \ ovencontroller.cpp \ - packetprinter.cpp \ configwindow.cpp \ functiontestwindow.cpp \ componenttestwindow.cpp \ @@ -47,7 +46,6 @@ HEADERS += mainwindow.h \ udphandler.h \ all_share.h \ ovencontroller.h \ - packetprinter.h \ configwindow.h \ functiontestwindow.h \ componenttestwindow.h \ @@ -65,7 +63,6 @@ HEADERS += mainwindow.h \ FORMS += mainwindow.ui \ manualcookwindow.ui \ - packetprinter.ui \ configwindow.ui \ functiontestwindow.ui \ componenttestwindow.ui \ diff --git a/app/gui/oven_control/packetprinter.cpp b/app/gui/oven_control/packetprinter.cpp deleted file mode 100644 index 673305c..0000000 --- a/app/gui/oven_control/packetprinter.cpp +++ /dev/null @@ -1,50 +0,0 @@ -#include "packetprinter.h" -#include "ui_packetprinter.h" - -#include - -#include "all_share.h" - -PacketPrinter::PacketPrinter(QWidget *parent) : - QMainWindow(parent), - ui(new Ui::PacketPrinter) -{ - ui->setupUi(this); -} - -PacketPrinter::~PacketPrinter() -{ - delete ui; -} - -void PacketPrinter::printControl(oven_control_t &control) -{ - QString str; - QTextStream stream(&str); - - stream << "Control\n"; - - for (int idx = 0; idx < (int) sizeof(control) / sizeof(unsigned short); idx++) - { - QString str; - stream << str.sprintf("0x%04X 0x%04X\n", idx, ((unsigned short *) &control)[idx]); - } - - ui->control->setPlainText(str); -} - -void PacketPrinter::printState(oven_state_t &state) -{ - - QString str; - QTextStream stream(&str); - stream << "State\n"; - - for (int idx = 0; idx < (int) sizeof(state) / sizeof(unsigned short); idx++) - { - QString str; - stream << str.sprintf("0x%04X 0x%04X\n", idx, ((unsigned short *) &state)[idx]); - } - - ui->state->setPlainText(str); -} diff --git a/app/gui/oven_control/packetprinter.h b/app/gui/oven_control/packetprinter.h deleted file mode 100644 index b55a2b1..0000000 --- a/app/gui/oven_control/packetprinter.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef PACKETPRINTER_H -#define PACKETPRINTER_H - -#include - -#include "all_share.h" - -namespace Ui { -class PacketPrinter; -} - -class PacketPrinter : public QMainWindow -{ - Q_OBJECT - -public: - explicit PacketPrinter(QWidget *parent = 0); - ~PacketPrinter(); - - void printControl(oven_control_t &control); - void printState(oven_state_t &state); - -private: - Ui::PacketPrinter *ui; -}; - -#endif // PACKETPRINTER_H diff --git a/app/gui/oven_control/packetprinter.ui b/app/gui/oven_control/packetprinter.ui deleted file mode 100644 index 0adac64..0000000 --- a/app/gui/oven_control/packetprinter.ui +++ /dev/null @@ -1,41 +0,0 @@ - - - PacketPrinter - - - - 0 - 0 - 367 - 928 - - - - MainWindow - - - - - - - - NanumGothicCoding - - - - - - - - - NanumGothicCoding - - - - - - - - - - diff --git a/app/gui/oven_control/udphandler.cpp b/app/gui/oven_control/udphandler.cpp index ad564e8..f58f4c8 100644 --- a/app/gui/oven_control/udphandler.cpp +++ b/app/gui/oven_control/udphandler.cpp @@ -13,9 +13,7 @@ typedef struct { UdpHandler::UdpHandler(QObject *parent) : QObject(parent) { -// printer = new PacketPrinter; -// connect(this, SIGNAL(changed()), this, SLOT(printData())); -// printer->show(); + } bool UdpHandler::init() @@ -111,8 +109,3 @@ void UdpHandler::fillData(oven_state_t &container) memcpy(&container, &state, sizeof(state)); } -void UdpHandler::printData() -{ - printer->printControl(control); - printer->printState(state); -} diff --git a/app/gui/oven_control/udphandler.h b/app/gui/oven_control/udphandler.h index 4c91f28..32a1af0 100644 --- a/app/gui/oven_control/udphandler.h +++ b/app/gui/oven_control/udphandler.h @@ -6,7 +6,6 @@ #include #include "all_share.h" -#include "packetprinter.h" class UdpHandler : public QObject { @@ -57,12 +56,10 @@ private: void processState(oven_state_t *state); QUdpSocket *sock; - PacketPrinter *printer; private slots: void readPendingDatagrams(); void sendCommand(int cmd, int target, int value); - void printData(); };