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