Differential D19519 Diff 53137 src/widgets/atcoreinstancewidget.cpp

Changeset View

Standalone View

View Options

src/widgets/atcoreinstancewidget.cpp

Show First 20 Lines • Show All 423 Lines • ▼ Show 20 Line(s)417 case AtCore::DISCONNECTED: {
424 m_logWidget->appendLog(i18n("Serial disconnected")); 424​ m_logWidget->appendLog(i18n("Serial disconnected"));
425 m_core.setSerialTimerInterval(100); 425​ m_core.setSerialTimerInterval(100);
426 m_connectButton->setText(i18n("Connect")); 426​ m_connectButton->setText(i18n("Connect"));
427 m_connectButton->setIcon(QIcon::fromTheme("network-connect", QIcon(QString(":/%1/connect").arg(m_theme)))); 427​ m_connectButton->setIcon(QIcon::fromTheme("network-connect", QIcon(QString(":/%1/connect").arg(m_theme))));
428 m_connectToolBar->setHidden(false); 428​ m_connectToolBar->setHidden(false);
429 m_toolBar->setHidden(true); 429​ m_toolBar->setHidden(true);
430 enableControls(false); 430​ enableControls(false);
431 connectExtruderTemperatureData(false); 431​ connectExtruderTemperatureData(false);
432 if (m_profileData["heatedBed"].toBool()) { ​
433 connectBedTemperatureData(false); 432​ connectBedTemperatureData(false);
434 } ​
435 } break; 433​ } break;
436 case AtCore::STARTPRINT: { 434​ case AtCore::STARTPRINT: {
437 stateString = i18n("Starting Print"); 435​ stateString = i18n("Starting Print");
438 m_statusWidget->showPrintArea(true); 436​ m_statusWidget->showPrintArea(true);
439 connect(&m_core, &AtCore::printProgressChanged, m_statusWidget, &StatusWidget::updatePrintProgress); 437​ connect(&m_core, &AtCore::printProgressChanged, m_statusWidget, &StatusWidget::updatePrintProgress);
440 } break; 438​ } break;
441 case AtCore::FINISHEDPRINT: { 439​ case AtCore::FINISHEDPRINT: {
442 stateString = i18n("Finished Print"); 440​ stateString = i18n("Finished Print");
▲ Show 20 Lines • Show All 112 Lines • ▼ Show 20 Line(s)550{
555 m_settings.endGroup(); 553​ m_settings.endGroup();
556 m_comboProfile->clear(); 554​ m_comboProfile->clear();
557 m_comboProfile->addItems(profiles); 555​ m_comboProfile->addItems(profiles);
558 556​
559 if (m_core.state() != AtCore::DISCONNECTED) { 557​ if (m_core.state() != AtCore::DISCONNECTED) {
560 m_profileData = readProfile(); 558​ m_profileData = readProfile();
561 bool hBed = m_profileData["heatedBed"].toBool(); 559​ bool hBed = m_profileData["heatedBed"].toBool();
562 m_bedExtWidget->setBedThermoHidden(!hBed); 560​ m_bedExtWidget->setBedThermoHidden(!hBed);
561​
563 connectBedTemperatureData(hBed); 562​ connectBedTemperatureData(hBed);
564 m_bedExtWidget->setBedMaxTemperature(m_profileData["bedTemp"].toInt()); 563​ m_bedExtWidget->setBedMaxTemperature(m_profileData["bedTemp"].toInt());
565 m_bedExtWidget->setExtruderMaxTemperature(m_profileData["hotendTemp"].toInt()); 564​ m_bedExtWidget->setExtruderMaxTemperature(m_profileData["hotendTemp"].toInt());
566 } 565​ }
567} 566​}
568 567​
569void AtCoreInstanceWidget::togglePrintButtons(bool shown) 568​void AtCoreInstanceWidget::togglePrintButtons(bool shown)
570{ 569​{
▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Line(s)606{
612 m_settings.setValue(QStringLiteral("autoReportTemp"), m_profileData["autoReportTemp"]); 611​ m_settings.setValue(QStringLiteral("autoReportTemp"), m_profileData["autoReportTemp"]);
613 m_settings.endGroup(); 612​ m_settings.endGroup();
614 m_settings.endGroup(); 613​ m_settings.endGroup();
615} 614​}
616 615​
617void AtCoreInstanceWidget::connectBedTemperatureData(bool connected) 616​void AtCoreInstanceWidget::connectBedTemperatureData(bool connected)
618{ 617​{
619 if (connected) { 618​ if (connected) {
620 if (m_plotWidget->plots().contains((i18n("Actual Bed")))) { 619​ if (m_plotWidget->plots().contains(i18n("Actual Bed"))) {
621 return; 620​ return;
622 } 621​ }
623 m_plotWidget->addPlot(i18n("Actual Bed")); 622​ m_plotWidget->addPlot(i18n("Actual Bed"));
624 connect(m_core.temperature().get(), &Temperature::bedTemperatureChanged, [this] { 623​ connect(m_core.temperature().get(), &Temperature::bedTemperatureChanged, [this] {
625 const float temp = m_core.temperature().get()->bedTemperature(); 624​ const float temp = m_core.temperature().get()->bedTemperature();
626 checkTemperature(0x00, 0, temp); 625​ checkTemperature(0x00, 0, temp);
627 m_plotWidget->appendPoint(i18n("Actual Bed"), temp); 626​ m_plotWidget->appendPoint(i18n("Actual Bed"), temp);
628 m_bedExtWidget->updateBedTemp(temp); 627​ m_bedExtWidget->updateBedTemp(temp);
629 }); 628​ });
630 m_plotWidget->addPlot(i18n("Target Bed")); 629​ m_plotWidget->addPlot(i18n("Target Bed"));
631 connect(m_core.temperature().get(), &Temperature::bedTargetTemperatureChanged, [this] { 630​ connect(m_core.temperature().get(), &Temperature::bedTargetTemperatureChanged, [this] {
632 const float temp = m_core.temperature().get()->bedTargetTemperature(); 631​ const float temp = m_core.temperature().get()->bedTargetTemperature();
633 checkTemperature(0x01, 0, temp); 632​ checkTemperature(0x01, 0, temp);
634 m_plotWidget->appendPoint(i18n("Target Bed"), temp); 633​ m_plotWidget->appendPoint(i18n("Target Bed"), temp);
635 m_bedExtWidget->updateBedTargetTemp(int(temp)); 634​ m_bedExtWidget->updateBedTargetTemp(int(temp));
636 }); 635​ });
637 } else { 636​ } else {
638 if (m_plotWidget->plots().contains(i18n("Actual Bed"))) { 637​ if (m_plotWidget->plots().contains(i18n("Actual Bed"))) {
639 m_plotWidget->removePlot(i18n("Actual Bed")); 638​ m_plotWidget->removePlot(i18n("Actual Bed"));
640 disconnect(m_core.temperature().get(), &Temperature::bedTemperatureChanged, this, nullptr); 639​ disconnect(m_core.temperature().get(), &Temperature::bedTemperatureChanged, nullptr, nullptr);
641 m_plotWidget->removePlot(i18n("Target Bed")); 640​ m_plotWidget->removePlot(i18n("Target Bed"));
642 disconnect(m_core.temperature().get(), &Temperature::bedTargetTemperatureChanged, this, nullptr); 641​ disconnect(m_core.temperature().get(), &Temperature::bedTargetTemperatureChanged, nullptr, nullptr);
643 } 642​ }
644 } 643​ }
645} 644​}
646 645​
647void AtCoreInstanceWidget::connectExtruderTemperatureData(bool connected) 646​void AtCoreInstanceWidget::connectExtruderTemperatureData(bool connected)
648{ 647​{
649 if (connected) { 648​ if (connected) {
650 if (m_plotWidget->plots().contains((i18n("Actual Ext.1")))) { 649​ if (m_plotWidget->plots().contains((i18n("Actual Ext.1")))) {
Show All 12 Lines661 connect(m_core.temperature().get(), &Temperature::extruderTargetTemperatureChanged, this, [this] {
663 const float temp = m_core.temperature().get()->extruderTargetTemperature(); 662​ const float temp = m_core.temperature().get()->extruderTargetTemperature();
664 checkTemperature(0x03, 0, temp); 663​ checkTemperature(0x03, 0, temp);
665 m_plotWidget->appendPoint(i18n("Target Ext.1"), temp); 664​ m_plotWidget->appendPoint(i18n("Target Ext.1"), temp);
666 m_bedExtWidget->updateExtTargetTemp(int(temp)); 665​ m_bedExtWidget->updateExtTargetTemp(int(temp));
667 }); 666​ });
668 } else { 667​ } else {
669 if (m_plotWidget->plots().contains(i18n("Actual Ext.1"))) { 668​ if (m_plotWidget->plots().contains(i18n("Actual Ext.1"))) {
670 m_plotWidget->removePlot(i18n("Actual Ext.1")); 669​ m_plotWidget->removePlot(i18n("Actual Ext.1"));
671 disconnect(m_core.temperature().get(), &Temperature::extruderTemperatureChanged, this, nullptr); 670​ disconnect(m_core.temperature().get(), &Temperature::extruderTemperatureChanged, nullptr, nullptr);
672 m_plotWidget->removePlot(i18n("Target Ext.1")); 671​ m_plotWidget->removePlot(i18n("Target Ext.1"));
673 disconnect(m_core.temperature().get(), &Temperature::extruderTargetTemperatureChanged, this, nullptr); 672​ disconnect(m_core.temperature().get(), &Temperature::extruderTargetTemperatureChanged, nullptr, nullptr);
674 } 673​ }
675 } 674​ }
676} 675​}
677 676​
678QSize AtCoreInstanceWidget::bedSize() 677​QSize AtCoreInstanceWidget::bedSize()
679{ 678​{
680 return m_bedSize; 679​ return m_bedSize;
681} 680​}