diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index 7a1857c..d5a0925 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -1,28 +1,30 @@ +include_directories(../dialogs) + set(widgets_SRCS gcodeeditorwidget.cpp axiscontrol.cpp bedextruderwidget.cpp plotwidget.cpp pushgcodewidget.cpp ratescontrolwidget.cpp printprogresswidget.cpp logwidget.cpp videomonitorwidget.cpp atcoreinstancewidget.cpp ) add_library(AtelierWidgets STATIC ${widgets_SRCS}) target_link_libraries(AtelierWidgets Qt5::Core Qt5::Widgets Qt5::SerialPort KF5::Solid KF5::I18n KF5::TextEditor Qt5::Charts Qt5::Multimedia Qt5::MultimediaWidgets AtCore::AtCore) add_subdirectory(3dview) diff --git a/src/widgets/atcoreinstancewidget.cpp b/src/widgets/atcoreinstancewidget.cpp index 5df8a1c..1b01490 100644 --- a/src/widgets/atcoreinstancewidget.cpp +++ b/src/widgets/atcoreinstancewidget.cpp @@ -1,290 +1,316 @@ /* Atelier KDE Printer Host for 3D Printing Copyright (C) <2017> Author: Lays Rodrigues - laysrodriguessilva@gmail.com 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) { ui = new Ui::AtCoreInstanceWidget; ui->setupUi(this); ui->printPB->setIcon(style()->standardIcon(QStyle::SP_MediaPlay)); ui->pausePB->setIcon(style()->standardIcon(QStyle::SP_MediaPause)); ui->stopPB->setIcon(style()->standardIcon(QStyle::SP_MediaStop)); ui->disableMotorsPB->setIcon(style()->standardIcon(QStyle::SP_DockWidgetCloseButton)); ui->printProgressWidget->setVisible(false); setupConnections(); enableControls(false); } void AtCoreInstanceWidget::setupConnections(){ connect(ui->pausePB, &QPushButton::clicked, this, &AtCoreInstanceWidget::pausePrint); connect(ui->stopPB, &QPushButton::clicked, this, &AtCoreInstanceWidget::stopPrint); connect(ui->disableMotorsPB, &QPushButton::clicked, this, &AtCoreInstanceWidget::disableMotors); buildToolbar(); connect(ui->disconnectPB, &QPushButton::clicked, [ & ]{ m_core.setState(AtCore::DISCONNECTED); }); + connect(ui->printPB, &QPushButton::clicked, this, &AtCoreInstanceWidget::print); + + enableControls(false); } AtCoreInstanceWidget::~AtCoreInstanceWidget() { delete ui; } void AtCoreInstanceWidget::buildToolbar() { toolBar = new QToolBar(); auto axis = new QAction("Axis"); axis->setCheckable(true); axis->setChecked(true); connect(axis, &QAction::toggled, ui->axisViewWidget, &AxisControl::setVisible); auto controls = new QAction("Controls"); controls->setCheckable(true); controls->setChecked(true); connect(controls, &QAction::toggled, ui->bedExtWidget, &BedExtruderWidget::setVisible); auto plot = new QAction("Temperature Plot"); plot->setCheckable(true); plot->setChecked(true); connect(plot, &QAction::toggled, ui->plotWidget, &PlotWidget::setVisible); toolBar->addAction(axis); toolBar->addAction(controls); toolBar->addAction(plot); ui->toolBarLayout->addWidget(new QLabel(i18n("Show/Hide: "))); ui->toolBarLayout->addWidget(toolBar); ui->toolBarLayout->addStretch(); } void AtCoreInstanceWidget::startConnection(const QString& serialPort, const QMap& profile){ m_core.initSerial(serialPort, profile["bps"].toInt()); profileData = profile; initConnectsToAtCore(); } void AtCoreInstanceWidget::initConnectsToAtCore() { // 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, [ & ](const float& temp) { checkTemperature(0x00, 0, temp); ui->plotWidget->appendPoint(i18n("Actual Bed"), temp); ui->plotWidget->update(); ui->bedExtWidget->updateBedTemp(temp); }); connect(&m_core.temperature(), &Temperature::bedTargetTemperatureChanged, [ & ](const float& temp) { checkTemperature(0x01, 0, temp); ui->plotWidget->appendPoint(i18n("Target Bed"), temp); ui->plotWidget->update(); ui->bedExtWidget->updateBedTargetTemp(temp); }); connect(&m_core.temperature(), &Temperature::extruderTemperatureChanged, [ & ](const float& temp) { checkTemperature(0x02, 0, temp); ui->plotWidget->appendPoint(i18n("Actual Ext.1"), temp); ui->plotWidget->update(); ui->bedExtWidget->updateExtTemp(temp); }); connect(&m_core.temperature(), &Temperature::extruderTargetTemperatureChanged, [ & ](const float& temp) { checkTemperature(0x03, 0, temp); ui->plotWidget->appendPoint(i18n("Target Ext.1"), temp); ui->plotWidget->update(); ui->bedExtWidget->updateExtTargetTemp(temp); }); connect(ui->pushGCodeWidget, &PushGCodeWidget::push, [ & ](QString command) { ui->logWidget->addLog("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(ui->axisViewWidget, &AxisControl::clicked, this, &AtCoreInstanceWidget::axisControlClicked); } 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.setIdleHold(0); } void AtCoreInstanceWidget::handlePrinterStatusChanged(AtCore::STATES newState) { static QString stateString; switch (newState) { case AtCore::CONNECTING: { stateString = i18n("Connecting..."); connect(&m_core, &AtCore::receivedMessage, this, &AtCoreInstanceWidget::checkReceivedCommand); connect(m_core.serial(), &SerialLayer::pushedCommand, this, &AtCoreInstanceWidget::checkPushedCommands); } break; case AtCore::IDLE: { stateString = i18n("Connected to ") + m_core.serial()->portName(); emit extruderCountChanged(m_core.extruderCount()); ui->logWidget->addLog(i18n("Serial connected")); ui->disconnectPB->setEnabled(true); enableControls(true); } break; case AtCore::DISCONNECTED: { stateString = i18n("Not Connected"); disconnect(&m_core, &AtCore::receivedMessage, this, &AtCoreInstanceWidget::checkReceivedCommand); disconnect(m_core.serial(), &SerialLayer::pushedCommand, this, &AtCoreInstanceWidget::checkPushedCommands); ui->logWidget->addLog(i18n("Serial disconnected")); 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); } break; case AtCore::BUSY: { stateString = i18n("Printing"); ui->disconnectPB->setDisabled(true); } break; case AtCore::PAUSE: { stateString = i18n("Paused"); } 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)); ui->logWidget->addRLog(msg); } void AtCoreInstanceWidget::checkReceivedCommand(const QByteArray &message) { ui->logWidget->addRLog(QString::fromUtf8(message)); } void AtCoreInstanceWidget::checkPushedCommands(const QByteArray &bmsg) { QString msg = QString::fromUtf8(bmsg); QRegExp _newLine(QChar::fromLatin1('\n')); QRegExp _return(QChar::fromLatin1('\r')); msg.replace(_newLine, QStringLiteral("\\n")); msg.replace(_return, QStringLiteral("\\r")); ui->logWidget->addSLog(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); ui->printPB->setEnabled(b); ui->pausePB->setEnabled(b); ui->stopPB->setEnabled(b); ui->disconnectPB->setEnabled(b); ui->disableMotorsPB->setEnabled(b); toolBar->setEnabled(b); } bool AtCoreInstanceWidget::connected() { return (m_core.state() != AtCore::DISCONNECTED); } + +void AtCoreInstanceWidget::setOpenFiles(const QList& files) +{ + m_files = files; +} diff --git a/src/widgets/atcoreinstancewidget.h b/src/widgets/atcoreinstancewidget.h index afd84a9..789a48c 100644 --- a/src/widgets/atcoreinstancewidget.h +++ b/src/widgets/atcoreinstancewidget.h @@ -1,71 +1,75 @@ /* Atelier KDE Printer Host for 3D Printing Copyright (C) <2017> Author: Lays Rodrigues - laysrodriguessilva@gmail.com 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 +#include namespace Ui { class AtCoreInstanceWidget; } /** * @todo write docs */ class AtCoreInstanceWidget : public QWidget { Q_OBJECT public: /** * Default constructor */ AtCoreInstanceWidget(QWidget* parent = nullptr); /** * Destructor */ ~AtCoreInstanceWidget(); void startConnection(const QString& serialPort, const QMap& profile); bool connected(); + void setOpenFiles(const QList& files); private: Ui::AtCoreInstanceWidget* ui; AtCore m_core; QToolBar *toolBar; QMap profileData; + QList m_files; void initConnectsToAtCore(); void printFile(const QUrl& fileName); void pausePrint(); void stopPrint(); void disableMotors(); void checkReceivedCommand(const QByteArray &message); void checkPushedCommands(const QByteArray &bmsg); void handlePrinterStatusChanged(AtCore::STATES newState); void checkTemperature(uint sensorType, uint number, uint temp); void axisControlClicked(QChar axis, int value); void enableControls(bool b); void buildToolbar(); void setupConnections(); + void print(); signals: void extruderCountChanged(int count); };