Details

Reviewers

patrickelectric
tcanabrava
laysrodrigues

Commits

R231:1ecf630c932d: Fix position of the Needles
R231:334205e5b929: Wire for adjusting temps when they changes
R231:0b7f6e0db926: Fix Crash
R231:eb3b0e10d28d: Find Qwt6 and use it.
R231:c77d258dfcfc: Implement arrow keys for fine tuning the thermo
R231:63a55c396250: Wire for adjusting temps when they changes
R231:9cea3cfb3f4d: Display current and target texts
R231:6beb89e8f08b: Clean some extra lines Shade the pie better
R231:c4d4957f9c8a: Start the thermo-shading
R231:49426f028feb: Clean some extra lines Shade the pie better
R231:49e5b15a9295: FindQwt cmake module
R231:699337e2a331: Add label to thermowidget
R231:74db36b7bbc0: Find Qwt6 and use it.
R231:53ef2ba62a8f: Start the thermo-shading
R231:d6fed5d469b4: Add label to thermowidget
R231:29b03bf9ec7f: Refactor of BedExtruderWidget
R231:8e2fd4f8bd87: Shade of the Thermo partially done
R231:9119303719d4: Add user Hints for input area
R231:07217b0acdd8: Display current and target texts
R231:cdf4ae3eee13: Implement mouse wheel for the thermo
R231:6d4937efb55d: Add thermo widget to display the temperature
R231:7001e58ee078: Implemented Page Up / Down handling
R231:20861a8fa19c: Shade of the Thermo partially done
R231:590e8ddb645c: Adjust Labels and Add Copyright info
R231:a533c12d3c9a: Adjust Labels and Add Copyright info
R231:b8810d4f1b9c: Fix Crash
R231:b6de14254d3b: FindQwt cmake module
R231:010740d6f03e: Refactor of BedExtruderWidget
R231:16ee9b65a323: Fix position of the Needles
R231:0f3fcac8a2f2: Implement arrow keys for fine tuning the thermo
R231:4e7f11aab5f5: finish the shade on the thermo
R231:6b45dbbe9481: Use the keyboard to set the values for the Thermo
R231:9a9928515454: finish the shade on the thermo
R231:8368682f98be: Implement mouse wheel for the thermo
R231:c498357e7b06: Implemented Page Up / Down handling
R231:6f0d67d3fcfe: Add thermo widget to display the temperature
R231:c8c06ddf0337: Textcursor with basic editing

Summary

Find Qwt6 and use it.

Add thermo widget to display the temperature

Fix position of the Needles

Wire for adjusting temps when they changes

Signed-off-by: Chris Rizzitello <rizzitello@kde.org>

Use the keyboard to set the values for the Thermo

Fix Crash

Implement arrow keys for fine tuning the thermo

Implemented Page Up / Down handling

Display current and target texts

Implement mouse wheel for the thermo

Start the thermo-shading

Shade of the Thermo partially done

finish the shade on the thermo

Clean some extra lines Shade the pie better

Signed-off-by: Chris Rizzitello <rizzitello@kde.org>

Refactor of BedExtruderWidget

Remove the use of ui file
Remove non used includes
Remove non used methods
Build a simple layout that adds the thermos

and a widget to control the active extruder

The 'andWait' feature for now it's not implemented.

The signal to change bed/extruder temps goes with a 'false'
value.

Signed-off-by: Lays Rodrigues <laysrodriguessilva@gmail.com>

Add label to thermowidget

Added on constructor a QString that will be the name displayed

on the label inside the dial.

Use color for the text based on the pallet of the system

Signed-off-by: Lays Rodrigues <laysrodriguessilva@gmail.com>

Adjust Labels and Add Copyright info

Signed-off-by: Chris Rizzitello <rizzitello@kde.org>

Diff Detail

Repository

R231 Atelier

Branch

part7

Lint

No Linters Available

Unit

No Unit Test Coverage

laysrodrigues requested review of this revision.Mar 18 2018, 7:35 PM

laysrodrigues created this revision.

