diff --git a/src/widgets/atcoreinstancewidget.cpp b/src/widgets/atcoreinstancewidget.cpp index 7ca5364..a2ce87b 100644 --- a/src/widgets/atcoreinstancewidget.cpp +++ b/src/widgets/atcoreinstancewidget.cpp @@ -1,469 +1,471 @@ /* Atelier KDE Printer Host for 3D Printing Copyright (C) <2017> Author: Lays Rodrigues - laysrodriguessilva@gmail.com 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 . */ #include "atcoreinstancewidget.h" #include "ui_atcoreinstancewidget.h" #include #include #include #include #include "choosefiledialog.h" AtCoreInstanceWidget::AtCoreInstanceWidget(QWidget *parent): QWidget(parent), m_toolBar(nullptr), m_printAction(nullptr), m_stopAction(nullptr) { m_theme = palette().text().color().value() >= QColor(Qt::lightGray).value() ? QString("dark") : QString("light") ; ui = new Ui::AtCoreInstanceWidget; ui->setupUi(this); m_axisControl = new AxisControl(); m_axisControl->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum); ui->controlsLayout->addWidget(m_axisControl); m_plotWidget = new PlotWidget(); ui->controlTabLayout->addWidget(m_plotWidget); m_logWidget = new LogWidget(new QTemporaryFile(QDir::tempPath() + QStringLiteral("/Atelier_"))); ui->advancedTabLayout->addWidget(m_logWidget); m_sdWidget = new SdWidget; ui->mainTab->addTab(m_sdWidget, i18n("Sd Card")); ui->printProgressWidget->setVisible(false); buildToolbar(); buildConnectionToolbar(); enableControls(false); updateProfileData(); initConnectsToAtCore(); m_toolBar->setHidden(true); } AtCoreInstanceWidget::~AtCoreInstanceWidget() { m_core.closeConnection(); delete ui; } void AtCoreInstanceWidget::buildToolbar() { m_toolBar = new QToolBar(); m_toolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); auto lb = new QLabel; QIcon icon = QIcon::fromTheme("go-home", QIcon(QString(":/%1/home").arg(m_theme))); lb->setPixmap(icon.pixmap(fontMetrics().height())); m_toolBar->addWidget(lb); lb = new QLabel(i18n("Home:")); m_toolBar->addWidget(lb); auto homeAll = new QAction("All"); connect(homeAll, &QAction::triggered, [this]{ m_core.home(); }); m_toolBar->addAction(homeAll); for(auto homes : std::map{{"X", AtCore::X}, {"Y", AtCore::Y}, {"Z", AtCore::Z}}) { auto home = new QAction(homes.first); connect(home, &QAction::triggered, [this, homes] { m_core.home(homes.second); }); m_toolBar->addAction(home); } m_toolBar->addSeparator(); m_printAction = new QAction(QIcon::fromTheme("media-playback-start", style()->standardIcon(QStyle::SP_MediaPlay)),i18n("Print")); connect(m_printAction, &QAction::triggered, [ this ](){ if(m_core.state() == AtCore::BUSY) { pausePrint(); return; } if (m_core.state() == AtCore::IDLE){ print(); } else if (m_core.state() == AtCore::PAUSE) { m_core.resume(); } }); m_toolBar->addAction(m_printAction); m_stopAction = new QAction(QIcon::fromTheme("media-playback-stop", QIcon(QString(":/%1/stop").arg(m_theme))), i18n("Stop")); connect(m_stopAction, &QAction::triggered, this, &AtCoreInstanceWidget::stopPrint); connect(m_stopAction, &QAction::triggered, [this](){ m_printAction->setText(i18n("Print")); m_printAction->setIcon(QIcon::fromTheme("media-playback-start", QIcon(QString(":/%1/start").arg(m_theme)))); }); m_toolBar->addAction(m_stopAction); auto disableMotorsAction = new QAction(style()->standardIcon(QStyle::SP_MediaStop),i18n("Disable Motors")); connect(disableMotorsAction, &QAction::triggered, this, &AtCoreInstanceWidget::disableMotors); m_toolBar->addAction(disableMotorsAction); ui->toolBarLayout->addWidget(m_toolBar); togglePrintButtons(m_files.size()); } void AtCoreInstanceWidget::buildConnectionToolbar() { m_connectToolBar = new QToolBar(); m_comboPort = new QComboBox; m_comboPort->setEditable(true); QLabel *deviceLabel = new QLabel(i18n("Device")); QHBoxLayout *deviceLayout = new QHBoxLayout; deviceLayout->addWidget(deviceLabel); deviceLayout->addWidget(m_comboPort,100); m_comboProfile = new QComboBox; m_comboProfile->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed); QHBoxLayout *profileLayout = new QHBoxLayout; QLabel *profileLabel = new QLabel(i18n("Profile")); profileLayout->addWidget(profileLabel); profileLayout->addWidget(m_comboProfile,100); QHBoxLayout *connectLayout = new QHBoxLayout; connectLayout->addLayout(deviceLayout,50); connectLayout->addLayout(profileLayout,50); m_connectWidget = new QWidget(); m_connectWidget->setLayout(connectLayout); m_connectToolBar->addWidget(m_connectWidget); m_connectButton = new QPushButton(QIcon::fromTheme("network-connect", QIcon(QString(":/%1/connect").arg(m_theme))), i18n("Connect")); m_connectButton->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed); connect(this, &AtCoreInstanceWidget::disableDisconnect, m_connectButton, &QPushButton::setDisabled); connect(m_connectButton, &QPushButton::clicked, this, &AtCoreInstanceWidget::connectButtonClicked); ui->toolBarLayout->addWidget(m_connectToolBar); ui->toolBarLayout->addWidget(m_connectButton); } void AtCoreInstanceWidget::connectButtonClicked() { if(m_core.state() == AtCore::DISCONNECTED) { if (m_comboProfile->currentText().isEmpty()) { QMessageBox::information(this, i18n("No Profiles!"), i18n("Connecting Requires creating a profile for your printer. Create a profile in the next dialog then try again.")); emit(requestProfileDialog()); return; } if (m_comboPort->currentText().isEmpty()) { QMessageBox::critical(this, i18n("Error"), i18n("Please, connect a serial device to continue!")); return; } //Get profile data before connecting. QString profile = m_comboProfile->currentText(); m_settings.beginGroup("GeneralSettings"); m_settings.beginGroup(profile); QMap data; data["bps"] = m_settings.value(QStringLiteral("bps"), QStringLiteral("115200")); data["bedTemp"] = m_settings.value(QStringLiteral("maximumTemperatureBed"), QStringLiteral("0")); data["hotendTemp"] = m_settings.value(QStringLiteral("maximumTemperatureExtruder"), QStringLiteral("0")); data["firmware"] = m_settings.value(QStringLiteral("firmware"),QStringLiteral("Auto-Detect")); data["postPause"] = m_settings.value(QStringLiteral("postPause"),QStringLiteral("")); data["name"] = profile; m_settings.endGroup(); m_settings.endGroup(); //then connect m_core.initSerial(m_comboPort->currentText(), data["bps"].toInt()); if(m_core.state() == AtCore::CONNECTING){ profileData = data; QString fw = profileData["firmware"].toString(); if( fw != QString("Auto-Detect")){ m_core.loadFirmwarePlugin(fw); } emit(connectionChanged(profileData["name"].toString())); + ui->bedExtWidget->setBedMaxTemperature(profileData["bedTemp"].toInt()); + ui->bedExtWidget->setExtruderMaxTemperature(profileData["hotendTemp"].toInt()); } } else { m_core.closeConnection(); emit(connectionChanged(i18n("Connect a Printer"))); } } void AtCoreInstanceWidget::initConnectsToAtCore() { m_core.setSerialTimerInterval(100); // Handle device changes connect(&m_core, &AtCore::portsChanged, this, &AtCoreInstanceWidget::updateSerialPort); // Handle AtCore status change connect(&m_core, &AtCore::stateChanged, this, &AtCoreInstanceWidget::handlePrinterStatusChanged); // If the number of extruders from the printer change, we need to update the radiobuttons on the widget connect(this, &AtCoreInstanceWidget::extruderCountChanged, ui->bedExtWidget, &BedExtruderWidget::setExtruderCount); // Bed and Extruder temperatures management connect(ui->bedExtWidget, &BedExtruderWidget::bedTemperatureChanged, &m_core, &AtCore::setBedTemp); connect(ui->bedExtWidget, &BedExtruderWidget::extTemperatureChanged, &m_core, &AtCore::setExtruderTemp); // Connect AtCore temperatures changes on Atelier Plot connect(&m_core.temperature(), &Temperature::bedTemperatureChanged, [ this ](const float& temp) { checkTemperature(0x00, 0, temp); m_plotWidget->appendPoint(i18n("Actual Bed"), temp); m_plotWidget->update(); ui->bedExtWidget->updateBedTemp(temp); }); connect(&m_core.temperature(), &Temperature::bedTargetTemperatureChanged, [ this ](const float& temp) { checkTemperature(0x01, 0, temp); m_plotWidget->appendPoint(i18n("Target Bed"), temp); m_plotWidget->update(); ui->bedExtWidget->updateBedTargetTemp(temp); }); connect(&m_core.temperature(), &Temperature::extruderTemperatureChanged, [ this ](const float& temp) { checkTemperature(0x02, 0, temp); m_plotWidget->appendPoint(i18n("Actual Ext.1"), temp); m_plotWidget->update(); ui->bedExtWidget->updateExtTemp(temp); }); connect(&m_core.temperature(), &Temperature::extruderTargetTemperatureChanged, [ this ](const float& temp) { checkTemperature(0x03, 0, temp); m_plotWidget->appendPoint(i18n("Target Ext.1"), temp); m_plotWidget->update(); ui->bedExtWidget->updateExtTargetTemp(temp); }); connect(ui->pushGCodeWidget, &PushGCodeWidget::push, [ this ](QString command) { m_logWidget->appendLog("Push " + command); m_core.pushCommand(command); }); // Fan, Flow and Speed management connect(ui->ratesControlWidget, &RatesControlWidget::fanSpeedChanged, &m_core, &AtCore::setFanSpeed); connect(ui->ratesControlWidget, &RatesControlWidget::flowRateChanged, &m_core, &AtCore::setFlowRate); connect(ui->ratesControlWidget, &RatesControlWidget::printSpeedChanged, &m_core, &AtCore::setPrinterSpeed); connect(m_axisControl, &AxisControl::clicked, this, &AtCoreInstanceWidget::axisControlClicked); //Sd Card Stuff connect(&m_core, &AtCore::sdCardFileListChanged, m_sdWidget, &SdWidget::updateFilelist); connect(m_sdWidget, &SdWidget::requestSdList, &m_core, &AtCore::sdFileList); connect(m_sdWidget, &SdWidget::printSdFile, [this](const QString & fileName) { if (fileName.isEmpty()) { QMessageBox::information(this, tr("Print Error"), tr("You must Select a file from the list")); } else { m_core.print(fileName, true); togglePrintButtons(true); } }); connect(m_sdWidget, &SdWidget::deleteSdFile, [this](const QString & fileName) { if (fileName.isEmpty()) { QMessageBox::information(this, tr("Delete Error"), tr("You must Select a file from the list")); } else { m_core.sdDelete(fileName); } }); } void AtCoreInstanceWidget::printFile(const QUrl& fileName) { if (!fileName.isEmpty() && (m_core.state() == AtCore::IDLE)) { m_core.print(fileName.toLocalFile()); } } void AtCoreInstanceWidget::print(){ switch (m_files.size()){ case 0: QMessageBox::warning(this, i18n("Error"), i18n("There's no GCode File open. \n Please select a file and try again."), QMessageBox::Ok); break; case 1: printFile(m_files.at(0)); break; default: auto dialog = new ChooseFileDialog(this, m_files); if(dialog->exec() == QDialog::Accepted){ printFile(dialog->choosenFile()); } } } void AtCoreInstanceWidget::pausePrint() { if(m_core.state() == AtCore::BUSY) { m_core.pause(profileData["postPause"].toString()); } else if (m_core.state() == AtCore::PAUSE) { m_core.resume(); } } void AtCoreInstanceWidget::stopPrint() { m_core.stop(); } void AtCoreInstanceWidget::disableMotors() { m_core.disableMotors(0); } void AtCoreInstanceWidget::handlePrinterStatusChanged(AtCore::STATES newState) { static QString stateString; switch (newState) { case AtCore::CONNECTING: { m_core.setSerialTimerInterval(0); m_connectButton->setText(i18n("Disconnect")); m_connectButton->setIcon(QIcon::fromTheme("network-disconnect", QIcon(QString(":/%1/disconnect").arg(m_theme)))); m_connectToolBar->setHidden(true); m_toolBar->setHidden(false); stateString = i18n("Connecting..."); connect(&m_core, &AtCore::receivedMessage, m_logWidget, &LogWidget::appendRLog); connect(m_core.serial(), &SerialLayer::pushedCommand, m_logWidget, &LogWidget::appendSLog); } break; case AtCore::IDLE: { stateString = i18n("Connected to ") + m_core.serial()->portName(); emit extruderCountChanged(m_core.extruderCount()); m_logWidget->appendLog(i18n("Serial connected")); emit disableDisconnect(false); enableControls(true); } break; case AtCore::DISCONNECTED: { stateString = i18n("Not Connected"); disconnect(&m_core, &AtCore::receivedMessage, m_logWidget, &LogWidget::appendRLog); disconnect(m_core.serial(), &SerialLayer::pushedCommand, m_logWidget, &LogWidget::appendSLog); m_logWidget->appendLog(i18n("Serial disconnected")); m_core.setSerialTimerInterval(100); m_connectButton->setText(i18n("Connect")); m_connectButton->setIcon(QIcon::fromTheme("network-connect",QIcon(QString(":/%1/connect").arg(m_theme)))); m_connectToolBar->setHidden(false); m_toolBar->setHidden(true); enableControls(false); } break; case AtCore::STARTPRINT: { stateString = i18n("Starting Print"); ui->printProgressWidget->setVisible(true); connect(&m_core, &AtCore::printProgressChanged, ui->printProgressWidget, &PrintProgressWidget::updateProgressBar); } break; case AtCore::FINISHEDPRINT: { stateString = i18n("Finished Print"); ui->printProgressWidget->setVisible(false); disconnect(&m_core, &AtCore::printProgressChanged, ui->printProgressWidget, &PrintProgressWidget::updateProgressBar); m_printAction->setText(i18n("Print")); m_printAction->setIcon(QIcon::fromTheme("media-playback-start", QIcon(QString(":/%1/start").arg(m_theme)))); } break; case AtCore::BUSY: { stateString = i18n("Printing"); emit disableDisconnect(true); m_printAction->setText(i18n("Pause")); m_printAction->setIcon(QIcon::fromTheme("media-playback-pause", QIcon(QString(":/%1/pause").arg(m_theme)))); } break; case AtCore::PAUSE: { stateString = i18n("Paused"); m_printAction->setText(i18n("Resume")); m_printAction->setIcon(QIcon::fromTheme("media-playback-start", QIcon(QString(":/%1/start").arg(m_theme)))); } break; case AtCore::STOP: { stateString = i18n("Stoping Print"); } break; case AtCore::ERRORSTATE: { stateString = i18n("Error"); } break; default: qWarning("AtCore State not Recognized."); break; } ui->lblState->setText(stateString); } void AtCoreInstanceWidget::checkTemperature(uint sensorType, uint number, uint temp) { static 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)); m_logWidget->appendLog(msg); } void AtCoreInstanceWidget::axisControlClicked(QChar axis, int value) { m_core.setRelativePosition(); m_core.pushCommand(GCode::toCommand(GCode::G1, QStringLiteral("%1%2").arg(axis, QString::number(value)))); m_core.setAbsolutePosition(); } void AtCoreInstanceWidget::enableControls(bool b) { ui->mainTab->setEnabled(b); m_toolBar->setEnabled(b); } bool AtCoreInstanceWidget::connected() { return (m_core.state() != AtCore::DISCONNECTED); } void AtCoreInstanceWidget::setOpenFiles(const QList& files) { m_files = files; togglePrintButtons(m_files.size()); } void AtCoreInstanceWidget::updateSerialPort(const QStringList &ports) { m_comboPort->clear(); m_comboPort->addItems(ports); } void AtCoreInstanceWidget::updateProfileData() { m_settings.beginGroup("GeneralSettings"); QStringList profiles = m_settings.childGroups(); m_settings.endGroup(); m_comboProfile->clear(); m_comboProfile->addItems(profiles); } void AtCoreInstanceWidget::togglePrintButtons(bool shown) { m_printAction->setVisible(shown); m_stopAction->setVisible(shown); } diff --git a/src/widgets/bedextruderwidget.cpp b/src/widgets/bedextruderwidget.cpp index 482b6ee..c1b89aa 100644 --- a/src/widgets/bedextruderwidget.cpp +++ b/src/widgets/bedextruderwidget.cpp @@ -1,122 +1,128 @@ /* Atelier KDE Printer Host for 3D Printing Copyright (C) <2016> Author: Lays Rodrigues - laysrodriguessilva@gmail.com Tomaz Canabraza - tcanabrava@kde.org 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 . */ #include #include #include #include #include "bedextruderwidget.h" #include "thermowidget.h" BedExtruderWidget::BedExtruderWidget(QWidget *parent) : QWidget(parent), m_bedThermo(new ThermoWidget(this, QString(i18n("Bed")))), m_extruderThermo(new ThermoWidget(this, QString(i18n("HotEnd")))), m_extruderBox(new QWidget(this)), m_extrudersLayout(new QHBoxLayout) { m_bedThermo->setScale(0, 150); m_extruderThermo->setScale(0, 250); m_extruderBox->setLayout(m_extrudersLayout); auto *layout = new QGridLayout; auto *label = new QLabel(i18n("Active Extruder:")); m_extrudersLayout->addWidget(label); layout->addWidget(m_extruderBox, 0, 0, 1, -1); layout->addWidget(m_bedThermo, 1, 0); layout->addWidget(m_extruderThermo, 1, 1); setLayout(layout); //Add Default Extruder setExtruderCount(1); connect(m_bedThermo, &ThermoWidget::targetTemperatureChanged, [this](double v) { qDebug() << "Receiving the temperature change for bed"; emit bedTemperatureChanged((int)v, false); }); connect(m_extruderThermo, &ThermoWidget::targetTemperatureChanged, [this](double v) { qDebug() << "Receiving the temperature changed for thermo"; emit extTemperatureChanged((int)v, currentExtruder(), false); }); } -BedExtruderWidget::~BedExtruderWidget() -{ -} - void BedExtruderWidget::setExtruderCount(int value) { value > 1 ? m_extruderBox->setVisible(true) : m_extruderBox->setVisible(false); if (value == m_extruderCount) { return; } else if (m_extruderCount < value) { //loop for the new buttons for (int i = m_extruderCount; i < value; i++) { auto *rb = new QRadioButton(QString::number(i + 1)); m_extrudersLayout->addWidget(rb); extruderMap.insert(i, rb); } } else { //remove buttons - need to test it! for (int i = m_extruderCount; i >= value; i--) { auto *rb = extruderMap.value(i); m_extrudersLayout->removeWidget(rb); extruderMap.remove(i); delete (rb); } } m_extruderCount = value; } void BedExtruderWidget::updateBedTemp(const float temp) { m_bedThermo->setCurrentTemperature(temp); } void BedExtruderWidget::updateExtTemp(const float temp) { m_extruderThermo->setCurrentTemperature(temp); } void BedExtruderWidget::updateBedTargetTemp(const float temp) { m_bedThermo->setTargetTemperature(temp); } void BedExtruderWidget::updateExtTargetTemp(const float temp) { m_extruderThermo->setTargetTemperature(temp); } int BedExtruderWidget::currentExtruder() { int currExt = 0; for (int i = 0; i < extruderMap.size(); i++) { if (extruderMap.value(i)->isChecked()) { currExt = i; break; } } return currExt; } + +void BedExtruderWidget::setBedMaxTemperature(int value) +{ + m_bedThermo->setScale(0, value); +} + +void BedExtruderWidget::setExtruderMaxTemperature(int value) +{ + m_extruderThermo->setScale(0, value); +} diff --git a/src/widgets/bedextruderwidget.h b/src/widgets/bedextruderwidget.h index 1b18f4d..d7c4612 100644 --- a/src/widgets/bedextruderwidget.h +++ b/src/widgets/bedextruderwidget.h @@ -1,55 +1,56 @@ /* Atelier KDE Printer Host for 3D Printing Copyright (C) <2016> Author: Lays Rodrigues - laysrodriguessilva@gmail.com Tomaz Canabraza - tcanabrava@kde.org 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 class ThermoWidget; class BedExtruderWidget : public QWidget { Q_OBJECT public: explicit BedExtruderWidget(QWidget *parent = nullptr); - ~BedExtruderWidget(); void setExtruderCount(int value); + void setBedMaxTemperature(int value); + void setExtruderMaxTemperature(int value); void updateBedTemp(const float temp); void updateExtTemp(const float temp); void updateBedTargetTemp(const float temp); void updateExtTargetTemp(const float temp); private: QMap extruderMap; ThermoWidget *m_bedThermo = nullptr; ThermoWidget *m_extruderThermo = nullptr; QWidget *m_extruderBox = nullptr; QHBoxLayout *m_extrudersLayout = nullptr; int currentExtruder(); int m_extruderCount = 0; signals: void bedTemperatureChanged(int tmp, bool andWait); void extTemperatureChanged(int tmp, int currExt, bool andWait); };