diff --git a/testclient/mainwindow.cpp b/testclient/mainwindow.cpp index e254739..0031a65 100644 --- a/testclient/mainwindow.cpp +++ b/testclient/mainwindow.cpp @@ -1,683 +1,604 @@ /* AtCore Test Client Copyright (C) <2016> Authors: Patrick José Pereira Lays Rodrigues Chris Rizzitello Tomaz Canabrava This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include #include #include #include #include #include "mainwindow.h" #include "seriallayer.h" #include "gcodecommands.h" #include "widgets/about.h" Q_LOGGING_CATEGORY(TESTCLIENT_MAINWINDOW, "org.kde.atelier.core") int MainWindow::fanCount = 4; MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), core(new AtCore(this)) { setWindowTitle(tr("AtCore - Test Client")); setWindowIcon(QIcon(QStringLiteral(":/icon/windowIcon"))); QCoreApplication::setApplicationVersion(core->version()); initMenu(); initStatusBar(); initWidgets(); logWidget->appendLog(tr("Attempting to locate Serial Ports")); core->setSerialTimerInterval(1000); connect(core, &AtCore::stateChanged, this, &MainWindow::printerStateChanged); connect(core, &AtCore::portsChanged, this, &MainWindow::locateSerialPort); connect(core, &AtCore::sdCardFileListChanged, [ & ](QStringList fileList) { listSdFiles->clear(); listSdFiles->addItems(fileList); }); connect(&core->temperature(), &Temperature::bedTemperatureChanged, [ this ](float temp) { checkTemperature(0x00, 0, temp); plotWidget->appendPoint(tr("Actual Bed"), temp); plotWidget->update(); }); connect(&core->temperature(), &Temperature::bedTargetTemperatureChanged, [ this ](float temp) { checkTemperature(0x01, 0, temp); plotWidget->appendPoint(tr("Target Bed"), temp); plotWidget->update(); }); connect(&core->temperature(), &Temperature::extruderTemperatureChanged, [ this ](float temp) { checkTemperature(0x02, 0, temp); plotWidget->appendPoint(tr("Actual Ext.1"), temp); plotWidget->update(); }); connect(&core->temperature(), &Temperature::extruderTargetTemperatureChanged, [ this ](float temp) { checkTemperature(0x03, 0, temp); plotWidget->appendPoint(tr("Target Ext.1"), temp); plotWidget->update(); }); } void MainWindow::initMenu() { QMenu *menuFile = new QMenu(tr("File")); QAction *actionQuit = new QAction(style()->standardIcon(QStyle::SP_DialogCloseButton), tr("Quit")); connect(actionQuit, &QAction::triggered, this, &MainWindow::close); menuFile->addAction(actionQuit); menuView = new QMenu(tr("View")); QAction *actionShowDockTitles = new QAction(tr("Show Dock Titles")); actionShowDockTitles->setCheckable(true); actionShowDockTitles->setChecked(true); connect(actionShowDockTitles, &QAction::toggled, this, &MainWindow::toggleDockTitles); menuView->addAction(actionShowDockTitles); QMenu *menuHelp = new QMenu(tr("Help")); QAction *actionAbout = new QAction(tr("About")); actionAbout->setShortcut(QKeySequence(Qt::Key_F1)); connect(actionAbout, &QAction::triggered, [] { auto *dialog = new About; dialog->exec(); }); menuHelp->addAction(actionAbout); menuBar()->addMenu(menuFile); menuBar()->addMenu(menuView); menuBar()->addMenu(menuHelp); } void MainWindow::initStatusBar() { statusWidget = new StatusWidget; connect(statusWidget, &StatusWidget::stopPressed, core, &AtCore::stop); connect(core, &AtCore::printProgressChanged, statusWidget, &StatusWidget::updatePrintProgress); connect(core, &AtCore::sdMountChanged, statusWidget, &StatusWidget::setSD); statusBar()->addPermanentWidget(statusWidget, 100); } void MainWindow::initWidgets() { //Make the Docks makeCommandDock(); makePrintDock(); makeTempTimelineDock(); makeLogDock(); makeConnectDock(); makeMoveDock(); makeTempControlsDock(); makeSdDock(); setDangeriousDocksDisabled(true); setTabPosition(Qt::LeftDockWidgetArea, QTabWidget::North); setTabPosition(Qt::RightDockWidgetArea, QTabWidget::North); tabifyDockWidget(moveDock, tempControlsDock); tabifyDockWidget(moveDock, sdDock); moveDock->raise(); tabifyDockWidget(connectDock, printDock); tabifyDockWidget(connectDock, commandDock); connectDock->raise(); setCentralWidget(nullptr); //More Gui stuff - populateCBs(); //hide the printing progress bar. statusWidget->showPrintArea(false); } void MainWindow::makeCommandDock() { commandWidget = new CommandWidget; //Connect the commandPressed signal connect(commandWidget, &CommandWidget::commandPressed, [this](const QString & command) { core->pushCommand(command.toUpper()); }); //Connect the messagePressed signal connect(commandWidget, &CommandWidget::messagePressed, [this](const QString & message) { core->showMessage(message); }); //Create the dock, and set the Widget. commandDock = new QDockWidget(tr("Commands"), this); commandDock->setWidget(commandWidget); //Push the toggle view action into our view menu menuView->insertAction(nullptr, commandDock->toggleViewAction()); //Place the Dock into a DockWidget Area. //Failure todo this will create some odd side effects at runtime addDockWidget(Qt::LeftDockWidgetArea, commandDock); } void MainWindow::makePrintDock() { printWidget = new PrintWidget; connect(printWidget, &PrintWidget::printPressed, this, &MainWindow::printPBClicked); connect(printWidget, &PrintWidget::emergencyStopPressed, core, &AtCore::emergencyStop); connect(printWidget, &PrintWidget::printSpeedChanged, [this](const int speed) { core->setPrinterSpeed(speed); }); connect(printWidget, &PrintWidget::flowRateChanged, [this](const int rate) { core->setFlowRate(rate); }); printDock = new QDockWidget(tr("Print"), this); printDock->setWidget(printWidget); menuView->insertAction(nullptr, printDock->toggleViewAction()); addDockWidget(Qt::LeftDockWidgetArea, printDock); } void MainWindow::makeTempTimelineDock() { plotWidget = new PlotWidget; tempTimelineDock = new QDockWidget(tr("Temperature Timeline"), this); tempTimelineDock->setWidget(plotWidget); menuView->insertAction(nullptr, tempTimelineDock->toggleViewAction()); addDockWidget(Qt::RightDockWidgetArea, tempTimelineDock); } void MainWindow::makeLogDock() { logWidget = new LogWidget(new QTemporaryFile(QDir::tempPath() + QStringLiteral("/AtCore_"))); logDock = new QDockWidget(tr("Session Log"), this); logDock->setWidget(logWidget); menuView->insertAction(nullptr, logDock->toggleViewAction()); addDockWidget(Qt::RightDockWidgetArea, logDock); } void MainWindow::makeConnectDock() { auto *mainLayout = new QVBoxLayout; auto *newLabel = new QLabel(tr("Port:")); comboPort = new QComboBox; comboPort->setEditable(true); auto *hBoxLayout = new QHBoxLayout; hBoxLayout->addWidget(newLabel); hBoxLayout->addWidget(comboPort, 75); mainLayout->addLayout(hBoxLayout); newLabel = new QLabel(tr("Baud Rate:")); comboBAUD = new QComboBox; comboBAUD->addItems(core->portSpeeds()); comboBAUD->setCurrentIndex(9); hBoxLayout = new QHBoxLayout; hBoxLayout->addWidget(newLabel); hBoxLayout->addWidget(comboBAUD, 75); mainLayout->addLayout(hBoxLayout); newLabel = new QLabel(tr("Use Plugin:")); comboPlugin = new QComboBox; comboPlugin->addItem(tr("Autodetect")); comboPlugin->addItems(core->availableFirmwarePlugins()); connect(comboPlugin, &QComboBox::currentTextChanged, this, &MainWindow::pluginCBChanged); hBoxLayout = new QHBoxLayout; hBoxLayout->addWidget(newLabel); hBoxLayout->addWidget(comboPlugin, 75); mainLayout->addLayout(hBoxLayout); buttonConnect = new QPushButton(tr("Connect")); connect(buttonConnect, &QPushButton::clicked, this, &MainWindow::connectPBClicked); mainLayout->addWidget(buttonConnect); auto *dockContents = new QWidget; dockContents->setLayout(mainLayout); connectDock = new QDockWidget(tr("Connect"), this); connectDock->setWidget(dockContents); menuView->insertAction(nullptr, connectDock->toggleViewAction()); addDockWidget(Qt::LeftDockWidgetArea, connectDock); } void MainWindow::makeMoveDock() { movementWidget = new MovementWidget; connect(movementWidget, &MovementWidget::homeAllPressed, [this] { logWidget->appendLog(tr("Home All")); core->home(); }); connect(movementWidget, &MovementWidget::homeXPressed, [this] { logWidget->appendLog(tr("Home X")); core->home(AtCore::X); }); connect(movementWidget, &MovementWidget::homeYPressed, [this] { logWidget->appendLog(tr("Home Y")); core->home(AtCore::Y); }); connect(movementWidget, &MovementWidget::homeZPressed, [this] { logWidget->appendLog(tr("Home Z")); core->home(AtCore::Z); }); connect(movementWidget, &MovementWidget::absoluteMove, [this](const QLatin1Char & axis, const double & value) { logWidget->appendLog(GCode::description(GCode::G1)); core->move(axis, value); }); connect(movementWidget, &MovementWidget::disableMotorsPressed, [this] { core->disableMotors(0); }); connect(movementWidget, &MovementWidget::relativeMove, [this](const QLatin1Char & axis, const double & value) { core->setRelativePosition(); core->move(axis, value); core->setAbsolutePosition(); }); moveDock = new QDockWidget(tr("Movement"), this); moveDock->setWidget(movementWidget); menuView->insertAction(nullptr, moveDock->toggleViewAction()); addDockWidget(Qt::LeftDockWidgetArea, moveDock); } void MainWindow::makeTempControlsDock() { - auto *mainLayout = new QVBoxLayout; - checkAndWait = new QCheckBox(tr("Wait Until Temperature Stabilizes")); - mainLayout->addWidget(checkAndWait); - - auto label = new QLabel(tr("Bed Temp")); - - sbBedTemp = new QSpinBox; - sbBedTemp->setRange(0, 120); - sbBedTemp->setSuffix(QStringLiteral("°C")); - - auto *newButton = new QPushButton(tr("Set")); - connect(newButton, &QPushButton::clicked, this, &MainWindow::bedTempPBClicked); - - auto *hboxLayout = new QHBoxLayout; - hboxLayout->addWidget(label, 80); - hboxLayout->addWidget(sbBedTemp); - hboxLayout->addWidget(newButton); - mainLayout->addItem(hboxLayout); - - comboExtruderSelect = new QComboBox; - sbExtruderTemp = new QSpinBox; - sbExtruderTemp->setRange(0, 275); - sbExtruderTemp->setSuffix(QStringLiteral("°C")); - - newButton = new QPushButton(tr("Set")); - connect(newButton, &QPushButton::clicked, this, &MainWindow::extTempPBClicked); - hboxLayout = new QHBoxLayout; - hboxLayout->addWidget(comboExtruderSelect, 80); - hboxLayout->addWidget(sbExtruderTemp); - hboxLayout->addWidget(newButton); - mainLayout->addItem(hboxLayout); - - comboFanSelect = new QComboBox; - sbFanSpeed = new QSpinBox; - sbFanSpeed->setRange(0, 100); - sbFanSpeed->setSuffix(QStringLiteral("%")); - - newButton = new QPushButton(tr("Set")); - connect(newButton, &QPushButton::clicked, this, &MainWindow::fanSpeedPBClicked); - hboxLayout = new QHBoxLayout; - hboxLayout->addWidget(comboFanSelect, 80); - hboxLayout->addWidget(sbFanSpeed); - hboxLayout->addWidget(newButton); - mainLayout->addItem(hboxLayout); - - auto *dockContents = new QWidget; - dockContents->setLayout(mainLayout); + temperatureWidget = new TemperatureWidget; + connect(temperatureWidget, &TemperatureWidget::bedTempChanged, core, &AtCore::setBedTemp); + connect(temperatureWidget, &TemperatureWidget::extTempChanged, core, &AtCore::setExtruderTemp); + connect(temperatureWidget, &TemperatureWidget::fanSpeedChanged, core, &AtCore::setFanSpeed); tempControlsDock = new QDockWidget(tr("Temperatures"), this); - tempControlsDock->setWidget(dockContents); - + tempControlsDock->setWidget(temperatureWidget); menuView->insertAction(nullptr, tempControlsDock->toggleViewAction()); addDockWidget(Qt::LeftDockWidgetArea, tempControlsDock); } void MainWindow::makeSdDock() { auto *hBoxLayout = new QHBoxLayout; auto *newButton = new QPushButton(tr("Get List")); connect(newButton, &QPushButton::clicked, this, &MainWindow::getSdList); hBoxLayout->addWidget(newButton); newButton = new QPushButton(tr("Print Selected")); connect(newButton, &QPushButton::clicked, this, &MainWindow::sdPrintPBClicked); hBoxLayout->addWidget(newButton); newButton = new QPushButton(tr("Delete Selected")); connect(newButton, &QPushButton::clicked, this, &MainWindow::sdDelPBClicked); hBoxLayout->addWidget(newButton); auto *groupFiles = new QGroupBox(tr("Files On Sd Card")); listSdFiles = new QListWidget; auto *groupLayout = new QVBoxLayout; groupLayout->addWidget(listSdFiles); groupFiles->setLayout(groupLayout); auto *mainLayout = new QVBoxLayout; mainLayout->addItem(hBoxLayout); mainLayout->addWidget(groupFiles); auto *dockContents = new QWidget; dockContents->setLayout(mainLayout); sdDock = new QDockWidget(tr("Sd Card"), this); sdDock->setWidget(dockContents); menuView->insertAction(nullptr, sdDock->toggleViewAction()); addDockWidget(Qt::LeftDockWidgetArea, sdDock); } void MainWindow::closeEvent(QCloseEvent *event) { core->close(); event->accept(); } MainWindow::~MainWindow() { } void MainWindow::checkTemperature(uint sensorType, uint number, uint temp) { QString msg; switch (sensorType) { case 0x00: // bed msg = QString::fromLatin1("Bed Temperature "); break; case 0x01: // bed target msg = QString::fromLatin1("Bed Target Temperature "); break; case 0x02: // extruder msg = QString::fromLatin1("Extruder Temperature "); break; case 0x03: // extruder target msg = QString::fromLatin1("Extruder Target Temperature "); break; case 0x04: // enclosure msg = QString::fromLatin1("Enclosure Temperature "); break; case 0x05: // enclosure target msg = QString::fromLatin1("Enclosure Target Temperature "); break; } msg.append(QString::fromLatin1("[%1] : %2")); msg = msg.arg(QString::number(number)) .arg(QString::number(temp)); logWidget->appendLog(msg); } /** * @brief MainWindow::locateSerialPort * Locate all active serial ports on the computer and add to the list * of serial ports */ void MainWindow::locateSerialPort(const QStringList &ports) { comboPort->clear(); if (!ports.isEmpty()) { comboPort->addItems(ports); logWidget->appendLog(tr("Found %1 Ports").arg(QString::number(ports.count()))); } else { QString portError(tr("No available ports! Please connect a serial device to continue!")); if (! logWidget->endsWith(portError)) { logWidget->appendLog(portError); } } } void MainWindow::connectPBClicked() { if (core->state() == AtCore::DISCONNECTED) { if (core->initSerial(comboPort->currentText(), comboBAUD->currentText().toInt())) { connect(core, &AtCore::receivedMessage, logWidget, &LogWidget::appendRLog); connect(core->serial(), &SerialLayer::pushedCommand, logWidget, &LogWidget::appendSLog); buttonConnect->setText(tr("Disconnect")); logWidget->appendLog(tr("Serial connected")); if (comboPlugin->currentText().contains(tr("Autodetect"))) { logWidget->appendLog(tr("No plugin loaded !")); logWidget->appendLog(tr("Requesting Firmware...")); } else { core->loadFirmwarePlugin(comboPlugin->currentText()); } } else { logWidget->appendLog(tr("Failed to open serial in r/w mode")); } } else { disconnect(core, &AtCore::receivedMessage, logWidget, &LogWidget::appendRLog); disconnect(core->serial(), &SerialLayer::pushedCommand, logWidget, &LogWidget::appendSLog); core->closeConnection(); core->setState(AtCore::DISCONNECTED); logWidget->appendLog(tr("Disconnected")); buttonConnect->setText(tr("Connect")); } } -void MainWindow::bedTempPBClicked() -{ - if (checkAndWait->isChecked()) { - logWidget->appendLog(GCode::description(GCode::M190)); - } else { - logWidget->appendLog(GCode::description(GCode::M140)); - } - core->setBedTemp(sbBedTemp->value(), checkAndWait->isChecked()); -} - -void MainWindow::extTempPBClicked() -{ - if (checkAndWait->isChecked()) { - logWidget->appendLog(GCode::description(GCode::M109)); - } else { - logWidget->appendLog(GCode::description(GCode::M104)); - } - core->setExtruderTemp(sbExtruderTemp->value(), comboExtruderSelect->currentIndex(), checkAndWait->isChecked()); -} - -void MainWindow::fanSpeedPBClicked() -{ - logWidget->appendLog(GCode::description(GCode::M106)); - core->setFanSpeed(sbFanSpeed->value(), comboFanSelect->currentIndex()); -} - void MainWindow::printPBClicked() { QString fileName; switch (core->state()) { case AtCore::DISCONNECTED: QMessageBox::information(this, tr("Error"), tr("Not Connected To a Printer")); break; case AtCore::CONNECTING: QMessageBox::information(this, tr("Error"), tr(" A Firmware Plugin was not loaded!\n Please send the command M115 and let us know what your firmware returns, so we can improve our firmware detection. We have loaded the most common plugin \"repetier\" for you. You may try to print again after this message")); comboPlugin->setCurrentText(QStringLiteral("repetier")); break; case AtCore::IDLE: fileName = QFileDialog::getOpenFileName(this, tr("Select a file to print"), QDir::homePath(), tr("*.gcode")); if (fileName.isNull()) { logWidget->appendLog(tr("No File Selected")); } else { logWidget->appendLog(tr("Print: %1").arg(fileName)); core->print(fileName); } break; case AtCore::BUSY: core->pause(printWidget->postPauseCommand()); break; case AtCore::PAUSE: core->resume(); break; default: qCDebug(TESTCLIENT_MAINWINDOW) << "ERROR / STOP unhandled."; } } void MainWindow::pluginCBChanged(QString currentText) { if (core->state() != AtCore::DISCONNECTED) { if (!currentText.contains(tr("Autodetect"))) { core->loadFirmwarePlugin(currentText); } } } void MainWindow::printerStateChanged(AtCore::STATES state) { QString stateString; switch (state) { case AtCore::IDLE: printWidget->setPrintText(tr("Print File")); stateString = tr("Connected to ") + core->connectedPort(); break; case AtCore::STARTPRINT: stateString = tr("START PRINT"); printWidget->setPrintText(tr("Pause Print")); statusWidget->showPrintArea(true); break; case AtCore::FINISHEDPRINT: stateString = tr("Finished Print"); printWidget->setPrintText(tr("Print File")); statusWidget->showPrintArea(false); break; case AtCore::PAUSE: stateString = tr("Paused"); printWidget->setPrintText(tr("Resume Print")); break; case AtCore::BUSY: stateString = tr("Printing"); printWidget->setPrintText(tr("Pause Print")); break; case AtCore::DISCONNECTED: stateString = QStringLiteral("Not Connected"); setDangeriousDocksDisabled(true); break; case AtCore::CONNECTING: stateString = QStringLiteral("Connecting"); setDangeriousDocksDisabled(false); break; case AtCore::STOP: stateString = tr("Stopping Print"); break; case AtCore::ERRORSTATE: stateString = tr("Command ERROR"); break; } statusWidget->setState(stateString); } -void MainWindow::populateCBs() -{ - // Extruders - for (int count = 0; count < core->extruderCount(); count++) { - comboExtruderSelect->insertItem(count, tr("Extruder %1").arg(count)); - } - - // Fan - for (int count = 0; count < fanCount; count++) { - comboFanSelect->insertItem(count, tr("Fan %1 speed").arg(count)); - } -} - void MainWindow::toggleDockTitles(bool checked) { if (checked) { delete connectDock->titleBarWidget(); delete logDock->titleBarWidget(); delete tempTimelineDock->titleBarWidget(); delete commandDock->titleBarWidget(); delete moveDock->titleBarWidget(); delete tempControlsDock->titleBarWidget(); delete printDock->titleBarWidget(); delete sdDock->titleBarWidget(); } else { connectDock->setTitleBarWidget(new QWidget()); logDock->setTitleBarWidget(new QWidget()); tempTimelineDock->setTitleBarWidget(new QWidget()); commandDock->setTitleBarWidget(new QWidget()); moveDock->setTitleBarWidget(new QWidget()); tempControlsDock->setTitleBarWidget(new QWidget()); printDock->setTitleBarWidget(new QWidget()); sdDock->setTitleBarWidget(new QWidget()); } } void MainWindow::setDangeriousDocksDisabled(bool disabled) { commandDock->widget()->setDisabled(disabled); moveDock->widget()->setDisabled(disabled); tempControlsDock->widget()->setDisabled(disabled); printDock->widget()->setDisabled(disabled); sdDock->widget()->setDisabled(disabled); + + if (!disabled) { + temperatureWidget->updateExtruderCount(core->extruderCount()); + temperatureWidget->updateFanCount(fanCount); + } } void MainWindow::getSdList() { core->sdFileList(); } void MainWindow::sdPrintPBClicked() { if (listSdFiles->currentRow() < 0) { QMessageBox::information(this, tr("Print Error"), tr("You must Select a file from the list")); } else { core->print(listSdFiles->currentItem()->text(), true); } } void MainWindow::sdDelPBClicked() { if (listSdFiles->currentRow() < 0) { QMessageBox::information(this, tr("Delete Error"), tr("You must Select a file from the list")); } else { core->sdDelete(listSdFiles->currentItem()->text()); listSdFiles->setCurrentRow(-1); } } diff --git a/testclient/mainwindow.h b/testclient/mainwindow.h index 05001df..989e398 100644 --- a/testclient/mainwindow.h +++ b/testclient/mainwindow.h @@ -1,212 +1,193 @@ /* AtCore Test Client Copyright (C) <2016> Authors: Patrick José Pereira Lays Rodrigues Chris Rizzitello Tomaz Canabrava This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ #pragma once #include #include #include "atcore.h" #include "widgets/commandwidget.h" #include "widgets/logwidget.h" #include "widgets/movementwidget.h" #include "widgets/plotwidget.h" #include "widgets/printwidget.h" #include "widgets/statuswidget.h" +#include "widgets/temperaturewidget.h" class SerialLayer; class MainWindow: public QMainWindow { Q_OBJECT public: explicit MainWindow(QWidget *parent = nullptr); ~MainWindow() override; public slots: /** * @brief Check temperature * * @param sensorType : type of sensor * @param number : index of sensor * @param temp : temperature */ void checkTemperature(uint sensorType, uint number, uint temp); private slots: //ButtonEvents /** * @brief Connect Button Clicked will connect or disconnect based on printer state */ void connectPBClicked(); - /** - * @brief Set Bed Temp Clicked - */ - void bedTempPBClicked(); - - /** - * @brief Set Extruder Temp Clicked - */ - void extTempPBClicked(); - - /** - * @brief Set Fan Speed Clicked - */ - void fanSpeedPBClicked(); - /** * @brief Print Button Clicked, can also pause /resue print based on printer state */ void printPBClicked(); /** * @brief Print Button for Sd Prints clicked. */ void sdPrintPBClicked(); /** * @brief printerStateChanged Catch and proccess printer state commands * @param state: new printer state */ void printerStateChanged(AtCore::STATES state); /** * @brief show/hide dock titlebars * @param checked: True if shown */ void toggleDockTitles(bool checked); /** * @brief Toggle disable state of dangerous docks * Command, Sd Card, Movement, Temperature Controls and Printing docks * @param disabled: True if items are disabled. */ void setDangeriousDocksDisabled(bool disabled); /** * @brief List Files on the sd card. */ void getSdList(); /** * @brief Sd Card Delete file clicked */ void sdDelPBClicked(); private: AtCore *core; // Define max number of fans static int fanCount; void closeEvent(QCloseEvent *event) override; /** * @brief Locate serial port * */ void locateSerialPort(const QStringList &ports); /** * @brief pluginCB index changed */ void pluginCBChanged(QString currentText); /** * @brief setupActions for KXMLGui */ void setupActions(); /** * @brief Populate comboboxes */ void populateCBs(); /** * @brief Gui Changes for when sd card mount status has changed. */ void sdChanged(bool mounted); //UI Functions /** * @brief Create The Menubar */ void initMenu(); /** * @brief Create StatusBar */ void initStatusBar(); /** * @brief Create Main Widgets. */ void initWidgets(); //Private GUI Items //menuView is global to allow for docks to be added / removed. QMenu *menuView = nullptr; //Status Bar Items StatusWidget *statusWidget = nullptr; //Docks void makeLogDock(); QDockWidget *logDock = nullptr; LogWidget *logWidget = nullptr; void makeTempTimelineDock(); QDockWidget *tempTimelineDock = nullptr; PlotWidget *plotWidget = nullptr; void makeCommandDock(); QDockWidget *commandDock = nullptr; CommandWidget *commandWidget = nullptr; void makePrintDock(); QDockWidget *printDock = nullptr; PrintWidget *printWidget = nullptr; void makeConnectDock(); QDockWidget *connectDock = nullptr; QComboBox *comboPort = nullptr; QComboBox *comboBAUD = nullptr; QComboBox *comboPlugin = nullptr; QPushButton *buttonConnect = nullptr; void makeMoveDock(); QDockWidget *moveDock = nullptr; MovementWidget *movementWidget = nullptr; void makeTempControlsDock(); QDockWidget *tempControlsDock = nullptr; - QCheckBox *checkAndWait = nullptr; - QSpinBox *sbBedTemp = nullptr; - QComboBox *comboExtruderSelect; - QSpinBox *sbExtruderTemp; - QComboBox *comboFanSelect; - QSpinBox *sbFanSpeed; + TemperatureWidget *temperatureWidget = nullptr; void makeSdDock(); QDockWidget *sdDock = nullptr; QListWidget *listSdFiles = nullptr; }; diff --git a/testclient/widgets/CMakeLists.txt b/testclient/widgets/CMakeLists.txt index 7f37015..ea057be 100644 --- a/testclient/widgets/CMakeLists.txt +++ b/testclient/widgets/CMakeLists.txt @@ -1,16 +1,17 @@ set(widgets_SRCS about.cpp axiscontrol.cpp commandwidget.cpp logwidget.cpp movementwidget.cpp plotwidget.cpp printwidget.cpp statuswidget.cpp + temperaturewidget.cpp ) add_library(AtCoreTestWidgets STATIC ${widgets_SRCS}) if (APPLE) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -std=c++11") endif() target_link_libraries(AtCoreTestWidgets Qt5::Core Qt5::Widgets Qt5::Charts) diff --git a/testclient/widgets/temperaturewidget.cpp b/testclient/widgets/temperaturewidget.cpp new file mode 100644 index 0000000..c09eef6 --- /dev/null +++ b/testclient/widgets/temperaturewidget.cpp @@ -0,0 +1,95 @@ +/* AtCore Test Client + Copyright (C) <2018> + Author: Chris Rizzitello - rizzitello@kde.org + Lays Rodrigues - lays.rodriguea@kde.org + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ +#include "temperaturewidget.h" +#include +#include +#include +#include + +TemperatureWidget::TemperatureWidget(QWidget *parent) : + QWidget(parent) +{ + auto *mainLayout = new QVBoxLayout; + checkAndWait = new QCheckBox(tr("Wait Until Temperature Stabilizes")); + mainLayout->addWidget(checkAndWait); + + auto label = new QLabel(tr("Bed Temp")); + + sbBedTemp = new QSpinBox; + sbBedTemp->setRange(0, 120); + sbBedTemp->setSuffix(QStringLiteral("°C")); + + auto *newButton = new QPushButton(tr("Set")); + connect(newButton, &QPushButton::clicked, [this] { + emit(bedTempChanged(sbBedTemp->value(), checkAndWait->isChecked())); + }); + + auto *hboxLayout = new QHBoxLayout; + hboxLayout->addWidget(label, 80); + hboxLayout->addWidget(sbBedTemp); + hboxLayout->addWidget(newButton); + mainLayout->addItem(hboxLayout); + + comboExtruderSelect = new QComboBox; + sbExtruderTemp = new QSpinBox; + sbExtruderTemp->setRange(0, 275); + sbExtruderTemp->setSuffix(QStringLiteral("°C")); + + newButton = new QPushButton(tr("Set")); + connect(newButton, &QPushButton::clicked, [this] { + emit(extTempChanged(sbExtruderTemp->value(), comboExtruderSelect->currentIndex(), checkAndWait->isChecked())); + }); + + hboxLayout = new QHBoxLayout; + hboxLayout->addWidget(comboExtruderSelect, 80); + hboxLayout->addWidget(sbExtruderTemp); + hboxLayout->addWidget(newButton); + mainLayout->addItem(hboxLayout); + + comboFanSelect = new QComboBox; + sbFanSpeed = new QSpinBox; + sbFanSpeed->setRange(0, 100); + sbFanSpeed->setSuffix(QStringLiteral("%")); + + newButton = new QPushButton(tr("Set")); + connect(newButton, &QPushButton::clicked, [this] { + emit(fanSpeedChanged(sbFanSpeed->value(), comboFanSelect->currentIndex())); + }); + + hboxLayout = new QHBoxLayout; + hboxLayout->addWidget(comboFanSelect, 80); + hboxLayout->addWidget(sbFanSpeed); + hboxLayout->addWidget(newButton); + mainLayout->addItem(hboxLayout); + + setLayout(mainLayout); +} + +void TemperatureWidget::updateExtruderCount(const int count) +{ + for (int i = 0; i < count; i++) { + comboExtruderSelect->insertItem(i, tr("Extruder %1").arg(i)); + } +} + +void TemperatureWidget::updateFanCount(const int count) +{ + for (int i = 0; i < count; i++) { + comboFanSelect->insertItem(i, tr("Fan %1 speed").arg(i)); + } +} diff --git a/testclient/widgets/temperaturewidget.h b/testclient/widgets/temperaturewidget.h new file mode 100644 index 0000000..1f4a034 --- /dev/null +++ b/testclient/widgets/temperaturewidget.h @@ -0,0 +1,50 @@ +/* AtCore Test Client + Copyright (C) <2018> + Author: Chris Rizzitello - rizzitello@kde.org + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ +#pragma once + +#include +#include +#include +#include + +/* Usage: + * + * Create a instance of the temperature widget. + */ + +class TemperatureWidget : public QWidget +{ + Q_OBJECT +public: + TemperatureWidget(QWidget *parent = nullptr); + void updateExtruderCount(const int count); + void updateFanCount(const int count); + +signals: + void bedTempChanged(const int temperature, bool andWait); + void extTempChanged(const int temperature, const int extNum, bool andWait); + void fanSpeedChanged(const int speed, const int fanNum); + +private: + QCheckBox *checkAndWait = nullptr; + QComboBox *comboExtruderSelect; + QComboBox *comboFanSelect; + QSpinBox *sbBedTemp = nullptr; + QSpinBox *sbExtruderTemp; + QSpinBox *sbFanSpeed; +};