Differential D11381 Diff 29731 testclient/mainwindow.cpp

Changeset View

Standalone View

testclient/mainwindow.cpp

Show All 33 Lines
34	#include "widgets/about.h"	34		#include "widgets/about.h"
35		35
36	Q_LOGGING_CATEGORY(TESTCLIENT_MAINWINDOW, "org.kde.atelier.core")	36		Q_LOGGING_CATEGORY(TESTCLIENT_MAINWINDOW, "org.kde.atelier.core")
37		37
38	int MainWindow::fanCount = 4;	38		int MainWindow::fanCount = 4;
39		39
40	MainWindow::MainWindow(QWidget *parent) :	40		MainWindow::MainWindow(QWidget *parent) :
41	QMainWindow(parent),	41		QMainWindow(parent),
42	ui(new Ui::MainWindow),
43	core(new AtCore(this)),	42		core(new AtCore(this)),
44	logFile(new QTemporaryFile(QDir::tempPath() + QStringLiteral("/AtCore_")))	43		logFile(new QTemporaryFile(QDir::tempPath() + QStringLiteral("/AtCore_")))
45	{	44		{
46	ui->setupUi(this);	45		setWindowTitle(tr("AtCore - Test Client"));
			laysrodriguesUnsubmitted Done use tr so we can have translation. laysrodrigues: use tr so we can have translation.
			rizzitelloAuthorUnsubmitted Done We currenly do not translate the test gui at all These can be added in another path, this patch is just to remove the UI. rizzitello: We currenly do not translate the test gui at all These can be added in another path, this patch…
			rizzitelloAuthorUnsubmitted Done Adding tr calls to this patch rizzitello: Adding tr calls to this patch
47	setWindowIcon(QIcon(QStringLiteral(":/icon/windowIcon")));	46		setWindowIcon(QIcon(QStringLiteral(":/icon/windowIcon")));
48	QCoreApplication::setApplicationVersion(core->version());	47		QCoreApplication::setApplicationVersion(core->version());
49	ui->serialPortCB->setEditable(true);	48		initMenu();
50	QValidator *validator = new QIntValidator();	49		initStatusBar();
51	ui->baudRateLE->setValidator(validator);	50		initWidgets();
52	ui->baudRateLE->addItems(core->portSpeeds());
53	ui->baudRateLE->setCurrentIndex(9);
54
55	ui->pluginCB->addItem(tr("Autodetect"));
56	ui->pluginCB->addItems(core->availableFirmwarePlugins());
57
58	AxisControl *axisControl = new AxisControl;
59	ui->moveDockContents->layout()->addWidget(axisControl);
60		51
61	addLog(tr("Attempting to locate Serial Ports"));	52		addLog(tr("Attempting to locate Serial Ports"));
62	core->setSerialTimerInterval(1000);	53		core->setSerialTimerInterval(1000);
63	setDangeriousDocksDisabled(true);
64	populateCBs();
65		54
66	//Icon for actionQuit
67	#ifndef Q_OS_MAC
68	ui->actionQuit->setIcon(QIcon::fromTheme(QStringLiteral("application-exit")));
69	#endif
70
71	//hide the printing progress bar.
72	ui->printLayout->setVisible(false);
73
74	ui->statusBar->addWidget(ui->statusBarWidget);
75	printTime = new QTime();	55		printTime = new QTime();
76	printTimer = new QTimer();	56		printTimer = new QTimer();
77	printTimer->setInterval(1000);	57		printTimer->setInterval(1000);
78	printTimer->setSingleShot(false);	58		printTimer->setSingleShot(false);
79	connect(printTimer, &QTimer::timeout, this, &MainWindow::updatePrintTime);	59		connect(printTimer, &QTimer::timeout, this, &MainWindow::updatePrintTime);
80		60
81	connect(ui->connectPB, &QPushButton::clicked, this, &MainWindow::connectPBClicked);
82	connect(ui->saveLogPB, &QPushButton::clicked, this, &MainWindow::saveLogPBClicked);
83	connect(ui->sendPB, &QPushButton::clicked, this, &MainWindow::sendPBClicked);
84	connect(ui->commandLE, &QLineEdit::returnPressed, this, &MainWindow::sendPBClicked);
85	connect(ui->homeAllPB, &QPushButton::clicked, this, &MainWindow::homeAllPBClicked);
86	connect(ui->homeXPB, &QPushButton::clicked, this, &MainWindow::homeXPBClicked);
87	connect(ui->homeYPB, &QPushButton::clicked, this, &MainWindow::homeYPBClicked);
88	connect(ui->homeZPB, &QPushButton::clicked, this, &MainWindow::homeZPBClicked);
89	connect(ui->bedTempPB, &QPushButton::clicked, this, &MainWindow::bedTempPBClicked);
90	connect(ui->extTempPB, &QPushButton::clicked, this, &MainWindow::extTempPBClicked);
91	connect(ui->mvAxisPB, &QPushButton::clicked, this, &MainWindow::mvAxisPBClicked);
92	connect(ui->fanSpeedPB, &QPushButton::clicked, this, &MainWindow::fanSpeedPBClicked);
93	connect(ui->printPB, &QPushButton::clicked, this, &MainWindow::printPBClicked);
94	connect(ui->sdPrintPB, &QPushButton::clicked, this, &MainWindow::sdPrintPBClicked);
95	connect(ui->sdDelPB, &QPushButton::clicked, this, &MainWindow::sdDelPBClicked);
96	connect(ui->printerSpeedPB, &QPushButton::clicked, this, &MainWindow::printerSpeedPBClicked);
97	connect(ui->flowRatePB, &QPushButton::clicked, this, &MainWindow::flowRatePBClicked);
98	connect(ui->showMessagePB, &QPushButton::clicked, this, &MainWindow::showMessage);
99	connect(ui->pluginCB, &QComboBox::currentTextChanged, this, &MainWindow::pluginCBChanged);
100	connect(ui->disableMotorsPB, &QPushButton::clicked, this, &MainWindow::disableMotorsPBClicked);
101	connect(ui->sdListPB, &QPushButton::clicked, this, &MainWindow::getSdList);
102	connect(core, &AtCore::stateChanged, this, &MainWindow::printerStateChanged);	61		connect(core, &AtCore::stateChanged, this, &MainWindow::printerStateChanged);
103	connect(ui->stopPB, &QPushButton::clicked, core, &AtCore::stop);
104	connect(ui->emergencyStopPB, &QPushButton::clicked, core, &AtCore::emergencyStop);
105	connect(axisControl, &AxisControl::clicked, this, &MainWindow::axisControlClicked);
106	connect(core, &AtCore::portsChanged, this, &MainWindow::locateSerialPort);	62		connect(core, &AtCore::portsChanged, this, &MainWindow::locateSerialPort);
107	connect(core, &AtCore::printProgressChanged, this, &MainWindow::printProgressChanged);	63		connect(core, &AtCore::printProgressChanged, this, &MainWindow::printProgressChanged);
108	connect(core, &AtCore::sdMountChanged, this, &MainWindow::sdChanged);	64		connect(core, &AtCore::sdMountChanged, this, &MainWindow::sdChanged);
109		65
110	connect(core, &AtCore::sdCardFileListChanged, [ & ](QStringList fileList) {	66		connect(core, &AtCore::sdCardFileListChanged, [ & ](QStringList fileList) {
111	ui->sdFileListView->clear();	67		listSdFiles->clear();
112	ui->sdFileListView->addItems(fileList);	68		listSdFiles->addItems(fileList);
113	});	69		});
114		70
115	connect(&core->temperature(), &Temperature::bedTemperatureChanged, [ this ](float temp) {	71		connect(&core->temperature(), &Temperature::bedTemperatureChanged, [ this ](float temp) {
116	checkTemperature(0x00, 0, temp);	72		checkTemperature(0x00, 0, temp);
117	ui->plotWidget->appendPoint(tr("Actual Bed"), temp);	73		plotWidget->appendPoint(tr("Actual Bed"), temp);
118	ui->plotWidget->update();	74		plotWidget->update();
119	});	75		});
120	connect(&core->temperature(), &Temperature::bedTargetTemperatureChanged, [ this ](float temp) {	76		connect(&core->temperature(), &Temperature::bedTargetTemperatureChanged, [ this ](float temp) {
121	checkTemperature(0x01, 0, temp);	77		checkTemperature(0x01, 0, temp);
122	ui->plotWidget->appendPoint(tr("Target Bed"), temp);	78		plotWidget->appendPoint(tr("Target Bed"), temp);
123	ui->plotWidget->update();	79		plotWidget->update();
124	});	80		});
125	connect(&core->temperature(), &Temperature::extruderTemperatureChanged, [ this ](float temp) {	81		connect(&core->temperature(), &Temperature::extruderTemperatureChanged, [ this ](float temp) {
126	checkTemperature(0x02, 0, temp);	82		checkTemperature(0x02, 0, temp);
127	ui->plotWidget->appendPoint(tr("Actual Ext.1"), temp);	83		plotWidget->appendPoint(tr("Actual Ext.1"), temp);
128	ui->plotWidget->update();	84		plotWidget->update();
129	});	85		});
130	connect(&core->temperature(), &Temperature::extruderTargetTemperatureChanged, [ this ](float temp) {	86		connect(&core->temperature(), &Temperature::extruderTargetTemperatureChanged, [ this ](float temp) {
131	checkTemperature(0x03, 0, temp);	87		checkTemperature(0x03, 0, temp);
132	ui->plotWidget->appendPoint(tr("Target Ext.1"), temp);	88		plotWidget->appendPoint(tr("Target Ext.1"), temp);
133	ui->plotWidget->update();	89		plotWidget->update();
134	});	90		});
		91		}
		92
		93		void MainWindow::initMenu()
		94		{
		95		QMenu *menuFile = new QMenu(tr("File"));
		96		QAction *actionQuit = new QAction(style()->standardIcon(QStyle::SP_DialogCloseButton), tr("Quit"));
		97		connect(actionQuit, &QAction::triggered, this, &MainWindow::close);
		98		menuFile->addAction(actionQuit);
		99
		100		menuView = new QMenu(tr("View"));
		101		QAction *actionShowDockTitles = new QAction(tr("Show Dock Titles"));
		102		actionShowDockTitles->setCheckable(true);
		103		actionShowDockTitles->setChecked(true);
		104		connect(actionShowDockTitles, &QAction::toggled, this, &MainWindow::toggleDockTitles);
		105		menuView->addAction(actionShowDockTitles);
		106
		107		QMenu *menuHelp = new QMenu(tr("Help"));
		108		QAction *actionAbout = new QAction(tr("About"));
		109		actionAbout->setShortcut(QKeySequence(Qt::Key_F1));
		110		connect(actionAbout, &QAction::triggered, [] {
		111		auto *dialog = new About;
		112		dialog->exec();
		113		});
		114		menuHelp->addAction(actionAbout);
135		115
136	connect(ui->actionQuit, &QAction::triggered, this, &MainWindow::close);	116		menuBar()->addMenu(menuFile);
137	connect(ui->actionShowDockTitles, &QAction::toggled, this, &MainWindow::toggleDockTitles);	117		menuBar()->addMenu(menuView);
138	connect(ui->actionAbout, &QAction::triggered, this, &MainWindow::about);	118		menuBar()->addMenu(menuHelp);
139		119		}
140	ui->menuView->insertAction(nullptr, ui->connectDock->toggleViewAction());	120
141	ui->menuView->insertAction(nullptr, ui->tempControlsDock->toggleViewAction());	121		void MainWindow::initStatusBar()
142	ui->menuView->insertAction(nullptr, ui->commandDock->toggleViewAction());	122		{
143	ui->menuView->insertAction(nullptr, ui->printDock->toggleViewAction());	123		//first create the item for the print Progress.
144	ui->menuView->insertAction(nullptr, ui->moveDock->toggleViewAction());	124		printingProgress = new QProgressBar;
145	ui->menuView->insertAction(nullptr, ui->tempTimelineDock->toggleViewAction());	125		auto *newButton = new QPushButton(style()->standardIcon(QStyle::SP_BrowserStop), QString());
146	ui->menuView->insertAction(nullptr, ui->logDock->toggleViewAction());	126		connect(newButton, &QPushButton::clicked, core, &AtCore::stop);
147	ui->menuView->insertAction(nullptr, ui->sdDock->toggleViewAction());	127		lblTime = new QLabel(QStringLiteral("00:00:00"));
		128		lblTime->setAlignment(Qt::AlignHCenter);
		129		auto *newLabel = new QLabel(QStringLiteral(" / "));
		130		lblTimeLeft = new QLabel(QStringLiteral("00:00:00"));
		131		lblTimeLeft->setAlignment(Qt::AlignHCenter);
		132
		133		auto *hBoxLayout = new QHBoxLayout;
		134		hBoxLayout->addWidget(printingProgress);
		135		hBoxLayout->addWidget(newButton);
		136		hBoxLayout->addWidget(lblTime);
		137		hBoxLayout->addWidget(newLabel);
		138		hBoxLayout->addWidget(lblTimeLeft);
		139		printProgressWidget = new QWidget();
		140		printProgressWidget->setLayout(hBoxLayout);
		141
		142		//Then Create the full bar.
		143		newLabel = new QLabel(tr("AtCore State:"));
		144		lblState = new QLabel(tr("Not Connected"));
		145		lblSd = new QLabel();
		146
		147		hBoxLayout = new QHBoxLayout;
		148		hBoxLayout->addWidget(newLabel);
		149		hBoxLayout->addWidget(lblState);
		150		hBoxLayout->addSpacerItem(new QSpacerItem(10, 20, QSizePolicy::Fixed));
		151		hBoxLayout->addWidget(lblSd);
		152		hBoxLayout->addSpacerItem(new QSpacerItem(40, 20, QSizePolicy::Expanding));
		153		hBoxLayout->addWidget(printProgressWidget);
		154
		155		//Then put it all into a widget on the bar.
		156		QWidget *sBar = new QWidget();
		157		sBar->setLayout(hBoxLayout);
		158		statusBar()->addPermanentWidget(sBar, 100);
		159		}
		160
		161		void MainWindow::initWidgets()
		162		{
		163		//Make the Docks
		164		makeCommandDock();
		165		makePrintDock();
		166		makeTempTimelineDock();
		167		makeLogDock();
		168		makeConnectDock();
		169		makeMoveDock();
		170		makeTempControlsDock();
		171		makeSdDock();
		172
		173		setDangeriousDocksDisabled(true);
148		174
149	//more dock stuff.
150	setTabPosition(Qt::LeftDockWidgetArea, QTabWidget::North);	175		setTabPosition(Qt::LeftDockWidgetArea, QTabWidget::North);
151	setTabPosition(Qt::RightDockWidgetArea, QTabWidget::North);	176		setTabPosition(Qt::RightDockWidgetArea, QTabWidget::North);
152	tabifyDockWidget(ui->moveDock, ui->tempControlsDock);	177		tabifyDockWidget(moveDock, tempControlsDock);
153	tabifyDockWidget(ui->moveDock, ui->sdDock);	178		tabifyDockWidget(moveDock, sdDock);
154	ui->moveDock->raise();	179		moveDock->raise();
155		180
156	tabifyDockWidget(ui->connectDock, ui->printDock);	181		tabifyDockWidget(connectDock, printDock);
157	tabifyDockWidget(ui->connectDock, ui->commandDock);	182		tabifyDockWidget(connectDock, commandDock);
158	ui->connectDock->raise();	183		connectDock->raise();
159	setCentralWidget(nullptr);	184		setCentralWidget(nullptr);
		185
		186		//More Gui stuff
		187		populateCBs();
		188		//hide the printing progress bar.
		189		printProgressWidget->setVisible(false);
		190		}
		191
		192		void MainWindow::makeCommandDock()
		193		{
		194		//The processing for making a dock is the same for all docks
		195		//Expose the least amount of object outside the creation function.
		196
		197		// First we make our mainLayout for the dock.
		198		auto *mainLayout = new QVBoxLayout;
		199
		200		//Begin making content from top to bottom or left to right.
		201		//Making child layouts in the order you want to put them
		202		// onto the mainLayout
		203		lineCommand = new QLineEdit;
		204		lineCommand->setPlaceholderText(tr("Send Command"));
		205
		206		//we have a few buttons to make here. Lets name this newButton so its easier to reuse
		207		auto *newButton = new QPushButton(tr("Send"));
		208		connect(newButton, &QPushButton::clicked, this, &MainWindow::sendPBClicked);
		209
		210		//When you have created a Row put the items into layout.
		211		auto *hBoxLayout = new QHBoxLayout;
		212		hBoxLayout->addWidget(lineCommand);
		213		hBoxLayout->addWidget(newButton);
		214		//Put the Layout or Widget on the mainLayout when its finished.
		215		//This will free your pointers for reuse.
		216		mainLayout->addLayout(hBoxLayout);
		217
		218		//Start making items for the next layout to place onto the mainLayout.
		219		lineMessage = new QLineEdit;
		220		lineMessage->setPlaceholderText(tr("Show Message"));
		221
		222		//Here we reuse our button pointer my having it point to a new button.
		223		newButton = new QPushButton(tr("Send"));
		224		connect(newButton, &QPushButton::clicked, this, &MainWindow::showMessage);
		225
		226		//We reuse the hBoxLayout pointer in the same way as the button pointer.
		227		hBoxLayout = new QHBoxLayout;
		228		hBoxLayout->addWidget(lineMessage);
		229		hBoxLayout->addWidget(newButton);
		230		mainLayout->addLayout(hBoxLayout);
		231
		232		//QDockWidget::setLayout is not ment to be used by us
		233		//We must instead Create a widget to hold or dock contents.
		234		auto *dockContents = new QWidget;
		235		dockContents->setLayout(mainLayout);
		236
		237		//Finally create the dock, and set the Widget.
		238		commandDock = new QDockWidget(tr("Commands"), this);
		239		commandDock->setWidget(dockContents);
		240
		241		//Push the toggle view action into our view menu
		242		menuView->insertAction(nullptr, commandDock->toggleViewAction());
		243
		244		//Place the Dock into a DockWidget Area.
		245		//Failure todo this will create some odd side effects at runtime
		246		addDockWidget(Qt::LeftDockWidgetArea, commandDock);
		247		}
		248
		249		void MainWindow::makePrintDock()
		250		{
		251		auto *mainLayout = new QVBoxLayout;
		252
		253		buttonPrint = new QPushButton(tr("Print File"));
		254		connect(buttonPrint, &QPushButton::clicked, this, &MainWindow::printPBClicked);
		255
		256		auto *newButton = new QPushButton(tr("Emergency Stop"));
		257		connect(newButton, &QPushButton::clicked, core, &AtCore::emergencyStop);
		258
		259		auto *hBoxLayout = new QHBoxLayout;
		260		hBoxLayout->addWidget(buttonPrint);
		261		hBoxLayout->addWidget(newButton);
		262		mainLayout->addLayout(hBoxLayout);
		263
		264		auto *newLabel = new QLabel(tr("On Pause:"));
		265		linePostPause = new QLineEdit;
		266		linePostPause->setPlaceholderText(QStringLiteral("G91,G0 Z1,G90,G1 X0 Y195"));
		267
		268		hBoxLayout = new QHBoxLayout;
		269		hBoxLayout->addWidget(newLabel);
		270		hBoxLayout->addWidget(linePostPause);
		271		mainLayout->addLayout(hBoxLayout);
		272
		273		newLabel = new QLabel(tr("Printer Speed"));
		274		sbPrintSpeed = new QSpinBox;
		275		sbPrintSpeed->setRange(1, 300);
		276		sbPrintSpeed->setValue(100);
		277		sbPrintSpeed->setSuffix(QStringLiteral("%"));
		278
		279		newButton = new QPushButton(tr("Set"));
		280		connect(newButton, &QPushButton::clicked, this, &MainWindow::printerSpeedPBClicked);
		281
		282		hBoxLayout = new QHBoxLayout;
		283		hBoxLayout->addWidget(newLabel, 35);
		284		hBoxLayout->addWidget(sbPrintSpeed, 10);
		285		hBoxLayout->addWidget(newButton, 20);
		286		mainLayout->addLayout(hBoxLayout);
		287
		288		newLabel = new QLabel(tr("Flow Rate"));
		289		sbFlowRate = new QSpinBox;
		290		sbFlowRate->setRange(1, 300);
		291		sbFlowRate->setValue(100);
		292		sbFlowRate->setSuffix(QStringLiteral("%"));
		293
		294		newButton = new QPushButton(tr("Set"));
		295		connect(newButton, &QPushButton::clicked, this, &MainWindow::flowRatePBClicked);
		296
		297		hBoxLayout = new QHBoxLayout;
		298		hBoxLayout->addWidget(newLabel, 35);
		299		hBoxLayout->addWidget(sbFlowRate, 10);
		300		hBoxLayout->addWidget(newButton, 20);
		301		mainLayout->addLayout(hBoxLayout);
		302
		303		auto *dockContents = new QWidget;
		304		dockContents->setLayout(mainLayout);
		305
		306		printDock = new QDockWidget(tr("Print"), this);
		307		printDock->setWidget(dockContents);
		308
		309		menuView->insertAction(nullptr, printDock->toggleViewAction());
		310		addDockWidget(Qt::LeftDockWidgetArea, printDock);
		311		}
		312
		313		void MainWindow::makeTempTimelineDock()
		314		{
		315		plotWidget = new PlotWidget;
		316		tempTimelineDock = new QDockWidget(tr("Temperature Timeline"), this);
		317		tempTimelineDock->setWidget(plotWidget);
		318		menuView->insertAction(nullptr, tempTimelineDock->toggleViewAction());
		319		addDockWidget(Qt::RightDockWidgetArea, tempTimelineDock);
		320		}
		321
		322		void MainWindow::makeLogDock()
		323		{
		324		textLog = new QPlainTextEdit;
		325		textLog->setReadOnly(true);
		326		textLog->setMaximumBlockCount(1000);
		327
		328		auto *newButton = new QPushButton(style()->standardIcon(QStyle::SP_DialogSaveButton), tr("Save Session Log"));
		329		connect(newButton, &QPushButton::clicked, this, &MainWindow::saveLogPBClicked);
		330
		331		auto *mainLayout = new QVBoxLayout;
		332		mainLayout->addWidget(textLog);
		333		mainLayout->addWidget(newButton);
		334
		335		auto *dockContents = new QWidget();
		336		dockContents->setLayout(mainLayout);
		337
		338		logDock = new QDockWidget(tr("Session Log"), this);
		339		logDock->setWidget(dockContents);
		340
		341		menuView->insertAction(nullptr, logDock->toggleViewAction());
		342		addDockWidget(Qt::RightDockWidgetArea, logDock);
		343		}
		344
		345		void MainWindow::makeConnectDock()
		346		{
		347		auto *mainLayout = new QVBoxLayout;
		348		auto *newLabel = new QLabel(tr("Port:"));
		349
		350		comboPort = new QComboBox;
		351		comboPort->setEditable(true);
		352
		353		auto *hBoxLayout = new QHBoxLayout;
		354		hBoxLayout->addWidget(newLabel);
		355		hBoxLayout->addWidget(comboPort, 75);
		356		mainLayout->addLayout(hBoxLayout);
		357
		358		newLabel = new QLabel(tr("Baud Rate:"));
		359		comboBAUD = new QComboBox;
		360		comboBAUD->addItems(core->portSpeeds());
		361		comboBAUD->setCurrentIndex(9);
		362
		363		hBoxLayout = new QHBoxLayout;
		364		hBoxLayout->addWidget(newLabel);
		365		hBoxLayout->addWidget(comboBAUD, 75);
		366		mainLayout->addLayout(hBoxLayout);
		367
		368		newLabel = new QLabel(tr("Use Plugin:"));
		369		comboPlugin = new QComboBox;
		370		comboPlugin->addItem(tr("Autodetect"));
		371		comboPlugin->addItems(core->availableFirmwarePlugins());
		372		connect(comboPlugin, &QComboBox::currentTextChanged, this, &MainWindow::pluginCBChanged);
		373
		374		hBoxLayout = new QHBoxLayout;
		375		hBoxLayout->addWidget(newLabel);
		376		hBoxLayout->addWidget(comboPlugin, 75);
		377		mainLayout->addLayout(hBoxLayout);
		378
		379		buttonConnect = new QPushButton(tr("Connect"));
		380		connect(buttonConnect, &QPushButton::clicked, this, &MainWindow::connectPBClicked);
		381		mainLayout->addWidget(buttonConnect);
		382
		383		auto *dockContents = new QWidget;
		384		dockContents->setLayout(mainLayout);
		385
		386		connectDock = new QDockWidget(tr("Connect"), this);
		387		connectDock->setWidget(dockContents);
		388
		389		menuView->insertAction(nullptr, connectDock->toggleViewAction());
		390		addDockWidget(Qt::LeftDockWidgetArea, connectDock);
		391		}
		392
		393		void MainWindow::makeMoveDock()
		394		{
		395		auto *mainLayout = new QVBoxLayout;
		396		auto *hBoxLayout = new QHBoxLayout;
		397
		398		auto *newButton = new QPushButton(tr("Home All"));
		399		connect(newButton, &QPushButton::clicked, this, &MainWindow::homeAllPBClicked);
		400		hBoxLayout->addWidget(newButton);
		401
		402		newButton = new QPushButton(tr("Home X"));
		403		connect(newButton, &QPushButton::clicked, this, &MainWindow::homeXPBClicked);
		404		hBoxLayout->addWidget(newButton);
		405
		406		newButton = new QPushButton(tr("Home Y"));
		407		connect(newButton, &QPushButton::clicked, this, &MainWindow::homeYPBClicked);
		408		hBoxLayout->addWidget(newButton);
		409
		410		newButton = new QPushButton(tr("Home Z"));
		411		connect(newButton, &QPushButton::clicked, this, &MainWindow::homeZPBClicked);
		412		hBoxLayout->addWidget(newButton);
		413
		414		mainLayout->addLayout(hBoxLayout);
		415
		416		comboMoveAxis = new QComboBox;
		417		comboMoveAxis->addItem(tr("Move X Axis to"));
		418		comboMoveAxis->addItem(tr("Move Y Axis to"));
		419		comboMoveAxis->addItem(tr("Move Z Axis to"));
		420
		421		sbMoveAxis = new QDoubleSpinBox;
		422		sbMoveAxis->setRange(0, 200);
		423
		424		newButton = new QPushButton(tr("Go"));
		425		connect(newButton, &QPushButton::clicked, this, &MainWindow::mvAxisPBClicked);
		426
		427		hBoxLayout = new QHBoxLayout;
		428		hBoxLayout->addWidget(comboMoveAxis);
		429		hBoxLayout->addWidget(sbMoveAxis);
		430		hBoxLayout->addWidget(newButton);
		431		mainLayout->addLayout(hBoxLayout);
		432
		433		newButton = new QPushButton(tr("Disable Motors"));
		434		connect(newButton, &QPushButton::clicked, this, &MainWindow::disableMotorsPBClicked);
		435		mainLayout->addWidget(newButton);
		436
		437		auto *axisControl = new AxisControl;
		438		connect(axisControl, &AxisControl::clicked, this, &MainWindow::axisControlClicked);
		439		mainLayout->addWidget(axisControl);
		440
		441		auto *dockContents = new QWidget;
		442		dockContents->setLayout(mainLayout);
		443
		444		moveDock = new QDockWidget(tr("Movement"), this);
		445		moveDock->setWidget(dockContents);
		446
		447		menuView->insertAction(nullptr, moveDock->toggleViewAction());
		448		addDockWidget(Qt::LeftDockWidgetArea, moveDock);
		449		}
		450
		451		void MainWindow::makeTempControlsDock()
		452		{
		453		auto *mainLayout = new QVBoxLayout;
		454		checkAndWait = new QCheckBox(tr("Wait Untill Temperature Stablizes"));
		455		mainLayout->addWidget(checkAndWait);
		456
		457		auto label = new QLabel(tr("Bed Temp"));
		458
		459		sbBedTemp = new QSpinBox;
		460		sbBedTemp->setRange(0, 120);
		461		sbBedTemp->setSuffix(QStringLiteral("°C"));
		462
		463		auto *newButton = new QPushButton(tr("Set"));
		464		connect(newButton, &QPushButton::clicked, this, &MainWindow::bedTempPBClicked);
		465
		466		auto *hboxLayout = new QHBoxLayout;
		467		hboxLayout->addWidget(label, 80);
		468		hboxLayout->addWidget(sbBedTemp);
		469		hboxLayout->addWidget(newButton);
		470		mainLayout->addItem(hboxLayout);
		471
		472		comboExtruderSelect = new QComboBox;
		473		sbExtruderTemp = new QSpinBox;
		474		sbExtruderTemp->setRange(0, 275);
		475		sbExtruderTemp->setSuffix(QStringLiteral("°C"));
		476
		477		newButton = new QPushButton(tr("Set"));
		478		connect(newButton, &QPushButton::clicked, this, &MainWindow::extTempPBClicked);
		479		hboxLayout = new QHBoxLayout;
		480		hboxLayout->addWidget(comboExtruderSelect, 80);
		481		hboxLayout->addWidget(sbExtruderTemp);
		482		hboxLayout->addWidget(newButton);
		483		mainLayout->addItem(hboxLayout);
		484
		485		comboFanSelect = new QComboBox;
		486		sbFanSpeed = new QSpinBox;
		487		sbFanSpeed->setRange(0, 100);
		488		sbFanSpeed->setSuffix(QStringLiteral("%"));
		489
		490		newButton = new QPushButton(tr("Set"));
		491		connect(newButton, &QPushButton::clicked, this, &MainWindow::fanSpeedPBClicked);
		492		hboxLayout = new QHBoxLayout;
		493		hboxLayout->addWidget(comboFanSelect, 80);
		494		hboxLayout->addWidget(sbFanSpeed);
		495		hboxLayout->addWidget(newButton);
		496		mainLayout->addItem(hboxLayout);
		497
		498		auto *dockContents = new QWidget;
		499		dockContents->setLayout(mainLayout);
		500
		501		tempControlsDock = new QDockWidget(tr("Temperatures"), this);
		502		tempControlsDock->setWidget(dockContents);
		503
		504		menuView->insertAction(nullptr, tempControlsDock->toggleViewAction());
		505		addDockWidget(Qt::LeftDockWidgetArea, tempControlsDock);
		506		}
		507
		508		void MainWindow::makeSdDock()
		509		{
		510		auto *hBoxLayout = new QHBoxLayout;
		511
		512		auto *newButton = new QPushButton(tr("Get List"));
		513		connect(newButton, &QPushButton::clicked, this, &MainWindow::getSdList);
		514		hBoxLayout->addWidget(newButton);
		515
		516		newButton = new QPushButton(tr("Print Selected"));
		517		connect(newButton, &QPushButton::clicked, this, &MainWindow::sdPrintPBClicked);
		518		hBoxLayout->addWidget(newButton);
		519
		520		newButton = new QPushButton(tr("Delete Selected"));
		521		connect(newButton, &QPushButton::clicked, this, &MainWindow::sdDelPBClicked);
		522		hBoxLayout->addWidget(newButton);
		523
		524		auto *groupFiles = new QGroupBox(tr("Files On Sd Card"));
		525		listSdFiles = new QListWidget;
		526		auto *groupLayout = new QVBoxLayout;
		527		groupLayout->addWidget(listSdFiles);
		528		groupFiles->setLayout(groupLayout);
		529
		530		auto *mainLayout = new QVBoxLayout;
		531		mainLayout->addItem(hBoxLayout);
		532		mainLayout->addWidget(groupFiles);
		533
		534		auto *dockContents = new QWidget;
		535		dockContents->setLayout(mainLayout);
		536
		537		sdDock = new QDockWidget(tr("Sd Card"), this);
		538		sdDock->setWidget(dockContents);
		539
		540		menuView->insertAction(nullptr, sdDock->toggleViewAction());
		541		addDockWidget(Qt::LeftDockWidgetArea, sdDock);
160	}	542		}
161		543
162	void MainWindow::closeEvent(QCloseEvent *event)	544		void MainWindow::closeEvent(QCloseEvent *event)
163	{	545		{
164	core->close();	546		core->close();
165	event->accept();	547		event->accept();
166	}	548		}
167		549
168	MainWindow::~MainWindow()	550		MainWindow::~MainWindow()
169	{	551		{
170	delete logFile;	552		delete logFile;
171	delete ui;
172	}	553		}
173		554
174	QString MainWindow::getTime()	555		QString MainWindow::getTime()
175	{	556		{
176	return QTime::currentTime().toString(QStringLiteral("hh:mm:ss:zzz"));	557		return QTime::currentTime().toString(QStringLiteral("hh:mm:ss:zzz"));
177	}	558		}
178		559
179	QString MainWindow::logHeader()	560		QString MainWindow::logHeader()
Show All 24 Lines		576	{
204	logFile->write(text.toLatin1());	585		logFile->write(text.toLatin1());
205	logFile->putChar('\n');	586		logFile->putChar('\n');
206	logFile->close();	587		logFile->close();
207	}	588		}
208		589
209	void MainWindow::addLog(QString msg)	590		void MainWindow::addLog(QString msg)
210	{	591		{
211	QString message(logHeader() + msg);	592		QString message(logHeader() + msg);
212	ui->logTE->appendPlainText(message);	593		textLog->appendPlainText(message);
213	writeTempFile(message);	594		writeTempFile(message);
214	}	595		}
215		596
216	void MainWindow::addRLog(QString msg)	597		void MainWindow::addRLog(QString msg)
217	{	598		{
218	QString message(rLogHeader() + msg);	599		QString message(rLogHeader() + msg);
219	ui->logTE->appendPlainText(message);	600		textLog->appendPlainText(message);
220	writeTempFile(message);	601		writeTempFile(message);
221	}	602		}
222		603
223	void MainWindow::addSLog(QString msg)	604		void MainWindow::addSLog(QString msg)
224	{	605		{
225	QString message(sLogHeader() + msg);	606		QString message(sLogHeader() + msg);
226	ui->logTE->appendPlainText(message);	607		textLog->appendPlainText(message);
227	writeTempFile(message);	608		writeTempFile(message);
228	}	609		}
229		610
230	void MainWindow::checkReceivedCommand(const QByteArray &message)	611		void MainWindow::checkReceivedCommand(const QByteArray &message)
231	{	612		{
232	addRLog(QString::fromUtf8(message));	613		addRLog(QString::fromUtf8(message));
233	}	614		}
234		615
▲ Show 20 Lines • Show All 44 Lines • ▼ Show 20 Line(s)
279	}	660		}
280	/**	661		/**
281	* @brief MainWindow::locateSerialPort	662		* @brief MainWindow::locateSerialPort
282	* Locate all active serial ports on the computer and add to the list	663		* Locate all active serial ports on the computer and add to the list
283	* of serial ports	664		* of serial ports
284	*/	665		*/
285	void MainWindow::locateSerialPort(const QStringList &ports)	666		void MainWindow::locateSerialPort(const QStringList &ports)
286	{	667		{
287	ui->serialPortCB->clear();	668		comboPort->clear();
288	if (!ports.isEmpty()) {	669		if (!ports.isEmpty()) {
289	ui->serialPortCB->addItems(ports);	670		comboPort->addItems(ports);
290	addLog(tr("Found %1 Ports").arg(QString::number(ports.count())));	671		addLog(tr("Found %1 Ports").arg(QString::number(ports.count())));
291	} else {	672		} else {
292	QString portError(tr("No available ports! Please connect a serial device to continue!"));	673		QString portError(tr("No available ports! Please connect a serial device to continue!"));
293	if (! ui->logTE->toPlainText().endsWith(portError)) {	674		if (! textLog->toPlainText().endsWith(portError)) {
294	addLog(portError);	675		addLog(portError);
295	}	676		}
296	}	677		}
297	}	678		}
298		679
299	void MainWindow::connectPBClicked()	680		void MainWindow::connectPBClicked()
300	{	681		{
301	if (core->state() == AtCore::DISCONNECTED) {	682		if (core->state() == AtCore::DISCONNECTED) {
302	if (core->initSerial(ui->serialPortCB->currentText(), ui->baudRateLE->currentText().toInt())) {	683		if (core->initSerial(comboPort->currentText(), comboBAUD->currentText().toInt())) {
303	connect(core, &AtCore::receivedMessage, this, &MainWindow::checkReceivedCommand);	684		connect(core, &AtCore::receivedMessage, this, &MainWindow::checkReceivedCommand);
304	connect(core->serial(), &SerialLayer::pushedCommand, this, &MainWindow::checkPushedCommands);	685		connect(core->serial(), &SerialLayer::pushedCommand, this, &MainWindow::checkPushedCommands);
305	ui->connectPB->setText(tr("Disconnect"));	686		buttonConnect->setText(tr("Disconnect"));
306	addLog(tr("Serial connected"));	687		addLog(tr("Serial connected"));
307	if (ui->pluginCB->currentText().contains(tr("Autodetect"))) {	688		if (comboPlugin->currentText().contains(tr("Autodetect"))) {
308	addLog(tr("No plugin loaded !"));	689		addLog(tr("No plugin loaded !"));
309	addLog(tr("Requesting Firmware..."));	690		addLog(tr("Requesting Firmware..."));
310	core->detectFirmware();	691		core->detectFirmware();
311	} else {	692		} else {
312	core->loadFirmwarePlugin(ui->pluginCB->currentText());	693		core->loadFirmwarePlugin(comboPlugin->currentText());
313	}	694		}
314	} else {	695		} else {
315	addLog(tr("Failed to open serial in r/w mode"));	696		addLog(tr("Failed to open serial in r/w mode"));
316	}	697		}
317	} else {	698		} else {
318	disconnect(core, &AtCore::receivedMessage, this, &MainWindow::checkReceivedCommand);	699		disconnect(core, &AtCore::receivedMessage, this, &MainWindow::checkReceivedCommand);
319	disconnect(core->serial(), &SerialLayer::pushedCommand, this, &MainWindow::checkPushedCommands);	700		disconnect(core->serial(), &SerialLayer::pushedCommand, this, &MainWindow::checkPushedCommands);
320	core->closeConnection();	701		core->closeConnection();
321	core->setState(AtCore::DISCONNECTED);	702		core->setState(AtCore::DISCONNECTED);
322	addLog(tr("Disconnected"));	703		addLog(tr("Disconnected"));
323	ui->connectPB->setText(tr("Connect"));	704		buttonConnect->setText(tr("Connect"));
324	}	705		}
325	}	706		}
326		707
327	void MainWindow::sendPBClicked()	708		void MainWindow::sendPBClicked()
328	{	709		{
329	QString comm = ui->commandLE->text().toUpper();	710		QString comm = lineCommand->text().toUpper();
330	core->pushCommand(comm);	711		core->pushCommand(comm);
331	ui->commandLE->clear();	712		lineCommand->clear();
332	}	713		}
333		714
334	void MainWindow::homeAllPBClicked()	715		void MainWindow::homeAllPBClicked()
335	{	716		{
336	addSLog(tr("Home All"));	717		addSLog(tr("Home All"));
337	core->home();	718		core->home();
338	}	719		}
339		720
Show All 12 Lines
352	void MainWindow::homeZPBClicked()	733		void MainWindow::homeZPBClicked()
353	{	734		{
354	addSLog(tr("Home Z"));	735		addSLog(tr("Home Z"));
355	core->home(AtCore::Z);	736		core->home(AtCore::Z);
356	}	737		}
357		738
358	void MainWindow::bedTempPBClicked()	739		void MainWindow::bedTempPBClicked()
359	{	740		{
360	if (ui->cb_andWait->isChecked()) {	741		if (checkAndWait->isChecked()) {
361	addSLog(GCode::description(GCode::M190));	742		addSLog(GCode::description(GCode::M190));
362	} else {	743		} else {
363	addSLog(GCode::description(GCode::M140));	744		addSLog(GCode::description(GCode::M140));
364	}	745		}
365	core->setBedTemp(ui->bedTempSB->value(), ui->cb_andWait->isChecked());	746		core->setBedTemp(sbBedTemp->value(), checkAndWait->isChecked());
366	}	747		}
367		748
368	void MainWindow::extTempPBClicked()	749		void MainWindow::extTempPBClicked()
369	{	750		{
370	if (ui->cb_andWait->isChecked()) {	751		if (checkAndWait->isChecked()) {
371	addSLog(GCode::description(GCode::M109));	752		addSLog(GCode::description(GCode::M109));
372	} else {	753		} else {
373	addSLog(GCode::description(GCode::M104));	754		addSLog(GCode::description(GCode::M104));
374	}	755		}
375	core->setExtruderTemp(ui->extTempSB->value(), ui->extTempSelCB->currentIndex(), ui->cb_andWait->isChecked());	756		core->setExtruderTemp(sbExtruderTemp->value(), comboExtruderSelect->currentIndex(), checkAndWait->isChecked());
376	}	757		}
377		758
378	void MainWindow::mvAxisPBClicked()	759		void MainWindow::mvAxisPBClicked()
379	{	760		{
380	addSLog(GCode::description(GCode::G1));	761		addSLog(GCode::description(GCode::G1));
381	if (ui->mvAxisCB->currentIndex() == 0) {	762		if (comboMoveAxis->currentIndex() == 0) {
382	core->move(AtCore::X, ui->mvAxisSB->value());	763		core->move(AtCore::X, sbMoveAxis->value());
383	} else if (ui->mvAxisCB->currentIndex() == 1) {	764		} else if (comboMoveAxis->currentIndex() == 1) {
384	core->move(AtCore::Y, ui->mvAxisSB->value());	765		core->move(AtCore::Y, sbMoveAxis->value());
385	} else if (ui->mvAxisCB->currentIndex() == 2) {	766		} else if (comboMoveAxis->currentIndex() == 2) {
386	core->move(AtCore::Z, ui->mvAxisSB->value());	767		core->move(AtCore::Z, sbMoveAxis->value());
387	}	768		}
388	}	769		}
389		770
390	void MainWindow::fanSpeedPBClicked()	771		void MainWindow::fanSpeedPBClicked()
391	{	772		{
392	addSLog(GCode::description(GCode::M106));	773		addSLog(GCode::description(GCode::M106));
393	core->setFanSpeed(ui->fanSpeedSB->value(), ui->fanSpeedSelCB->currentIndex());	774		core->setFanSpeed(sbFanSpeed->value(), comboFanSelect->currentIndex());
394	}	775		}
395		776
396	void MainWindow::printPBClicked()	777		void MainWindow::printPBClicked()
397	{	778		{
398	QString fileName;	779		QString fileName;
399	switch (core->state()) {	780		switch (core->state()) {
400		781
401	case AtCore::DISCONNECTED:	782		case AtCore::DISCONNECTED:
402	QMessageBox::information(this, tr("Error"), tr("Not Connected To a Printer"));	783		QMessageBox::information(this, tr("Error"), tr("Not Connected To a Printer"));
403	break;	784		break;
404		785
405	case AtCore::CONNECTING:	786		case AtCore::CONNECTING:
406	QMessageBox::information(this, tr("Error"), tr(" A Firmware Plugin was not loaded!\n Please send the command M115 and let us know what your firmware returns, so we can improve our firmware detection. We have loaded the most common plugin \"repetier\" for you. You may try to print again after this message"));	787		QMessageBox::information(this, tr("Error"), tr(" A Firmware Plugin was not loaded!\n Please send the command M115 and let us know what your firmware returns, so we can improve our firmware detection. We have loaded the most common plugin \"repetier\" for you. You may try to print again after this message"));
407	ui->pluginCB->setCurrentText(QStringLiteral("repetier"));	788		comboPlugin->setCurrentText(QStringLiteral("repetier"));
408	break;	789		break;
409		790
410	case AtCore::IDLE:	791		case AtCore::IDLE:
411	fileName = QFileDialog::getOpenFileName(this, tr("Select a file to print"), QDir::homePath(), QStringLiteral("*.gcode"));	792		fileName = QFileDialog::getOpenFileName(this, tr("Select a file to print"), QDir::homePath(), tr("*.gcode"));
412	if (fileName.isNull()) {	793		if (fileName.isNull()) {
413	addLog(tr("No File Selected"));	794		addLog(tr("No File Selected"));
414	} else {	795		} else {
415	addLog(tr("Print: %1").arg(fileName));	796		addLog(tr("Print: %1").arg(fileName));
416	core->print(fileName);	797		core->print(fileName);
417	}	798		}
418	break;	799		break;
419		800
420	case AtCore::BUSY:	801		case AtCore::BUSY:
421	core->pause(ui->postPauseLE->text());	802		core->pause(linePostPause->text());
422	break;	803		break;
423		804
424	case AtCore::PAUSE:	805		case AtCore::PAUSE:
425	core->resume();	806		core->resume();
426	break;	807		break;
427		808
428	default:	809		default:
429	qCDebug(TESTCLIENT_MAINWINDOW) << "ERROR / STOP unhandled.";	810		qCDebug(TESTCLIENT_MAINWINDOW) << "ERROR / STOP unhandled.";
Show All 16 Lines		824	if (core->state() != AtCore::DISCONNECTED) {
446	} else {	827		} else {
447	core->detectFirmware();	828		core->detectFirmware();
448	}	829		}
449	}	830		}
450	}	831		}
451		832
452	void MainWindow::flowRatePBClicked()	833		void MainWindow::flowRatePBClicked()
453	{	834		{
454	core->setFlowRate(ui->flowRateSB->value());	835		core->setFlowRate(sbFlowRate->value());
455	}	836		}
456		837
457	void MainWindow::printerSpeedPBClicked()	838		void MainWindow::printerSpeedPBClicked()
458	{	839		{
459	core->setPrinterSpeed(ui->printerSpeedSB->value());	840		core->setPrinterSpeed(sbPrintSpeed->value());
460	}	841		}
461		842
462	void MainWindow::printerStateChanged(AtCore::STATES state)	843		void MainWindow::printerStateChanged(AtCore::STATES state)
463	{	844		{
464	QString stateString;	845		QString stateString;
465	switch (state) {	846		switch (state) {
466	case AtCore::IDLE:	847		case AtCore::IDLE:
467	ui->printPB->setText(tr("Print File"));	848		buttonPrint->setText(tr("Print File"));
468	stateString = QStringLiteral("Connected to ") + core->connectedPort();	849		stateString = tr("Connected to ") + core->connectedPort();
469	break;	850		break;
470		851
471	case AtCore::STARTPRINT:	852		case AtCore::STARTPRINT:
472	stateString = QStringLiteral("START PRINT");	853		stateString = tr("START PRINT");
473	ui->printPB->setText(tr("Pause Print"));	854		buttonPrint->setText(tr("Pause Print"));
474	ui->printLayout->setVisible(true);	855		printProgressWidget->setVisible(true);
475	printTime->start();	856		printTime->start();
476	printTimer->start();	857		printTimer->start();
477	break;	858		break;
478		859
479	case AtCore::FINISHEDPRINT:	860		case AtCore::FINISHEDPRINT:
480	stateString = QStringLiteral("Finished Print");	861		stateString = tr("Finished Print");
481	ui->printPB->setText(tr("Print File"));	862		buttonPrint->setText(tr("Print File"));
482	ui->printLayout->setVisible(false);	863		printProgressWidget->setVisible(false);
483	printTimer->stop();	864		printTimer->stop();
484	break;	865		break;
485		866
486	case AtCore::PAUSE:	867		case AtCore::PAUSE:
487	stateString = QStringLiteral("Paused");	868		stateString = tr("Paused");
488	ui->printPB->setText(tr("Resume Print"));	869		buttonPrint->setText(tr("Resume Print"));
489	break;	870		break;
490		871
491	case AtCore::BUSY:	872		case AtCore::BUSY:
492	stateString = QStringLiteral("Printing");	873		stateString = tr("Printing");
493	ui->printPB->setText(tr("Pause Print"));	874		buttonPrint->setText(tr("Pause Print"));
494	break;	875		break;
495		876
496	case AtCore::DISCONNECTED:	877		case AtCore::DISCONNECTED:
497	stateString = QStringLiteral("Not Connected");	878		stateString = QStringLiteral("Not Connected");
498	setDangeriousDocksDisabled(true);	879		setDangeriousDocksDisabled(true);
499	break;	880		break;
500		881
501	case AtCore::CONNECTING:	882		case AtCore::CONNECTING:
502	stateString = QStringLiteral("Connecting");	883		stateString = QStringLiteral("Connecting");
503	setDangeriousDocksDisabled(false);	884		setDangeriousDocksDisabled(false);
504	break;	885		break;
505		886
506	case AtCore::STOP:	887		case AtCore::STOP:
507	stateString = QStringLiteral("Stoping Print");	888		stateString = tr("Stoping Print");
508	break;	889		break;
509		890
510	case AtCore::ERRORSTATE:	891		case AtCore::ERRORSTATE:
511	stateString = QStringLiteral("Command ERROR");	892		stateString = tr("Command ERROR");
512	break;	893		break;
513	}	894		}
514	ui->lblState->setText(stateString);	895		lblState->setText(stateString);
515	}	896		}
516		897
517	void MainWindow::populateCBs()	898		void MainWindow::populateCBs()
518	{	899		{
519	// Extruders	900		// Extruders
520	for (int count = 0; count < core->extruderCount(); count++) {	901		for (int count = 0; count < core->extruderCount(); count++) {
521	ui->extTempSelCB->insertItem(count, tr("Extruder %1").arg(count));	902		comboExtruderSelect->insertItem(count, tr("Extruder %1").arg(count));
522	}	903		}
523		904
524	// Fan	905		// Fan
525	for (int count = 0; count < fanCount; count++) {	906		for (int count = 0; count < fanCount; count++) {
526	ui->fanSpeedSelCB->insertItem(count, tr("Fan %1 speed").arg(count));	907		comboFanSelect->insertItem(count, tr("Fan %1 speed").arg(count));
527	}	908		}
528	}	909		}
529		910
530	void MainWindow::showMessage()	911		void MainWindow::showMessage()
531	{	912		{
532	core->showMessage(ui->messageLE->text());	913		core->showMessage(lineMessage->text());
533	}	914		}
534		915
535	void MainWindow::updatePrintTime()	916		void MainWindow::updatePrintTime()
536	{	917		{
537	QTime temp(0, 0, 0);	918		QTime temp(0, 0, 0);
538	ui->time->setText(temp.addMSecs(printTime->elapsed()).toString(QStringLiteral("hh:mm:ss")));	919		lblTime->setText(temp.addMSecs(printTime->elapsed()).toString(QStringLiteral("hh:mm:ss")));
539	}	920		}
540		921
541	void MainWindow::printProgressChanged(int progress)	922		void MainWindow::printProgressChanged(int progress)
542	{	923		{
543	ui->printingProgress->setValue(progress);	924		printingProgress->setValue(progress);
544	if (progress > 0) {	925		if (progress > 0) {
545	QTime temp(0, 0, 0);	926		QTime temp(0, 0, 0);
546	ui->timeLeft->setText(temp.addMSecs((100 - progress) * (printTime->elapsed() / progress)).toString(QStringLiteral("hh:mm:ss")));	927		lblTimeLeft->setText(temp.addMSecs((100 - progress) * (printTime->elapsed() / progress)).toString(QStringLiteral("hh:mm:ss")));
547	} else {	928		} else {
548	ui->timeLeft->setText(QStringLiteral("??:??:??"));	929		lblTimeLeft->setText(QStringLiteral("??:??:??"));
549	}	930		}
550	}	931		}
551	void MainWindow::toggleDockTitles()	932		void MainWindow::toggleDockTitles(bool checked)
552	{	933		{
553	if (ui->actionShowDockTitles->isChecked()) {	934		if (checked) {
554	delete ui->connectDock->titleBarWidget();	935		delete connectDock->titleBarWidget();
555	delete ui->logDock->titleBarWidget();	936		delete logDock->titleBarWidget();
556	delete ui->tempTimelineDock->titleBarWidget();	937		delete tempTimelineDock->titleBarWidget();
557	delete ui->commandDock->titleBarWidget();	938		delete commandDock->titleBarWidget();
			patrickelectricUnsubmitted Done I don't see this as a good thing. Ui files help to improve the interface without changing the code base. Any GOOD motive to remove it ? patrickelectric: I don't see this as a good thing. Ui files help to improve the interface without changing the…
			rizzitelloAuthorUnsubmitted Done Some reasons: Removes code spaghettification by making the docks in one place instead of across several files and functions. Despaghettification makes code easier to read. Avoid designers sizing based on the host it was last saved on. Guis made in code are explict. Ui files automaticly add many things to the object like default sizes and other properties we want done at runtime. This Diff Is Only the first part of the plan to simplify the atcore-gui Moving the docks into their own objects. This will simplity the mainwindow class. Comments for the creation of the docks will be added so its eaiser to follow. rizzitello: Some reasons: - Removes code spaghettification by making the docks in one place instead of…
558	delete ui->moveDock->titleBarWidget();	939		delete moveDock->titleBarWidget();
559	delete ui->tempControlsDock->titleBarWidget();	940		delete tempControlsDock->titleBarWidget();
560	delete ui->printDock->titleBarWidget();	941		delete printDock->titleBarWidget();
561	delete ui->sdDock->titleBarWidget();	942		delete sdDock->titleBarWidget();
562	} else {	943		} else {
563	ui->connectDock->setTitleBarWidget(new QWidget());	944		connectDock->setTitleBarWidget(new QWidget());
564	ui->logDock->setTitleBarWidget(new QWidget());	945		logDock->setTitleBarWidget(new QWidget());
565	ui->tempTimelineDock->setTitleBarWidget(new QWidget());	946		tempTimelineDock->setTitleBarWidget(new QWidget());
566	ui->commandDock->setTitleBarWidget(new QWidget());	947		commandDock->setTitleBarWidget(new QWidget());
567	ui->moveDock->setTitleBarWidget(new QWidget());	948		moveDock->setTitleBarWidget(new QWidget());
568	ui->tempControlsDock->setTitleBarWidget(new QWidget());	949		tempControlsDock->setTitleBarWidget(new QWidget());
569	ui->printDock->setTitleBarWidget(new QWidget());	950		printDock->setTitleBarWidget(new QWidget());
570	ui->sdDock->setTitleBarWidget(new QWidget());	951		sdDock->setTitleBarWidget(new QWidget());
571	}	952		}
572	}	953		}
573		954
574	void MainWindow::setDangeriousDocksDisabled(bool disabled)	955		void MainWindow::setDangeriousDocksDisabled(bool disabled)
575	{	956		{
576	ui->commandDock->widget()->setDisabled(disabled);	957		commandDock->widget()->setDisabled(disabled);
577	ui->moveDock->widget()->setDisabled(disabled);	958		moveDock->widget()->setDisabled(disabled);
578	ui->tempControlsDock->widget()->setDisabled(disabled);	959		tempControlsDock->widget()->setDisabled(disabled);
579	ui->printDock->widget()->setDisabled(disabled);	960		printDock->widget()->setDisabled(disabled);
580	ui->sdDock->widget()->setDisabled(disabled);	961		sdDock->widget()->setDisabled(disabled);
581	}
582
583	void MainWindow::about()
584	{
585	About *aboutDialog = new About(this);
586	aboutDialog->exec();
587	}	962		}
588		963
589	void MainWindow::axisControlClicked(QLatin1Char axis, int value)	964		void MainWindow::axisControlClicked(QLatin1Char axis, int value)
590	{	965		{
591	core->setRelativePosition();	966		core->setRelativePosition();
592	core->move(axis, value);	967		core->move(axis, value);
593	core->setAbsolutePosition();	968		core->setAbsolutePosition();
594	}	969		}
595		970
596	void MainWindow::disableMotorsPBClicked()	971		void MainWindow::disableMotorsPBClicked()
597	{	972		{
598	core->setIdleHold(0);	973		core->setIdleHold(0);
599	}	974		}
600		975
601	void MainWindow::sdChanged(bool mounted)	976		void MainWindow::sdChanged(bool mounted)
602	{	977		{
603	QString labelText = mounted ? QStringLiteral("SD") : QString();	978		QString labelText = mounted ? tr("SD") : QString();
604	ui->lbl_sd->setText(labelText);	979		lblSd->setText(labelText);
605	}	980		}
606		981
607	void MainWindow::getSdList()	982		void MainWindow::getSdList()
608	{	983		{
609	core->sdFileList();	984		core->sdFileList();
610	}	985		}
611		986
612	void MainWindow::sdPrintPBClicked()	987		void MainWindow::sdPrintPBClicked()
613	{	988		{
614	if (ui->sdFileListView->currentRow() < 0) {	989		if (listSdFiles->currentRow() < 0) {
615	QMessageBox::information(this, QStringLiteral("Print Error"), QStringLiteral("You must Select a file from the list"));	990		QMessageBox::information(this, tr("Print Error"), tr("You must Select a file from the list"));
616	} else {	991		} else {
617	core->print(ui->sdFileListView->currentItem()->text(), true);	992		core->print(listSdFiles->currentItem()->text(), true);
618	}	993		}
619	}	994		}
620		995
621	void MainWindow::sdDelPBClicked()	996		void MainWindow::sdDelPBClicked()
622	{	997		{
623	if (ui->sdFileListView->currentRow() < 0) {	998		if (listSdFiles->currentRow() < 0) {
624	QMessageBox::information(this, QStringLiteral("Delete Error"), QStringLiteral("You must Select a file from the list"));	999		QMessageBox::information(this, tr("Delete Error"), tr("You must Select a file from the list"));
625	} else {	1000		} else {
626	core->sdDelete(ui->sdFileListView->currentItem()->text());	1001		core->sdDelete(listSdFiles->currentItem()->text());
627	ui->sdFileListView->setCurrentRow(-1);	1002		listSdFiles->setCurrentRow(-1);
628	}	1003		}
629	}	1004		}