laysrodrigues retitled this revision from Add ThermoWidget FindQwt cmake module to Add ThermoWidgetFindQwt cmake module.Mar 18 2018, 7:43 PM

laysrodrigues added reviewers: patrickelectric, rizzitello, tcanabrava.

patrickelectric requested changes to this revision.Mar 18 2018, 8:08 PM

patrickelectric added inline comments.

cmake/FindQwt6.cmake
2	From where this file come from ?
src/widgets/bedextruderwidget.h
52	space = space
src/widgets/thermowidget.cpp
39–40	Move to constructor initialization list.
108	Where this font() comes from ?
142	why not y()/15 ? `delta value is a multiple of 120; i.e., 120 units * 1/8 = 15 degrees.`
163	Why not remove dir ?
src/widgets/thermowidget.h
21	pragma once
40	try to keep an alphabetic order.
47	variables name ?
57	Put double after or before the classes to maintain the memory alignment.

This revision now requires changes to proceed.Mar 18 2018, 8:08 PM

rizzitello added inline comments.Mar 19 2018, 12:38 PM

src/widgets/thermowidget.cpp
108	font() is the current font used by the application.

patrickelectric added inline comments.Mar 19 2018, 12:50 PM

src/widgets/thermowidget.cpp
108	It comes from QPainter, I was searching again today, this is inherent by the Qwt item.

rizzitello added inline comments.Mar 19 2018, 1:19 PM

src/widgets/thermowidget.cpp
108	QWidget::font() Any subclass of QWidget will have this property.

rizzitello added inline comments.Mar 21 2018, 1:16 AM

src/widgets/thermowidget.cpp
163	This function overrides QWTDial::drawNeedle.

This revision was not accepted when it landed; it landed in state Needs Revision.Mar 21 2018, 10:42 AM

Closed by commit R231:49e5b15a9295: FindQwt cmake module (authored by tcanabrava, committed by Lays Rodrigues <laysrodriguessilva@gmail.com>). · Explain Why

This revision was automatically updated to reflect the committed changes.

laysrodrigues reopened this revision.Mar 21 2018, 11:03 AM

Add patricks suggestions

more fixes

rizzitello commandeered this revision.Mar 25 2018, 1:37 AM

rizzitello edited reviewers, added: laysrodrigues; removed: rizzitello.

rizzitello marked 10 inline comments as done.

rizzitello marked an inline comment as done.Mar 25 2018, 1:39 AM

Add user Hints for input area

rizzitello retitled this revision from Add ThermoWidgetFindQwt cmake module to Refactor Part7.Mar 25 2018, 7:26 PM

laysrodrigues requested changes to this revision.Mar 25 2018, 9:24 PM

laysrodrigues added inline comments.

CMakeLists.txt
13	remove new line
src/widgets/bedextruderwidget.cpp
4–6	needs to add tomaz email

This revision now requires changes to proceed.Mar 25 2018, 9:24 PM

rizzitello marked 2 inline comments as done.Mar 25 2018, 11:27 PM

remove extra space
add tomaz's to bedwidget

laysrodrigues requested changes to this revision.Mar 26 2018, 12:47 AM

laysrodrigues added inline comments.

src/widgets/bedextruderwidget.cpp
53–56	idk if this is a case to use [&] instead of [this], any thoughts?
src/widgets/bedextruderwidget.h
24	headers in alphabetical order

This revision now requires changes to proceed.Mar 26 2018, 12:47 AM

Textcursor with basic editing

rizzitello marked 2 inline comments as done.Mar 26 2018, 3:21 AM

rizzitello added inline comments.

src/widgets/bedextruderwidget.cpp
53–56	I think in this case they are the same. [&] will auto capture all used in the block by referance and [this] grabs the current object "this" by referance. Our block has only a call for `BedExtruderWidget::bedTemperatureChanged` therefore [&] should only grab "this".

lays Suggestions

tcanabrava accepted this revision.Mar 26 2018, 10:53 AM

laysrodrigues accepted this revision.Mar 27 2018, 2:59 AM

rebase

patrickelectric added inline comments.Mar 27 2018, 8:47 PM

