Differential D15861 Diff 43346 testclient/mainwindow.cpp

Changeset View

Standalone View

View Options

testclient/mainwindow.cpp

Show First 20 Lines • Show All 148 Lines • ▼ Show 20 Line(s)
149void MainWindow::makePrintDock() 149​void MainWindow::makePrintDock()
150{ 150​{
151 printWidget = new PrintWidget; 151​ printWidget = new PrintWidget;
152 connect(printWidget, &PrintWidget::printPressed, this, &MainWindow::printPBClicked); 152​ connect(printWidget, &PrintWidget::printPressed, this, &MainWindow::printPBClicked);
153 connect(printWidget, &PrintWidget::emergencyStopPressed, core, &AtCore::emergencyStop); 153​ connect(printWidget, &PrintWidget::emergencyStopPressed, core, &AtCore::emergencyStop);
154 connect(printWidget, &PrintWidget::fanSpeedChanged, core, &AtCore::setFanSpeed); 154​ connect(printWidget, &PrintWidget::fanSpeedChanged, core, &AtCore::setFanSpeed);
155 155​
156 connect(printWidget, &PrintWidget::printSpeedChanged, this, [this](const int speed) { 156​ connect(printWidget, &PrintWidget::printSpeedChanged, this, [this](const int speed) {
157 core->setPrinterSpeed(speed); 157​ core->setPrinterSpeed(uint(std::max(1, speed)));
patrickelectricUnsubmitted
Done

negative numbers will overflow.

patrickelectric: negative numbers will overflow.
rizzitelloAuthorUnsubmitted
Not Done

The range here is 1-300. It will not be negative.

rizzitello: The range here is 1-300. It will not be negative.
patrickelectricUnsubmitted
Not Done

How can you assure that to be future proof ?
You should use std::max

patrickelectric: How can you assure that to be future proof ? You should use std::max
158 }); 158​ });
159 159​
160 connect(printWidget, &PrintWidget::flowRateChanged, [this](const int rate) { 160​ connect(printWidget, &PrintWidget::flowRateChanged, [this](const int rate) {
161 core->setFlowRate(rate); 161​
162​ core->setFlowRate(uint(std::max(1, rate)));
162 }); 163​ });
163 164​
164 printDock = new QDockWidget(tr("Print"), this); 165​ printDock = new QDockWidget(tr("Print"), this);
165 printDock->setWidget(printWidget); 166​ printDock->setWidget(printWidget);
166 167​
167 menuView->insertAction(nullptr, printDock->toggleViewAction()); 168​ menuView->insertAction(nullptr, printDock->toggleViewAction());
168 addDockWidget(Qt::LeftDockWidgetArea, printDock); 169​ addDockWidget(Qt::LeftDockWidgetArea, printDock);
169} 170​}
▲ Show 20 Lines • Show All 195 Lines • ▼ Show 20 Line(s)364{
365 event->accept(); 366​ event->accept();
366} 367​}
367 368​
368MainWindow::~MainWindow() 369​MainWindow::~MainWindow()
369{ 370​{
370 371​
371} 372​}
372 373​
373void MainWindow::checkTemperature(uint sensorType, uint number, uint temp) 374​void MainWindow::checkTemperature(uint sensorType, uint number, float temp)
374{ 375​{
375 QString msg; 376​ QString msg;
376 switch (sensorType) { 377​ switch (sensorType) {
377 case 0x00: // bed 378​ case 0x00: // bed
378 msg = QString::fromLatin1("Bed Temperature "); 379​ msg = QString::fromLatin1("Bed Temperature ");
379 break; 380​ break;
380 381​
381 case 0x01: // bed target 382​ case 0x01: // bed target
Show All 13 Lines394 case 0x04: // enclosure
395 break; 396​ break;
396 397​
397 case 0x05: // enclosure target 398​ case 0x05: // enclosure target
398 msg = QString::fromLatin1("Enclosure Target Temperature "); 399​ msg = QString::fromLatin1("Enclosure Target Temperature ");
399 break; 400​ break;
400 } 401​ }
401 402​
402 msg.append(QString::fromLatin1("[%1] : %2").arg( 403​ msg.append(QString::fromLatin1("[%1] : %2").arg(
403 QString::number(number), QString::number(temp) 404​ QString::number(number), QString::number(double(temp), 'f', 2)
404 )); 405​ ));
405 406​
406 logWidget->appendLog(msg); 407​ logWidget->appendLog(msg);
407} 408​}
408/** 409​/**
409 * @brief MainWindow::locateSerialPort 410​ * @brief MainWindow::locateSerialPort
410 * Locate all active serial ports on the computer and add to the list 411​ * Locate all active serial ports on the computer and add to the list
411 * of serial ports 412​ * of serial ports
▲ Show 20 Lines • Show All 180 Lines • Show Last 20 Lines