Commit graph

4480 commits

Author SHA1 Message Date
Thomas Karl Pietrowski
8179fabf1d Merge remote-tracking branch 'upstream/master' into master-CURA-2079 2016-08-14 17:43:26 +02:00
Thomas Karl Pietrowski
f915092f83 CURA-2079: Finish firmware upload process on errors
Looking at the old code shows that the download process was never
completely finished. The according function was only return'ed, but no
signal was emitted to the window to give the user the possibility to
close it again.

Optionally, it would be useful here to pass messages to the window
dialog to inform the user about problems.

However, this code is untested because:
1. I don't know where put my printers *.hex-file, when coding here with
my editor,
2. Have no idea how to reproduce the IO errors reported at JIRA, so
fingers crossed here.

Contributes to CURA-2079
2016-08-14 17:37:36 +02:00
Ghostkeeper
4472e0206e
Fix calls to max function
I think this was my mistake.
2016-08-12 16:56:07 +02:00
Tim Kuipers
85d97453f1
JSON feat: brim only on outer boundary polys (CURA-1413) 2016-08-12 11:18:37 +02:00
Aldo Hoeben
eee6828dac Merge pull request #920 from Ultimaker/thopiekar-adding-approximately-equal-to-jobspecs
Adding "approximately equal" to the amount of material needed
2016-08-11 21:25:36 +02:00
Thomas Karl Pietrowski
bfe97a1eca Using ~ only for the amount of material in grams 2016-08-11 21:10:16 +02:00
Thomas Karl Pietrowski
1ab0637d11 Adding "approximately equal" to the amount of material needed
I think it makes sense to add this character here, because the amount needed is only a approximated value, and without the end-user might expect a more accurate value.
2016-08-11 20:34:01 +02:00
Arjen Hiemstra
2969aafb6d Update profile page with the renamed functions
Contributes to CURA-2006
2016-08-11 17:51:16 +02:00
Arjen Hiemstra
a14a80be56 Document and simplify the quality/quality changes code in ContainerManager
Contributes to CURA-2006
2016-08-11 17:50:54 +02:00
Arjen Hiemstra
9f33fef4ec Use the new generator to simplify some extruder related code in MachineManager
Contributes to CURA-2006
2016-08-11 17:50:08 +02:00
Arjen Hiemstra
6049d6f3a5 Introduce a getActiveGlobalAndExtruderStacks method to ExtruderManager
It can be used to iterate over the active global and extruder stacks

Contributes to CURA-2006
2016-08-11 17:49:02 +02:00
Arjen Hiemstra
c557cd1a7a Move comment
Contributes to CURA-2006
2016-08-11 17:48:22 +02:00
Arjen Hiemstra
6778020d56 Remove duplicated code
Contributes to CURA-2006
2016-08-11 17:47:30 +02:00
Arjen Hiemstra
e1ddb878ad Fix copyright header
Contributes to CURA-2006
2016-08-11 17:47:15 +02:00
fieldOfView
5c63e5e13f Fix a typo in a comment
CURA-2113
2016-08-11 17:18:43 +02:00
fieldOfView
2a55bba840 Code-style fixes
CURA-2079
2016-08-11 16:58:02 +02:00
fieldOfView
b619b68675 Remove repeated header between versions in changelog
CURA-2056
2016-08-11 16:51:48 +02:00
fieldOfView
c95cc7a21b Fix error in SolidView when there is a model but no printer 2016-08-11 16:44:19 +02:00
fieldOfView
1848bb5cc4 Fix typo in Changes on the Printer dialog 2016-08-11 16:36:24 +02:00
fieldOfView
db028b7e5f Update "Select Settings dialog" when the user removes a setting
CURA-2102
2016-08-11 15:10:30 +02:00
Jaime van Kessel
91dfd971ca PerObject settings don't automatically get a user changed state
CURA-2113
2016-08-11 14:57:21 +02:00
fieldOfView
6075536497 Fix settingtextfield validator in PerObjectSettings
CURA-2115
2016-08-11 14:37:58 +02:00
fieldOfView
71a9f2dd7a Clean up conversion to string
CURA-2071
2016-08-11 11:53:55 +02:00
Ghostkeeper
8c231e2942
Allow higher speeds for diagonal wireframe moves
Since these moves are slightly diagonal in all directions, a higher speed can be achieved. Exactly how high depends on both angles, but for simplification this limit is a bit too broad, allowing speeds that the printer can't handle. The firmware should catch that case if it happens.