cmake/FindQwt6.cmake
2	?
src/widgets/thermowidget.cpp
142	void ThermoWidget::wheelEvent(QWheelEvent* event)

Rebase

patrick suggestions

rizzitello marked an inline comment as done.Mar 28 2018, 8:51 PM

rizzitello marked 2 inline comments as done.Mar 28 2018, 8:58 PM

rizzitello added inline comments.

cmake/FindQwt6.cmake
2	https://cmake.org/Wiki/CMakeUserFindQwt

fix base

laysrodrigues accepted this revision.Mar 29 2018, 12:21 AM

MERGED

laysrodrigues mentioned this in T7468: Refactor of Main Window and Widgets.Mar 31 2018, 11:38 AM

		Path
M		CMakeLists.txt (6 lines)
A	M	cmake/FindQwt6.cmake (112 lines)
M		src/atelierui.rc (7 lines)
M		src/dialogs/CMakeLists.txt (1 line)
M		src/dialogs/choosefiledialog.cpp (2 lines)
D	M	src/dialogs/connectsettingsdialog.h (47 lines)
D	M	src/dialogs/connectsettingsdialog.cpp (111 lines)
M		src/dialogs/profilesdialog.cpp (10 lines)
M		src/mainwindow.h (4 lines)
M		src/mainwindow.cpp (63 lines)
M		src/widgets/CMakeLists.txt (18 lines)
M		src/widgets/atcoreinstancewidget.h (23 lines)
M		src/widgets/atcoreinstancewidget.cpp (137 lines)
M		src/widgets/axiscontrol.cpp (4 lines)
M		src/widgets/bedextruderwidget.h (23 lines)
M		src/widgets/bedextruderwidget.cpp (100 lines)
D	M	src/widgets/bedextruderwidget.ui (182 lines)
M		src/widgets/plotwidget.h (29 lines)
M		src/widgets/plotwidget.cpp (71 lines)
M		src/widgets/pushgcodewidget.cpp (3 lines)
M		src/widgets/ratescontrolwidget.cpp (6 lines)
A	M	src/widgets/thermowidget.h (64 lines)
A	M	src/widgets/thermowidget.cpp (280 lines)
M		src/widgets/videomonitorwidget.cpp (4 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	29853	2d0d47d		Mar 18 2018, 7:35 PM	★	★
Diff 2	30109	2d0d47d	R231:49e5b15a92951ac93cd2871073cd3868775cd5d2	Mar 18 2018, 6:48 PM	★	★
Diff 3	30366	74db36b	- Add patricks suggestions	Mar 24 2018, 3:08 AM	★	★
Diff 4	30367	74db36b	- more fixes	Mar 24 2018, 3:17 AM	★	★
Diff 5	30549	74db36b	- Add user Hints for input area	Mar 25 2018, 7:25 PM	★	★
Diff 6	30571	74db36b	- remove extra space	Mar 25 2018, 11:28 PM	★	★
Diff 7	30578	74db36b	- Textcursor with basic editing	Mar 26 2018, 2:58 AM	★	★
Diff 8	30579	74db36b	- lays Suggestions	Mar 26 2018, 3:22 AM	★	★
Diff 9	30756	2d0d47d	- rebase	Mar 27 2018, 8:12 PM	★	★
Diff 10	30810	2d0d47d	Rebase	Mar 28 2018, 8:40 PM	★	★
Diff 11	30811	2d0d47d	- patrick suggestions	Mar 28 2018, 8:50 PM	★	★
Diff 12	30814	2d0d47d	- fix base	Mar 28 2018, 9:17 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
c8c06ddf0337	7a14c81ba596	9119303719d4	Chris Rizzitello	Textcursor with basic editing (Show More…)	Mar 26 2018, 2:57 AM
9119303719d4	f5762286adbd	a533c12d3c9a	Chris Rizzitello	Add user Hints for input area (Show More…)	Mar 25 2018, 4:36 PM
a533c12d3c9a	c904a827c334	699337e2a331	Chris Rizzitello	Adjust Labels and Add Copyright info (Show More…)	Feb 18 2018, 4:10 PM
699337e2a331	f64c8c497ad6	010740d6f03e	Lays Rodrigues	Add label to thermowidget (Show More…)	Feb 17 2018, 4:07 PM
010740d6f03e	931ea35de378	49426f028feb	Lays Rodrigues	Refactor of BedExtruderWidget (Show More…)	Feb 17 2018, 3:02 PM
49426f028feb	4d0b071d96dd	4e7f11aab5f5	Chris Rizzitello	Clean some extra lines Shade the pie better (Show More…)	Feb 13 2018, 12:55 AM
4e7f11aab5f5	2033300a95af	20861a8fa19c	Tomaz Canabrava	finish the shade on the thermo	Feb 12 2018, 2:42 PM
20861a8fa19c	82016f7c030e	c4d4957f9c8a	Tomaz Canabrava	Shade of the Thermo partially done	Feb 12 2018, 2:17 PM
c4d4957f9c8a	faf2838211a5	8368682f98be	Tomaz Canabrava	Start the thermo-shading	Feb 12 2018, 1:28 PM
8368682f98be	5ab3c64b23c5	9cea3cfb3f4d	Tomaz Canabrava	Implement mouse wheel for the thermo	Feb 12 2018, 1:10 PM
9cea3cfb3f4d	1a83f54e54e1	7001e58ee078	Tomaz Canabrava	Display current and target texts	Feb 12 2018, 1:00 PM
7001e58ee078	826e6df6c999	0f3fcac8a2f2	Tomaz Canabrava	Implemented Page Up / Down handling	Feb 12 2018, 12:41 AM
0f3fcac8a2f2	e586edbccc59	0b7f6e0db926	Tomaz Canabrava	Implement arrow keys for fine tuning the thermo	Feb 12 2018, 12:36 AM
0b7f6e0db926	0d93ce58bfd3	334205e5b929	Tomaz Canabrava	Fix Crash	Feb 12 2018, 12:28 AM
334205e5b929	4a5069aa7f7b	1ecf630c932d	Chris Rizzitello	Wire for adjusting temps when they changes (Show More…)	Feb 11 2018, 3:23 PM
1ecf630c932d	b9a064063733	6d4937efb55d	Tomaz Canabrava	Fix position of the Needles	Feb 11 2018, 2:42 PM
6d4937efb55d	a128fc45690c	eb3b0e10d28d	Tomaz Canabrava	Add thermo widget to display the temperature	Feb 11 2018, 2:19 PM
eb3b0e10d28d	63c2c701b8c4	b6de14254d3b	Tomaz Canabrava	Find Qwt6 and use it.	Feb 11 2018, 11:58 AM
b6de14254d3b	7b38deade927	46c4ccd54775	Tomaz Canabrava	FindQwt cmake module	Feb 11 2018, 11:55 AM
46c4ccd54775	6bb82f7945f8	0de41fe4aed3	Chris Rizzitello	Correct "Sync to atcore widget" (Show More…)	Mar 28 2018, 9:13 PM
0de41fe4aed3	dc343dfaeed0	cc3237575665 c87116ebf9c7	Chris Rizzitello	Connect in instance (Show More…)	Mar 19 2018, 2:56 AM
c87116ebf9c7	dc343dfaeed0	dc2e5236194a	Chris Rizzitello	- closeable tabs if more then one tab open - atcore is stoped if a tab is… (Show More…)	Mar 19 2018, 2:56 AM
dc2e5236194a	df07694349e1	cc3237575665	Chris Rizzitello	- Connect bar for atcoreinstance (Show More…)	Mar 19 2018, 1:32 AM
cc3237575665	054b13729500	67d6947df858	Chris Rizzitello	Sync to atcore widget (Show More…)	Mar 28 2018, 8:00 PM
67d6947df858	92eacac0ee4b	2d0d47de575b 3f684b92fd1e	Chris Rizzitello	Safer lambdas (Show More…)	Mar 26 2018, 8:29 PM
3f684b92fd1e	92eacac0ee4b	1a6c7f98cc8a	Chris Rizzitello	VideoWidget: Safer lambdas (Show More…)	Mar 26 2018, 8:29 PM
1a6c7f98cc8a	1a1197a9f811	a8a4e9877db9	Chris Rizzitello	RatesControlWidget: Safer lambdas (Show More…)	Mar 26 2018, 8:29 PM
a8a4e9877db9	bd7af92a662c	11b91c5bb31e	Chris Rizzitello	PushGcodeWidget: Safer lambdas (Show More…)	Mar 26 2018, 8:28 PM
11b91c5bb31e	3cba38cb94e0	49b7fdbb53c8	Chris Rizzitello	BedExtruderWidget: Safer lambdas (Show More…)	Mar 26 2018, 8:27 PM
49b7fdbb53c8	103a6e28b4f6	8eb382535e9f	Chris Rizzitello	AxisControl: Safer lambdas (Show More…)	Mar 26 2018, 8:27 PM
8eb382535e9f	a63873875130	6b26ed4efd59	Chris Rizzitello	AtCoreInstance: Safer lambdas (Show More…)	Mar 26 2018, 8:26 PM
6b26ed4efd59	656fbdd72d97	b054a289cd66	Chris Rizzitello	ProfileDialog: Safer lambdas (Show More…)	Mar 26 2018, 8:25 PM
b054a289cd66	1369f282c2c0	1534a278c630	Chris Rizzitello	ChooseFileDialog: Safer lambdas (Show More…)	Mar 26 2018, 8:24 PM
1534a278c630	5909dc822c45	8d9fc311fbc3	Chris Rizzitello	Mainwindow: Safer lambdas (Show More…)	Mar 26 2018, 8:23 PM

Refactor Part7
AbandonedPublic
Actions

Details

Diff Detail

Revision Contents
Changeset List

Diff 30814

CMakeLists.txt

cmake/FindQwt6.cmake

src/atelierui.rc

src/dialogs/CMakeLists.txt

src/dialogs/choosefiledialog.cpp

src/dialogs/connectsettingsdialog.h

src/dialogs/connectsettingsdialog.cpp

src/dialogs/profilesdialog.cpp

src/mainwindow.h

src/mainwindow.cpp

src/widgets/CMakeLists.txt

src/widgets/atcoreinstancewidget.h

src/widgets/atcoreinstancewidget.cpp

src/widgets/axiscontrol.cpp

src/widgets/bedextruderwidget.h

src/widgets/bedextruderwidget.cpp

src/widgets/bedextruderwidget.ui

src/widgets/plotwidget.h

src/widgets/plotwidget.cpp

src/widgets/pushgcodewidget.cpp

src/widgets/ratescontrolwidget.cpp

src/widgets/thermowidget.h

src/widgets/thermowidget.cpp

src/widgets/videomonitorwidget.cpp

Refactor Part7AbandonedPublicActions

Details

Diff Detail

Revision ContentsChangeset List

Diff 30814

CMakeLists.txt

cmake/FindQwt6.cmake

src/atelierui.rc

src/dialogs/CMakeLists.txt

src/dialogs/choosefiledialog.cpp

src/dialogs/connectsettingsdialog.h

src/dialogs/connectsettingsdialog.cpp

src/dialogs/profilesdialog.cpp

src/mainwindow.h

src/mainwindow.cpp

src/widgets/CMakeLists.txt

src/widgets/atcoreinstancewidget.h

src/widgets/atcoreinstancewidget.cpp

src/widgets/axiscontrol.cpp

src/widgets/bedextruderwidget.h

src/widgets/bedextruderwidget.cpp

src/widgets/bedextruderwidget.ui

src/widgets/plotwidget.h

src/widgets/plotwidget.cpp

src/widgets/pushgcodewidget.cpp

src/widgets/ratescontrolwidget.cpp

src/widgets/thermowidget.h

src/widgets/thermowidget.cpp

src/widgets/videomonitorwidget.cpp

Refactor Part7
AbandonedPublic
Actions

Revision Contents
Changeset List