3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 14:37:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
4212 commits 302 branches 270 tags 768 MiB
Commit graph

4212 commits

This branch
This branch
All branches
Author SHA1 Message Date
fieldOfView
b7b0faf44a Fix sorting of settings on Profile manager page 
CURA-2123
 2016-08-15 15:17:59 +02:00
fieldOfView
dbaa6190be Add firmware upload for umo_dual 
CURA-1774
 2016-08-15 13:43:16 +02:00
fieldOfView
f0622cdda6 Add start & end gcode to UM2 depending on gcode flavor 
CURA-580
 2016-08-15 13:42:06 +02:00
Aldo Hoeben
db4a198a1c Merge pull request #922 from thopiekar/master-CURA-2079 
CURA-2079: Finish firmware upload process on errors
 2016-08-15 12:22:00 +02:00
Aldo Hoeben
f2d35cd57d Merge pull request #918 from Ultimaker/feature_terminology 
Update UI texts to be compliant to Ultimaker dictionary
 2016-08-15 11:35:19 +02:00
fieldOfView
633e37713c Update Printer manager details pane after removing a printer 
CURA-2085
 2016-08-15 11:32:09 +02:00
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
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
Jack Ha
9bf4dbd24f Fix wrong variable name 2016-08-10 09:44:27 +02:00
Jack Ha
decf998d68 Code style, semicolons 2016-08-10 09:17:10 +02:00
fieldOfView
e551898e04 Add a connection string to the printmonitor 
CURA-2091
 2016-08-09 18:43:09 +02:00
Ghostkeeper
a0df0c76de
Use correct material profile in extruder stack 
The material profile is more specific inside a material profile if the machine has material quality profiles.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Ghostkeeper
4d13622a6e
Split profiles also per variant 
But of course the variant names are strange in the new material profiles.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Ghostkeeper
9c7a28fa2d
Don't break if current settings machine is unknown 
Currently it sets the user profile to 'empty', which is bad because empty is read-only. But it allows me to continue for now. I'll find a solution for that later.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Ghostkeeper
36b027b290
Fix copying ConfigParser 
Turns out that copy.copy() doesn't work on ConfigParsers. It returns a different instance but modifying that instance still modifies the old configs. Deep copy isn't allowed. But this dictionary copy works.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Ghostkeeper
71505a8b35
Use normal config only if not material(-specific) profile 
Other profiles should just return an array with only their single profile.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Ghostkeeper
9a555fcab0
Fix call to VersionUpgrade21to22.machinesWithMachineQuality 
It needs that stupidly long path if we're using imports inside a plug-in.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Ghostkeeper
1428f67798
Rename machines_with_machine_quality to machinesWithMachineQuality 
As per the code style conventions. Sorry, I'm used to other conventions in one of my own projects.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Ghostkeeper
36f84017cf
Move _machines_with_machine_quality to VersionUpgrade21to22 
It's going to need to be used by the upgrader of machine instances as well, that's why.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00
Ghostkeeper
7481f0802e
Split profiles into multiple if new printer has material profiles 
If the old profile didn't specify any material, it would be global. But if the new machine specifies that its profiles are material-specific, these profiles have to be split into multiple profiles in order to be able to show them in Cura 2.2.

Contributes to issue CURA-844.
 2016-08-09 18:06:23 +02:00