Contributes to issue CURA-1049.
2016-08-11 10:54:00 +02:00
Ghostkeeper
4e13c262cf
Re-add max warning value for speed_slowdown_layers
It warns if the slowdown layers span more than 1mm.

Contributes to issue CURA-1049.
2016-08-11 10:53:59 +02:00
fieldOfView
957f60eb11 Add first draft of an UMO with Dual Extrusion Kit definition
CURA-1774
2016-08-10 18:04:30 +02:00
fieldOfView
6d64d11c2e Change Simple Mode adhesion/support label to "Helper Parts"
UXD-76
2016-08-10 17:57:06 +02:00
fieldOfView
85a58a22cb Change "Bed"/"Platform" to "Build Plate"
UXD-76
2016-08-10 17:57:05 +02:00
fieldOfView
505da1a9a7 Change "Hotend temperature" to the name of the extruder
UXD-79
2016-08-10 17:55:52 +02:00
fieldOfView
2963a64fc2 Change "Bed Temperature" to "Build Plate Temperature"
UXD-80
2016-08-10 17:55:52 +02:00
fieldOfView
885acb49dc Change "Cooling Fans" to "Print Cooling"
UXD-81
2016-08-10 17:55:51 +02:00
fieldOfView
7aab8ad397 Change "object" to "model"
UXD-83
2016-08-10 17:55:51 +02:00
Tim Kuipers
63f5889eae JSON fix type (CURA-1049) 2016-08-10 17:06:51 +02:00
fieldOfView
ff025a753f Change placeholder material colors
CURA-2070
2016-08-10 14:56:13 +02:00
fieldOfView
b6bf02e0a0 Update swatch colors when changing materials
CURA-1971
2016-08-10 14:37:59 +02:00
fieldOfView
717fac3d78 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-10 14:09:10 +02:00
fieldOfView
a0203905b6 Show the right material color for single-extrusion machines
CURA-1992
2016-08-10 14:08:58 +02:00
Ghostkeeper
15fef2452b
Limit speeds to max feedrates of the printer
Also number of slowdown layers is no longer limited by light speed.

Contributes to issue CURA-1049.
2016-08-10 13:52:28 +02:00
Jack Ha
48792aa8f3 Fixed firmware update screen. CURA-2079. 2016-08-10 12:57:01 +02:00
Arjen Hiemstra
be4db899a6 Change the active quality if we remove the active quality
Contributes to CURA-2006
2016-08-10 12:02:11 +02:00
Arjen Hiemstra
5edeaa1c93 Reduce the amount of QML warning showing up
Contributes to CURA-2006
2016-08-10 12:00:03 +02:00
Arjen Hiemstra
7ba49b4f88 Remove code that is obsolete and moved to ContainerManager
Contributes to CURA-2006
2016-08-10 11:58:40 +02:00
Arjen Hiemstra
2c0f0e8559 Move new_id in ContainerManager::duplicate into a general block
Saves duplication

Contributes to CURA-2006
2016-08-10 11:57:57 +02:00
Arjen Hiemstra
29c0cc3850 Fix ContainerManager::renameQuality to set a proper unique id
Contributes to CURA-2006
2016-08-10 11:57:04 +02:00
Arjen Hiemstra
2a81d25bf9 Fix removing container after rejecting a rename
Contributes to CURA-2006
2016-08-10 11:05:56 +02:00
Arjen Hiemstra
783d395fbc Use containermanager for operations on Quality
Contributes to CURA-2006
2016-08-10 11:04:15 +02:00
Arjen Hiemstra
ba2c60bb0d Implement remove, rename, duplicate quality in containermanager
Contributes to CURA-2006
2016-08-10 11:03:33 +02:00
Arjen Hiemstra
975a60bec3 Display all the extruder settings and global settings in profile manager
Contributes to CURA-2006
2016-08-10 11:03:00 +02:00
Arjen Hiemstra
03252c69dc List all the qualities and quality changes in the profiles page
Contributes to CURA-2006
2016-08-10 11:01:50 +02:00
Arjen Hiemstra
1a6b16932a Add a QualitySettingsModel that lists all quality related settings and values
Contributes to CURA-2006
2016-08-10 11:00:36 +02:00