diff --git a/src/widgets/atcoreinstancewidget.h b/src/widgets/atcoreinstancewidget.h --- a/src/widgets/atcoreinstancewidget.h +++ b/src/widgets/atcoreinstancewidget.h @@ -69,7 +69,7 @@ QAction *m_stopAction; QComboBox *m_comboPort; QComboBox *m_comboProfile; - QMap profileData; + QMap m_profileData; QPushButton *m_connectButton; QSettings m_settings; QString m_theme; diff --git a/src/widgets/atcoreinstancewidget.cpp b/src/widgets/atcoreinstancewidget.cpp --- a/src/widgets/atcoreinstancewidget.cpp +++ b/src/widgets/atcoreinstancewidget.cpp @@ -221,21 +221,24 @@ 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["heatedBed"] = m_settings.value(QStringLiteral("heatedBed"), true); data["name"] = profile; m_settings.endGroup(); m_settings.endGroup(); //then connect if (m_core.initSerial(m_comboPort->currentText(), data["bps"].toInt())) { - profileData = data; - QString fw = profileData["firmware"].toString(); + m_profileData = data; + QString fw = m_profileData["firmware"].toString(); m_logWidget->appendLog(i18n("Firmware: %1", fw)); 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()); + emit(connectionChanged(m_profileData["name"].toString())); + m_profileData["heatedBed"].toBool() ? m_bedExtWidget->setBedMaxTemperature(m_profileData["bedTemp"].toInt()) : + m_bedExtWidget->setBedThermoHidden(true); + + m_bedExtWidget->setExtruderMaxTemperature(m_profileData["hotendTemp"].toInt()); //AddFan Support to profile m_printWidget->updateFanCount(2); } @@ -358,7 +361,7 @@ void AtCoreInstanceWidget::pausePrint() { if (m_core.state() == AtCore::BUSY) { - m_core.pause(profileData["postPause"].toString()); + m_core.pause(m_profileData["postPause"].toString()); } else if (m_core.state() == AtCore::PAUSE) { m_core.resume(); } diff --git a/src/widgets/bedextruderwidget.h b/src/widgets/bedextruderwidget.h --- a/src/widgets/bedextruderwidget.h +++ b/src/widgets/bedextruderwidget.h @@ -39,6 +39,7 @@ void updateExtTemp(const float temp); void updateBedTargetTemp(const float temp); void updateExtTargetTemp(const float temp); + void setBedThermoHidden(bool hidden); private: int m_extruderCount = 0; diff --git a/src/widgets/bedextruderwidget.cpp b/src/widgets/bedextruderwidget.cpp --- a/src/widgets/bedextruderwidget.cpp +++ b/src/widgets/bedextruderwidget.cpp @@ -38,10 +38,10 @@ auto *label = new QLabel(i18n("Active Extruder:")); m_extrudersLayout->addWidget(label); - auto *layout = new QGridLayout; - layout->addWidget(m_extruderBox, 0, 0, 1, -1); - layout->addWidget(m_bedThermo, 1, 0); - layout->addWidget(m_extruderThermo, 1, 1); + auto *layout = new QHBoxLayout; + layout->addWidget(m_extruderBox); + layout->addWidget(m_bedThermo); + layout->addWidget(m_extruderThermo); setLayout(layout); //Add Default Extruder @@ -123,3 +123,8 @@ { m_extruderThermo->setScale(0, value); } + +void BedExtruderWidget::setBedThermoHidden(bool hidden) +{ + m_bedThermo->setHidden(hidden); +}