Differential D17106 Diff 46612 src/widgets/atcoreinstancewidget.cpp

Changeset View

Standalone View

View Options

src/widgets/atcoreinstancewidget.cpp

Show All 27 Lines26AtCoreInstanceWidget::AtCoreInstanceWidget(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​ , m_bedSize(200, 200)
33{ 33​{
34 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") ;
35 m_iconSize = QSize(fontMetrics().lineSpacing(), fontMetrics().lineSpacing()); 35​ m_iconSize = QSize(fontMetrics().lineSpacing(), fontMetrics().lineSpacing());
36 QHBoxLayout *HLayout = new QHBoxLayout; 36​ auto HLayout = new QHBoxLayout;
37 m_bedExtWidget = new BedExtruderWidget; 37​ m_bedExtWidget = new BedExtruderWidget(this);
38 HLayout->addWidget(m_bedExtWidget); 38​ HLayout->addWidget(m_bedExtWidget);
39 39​
40 m_movementWidget = new MovementWidget(false); 40​ m_movementWidget = new MovementWidget(false, this);
41 m_movementWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum); 41​ m_movementWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
42 HLayout->addWidget(m_movementWidget); 42​ HLayout->addWidget(m_movementWidget);
43 43​
44 QVBoxLayout *VLayout = new QVBoxLayout; 44​ auto VLayout = new QVBoxLayout;
45 VLayout->addLayout(HLayout); 45​ VLayout->addLayout(HLayout);
46 46​
47 m_plotWidget = new PlotWidget(); 47​ m_plotWidget = new PlotWidget(this);
48 VLayout->addWidget(m_plotWidget, 80); 48​ VLayout->addWidget(m_plotWidget, 80);
49 49​
50 QWidget *controlTab = new QWidget(); 50​ auto controlTab = new QWidget(this);
51 controlTab->setLayout(VLayout); 51​ controlTab->setLayout(VLayout);
52 52​
53 //AdvancedTab 53​ //AdvancedTab
54 VLayout = new QVBoxLayout; 54​ VLayout = new QVBoxLayout;
55 m_printWidget = new PrintWidget(false); 55​ m_printWidget = new PrintWidget(false, this);
56 VLayout->addWidget(m_printWidget); 56​ VLayout->addWidget(m_printWidget);
57 57​
58 m_commandWidget = new CommandWidget; 58​ m_commandWidget = new CommandWidget(this);
59 VLayout->addWidget(m_commandWidget); 59​ VLayout->addWidget(m_commandWidget);
60 60​
61 m_logWidget = new LogWidget(new QTemporaryFile(QDir::tempPath() + QStringLiteral("/Atelier_"))); 61​ m_logWidget = new LogWidget(new QTemporaryFile(QDir::tempPath() + QStringLiteral("/Atelier_")), this);
62 VLayout->addWidget(m_logWidget); 62​ VLayout->addWidget(m_logWidget);
63 63​
64 m_advancedTab = new QWidget; 64​ m_advancedTab = new QWidget(this);
65 m_advancedTab->setLayout(VLayout); 65​ m_advancedTab->setLayout(VLayout);
66 66​
67 m_sdWidget = new SdWidget; 67​ m_sdWidget = new SdWidget(this);
68 68​
69 VLayout = new QVBoxLayout(); 69​ VLayout = new QVBoxLayout();
70 buildToolbar(); 70​ buildToolbar();
71 buildConnectionToolbar(); 71​ buildConnectionToolbar();
72 HLayout = new QHBoxLayout; 72​ HLayout = new QHBoxLayout;
73 HLayout->addWidget(m_toolBar); 73​ HLayout->addWidget(m_toolBar);
74 HLayout->addWidget(m_connectToolBar); 74​ HLayout->addWidget(m_connectToolBar);
75 HLayout->addWidget(m_connectButton); 75​ HLayout->addWidget(m_connectButton);
76 VLayout->addLayout(HLayout); 76​ VLayout->addLayout(HLayout);
77 m_toolBar->setHidden(true); 77​ m_toolBar->setHidden(true);
78 78​
79 m_tabWidget = new QTabWidget; 79​ m_tabWidget = new QTabWidget(this);
80 m_tabWidget->addTab(controlTab, i18n("Controls")); 80​ m_tabWidget->addTab(controlTab, i18n("Controls"));
81 m_tabWidget->addTab(m_advancedTab, i18n("Advanced")); 81​ m_tabWidget->addTab(m_advancedTab, i18n("Advanced"));
82 m_tabWidget->addTab(m_sdWidget, i18n("Sd Card")); 82​ m_tabWidget->addTab(m_sdWidget, i18n("Sd Card"));
83 VLayout->addWidget(m_tabWidget); 83​ VLayout->addWidget(m_tabWidget);
84 84​
85 m_statusWidget = new StatusWidget(false); 85​ m_statusWidget = new StatusWidget(false, this);
86 m_statusWidget->showPrintArea(false); 86​ m_statusWidget->showPrintArea(false);
87 VLayout->addWidget(m_statusWidget); 87​ VLayout->addWidget(m_statusWidget);
88 setLayout(VLayout); 88​ setLayout(VLayout);
89 89​
90 enableControls(false); 90​ enableControls(false);
91 updateProfileData(); 91​ updateProfileData();
92 initConnectsToAtCore(); 92​ initConnectsToAtCore();
93} 93​}
94 94​
95AtCoreInstanceWidget::~AtCoreInstanceWidget() 95​AtCoreInstanceWidget::~AtCoreInstanceWidget()
96{ 96​{
97 m_core.closeConnection(); 97​ m_core.closeConnection();
98} 98​}
99 99​
100void AtCoreInstanceWidget::buildToolbar() 100​void AtCoreInstanceWidget::buildToolbar()
101{ 101​{
102 m_toolBar = new QToolBar(); 102​ m_toolBar = new QToolBar(this);
103 m_toolBar->setIconSize(m_iconSize); 103​ m_toolBar->setIconSize(m_iconSize);
104 m_toolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); 104​ m_toolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
105 105​
106 auto lb = new QLabel; 106​ auto lb = new QLabel(this);
107 QIcon icon = QIcon::fromTheme("go-home", QIcon(QString(":/%1/home").arg(m_theme))); 107​ QIcon icon = QIcon::fromTheme("go-home", QIcon(QString(":/%1/home").arg(m_theme)));
108 lb->setPixmap(icon.pixmap(m_iconSize)); 108​ lb->setPixmap(icon.pixmap(m_iconSize));
109 m_toolBar->addWidget(lb); 109​ m_toolBar->addWidget(lb);
110 lb = new QLabel(i18n("Home:")); 110​ lb = new QLabel(i18n("Home:"), this);
111 m_toolBar->addWidget(lb); 111​ m_toolBar->addWidget(lb);
112 112​
113 auto homeAll = new QAction(i18n("All")); 113​ auto homeAll = new QAction(i18n("All"));
114 connect(homeAll, &QAction::triggered, this, [this] { 114​ connect(homeAll, &QAction::triggered, this, [this] {
115 m_core.home(); 115​ m_core.home();
116 }); 116​ });
117 m_toolBar->addAction(homeAll); 117​ m_toolBar->addAction(homeAll);
118 118​
119 for (auto homes : std::map<QString, int> {{"X", AtCore::X}, {"Y", AtCore::Y}, {"Z", AtCore::Z}}) { 119​ for (const auto &homes : std::map<QString, int> {{"X", AtCore::X}, {"Y", AtCore::Y}, {"Z", AtCore::Z}}) {
120 auto home = new QAction(homes.first); 120​ auto home = new QAction(homes.first, this);
121 connect(home, &QAction::triggered, this, [this, homes] { 121​ connect(home, &QAction::triggered, this, [this, homes] {
122 m_core.home(uchar(homes.second)); 122​ m_core.home(uchar(homes.second));
123 }); 123​ });
124 m_toolBar->addAction(home); 124​ m_toolBar->addAction(home);
125 } 125​ }
126 126​
127 m_toolBar->addSeparator(); 127​ m_toolBar->addSeparator();
128 128​
129 m_printAction = new QAction(QIcon::fromTheme("media-playback-start", style()->standardIcon(QStyle::SP_MediaPlay)), i18n("Print")); 129​ m_printAction = new QAction(QIcon::fromTheme("media-playback-start", style()->standardIcon(QStyle::SP_MediaPlay)), i18n("Print"), this);
130 connect(m_printAction, &QAction::triggered, this, [this] { 130​ connect(m_printAction, &QAction::triggered, this, [this] {
131 ​
132 if (m_core.state() == AtCore::BUSY) 131​ if (m_core.state() == AtCore::BUSY)
133 { 132​ {
134 m_logWidget->appendLog(i18n("Pause Print")); 133​ m_logWidget->appendLog(i18n("Pause Print"));
135 pausePrint(); 134​ pausePrint();
136 return; 135​ return;
137 } 136​ }
138 ​
139 if (m_core.state() == AtCore::IDLE) 137​ if (m_core.state() == AtCore::IDLE)
140 { 138​ {
141 print(); 139​ print();
142 } else if (m_core.state() == AtCore::PAUSE) 140​ } else if (m_core.state() == AtCore::PAUSE)
143 { 141​ {
144 m_logWidget->appendLog(i18n("Resume Print")); 142​ m_logWidget->appendLog(i18n("Resume Print"));
145 m_core.resume(); 143​ m_core.resume();
146 } 144​ }
147 }); 145​ });
148 m_toolBar->addAction(m_printAction); 146​ m_toolBar->addAction(m_printAction);
149 147​
150 m_stopAction = new QAction(QIcon::fromTheme("media-playback-stop", QIcon(QString(":/%1/stop").arg(m_theme))), i18n("Stop")); 148​ m_stopAction = new QAction(QIcon::fromTheme("media-playback-stop", QIcon(QString(":/%1/stop").arg(m_theme))), i18n("Stop"), this);
patrickelectricUnsubmitted
Done

QStringLiteral

patrickelectric: QStringLiteral
151 connect(m_stopAction, &QAction::triggered, this, &AtCoreInstanceWidget::stopPrint); 149​ connect(m_stopAction, &QAction::triggered, this, &AtCoreInstanceWidget::stopPrint);
152 connect(m_stopAction, &QAction::triggered, this, [this] { 150​ connect(m_stopAction, &QAction::triggered, this, [this] {
153 m_printAction->setText(i18n("Print")); 151​ m_printAction->setText(i18n("Print"));
154 m_printAction->setIcon(QIcon::fromTheme("media-playback-start", QIcon(QString(":/%1/start").arg(m_theme)))); 152​ m_printAction->setIcon(QIcon::fromTheme("media-playback-start", QIcon(QString(":/%1/start").arg(m_theme))));
155 }); 153​ });
156 m_toolBar->addAction(m_stopAction); 154​ m_toolBar->addAction(m_stopAction);
157 155​
158 auto disableMotorsAction = new QAction(style()->standardIcon(QStyle::SP_MediaStop), i18n("Disable Motors")); 156​ auto disableMotorsAction = new QAction(style()->standardIcon(QStyle::SP_MediaStop), i18n("Disable Motors"), this);
159 connect(disableMotorsAction, &QAction::triggered, this, &AtCoreInstanceWidget::disableMotors); 157​ connect(disableMotorsAction, &QAction::triggered, this, &AtCoreInstanceWidget::disableMotors);
160 m_toolBar->addAction(disableMotorsAction); 158​ m_toolBar->addAction(disableMotorsAction);
161 159​
162 togglePrintButtons(m_fileCount); 160​ togglePrintButtons(m_fileCount);
163} 161​}
164 162​
165void AtCoreInstanceWidget::buildConnectionToolbar() 163​void AtCoreInstanceWidget::buildConnectionToolbar()
166{ 164​{
167 m_connectToolBar = new QToolBar(); 165​ m_connectToolBar = new QToolBar(this);
168 m_comboPort = new QComboBox; 166​ m_comboPort = new QComboBox(this);
169 m_comboPort->setEditable(true); 167​ m_comboPort->setEditable(true);
170 QLabel *deviceLabel = new QLabel(i18n("Device")); 168​ auto deviceLabel = new QLabel(i18n("Device"), this);
171 QHBoxLayout *deviceLayout = new QHBoxLayout; 169​ auto deviceLayout = new QHBoxLayout;
172 deviceLayout->addWidget(deviceLabel); 170​ deviceLayout->addWidget(deviceLabel);
173 deviceLayout->addWidget(m_comboPort, 100); 171​ deviceLayout->addWidget(m_comboPort, 100);
174 172​
175 m_comboProfile = new QComboBox; 173​ m_comboProfile = new QComboBox(this);
176 m_comboProfile->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); 174​ m_comboProfile->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
177 QHBoxLayout *profileLayout = new QHBoxLayout; 175​ auto profileLayout = new QHBoxLayout;
178 QLabel *profileLabel = new QLabel(i18n("Profile")); 176​ auto profileLabel = new QLabel(i18n("Profile"), this);
179 profileLayout->addWidget(profileLabel); 177​ profileLayout->addWidget(profileLabel);
180 profileLayout->addWidget(m_comboProfile, 100); 178​ profileLayout->addWidget(m_comboProfile, 100);
181 179​
182 QHBoxLayout *connectLayout = new QHBoxLayout; 180​ auto connectLayout = new QHBoxLayout;
183 connectLayout->addLayout(deviceLayout, 50); 181​ connectLayout->addLayout(deviceLayout, 50);
184 connectLayout->addLayout(profileLayout, 50); 182​ connectLayout->addLayout(profileLayout, 50);
185 183​
186 m_connectWidget = new QWidget(); 184​ m_connectWidget = new QWidget(this);
187 m_connectWidget->setLayout(connectLayout); 185​ m_connectWidget->setLayout(connectLayout);
188 m_connectToolBar->addWidget(m_connectWidget); 186​ m_connectToolBar->addWidget(m_connectWidget);
189 187​
190 m_connectButton = new QPushButton(QIcon::fromTheme("network-connect", QIcon(QString(":/%1/connect").arg(m_theme))), i18n("Connect")); 188​ m_connectButton = new QPushButton(QIcon::fromTheme("network-connect", QIcon(QString(":/%1/connect").arg(m_theme))), i18n("Connect"), this);
191 m_connectButton->setIconSize(m_iconSize); 189​ m_connectButton->setIconSize(m_iconSize);
192 m_connectButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); 190​ m_connectButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
193 connect(this, &AtCoreInstanceWidget::disableDisconnect, m_connectButton, &QPushButton::setDisabled); 191​ connect(this, &AtCoreInstanceWidget::disableDisconnect, m_connectButton, &QPushButton::setDisabled);
194 connect(m_connectButton, &QPushButton::clicked, this, &AtCoreInstanceWidget::connectButtonClicked); 192​ connect(m_connectButton, &QPushButton::clicked, this, &AtCoreInstanceWidget::connectButtonClicked);
195} 193​}
196 194​
197void AtCoreInstanceWidget::connectButtonClicked() 195​void AtCoreInstanceWidget::connectButtonClicked()
198{ 196​{
▲ Show 20 Lines • Show All 132 Lines • ▼ Show 20 Line(s)
331{ 329​{
332 if (fileName.isEmpty()) { 330​ if (fileName.isEmpty()) {
333 QMessageBox::critical( 331​ QMessageBox::critical(
334 this 332​ this
335 , i18n("Filename Empty") 333​ , i18n("Filename Empty")
336 , i18n("No filename sent from calling method, please check and try again.") 334​ , i18n("No filename sent from calling method, please check and try again.")
337 ); 335​ );
338 return; 336​ return;
339 } else if (!QFileInfo(fileName.toLocalFile()).isReadable()) { 337​ }
338​ if (!QFileInfo(fileName.toLocalFile()).isReadable()) {
340 QMessageBox::critical( 339​ QMessageBox::critical(
341 this 340​ this
342 , i18n("File not found") 341​ , i18n("File not found")
343 , i18n("%1 \nIs not readable, please check and try again.", fileName.toLocalFile()) 342​ , i18n("%1 \nIs not readable, please check and try again.", fileName.toLocalFile())
344 ); 343​ );
345 return; 344​ return;
346 } 345​ }
347 if (m_core.state() == AtCore::IDLE) { 346​ if (m_core.state() == AtCore::IDLE) {
▲ Show 20 Lines • Show All 96 Lines • ▼ Show 20 Line(s)442 case AtCore::STOP: {
444 stateString = i18n("Stoping Print"); 443​ stateString = i18n("Stoping Print");
445 m_logWidget->appendLog(stateString); 444​ m_logWidget->appendLog(stateString);
446 } break; 445​ } break;
447 case AtCore::ERRORSTATE: { 446​ case AtCore::ERRORSTATE: {
448 stateString = i18n("Error"); 447​ stateString = i18n("Error");
449 } break; 448​ } break;
450 default: 449​ default:
451 m_logWidget->appendLog(i18n("Unknown AtCore State, %1", newState)); 450​ m_logWidget->appendLog(i18n("Unknown AtCore State, %1", newState));
452 qWarning("AtCore State not Recognized."); ​
453 break; 451​ break;
454 } 452​ }
455 m_statusWidget->setState(stateString); 453​ m_statusWidget->setState(stateString);
456} 454​}
457 455​
458void AtCoreInstanceWidget::checkTemperature(uint sensorType, uint number, float temp) 456​void AtCoreInstanceWidget::checkTemperature(uint sensorType, uint number, float temp)
459{ 457​{
460 static QString msg; 458​ static QString msg;
461 switch (sensorType) { 459​ switch (sensorType) {
462 case 0x00: // bed 460​ case 0x00: // bed
463 msg = QString::fromLatin1("Bed Temperature "); 461​ msg = QString::fromLatin1("Bed Temperature");
464 break; 462​ break;
465 463​
466 case 0x01: // bed target 464​ case 0x01: // bed target
467 msg = QString::fromLatin1("Bed Target Temperature "); 465​ msg = QString::fromLatin1("Bed Target Temperature");
468 break; 466​ break;
469 467​
470 case 0x02: // extruder 468​ case 0x02: // extruder
471 msg = QString::fromLatin1("Extruder Temperature "); 469​ msg = QString::fromLatin1("Extruder[%1] Temperature").arg(QString::number(number));
472 break; 470​ break;
473 471​
474 case 0x03: // extruder target 472​ case 0x03: // extruder target
475 msg = QString::fromLatin1("Extruder Target Temperature "); 473​ msg = QString::fromLatin1("Extruder[%1] Target Temperature").arg(QString::number(number));
476 break; 474​ break;
477 475​
478 case 0x04: // enclosure 476​ case 0x04: // enclosure
479 msg = QString::fromLatin1("Enclosure Temperature "); 477​ msg = QString::fromLatin1("Enclosure Temperature");
480 break; 478​ break;
481 479​
482 case 0x05: // enclosure target 480​ case 0x05: // enclosure target
483 msg = QString::fromLatin1("Enclosure Target Temperature "); 481​ msg = QString::fromLatin1("Enclosure Target Temperature");
484 break; 482​ break;
485 } 483​ }
486 484​
487 msg.append(QString::fromLatin1("[%1] : %2")); 485​ msg.append(QString::fromLatin1(": %1").arg(QString::number(double(temp), 'f', 2)));
488 msg = msg.arg(QString::number(number)) ​
489 .arg(QString::number(double(temp), 'f', 2)); ​
490 m_logWidget->appendLog(msg); 486​ m_logWidget->appendLog(msg);
491} 487​}
492 488​
493void AtCoreInstanceWidget::enableControls(bool b) 489​void AtCoreInstanceWidget::enableControls(bool b)
494{ 490​{
495 if (b) { 491​ if (b) {
496 layout()->removeWidget(m_logWidget); 492​ layout()->removeWidget(m_logWidget);
497 layout()->removeWidget(m_statusWidget); 493​ layout()->removeWidget(m_statusWidget);
▲ Show 20 Lines • Show All 70 Lines • ▼ Show 20 Line(s)563{
568 QString profile = m_comboProfile->currentText(); 564​ QString profile = m_comboProfile->currentText();
569 m_settings.beginGroup("Profiles"); 565​ m_settings.beginGroup("Profiles");
570 m_settings.beginGroup(profile); 566​ m_settings.beginGroup(profile);
571 QMap<QString, QVariant> data{ 567​ QMap<QString, QVariant> data{
572 {"bps", m_settings.value(QStringLiteral("bps"), QStringLiteral("115200"))} 568​ {"bps", m_settings.value(QStringLiteral("bps"), QStringLiteral("115200"))}
573 , {"bedTemp", m_settings.value(QStringLiteral("maximumTemperatureBed"), QStringLiteral("0"))} 569​ , {"bedTemp", m_settings.value(QStringLiteral("maximumTemperatureBed"), QStringLiteral("0"))}
574 , {"hotendTemp", m_settings.value(QStringLiteral("maximumTemperatureExtruder"), QStringLiteral("0"))} 570​ , {"hotendTemp", m_settings.value(QStringLiteral("maximumTemperatureExtruder"), QStringLiteral("0"))}
575 , {"firmware", m_settings.value(QStringLiteral("firmware"), QStringLiteral("Auto-Detect"))} 571​ , {"firmware", m_settings.value(QStringLiteral("firmware"), QStringLiteral("Auto-Detect"))}
576 , {"postPause", m_settings.value(QStringLiteral("postPause"), QStringLiteral(""))} 572​ , {"postPause", m_settings.value(QStringLiteral("postPause"), QString())}
577 , {"heatedBed", m_settings.value(QStringLiteral("heatedBed"), true)} 573​ , {"heatedBed", m_settings.value(QStringLiteral("heatedBed"), true)}
578 , {"name", profile} 574​ , {"name", profile}
579 , {"isCartesian", m_settings.value(QStringLiteral("isCartesian"), true)} 575​ , {"isCartesian", m_settings.value(QStringLiteral("isCartesian"), true)}
580 , {"dimensionX", m_settings.value(QStringLiteral("dimensionX"), QStringLiteral("200"))} 576​ , {"dimensionX", m_settings.value(QStringLiteral("dimensionX"), QStringLiteral("200"))}
581 , {"dimensionY", m_settings.value(QStringLiteral("dimensionY"), QStringLiteral("200"))} 577​ , {"dimensionY", m_settings.value(QStringLiteral("dimensionY"), QStringLiteral("200"))}
582 , {"dimensionZ", m_settings.value(QStringLiteral("dimensionZ"), QStringLiteral("180"))} 578​ , {"dimensionZ", m_settings.value(QStringLiteral("dimensionZ"), QStringLiteral("180"))}
583 , {"radius", m_settings.value(QStringLiteral("radius"), QStringLiteral("200"))} 579​ , {"radius", m_settings.value(QStringLiteral("radius"), QStringLiteral("200"))}
584 , {"z_delta_dimension", m_settings.value(QStringLiteral("z_delta_dimension"), QStringLiteral("180"))} 580​ , {"z_delta_dimension", m_settings.value(QStringLiteral("z_delta_dimension"), QStringLiteral("180"))}
▲ Show 20 Lines • Show All 67 Lines • Show Last 20 Lines