Differential D10299 Diff 28070 testclient/mainwindow.cpp

Changeset View

Standalone View

View Options

testclient/mainwindow.cpp

Show First 20 Lines • Show All 84 Lines • ▼ Show 20 Line(s)68#endif
85 connect(ui->homeXPB, &QPushButton::clicked, this, &MainWindow::homeXPBClicked); 85​ connect(ui->homeXPB, &QPushButton::clicked, this, &MainWindow::homeXPBClicked);
86 connect(ui->homeYPB, &QPushButton::clicked, this, &MainWindow::homeYPBClicked); 86​ connect(ui->homeYPB, &QPushButton::clicked, this, &MainWindow::homeYPBClicked);
87 connect(ui->homeZPB, &QPushButton::clicked, this, &MainWindow::homeZPBClicked); 87​ connect(ui->homeZPB, &QPushButton::clicked, this, &MainWindow::homeZPBClicked);
88 connect(ui->bedTempPB, &QPushButton::clicked, this, &MainWindow::bedTempPBClicked); 88​ connect(ui->bedTempPB, &QPushButton::clicked, this, &MainWindow::bedTempPBClicked);
89 connect(ui->extTempPB, &QPushButton::clicked, this, &MainWindow::extTempPBClicked); 89​ connect(ui->extTempPB, &QPushButton::clicked, this, &MainWindow::extTempPBClicked);
90 connect(ui->mvAxisPB, &QPushButton::clicked, this, &MainWindow::mvAxisPBClicked); 90​ connect(ui->mvAxisPB, &QPushButton::clicked, this, &MainWindow::mvAxisPBClicked);
91 connect(ui->fanSpeedPB, &QPushButton::clicked, this, &MainWindow::fanSpeedPBClicked); 91​ connect(ui->fanSpeedPB, &QPushButton::clicked, this, &MainWindow::fanSpeedPBClicked);
92 connect(ui->printPB, &QPushButton::clicked, this, &MainWindow::printPBClicked); 92​ connect(ui->printPB, &QPushButton::clicked, this, &MainWindow::printPBClicked);
93​ connect(ui->sdPrintPB, &QPushButton::clicked, this, &MainWindow::sdPrintPBClicked);
94​ connect(ui->sdDelPB, &QPushButton::clicked, this, &MainWindow::sdDelPBClicked);
93 connect(ui->printerSpeedPB, &QPushButton::clicked, this, &MainWindow::printerSpeedPBClicked); 95​ connect(ui->printerSpeedPB, &QPushButton::clicked, this, &MainWindow::printerSpeedPBClicked);
94 connect(ui->flowRatePB, &QPushButton::clicked, this, &MainWindow::flowRatePBClicked); 96​ connect(ui->flowRatePB, &QPushButton::clicked, this, &MainWindow::flowRatePBClicked);
95 connect(ui->showMessagePB, &QPushButton::clicked, this, &MainWindow::showMessage); 97​ connect(ui->showMessagePB, &QPushButton::clicked, this, &MainWindow::showMessage);
96 connect(ui->pluginCB, &QComboBox::currentTextChanged, this, &MainWindow::pluginCBChanged); 98​ connect(ui->pluginCB, &QComboBox::currentTextChanged, this, &MainWindow::pluginCBChanged);
97 connect(ui->disableMotorsPB, &QPushButton::clicked, this, &MainWindow::disableMotorsPBClicked); 99​ connect(ui->disableMotorsPB, &QPushButton::clicked, this, &MainWindow::disableMotorsPBClicked);
100​ connect(ui->sdListPB, &QPushButton::clicked, this, &MainWindow::getSdList);
98 connect(core, &AtCore::stateChanged, this, &MainWindow::printerStateChanged); 101​ connect(core, &AtCore::stateChanged, this, &MainWindow::printerStateChanged);
99 connect(this, &MainWindow::printFile, core, &AtCore::print); 102​ connect(this, &MainWindow::printFile, core, &AtCore::print);
100 connect(ui->stopPB, &QPushButton::clicked, core, &AtCore::stop); 103​ connect(ui->stopPB, &QPushButton::clicked, core, &AtCore::stop);
101 connect(ui->emergencyStopPB, &QPushButton::clicked, core, &AtCore::emergencyStop); 104​ connect(ui->emergencyStopPB, &QPushButton::clicked, core, &AtCore::emergencyStop);
102 connect(axisControl, &AxisControl::clicked, this, &MainWindow::axisControlClicked); 105​ connect(axisControl, &AxisControl::clicked, this, &MainWindow::axisControlClicked);
103 connect(core, &AtCore::portsChanged, this, &MainWindow::locateSerialPort); 106​ connect(core, &AtCore::portsChanged, this, &MainWindow::locateSerialPort);
104 connect(core, &AtCore::printProgressChanged, this, &MainWindow::printProgressChanged); 107​ connect(core, &AtCore::printProgressChanged, this, &MainWindow::printProgressChanged);
108​ connect(core, &AtCore::sdMountChanged, this, &MainWindow::sdChanged);
109​
110​ connect(core, &AtCore::sdCardFileListChanged, [ & ](QStringList fileList) {
patrickelectricUnsubmitted
Not Done

you can use only ui.

patrickelectric: you can use only `ui`.
rizzitelloAuthorUnsubmitted
Not Done

Does not build if only capture ui

rizzitello: Does not build if only capture ui
111​ ui->sdFileListView->clear();
112​ ui->sdFileListView->addItems(fileList);
113​ });
105 114​
106 connect(&core->temperature(), &Temperature::bedTemperatureChanged, [ this ](float temp) { 115​ connect(&core->temperature(), &Temperature::bedTemperatureChanged, [ this ](float temp) {
107 checkTemperature(0x00, 0, temp); 116​ checkTemperature(0x00, 0, temp);
108 ui->plotWidget->appendPoint(tr("Actual Bed"), temp); 117​ ui->plotWidget->appendPoint(tr("Actual Bed"), temp);
109 ui->plotWidget->update(); 118​ ui->plotWidget->update();
110 }); 119​ });
111 connect(&core->temperature(), &Temperature::bedTargetTemperatureChanged, [ this ](float temp) { 120​ connect(&core->temperature(), &Temperature::bedTargetTemperatureChanged, [ this ](float temp) {
112 checkTemperature(0x01, 0, temp); 121​ checkTemperature(0x01, 0, temp);
Show All 17 Lines
130 139​
131 ui->menuView->insertAction(nullptr, ui->connectDock->toggleViewAction()); 140​ ui->menuView->insertAction(nullptr, ui->connectDock->toggleViewAction());
132 ui->menuView->insertAction(nullptr, ui->tempControlsDock->toggleViewAction()); 141​ ui->menuView->insertAction(nullptr, ui->tempControlsDock->toggleViewAction());
133 ui->menuView->insertAction(nullptr, ui->commandDock->toggleViewAction()); 142​ ui->menuView->insertAction(nullptr, ui->commandDock->toggleViewAction());
134 ui->menuView->insertAction(nullptr, ui->printDock->toggleViewAction()); 143​ ui->menuView->insertAction(nullptr, ui->printDock->toggleViewAction());
135 ui->menuView->insertAction(nullptr, ui->moveDock->toggleViewAction()); 144​ ui->menuView->insertAction(nullptr, ui->moveDock->toggleViewAction());
136 ui->menuView->insertAction(nullptr, ui->tempTimelineDock->toggleViewAction()); 145​ ui->menuView->insertAction(nullptr, ui->tempTimelineDock->toggleViewAction());
137 ui->menuView->insertAction(nullptr, ui->logDock->toggleViewAction()); 146​ ui->menuView->insertAction(nullptr, ui->logDock->toggleViewAction());
147​ ui->menuView->insertAction(nullptr, ui->sdDock->toggleViewAction());
138 148​
139 //more dock stuff. 149​ //more dock stuff.
140 setTabPosition(Qt::LeftDockWidgetArea, QTabWidget::North); 150​ setTabPosition(Qt::LeftDockWidgetArea, QTabWidget::North);
141 setTabPosition(Qt::RightDockWidgetArea, QTabWidget::North); 151​ setTabPosition(Qt::RightDockWidgetArea, QTabWidget::North);
142 tabifyDockWidget(ui->moveDock, ui->tempControlsDock); 152​ tabifyDockWidget(ui->moveDock, ui->tempControlsDock);
153​ tabifyDockWidget(ui->moveDock, ui->sdDock);
143 ui->moveDock->raise(); 154​ ui->moveDock->raise();
144 155​
145 tabifyDockWidget(ui->connectDock, ui->printDock); 156​ tabifyDockWidget(ui->connectDock, ui->printDock);
146 tabifyDockWidget(ui->connectDock, ui->commandDock); 157​ tabifyDockWidget(ui->connectDock, ui->commandDock);
147 ui->connectDock->raise(); 158​ ui->connectDock->raise();
148 setCentralWidget(nullptr); 159​ setCentralWidget(nullptr);
149} 160​}
150 161​
▲ Show 20 Lines • Show All 332 Lines • ▼ Show 20 Line(s)491 case AtCore::BUSY:
483 break; 494​ break;
484 495​
485 case AtCore::DISCONNECTED: 496​ case AtCore::DISCONNECTED:
486 stateString = QStringLiteral("Not Connected"); 497​ stateString = QStringLiteral("Not Connected");
487 ui->commandDock->setDisabled(true); 498​ ui->commandDock->setDisabled(true);
488 ui->moveDock->setDisabled(true); 499​ ui->moveDock->setDisabled(true);
489 ui->tempControlsDock->setDisabled(true); 500​ ui->tempControlsDock->setDisabled(true);
490 ui->printDock->setDisabled(true); 501​ ui->printDock->setDisabled(true);
502​ ui->sdDock->setDisabled(true);
491 break; 503​ break;
492 504​
493 case AtCore::CONNECTING: 505​ case AtCore::CONNECTING:
494 stateString = QStringLiteral("Connecting"); 506​ stateString = QStringLiteral("Connecting");
495 ui->commandDock->setDisabled(false); 507​ ui->commandDock->setDisabled(false);
496 ui->moveDock->setDisabled(false); 508​ ui->moveDock->setDisabled(false);
497 ui->tempControlsDock->setDisabled(false); 509​ ui->tempControlsDock->setDisabled(false);
498 ui->printDock->setDisabled(false); 510​ ui->printDock->setDisabled(false);
511​ ui->sdDock->setDisabled(false);
499 break; 512​ break;
500 513​
501 case AtCore::STOP: 514​ case AtCore::STOP:
502 stateString = QStringLiteral("Stoping Print"); 515​ stateString = QStringLiteral("Stoping Print");
503 break; 516​ break;
504 517​
505 case AtCore::ERRORSTATE: 518​ case AtCore::ERRORSTATE:
506 stateString = QStringLiteral("Command ERROR"); 519​ stateString = QStringLiteral("Command ERROR");
▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Line(s)560{
548 if (ui->actionShowDockTitles->isChecked()) { 561​ if (ui->actionShowDockTitles->isChecked()) {
549 delete ui->connectDock->titleBarWidget(); 562​ delete ui->connectDock->titleBarWidget();
550 delete ui->logDock->titleBarWidget(); 563​ delete ui->logDock->titleBarWidget();
551 delete ui->tempTimelineDock->titleBarWidget(); 564​ delete ui->tempTimelineDock->titleBarWidget();
552 delete ui->commandDock->titleBarWidget(); 565​ delete ui->commandDock->titleBarWidget();
553 delete ui->moveDock->titleBarWidget(); 566​ delete ui->moveDock->titleBarWidget();
554 delete ui->tempControlsDock->titleBarWidget(); 567​ delete ui->tempControlsDock->titleBarWidget();
555 delete ui->printDock->titleBarWidget(); 568​ delete ui->printDock->titleBarWidget();
569​ delete ui->sdDock->titleBarWidget();
556 } else { 570​ } else {
557 ui->connectDock->setTitleBarWidget(new QWidget()); 571​ ui->connectDock->setTitleBarWidget(new QWidget());
558 ui->logDock->setTitleBarWidget(new QWidget()); 572​ ui->logDock->setTitleBarWidget(new QWidget());
559 ui->tempTimelineDock->setTitleBarWidget(new QWidget()); 573​ ui->tempTimelineDock->setTitleBarWidget(new QWidget());
560 ui->commandDock->setTitleBarWidget(new QWidget()); 574​ ui->commandDock->setTitleBarWidget(new QWidget());
561 ui->moveDock->setTitleBarWidget(new QWidget()); 575​ ui->moveDock->setTitleBarWidget(new QWidget());
562 ui->tempControlsDock->setTitleBarWidget(new QWidget()); 576​ ui->tempControlsDock->setTitleBarWidget(new QWidget());
563 ui->printDock->setTitleBarWidget(new QWidget()); 577​ ui->printDock->setTitleBarWidget(new QWidget());
578​ ui->sdDock->setTitleBarWidget(new QWidget());
564 } 579​ }
565} 580​}
566 581​
567void MainWindow::about() 582​void MainWindow::about()
568{ 583​{
569 About *aboutDialog = new About(this); 584​ About *aboutDialog = new About(this);
570 aboutDialog->exec(); 585​ aboutDialog->exec();
571} 586​}
572 587​
573void MainWindow::axisControlClicked(QChar axis, int value) 588​void MainWindow::axisControlClicked(QChar axis, int value)
574{ 589​{
575 core->setRelativePosition(); 590​ core->setRelativePosition();
576 core->pushCommand(GCode::toCommand(GCode::G1, QStringLiteral("%1%2").arg(axis, QString::number(value)))); 591​ core->pushCommand(GCode::toCommand(GCode::G1, QStringLiteral("%1%2").arg(axis, QString::number(value))));
577 core->setAbsolutePosition(); 592​ core->setAbsolutePosition();
578} 593​}
579 594​
580void MainWindow::disableMotorsPBClicked() 595​void MainWindow::disableMotorsPBClicked()
581{ 596​{
582 core->setIdleHold(0); 597​ core->setIdleHold(0);
583} 598​}
599​
600​void MainWindow::sdChanged(bool mounted)
601​{
602​ QString labelText = mounted ? QStringLiteral("SD") : QString();
603​ ui->lbl_sd->setText(labelText);
604​}
605​
606​void MainWindow::getSdList()
patrickelectricUnsubmitted
Done

QString sdName = mounted ? QStringLiteral("SD") : QString();
ui->lbl_sd->setText(sdName);

patrickelectric: QString sdName = mounted ? QStringLiteral("SD") : QString(); ui->lbl_sd->setText(sdName);
607​{
608​ core->sdFileList();
609​}
610​
611​void MainWindow::sdPrintPBClicked()
612​{
613​ if (ui->sdFileListView->currentRow() < 0) {
614​ QMessageBox::information(this, QStringLiteral("Print Error"), QStringLiteral("You must Select a file from the list"));
615​ } else {
616​ core->print(ui->sdFileListView->currentItem()->text(), true);
patrickelectricUnsubmitted
Done

Again, the most common case comes first in the if/else logic.

patrickelectric: Again, the most common case comes first in the if/else logic.
rizzitelloAuthorUnsubmitted
Not Done

This only happens if you hit the button to print from the sd card.

rizzitello: This only happens if you hit the button to print from the sd card.
617​ }
618​}
619​
620​void MainWindow::sdDelPBClicked()
621​{
622​ if (ui->sdFileListView->currentRow() < 0) {
623​ QMessageBox::information(this, QStringLiteral("Delete Error"), QStringLiteral("You must Select a file from the list"));
624​ } else {
625​ core->sdDelete(ui->sdFileListView->currentItem()->text());
patrickelectricUnsubmitted
Done

< 0 ?

patrickelectric: `< 0` ?
rizzitelloAuthorUnsubmitted
Not Done

i guess it could be <0. if current row is set to -1 when there is no selection

rizzitello: i guess it could be <0. if current row is set to -1 when there is no selection
626​ ui->sdFileListView->setCurrentRow(-1);
627​ }
628​}