Differential D16205 Diff 43693 src/widgets/atcoreinstancewidget.cpp

Changeset View

Standalone View

View Options

src/widgets/atcoreinstancewidget.cpp

Show First 20 Lines • Show All 372 Lines • ▼ Show 20 Line(s)369 case AtCore::CONNECTING: {
373 m_connectToolBar->setHidden(true); 373​ m_connectToolBar->setHidden(true);
374 m_toolBar->setHidden(false); 374​ m_toolBar->setHidden(false);
375 stateString = i18n("Connecting..."); 375​ stateString = i18n("Connecting...");
376 m_logWidget->appendLog(i18n("Attempting to Connect")); 376​ m_logWidget->appendLog(i18n("Attempting to Connect"));
377 connect(&m_core, &AtCore::receivedMessage, m_logWidget, &LogWidget::appendRLog); 377​ connect(&m_core, &AtCore::receivedMessage, m_logWidget, &LogWidget::appendRLog);
378 connect(m_core.serial(), &SerialLayer::pushedCommand, m_logWidget, &LogWidget::appendSLog); 378​ connect(m_core.serial(), &SerialLayer::pushedCommand, m_logWidget, &LogWidget::appendSLog);
379 } break; 379​ } break;
380 case AtCore::IDLE: { 380​ case AtCore::IDLE: {
381 stateString = i18n("Connected to %1", m_core.serial()->portName()); 381​ stateString = i18n("Connected to %1", m_core.connectedPort());
382 emit extruderCountChanged(m_core.extruderCount()); 382​ emit extruderCountChanged(m_core.extruderCount());
383 m_logWidget->appendLog(stateString); 383​ m_logWidget->appendLog(stateString);
384 emit disableDisconnect(false); 384​ emit disableDisconnect(false);
385 enableControls(true); 385​ enableControls(true);
386 connectExtruderTemperatureData(true); 386​ connectExtruderTemperatureData(true);
387 if (m_profileData["heatedBed"].toBool()) { 387​ if (m_profileData["heatedBed"].toBool()) {
388 connectBedTemperatureData(true); 388​ connectBedTemperatureData(true);
389 } 389​ }
▲ Show 20 Lines • Show All 79 Lines • ▼ Show 20 Line(s)447{
469 469​
470 case 0x05: // enclosure target 470​ case 0x05: // enclosure target
471 msg = QString::fromLatin1("Enclosure Target Temperature "); 471​ msg = QString::fromLatin1("Enclosure Target Temperature ");
472 break; 472​ break;
473 } 473​ }
474 474​
475 msg.append(QString::fromLatin1("[%1] : %2")); 475​ msg.append(QString::fromLatin1("[%1] : %2"));
476 msg = msg.arg(QString::number(number)) 476​ msg = msg.arg(QString::number(number))
477 .arg(QString::number(temp, 'f', 2)); 477​ .arg(QString::number(double(temp), 'f', 2));
478 m_logWidget->appendLog(msg); 478​ m_logWidget->appendLog(msg);
479} 479​}
480 480​
481void AtCoreInstanceWidget::enableControls(bool b) 481​void AtCoreInstanceWidget::enableControls(bool b)
482{ 482​{
483 if (b) { 483​ if (b) {
484 layout()->removeWidget(m_logWidget); 484​ layout()->removeWidget(m_logWidget);
485 layout()->removeWidget(m_statusWidget); 485​ layout()->removeWidget(m_statusWidget);
▲ Show 20 Lines • Show All 95 Lines • ▼ Show 20 Line(s)580 connect(&m_core.temperature(), &Temperature::bedTemperatureChanged, [this](const float & temp) {
581 checkTemperature(0x00, 0, temp); 581​ checkTemperature(0x00, 0, temp);
582 m_plotWidget->appendPoint(i18n("Actual Bed"), temp); 582​ m_plotWidget->appendPoint(i18n("Actual Bed"), temp);
583 m_bedExtWidget->updateBedTemp(temp); 583​ m_bedExtWidget->updateBedTemp(temp);
584 }); 584​ });
585 m_plotWidget->addPlot(i18n("Target Bed")); 585​ m_plotWidget->addPlot(i18n("Target Bed"));
586 connect(&m_core.temperature(), &Temperature::bedTargetTemperatureChanged, [this](const float & temp) { 586​ connect(&m_core.temperature(), &Temperature::bedTargetTemperatureChanged, [this](const float & temp) {
587 checkTemperature(0x01, 0, temp); 587​ checkTemperature(0x01, 0, temp);
588 m_plotWidget->appendPoint(i18n("Target Bed"), temp); 588​ m_plotWidget->appendPoint(i18n("Target Bed"), temp);
589 m_bedExtWidget->updateBedTargetTemp(temp); 589​ m_bedExtWidget->updateBedTargetTemp(int(temp));
590 }); 590​ });
591 } else { 591​ } else {
592 if (m_plotWidget->plots().contains(i18n("Actual Bed"))) { 592​ if (m_plotWidget->plots().contains(i18n("Actual Bed"))) {
593 m_plotWidget->removePlot(i18n("Actual Bed")); 593​ m_plotWidget->removePlot(i18n("Actual Bed"));
594 disconnect(&m_core.temperature(), &Temperature::bedTemperatureChanged, this, nullptr); 594​ disconnect(&m_core.temperature(), &Temperature::bedTemperatureChanged, this, nullptr);
595 m_plotWidget->removePlot(i18n("Target Bed")); 595​ m_plotWidget->removePlot(i18n("Target Bed"));
596 disconnect(&m_core.temperature(), &Temperature::bedTargetTemperatureChanged, this, nullptr); 596​ disconnect(&m_core.temperature(), &Temperature::bedTargetTemperatureChanged, this, nullptr);
597 } 597​ }
Show All 12 Lines609 connect(&m_core.temperature(), &Temperature::extruderTemperatureChanged, this, [this](const float & temp) {
610 checkTemperature(0x02, 0, temp); 610​ checkTemperature(0x02, 0, temp);
611 m_plotWidget->appendPoint(i18n("Actual Ext.1"), temp); 611​ m_plotWidget->appendPoint(i18n("Actual Ext.1"), temp);
612 m_bedExtWidget->updateExtTemp(temp); 612​ m_bedExtWidget->updateExtTemp(temp);
613 }); 613​ });
614 m_plotWidget->addPlot(i18n("Target Ext.1")); 614​ m_plotWidget->addPlot(i18n("Target Ext.1"));
615 connect(&m_core.temperature(), &Temperature::extruderTargetTemperatureChanged, this, [this](const float & temp) { 615​ connect(&m_core.temperature(), &Temperature::extruderTargetTemperatureChanged, this, [this](const float & temp) {
616 checkTemperature(0x03, 0, temp); 616​ checkTemperature(0x03, 0, temp);
617 m_plotWidget->appendPoint(i18n("Target Ext.1"), temp); 617​ m_plotWidget->appendPoint(i18n("Target Ext.1"), temp);
618 m_bedExtWidget->updateExtTargetTemp(temp); 618​ m_bedExtWidget->updateExtTargetTemp(int(temp));
619 }); 619​ });
620 } else { 620​ } else {
621 if (m_plotWidget->plots().contains(i18n("Actual Ext.1"))) { 621​ if (m_plotWidget->plots().contains(i18n("Actual Ext.1"))) {
622 m_plotWidget->removePlot(i18n("Actual Ext.1")); 622​ m_plotWidget->removePlot(i18n("Actual Ext.1"));
623 disconnect(&m_core.temperature(), &Temperature::extruderTemperatureChanged, this, nullptr); 623​ disconnect(&m_core.temperature(), &Temperature::extruderTemperatureChanged, this, nullptr);
624 m_plotWidget->removePlot(i18n("Target Ext.1")); 624​ m_plotWidget->removePlot(i18n("Target Ext.1"));
625 disconnect(&m_core.temperature(), &Temperature::extruderTargetTemperatureChanged, this, nullptr); 625​ disconnect(&m_core.temperature(), &Temperature::extruderTargetTemperatureChanged, this, nullptr);
626 } 626​ }
627 } 627​ }
628} 628​}