Differential D16144 Diff 43998 src/widgets/atcoreinstancewidget.cpp

Changeset View

Standalone View

View Options

src/widgets/atcoreinstancewidget.cpp

Show All 23 Lines
24#include "atcoreinstancewidget.h" 24​#include "atcoreinstancewidget.h"
25 25​
26AtCoreInstanceWidget::AtCoreInstanceWidget(QWidget *parent): 26​AtCoreInstanceWidget::AtCoreInstanceWidget(QWidget *parent):
27 QWidget(parent) 27​ QWidget(parent)
28 , m_fileCount(0) 28​ , m_fileCount(0)
29 , m_printAction(nullptr) 29​ , m_printAction(nullptr)
30 , m_stopAction(nullptr) 30​ , m_stopAction(nullptr)
31 , m_toolBar(nullptr) 31​ , m_toolBar(nullptr)
32​ , m_bedSize(200, 200)
32{ 33​{
33 m_theme = palette().text().color().value() >= QColor(Qt::lightGray).value() ? QString("dark") : QString("light") ; 34​ m_theme = palette().text().color().value() >= QColor(Qt::lightGray).value() ? QString("dark") : QString("light") ;
34 m_iconSize = QSize(fontMetrics().lineSpacing(), fontMetrics().lineSpacing()); 35​ m_iconSize = QSize(fontMetrics().lineSpacing(), fontMetrics().lineSpacing());
35 QHBoxLayout *HLayout = new QHBoxLayout; 36​ QHBoxLayout *HLayout = new QHBoxLayout;
36 m_bedExtWidget = new BedExtruderWidget; 37​ m_bedExtWidget = new BedExtruderWidget;
37 HLayout->addWidget(m_bedExtWidget); 38​ HLayout->addWidget(m_bedExtWidget);
38 39​
39 m_movementWidget = new MovementWidget(false); 40​ m_movementWidget = new MovementWidget(false);
▲ Show 20 Lines • Show All 185 Lines • ▼ Show 20 Line(s)221 if (m_core.initSerial(m_comboPort->currentText(), m_profileData["bps"].toInt())) {
225 } 226​ }
226 emit(connectionChanged(m_profileData["name"].toString())); 227​ emit(connectionChanged(m_profileData["name"].toString()));
227 m_profileData["heatedBed"].toBool() ? m_bedExtWidget->setBedMaxTemperature(m_profileData["bedTemp"].toInt()) : 228​ m_profileData["heatedBed"].toBool() ? m_bedExtWidget->setBedMaxTemperature(m_profileData["bedTemp"].toInt()) :
228 m_bedExtWidget->setBedThermoHidden(true); 229​ m_bedExtWidget->setBedThermoHidden(true);
229 230​
230 m_bedExtWidget->setExtruderMaxTemperature(m_profileData["hotendTemp"].toInt()); 231​ m_bedExtWidget->setExtruderMaxTemperature(m_profileData["hotendTemp"].toInt());
231 //AddFan Support to profile 232​ //AddFan Support to profile
232 m_printWidget->updateFanCount(2); 233​ m_printWidget->updateFanCount(2);
234​ //Adjust bed size
235​ if (m_profileData["isCartesian"].toBool()) {
236​ QSize newSize = QSize(m_profileData["dimensionX"].toInt(), m_profileData["dimensionY"].toInt());
237​ if (newSize != m_bedSize) {
rizzitelloAuthorUnsubmitted
Not Done

Add Check if delta.

} else {
   //Delta machines have only a radius. 
    QSize newSize = QSize(m_profileData["radius"].toInt(), 0);
}

if (newSize != m_bedSize) {
rizzitello: Add Check if delta. ``` } else { //Delta machines have only a radius. QSize newSize =…
238​ m_bedSize = newSize;
239​ emit bedSizeChanged(m_bedSize);
240​ }
241​ }
233 } 242​ }
234 } else { 243​ } else {
235 m_core.closeConnection(); 244​ m_core.closeConnection();
236 emit(connectionChanged(i18n("Connect a Printer"))); 245​ emit(connectionChanged(i18n("Connect a Printer")));
237 } 246​ }
238} 247​}
239 248​
240void AtCoreInstanceWidget::initConnectsToAtCore() 249​void AtCoreInstanceWidget::initConnectsToAtCore()
▲ Show 20 Lines • Show All 318 Lines • ▼ Show 20 Line(s)564{
559 QMap<QString, QVariant> data{ 568​ QMap<QString, QVariant> data{
560 {"bps", m_settings.value(QStringLiteral("bps"), QStringLiteral("115200"))} 569​ {"bps", m_settings.value(QStringLiteral("bps"), QStringLiteral("115200"))}
561 , {"bedTemp", m_settings.value(QStringLiteral("maximumTemperatureBed"), QStringLiteral("0"))} 570​ , {"bedTemp", m_settings.value(QStringLiteral("maximumTemperatureBed"), QStringLiteral("0"))}
562 , {"hotendTemp", m_settings.value(QStringLiteral("maximumTemperatureExtruder"), QStringLiteral("0"))} 571​ , {"hotendTemp", m_settings.value(QStringLiteral("maximumTemperatureExtruder"), QStringLiteral("0"))}
563 , {"firmware", m_settings.value(QStringLiteral("firmware"), QStringLiteral("Auto-Detect"))} 572​ , {"firmware", m_settings.value(QStringLiteral("firmware"), QStringLiteral("Auto-Detect"))}
564 , {"postPause", m_settings.value(QStringLiteral("postPause"), QStringLiteral(""))} 573​ , {"postPause", m_settings.value(QStringLiteral("postPause"), QStringLiteral(""))}
565 , {"heatedBed", m_settings.value(QStringLiteral("heatedBed"), true)} 574​ , {"heatedBed", m_settings.value(QStringLiteral("heatedBed"), true)}
566 , {"name", profile} 575​ , {"name", profile}
576​ , {"isCartesian", m_settings.value(QStringLiteral("isCartesian"), true)}
577​ , {"dimensionX", m_settings.value(QStringLiteral("dimensionX"), QStringLiteral("200"))}
578​ , {"dimensionY", m_settings.value(QStringLiteral("dimensionY"), QStringLiteral("200"))}
579​ , {"dimensionZ", m_settings.value(QStringLiteral("dimensionZ"), QStringLiteral("180"))}
567 }; 580​ };
rizzitelloAuthorUnsubmitted
Not Done

Add Delta Sizes

, {"radius", m_settings.value(QStringLiteral("radius"), QStringLiteral("200"))}
, {"z_delta_dimension", m_settings.value(QStringLiteral("z_delta_dimension"), QStringLiteral("180"))}
rizzitello: Add Delta Sizes ``` , {"radius", m_settings.value(QStringLiteral("radius"), QStringLiteral…
568 m_settings.endGroup(); 581​ m_settings.endGroup();
569 m_settings.endGroup(); 582​ m_settings.endGroup();
570 return data; 583​ return data;
571} 584​}
572 585​
573void AtCoreInstanceWidget::connectBedTemperatureData(bool connected) 586​void AtCoreInstanceWidget::connectBedTemperatureData(bool connected)
574{ 587​{
575 if (connected) { 588​ if (connected) {
▲ Show 20 Lines • Show All 45 Lines • ▼ Show 20 Line(s)633 } else {
621 if (m_plotWidget->plots().contains(i18n("Actual Ext.1"))) { 634​ if (m_plotWidget->plots().contains(i18n("Actual Ext.1"))) {
622 m_plotWidget->removePlot(i18n("Actual Ext.1")); 635​ m_plotWidget->removePlot(i18n("Actual Ext.1"));
623 disconnect(&m_core.temperature(), &Temperature::extruderTemperatureChanged, this, nullptr); 636​ disconnect(&m_core.temperature(), &Temperature::extruderTemperatureChanged, this, nullptr);
624 m_plotWidget->removePlot(i18n("Target Ext.1")); 637​ m_plotWidget->removePlot(i18n("Target Ext.1"));
625 disconnect(&m_core.temperature(), &Temperature::extruderTargetTemperatureChanged, this, nullptr); 638​ disconnect(&m_core.temperature(), &Temperature::extruderTargetTemperatureChanged, this, nullptr);
626 } 639​ }
627 } 640​ }
628} 641​}
642​
643​QSize AtCoreInstanceWidget::bedSize()
644​{
645​ return m_bedSize;
646​}