diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 3c933fa..fb89877 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1,214 +1,234 @@
/* Atelier KDE Printer Host for 3D Printing
Copyright (C) <2016>
Author: Lays Rodrigues - laysrodrigues@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 "mainwindow.h"
#include
+#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
MainWindow::MainWindow(QWidget *parent) :
KXmlGuiWindow(parent),
m_currEditorView(nullptr),
m_instances(new QTabWidget(this))
{
m_theme = palette().text().color().value() >= QColor(Qt::lightGray).value() ? QString("dark") : QString("light");
initWidgets();
setupActions();
connect(m_instances, &QTabWidget::tabCloseRequested, [this] (int index){
QWidget *tempWidget= m_instances->widget(index);
delete tempWidget;
if(m_instances->count() == 1) {
m_instances->setTabsClosable(false);
m_instances->setMovable(false);
}
});
}
void MainWindow::initWidgets()
{
setupLateralArea();
newAtCoreInstance();
// View:
// Sidebar, Sidevar Controls, Printer Tabs.
// Sidevar Controls and Printer Tabs can be resized, Sidebar cant.
auto *centralLayout = new QHBoxLayout();
auto splitter = new QSplitter();
splitter->addWidget(m_lateral.m_stack);
splitter->addWidget(m_instances);
auto addTabBtn =new QToolButton();
addTabBtn->setText("+");
addTabBtn->setToolTip(i18n("Create new instance"));
addTabBtn->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_T));
connect(addTabBtn, &QToolButton::clicked, this, &MainWindow::newAtCoreInstance);
m_instances->setCornerWidget(addTabBtn, Qt::TopLeftCorner);
centralLayout->addWidget(m_lateral.m_toolBar);
centralLayout->addWidget(splitter);
auto *centralWidget = new QWidget();
centralWidget->setLayout(centralLayout);
setCentralWidget(centralWidget);
}
void MainWindow::newAtCoreInstance()
{
auto newInstanceWidget = new AtCoreInstanceWidget();
QString name = QString::number(m_instances->addTab(newInstanceWidget, i18n("Connect a printer")));
newInstanceWidget->setObjectName(name);
- newInstanceWidget->setOpenFiles(m_openFiles);
+ newInstanceWidget->setFileCount(m_openFiles.size());
connect(this, &MainWindow::profilesChanged, newInstanceWidget, &AtCoreInstanceWidget::updateProfileData);
connect(newInstanceWidget, &AtCoreInstanceWidget::requestProfileDialog, [ this ] {
std::unique_ptr pd(new ProfilesDialog);
pd->exec();
emit(profilesChanged());
});
+
+ connect(newInstanceWidget, &AtCoreInstanceWidget::requestFileChooser, [ newInstanceWidget, this ] {
+ switch (m_openFiles.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:
+ newInstanceWidget->printFile(m_openFiles.at(0));
+ break;
+ default:
+ ChooseFileDialog dialog(this,m_openFiles);
+ if(dialog.exec() == QDialog::Accepted){
+ newInstanceWidget->printFile(dialog.choosenFile());
+ }
+ }
+ });
+
connect(newInstanceWidget, &AtCoreInstanceWidget::connectionChanged, this, &MainWindow::atCoreInstanceNameChange);
if(m_instances->count() > 1) {
m_instances->setTabsClosable(true);
m_instances->setMovable(true);
m_instances->setCurrentIndex(m_instances->count()-1);
}
}
// Move to LateralArea.
void MainWindow::setupLateralArea()
{
m_lateral.m_toolBar = new QWidget();
m_lateral.m_stack = new QStackedWidget();
auto buttonLayout = new QVBoxLayout();
auto setupButton = [this, buttonLayout](const QString& key, const QString& text, const QIcon& icon, QWidget *w) {
auto *btn = new QPushButton(m_lateral.m_toolBar);
btn->setToolTip(text);
btn->setAutoExclusive(true);
btn->setCheckable(true);
//3d view is on top set it checked so users see its selected.
btn->setChecked(key == "3d");
btn->setIcon(icon);
btn->setFixedSize(48,48);
btn->setIconSize(QSize(48,48));
btn->setFlat(true);
m_lateral.m_stack->addWidget(w);
m_lateral.m_map[key] = {btn, w};
buttonLayout->addWidget(btn);
connect(btn, &QPushButton::clicked, [this, w, btn] {
if (m_lateral.m_stack->currentWidget() == w) {
m_lateral.m_stack->setHidden(m_lateral.m_stack->isVisible());
if(m_lateral.m_stack->isHidden()){
btn->setCheckable(false);
btn->setCheckable(true);
}
} else {
m_lateral.m_stack->setHidden(false);
m_lateral.m_stack->setCurrentWidget(w);
}
});
};
auto *gcodeEditor = new GCodeEditorWidget(this);
connect(gcodeEditor, &GCodeEditorWidget::updateClientFactory, this, [this](KTextEditor::View* view){
guiFactory()->removeClient(m_currEditorView);
guiFactory()->addClient(view);
m_currEditorView = view;
});
setupButton("3d", i18n("&3D"), QIcon::fromTheme("draw-cuboid", QIcon(QString(":/%1/3d").arg(m_theme))), new Viewer3D(this));
setupButton("gcode", i18n("&GCode"), QIcon::fromTheme("accessories-text-editor", QIcon(":/icon/edit")), gcodeEditor);
setupButton("video", i18n("&Video"), QIcon::fromTheme("camera-web", QIcon(":/icon/video")), new VideoMonitorWidget(this));
buttonLayout->addStretch();
m_lateral.m_toolBar->setLayout(buttonLayout);
}
void MainWindow::setupActions()
{
// Actions for the Toolbar
QAction *action;
action = actionCollection()->addAction(QStringLiteral("open"));
action->setIcon(QIcon::fromTheme("document-open", QIcon(QString(":/%1/open").arg(m_theme))));
action->setText(i18n("&Open"));
actionCollection()->setDefaultShortcut(action, QKeySequence::Open);
connect(action, &QAction::triggered, this, &MainWindow::openFile);
action = actionCollection()->addAction(QStringLiteral("new_instance"));
action->setIcon(QIcon::fromTheme("list-add", QIcon(QString(":/%1/addTab").arg(m_theme))));
action->setText(i18n("&New Connection"));
actionCollection()->setDefaultShortcut(action, QKeySequence::AddTab);
connect(action, &QAction::triggered, this, &MainWindow::newAtCoreInstance);
action = actionCollection()->addAction(QStringLiteral("profiles"));
action->setIcon(QIcon::fromTheme("document-properties", QIcon(QString(":/%1/configure").arg(m_theme))));
action->setText(i18n("&Profiles"));
connect(action, &QAction::triggered, [this] {
std::unique_ptr pd(new ProfilesDialog);
pd->exec();
emit(profilesChanged());
});
action = actionCollection()->addAction(QStringLiteral("quit"));
action->setIcon(QIcon::fromTheme("application-exit", QIcon(":/icon/exit")));
action->setText(i18n("&Quit"));
actionCollection()->setDefaultShortcut(action, QKeySequence::Quit);
connect(action, &QAction::triggered, this, &MainWindow::close);
setupGUI(Default, "atelierui");
}
void MainWindow::openFile()
{
QUrl fileName = QFileDialog::getOpenFileUrl(this, i18n("Open GCode"),
QUrl::fromLocalFile(QDir::homePath()), i18n("GCode(*.gco *.gcode);;All Files(*.*)"));
if (!fileName.isEmpty()) {
m_lateral.get("gcode")->loadFile(fileName);
m_lateral.get("3d")->drawModel(fileName.toString());
const int tabs = m_instances->count();
m_openFiles.append(fileName);
for(int i=0; i < tabs; ++i){
auto instance = qobject_cast(m_instances->widget(i));
- instance->setOpenFiles(m_openFiles);
+ instance->setFileCount(m_openFiles.size());
}
}
}
void MainWindow::atCoreInstanceNameChange(const QString &name)
{
m_instances->setTabText(sender()->objectName().toInt(),name);
}
diff --git a/src/widgets/atcoreinstancewidget.cpp b/src/widgets/atcoreinstancewidget.cpp
index a1ad382..9b44bdb 100644
--- a/src/widgets/atcoreinstancewidget.cpp
+++ b/src/widgets/atcoreinstancewidget.cpp
@@ -1,533 +1,520 @@
/* 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
#include
#include
#include
-#include "choosefiledialog.h"
AtCoreInstanceWidget::AtCoreInstanceWidget(QWidget *parent):
QWidget(parent),
+ m_fileCount(0),
m_toolBar(nullptr),
m_printAction(nullptr),
m_stopAction(nullptr)
{
m_theme = palette().text().color().value() >= QColor(Qt::lightGray).value() ? QString("dark") : QString("light") ;
-
QHBoxLayout *HLayout = new QHBoxLayout;
m_bedExtWidget = new BedExtruderWidget;
HLayout->addWidget(m_bedExtWidget);
m_movementWidget = new MovementWidget(false);
m_movementWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
HLayout->addWidget(m_movementWidget);
QVBoxLayout *VLayout = new QVBoxLayout;
VLayout->addLayout(HLayout);
m_plotWidget = new PlotWidget();
VLayout->addWidget(m_plotWidget,80);
QWidget *controlTab = new QWidget();
controlTab->setLayout(VLayout);
//AdvancedTab
VLayout = new QVBoxLayout;
m_printWidget = new PrintWidget(false);
VLayout->addWidget(m_printWidget);
m_commandWidget = new CommandWidget;
VLayout->addWidget(m_commandWidget);
m_logWidget = new LogWidget(new QTemporaryFile(QDir::tempPath() + QStringLiteral("/Atelier_")));
VLayout->addWidget(m_logWidget);
m_advancedTab = new QWidget;
m_advancedTab->setLayout(VLayout);
m_sdWidget = new SdWidget;
VLayout = new QVBoxLayout();
buildToolbar();
buildConnectionToolbar();
HLayout = new QHBoxLayout;
HLayout->addWidget(m_toolBar);
HLayout->addWidget(m_connectToolBar);
HLayout->addWidget(m_connectButton);
VLayout->addLayout(HLayout);
m_toolBar->setHidden(true);
m_tabWidget = new QTabWidget;
m_tabWidget->addTab(controlTab, i18n("Controls"));
m_tabWidget->addTab(m_advancedTab, i18n("Advanced"));
m_tabWidget->addTab(m_sdWidget, i18n("Sd Card"));
VLayout->addWidget(m_tabWidget);
m_statusWidget = new StatusWidget(false);
m_statusWidget->showPrintArea(false);
VLayout->addWidget(m_statusWidget);
setLayout(VLayout);
enableControls(false);
updateProfileData();
initConnectsToAtCore();
}
AtCoreInstanceWidget::~AtCoreInstanceWidget()
{
m_core.closeConnection();
}
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);
- togglePrintButtons(m_files.size());
+ togglePrintButtons(m_fileCount);
}
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);
}
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
if (m_core.initSerial(m_comboPort->currentText(), data["bps"].toInt()) ) {
m_logWidget->appendLog(i18n("Serial connected"));
profileData = data;
QString fw = profileData["firmware"].toString();
if( fw != QString("Auto-Detect")){
m_core.loadFirmwarePlugin(fw);
}
emit(connectionChanged(profileData["name"].toString()));
m_bedExtWidget->setBedMaxTemperature(profileData["bedTemp"].toInt());
m_bedExtWidget->setExtruderMaxTemperature(profileData["hotendTemp"].toInt());
//AddFan Support to profile
m_printWidget->updateFanCount(2);
} else {
m_logWidget->appendLog(i18n("Failed to open serial in r/w mode"));
}
} 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, m_bedExtWidget, &BedExtruderWidget::setExtruderCount);
// Bed and Extruder temperatures management
connect(m_bedExtWidget, &BedExtruderWidget::bedTemperatureChanged, &m_core, &AtCore::setBedTemp);
connect(m_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();
m_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();
m_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();
m_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();
m_bedExtWidget->updateExtTargetTemp(temp);
});
//command Widget
connect(m_commandWidget, &CommandWidget::commandPressed, [ this ](const QString &command) {
m_logWidget->appendLog("Push: " + command);
m_core.pushCommand(command);
});
connect(m_commandWidget, &CommandWidget::messagePressed, [ this ](const QString &message) {
m_logWidget->appendLog("Display: " + message);
m_core.showMessage(message);
});
// Fan, Flow and Speed management
connect(m_printWidget, &PrintWidget::fanSpeedChanged, &m_core, &AtCore::setFanSpeed);
connect(m_printWidget, &PrintWidget::flowRateChanged, &m_core, &AtCore::setFlowRate);
connect(m_printWidget, &PrintWidget::printSpeedChanged, &m_core, &AtCore::setPrinterSpeed);
//Movement Widget
connect(m_movementWidget, &MovementWidget::absoluteMove, [this](const QLatin1Char & axis, const double value) {
m_logWidget->appendLog(GCode::description(GCode::G1));
m_core.move(axis, value);
});
connect(m_movementWidget, &MovementWidget::relativeMove, [this](const QLatin1Char & axis, const double value) {
m_logWidget->appendLog(i18n("Relative Move: %1, %2", axis, QString::number(value)));
m_core.setRelativePosition();
m_core.move(axis, value);
m_core.setAbsolutePosition();
});
//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, i18n("Print Error"), i18n("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, i18n("Delete Error"), i18n("You must Select a file from the list"));
} else {
m_core.sdDelete(fileName);
}
});
//Status Area
connect(&m_core, &AtCore::sdMountChanged, m_statusWidget, &StatusWidget::setSD);
}
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::print()
+{
+ emit (requestFileChooser());
}
+
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 %1", 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");
m_statusWidget->showPrintArea(true);
connect(&m_core, &AtCore::printProgressChanged, m_statusWidget, &StatusWidget::updatePrintProgress);
} break;
case AtCore::FINISHEDPRINT: {
stateString = i18n("Finished Print");
m_statusWidget->showPrintArea(false);
disconnect(&m_core, &AtCore::printProgressChanged, m_statusWidget, &StatusWidget::updatePrintProgress);
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;
}
m_statusWidget->setState(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::enableControls(bool b)
{
if(b) {
layout()->removeWidget(m_logWidget);
layout()->removeWidget(m_statusWidget);
layout()->addWidget(m_statusWidget);
m_advancedTab->layout()->addWidget(m_logWidget);
} else {
m_advancedTab->layout()->removeWidget(m_logWidget);
layout()->addWidget(m_logWidget);
layout()->removeWidget(m_statusWidget);
layout()->addWidget(m_statusWidget);
}
m_tabWidget->setHidden(!b);
m_toolBar->setEnabled(b);
}
bool AtCoreInstanceWidget::connected()
{
return (m_core.state() != AtCore::DISCONNECTED);
}
-void AtCoreInstanceWidget::setOpenFiles(const QList& files)
+void AtCoreInstanceWidget::setFileCount(int count)
{
- m_files = files;
- togglePrintButtons(m_files.size());
+ m_fileCount = count;
+ togglePrintButtons(m_fileCount);
}
void AtCoreInstanceWidget::updateSerialPort(const QStringList &ports)
{
m_comboPort->clear();
if (!ports.isEmpty()) {
m_comboPort->addItems(ports);
m_logWidget->appendLog(i18n("Found %1 Ports", QString::number(ports.count())));
} else {
QString portError(i18n("No available ports! Please connect a serial device to continue!"));
if (! m_logWidget->endsWith(portError)) {
m_logWidget->appendLog(portError);
}
}
}
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/atcoreinstancewidget.h b/src/widgets/atcoreinstancewidget.h
index 6a9a6a3..1923d89 100644
--- a/src/widgets/atcoreinstancewidget.h
+++ b/src/widgets/atcoreinstancewidget.h
@@ -1,104 +1,105 @@
/* 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
#include
#include
#include
#include "bedextruderwidget.h"
#include
#include
#include
#include
#include
#include
#include
/**
* @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);
+ void setFileCount(int count);
public slots:
void updateProfileData();
+ void printFile(const QUrl& fileName);
private:
AtCore m_core;
+ int m_fileCount;
QToolBar *m_toolBar;
QComboBox *m_comboPort;
QComboBox *m_comboProfile;
QPushButton *m_connectButton;
QToolBar *m_connectToolBar;
QWidget *m_connectWidget;
QMap profileData;
- QList m_files;
QAction *m_printAction;
QAction *m_stopAction;
QSettings m_settings;
QString m_theme;
QTabWidget *m_tabWidget;
QWidget *m_advancedTab;
BedExtruderWidget *m_bedExtWidget;
CommandWidget *m_commandWidget;
LogWidget *m_logWidget;
MovementWidget *m_movementWidget;
PlotWidget *m_plotWidget;
PrintWidget *m_printWidget;
SdWidget *m_sdWidget;
StatusWidget *m_statusWidget;
void initConnectsToAtCore();
- void printFile(const QUrl& fileName);
void pausePrint();
void stopPrint();
void disableMotors();
void handlePrinterStatusChanged(AtCore::STATES newState);
void checkTemperature(uint sensorType, uint number, uint temp);
void enableControls(bool b);
void buildToolbar();
void print();
void updateSerialPort(const QStringList &ports);
void buildConnectionToolbar();
void connectButtonClicked();
void togglePrintButtons(bool shown);
signals:
void connectionChanged(QString name);
void disableDisconnect(bool b);
void extruderCountChanged(int count);
void requestProfileDialog();
+ void requestFileChooser();
};