Commit graph

5880 commits

Author SHA1 Message Date
Ghostkeeper
7b284355fb
Revert "Fix code-style in CuraEngineBackend"
This reverts commit 7d7a51d772. That commit broke the start-up sequence.
2018-07-05 15:24:55 +02:00
Ian Paschal
07e92ead0b last fixes for CuraEngineBackend 2018-07-05 15:20:38 +02:00
Diego Prado Gesto
8afc49e902 Add style to a variable in X3Reader 2018-07-05 14:41:49 +02:00
Lipu Fei
b0f1a6d859 Use Label delegate to avoid overlapping texts
CURA-5544
2018-07-05 14:36:41 +02:00
Diego Prado Gesto
c738f306fb Fix style in some components 2018-07-05 14:35:12 +02:00
Ghostkeeper
8f8c515438
Fix bug when default_extruder_nr is not provided
Then this would not slice because of a KeyError that is not caught.

Contributes to issue CURA-5457.
2018-07-05 12:51:27 +02:00
Andreea Scorojitu
87fd4c9e70 Add color to text in toolboxFooter, CURA-5544
"You will need to restart Cura before changes in packages have effect." wasn't visible in Ultimaker darktheme, color has been added to the label, CURA-5544.
2018-07-05 12:44:11 +02:00
Ghostkeeper
ef2250b889
Don't check if keys are str
Our type checking should take care of that.
2018-07-05 12:31:42 +02:00
Ian Paschal
6f20b9219d code style fixes 2018-07-05 11:57:13 +02:00
Jack Ha
675c5064ed Added checkPackageUsageAndUninstall and the package usage check. No confirmation dialog yet 2018-07-05 11:47:06 +02:00
Ian Paschal
1aac301f75 additional code style fixes 2018-07-05 11:46:21 +02:00
Ian Paschal
50da6d5176 Fix some code-style 2018-07-05 11:36:36 +02:00
Mark
e1bc5d0f74 fix typing 2018-07-05 11:25:22 +02:00
Diego Prado Gesto
7d7a51d772 Fix code-style in CuraEngineBackend 2018-07-05 08:04:19 +02:00
Ghostkeeper
b149ef57fd
Add test for the version number being incremented 2018-07-04 17:18:01 +02:00
Ghostkeeper
8ff4327c41
Remove Wipe Nozzle After Switch and Purge Volume settings
The entire purging algorithm is gone now since it purges by printing the prime tower. The prime tower should be sufficiently strong now to not need this.

Contributes to issue CURA-5457.
2018-07-04 14:17:57 +02:00
Ghostkeeper
7b2a5c9160
Remove prime_tower_wall_thickness setting
The wall thickness now depends on the order in which the prime towers are folded, which is really hard to obtain within an inheritance formula. So we forego one of the settings and compute the required thickness to obtain the desired volume in the engine where the shell order is known.

Contributes to issue CURA-5457.
2018-07-04 13:45:44 +02:00
Ian Paschal
d4aaec7355 CURA-5537 Style improvements 2018-07-04 12:51:01 +02:00
Ian Paschal
7d30cee205 Revert "Add dummy details for when there is no selection"
This reverts commit 2e3528d9b2.
2018-07-04 11:36:56 +02:00
Lipu Fei
5f2cbd4440
Merge pull request #4015 from Ultimaker/CURA-5537_toolbox_style_improvements
CURA-5537 improve styling of toolbox
2018-07-03 16:05:51 +02:00
Lipu Fei
2e3528d9b2 Add dummy details for when there is no selection
CURA-5521
2018-07-03 15:58:54 +02:00
Ian Paschal
bc05839940 CURA-5537 improve styling of toolbox 2018-07-03 15:54:20 +02:00
Jack Ha
b77220b260 Add more ultigcode retract and unretract. CURA-5491 2018-07-03 13:41:14 +02:00
Jack Ha
e61ad750b7 Fixed UM3 Griffin and UM2 UltiGCode for Pause At Height. CURA-5491 2018-07-03 13:13:33 +02:00
Diego Prado Gesto
ff6bc9de4e Fix some more code-style 2018-07-03 13:09:05 +02:00
Diego Prado Gesto
7714515204 Merge branch 'master' of github.com:Ultimaker/Cura 2018-07-03 12:06:23 +02:00
Diego Prado Gesto
762a1b1bfd Fix code-style 2018-07-03 12:06:06 +02:00
Lipu Fei
293b803dd3 Fix preferences upgrade in 3.4 to 4.0 2018-07-03 10:40:57 +02:00
Diego Prado Gesto
e983a9a9e7 Merge branch 'master' of github.com:Ultimaker/Cura 2018-07-03 10:40:00 +02:00
Diego Prado Gesto
3c57068cf4 CURA-5034 Fix a typo in the method call. 2018-07-03 10:38:44 +02:00
Aleksei S
47300eabe7 Merge branch 'master' of github.com:Ultimaker/Cura 2018-07-03 10:24:17 +02:00
Aleksei S
7b63dc7b10 Changed machine and extruder_train version in VersionUpgrade 34to40 2018-07-03 10:17:42 +02:00
Jack Ha
c260078631 Remove temperature commands for pause at height for UM3. CURA-5491 2018-07-03 09:40:42 +02:00
Mark
c0e97b9529 Merge branch '3.4' 2018-07-02 16:37:04 +02:00
Jack Ha
7058ddbb66 Corrected float/int mixups and allow catching temperature before the layers start. CURA-5491 2018-07-02 16:35:49 +02:00
Mark
c6b31b3b0c
Merge pull request #3901 from fieldOfView/fix_toolbox_flicking
Limit flicking the Toolbox scrollviews to vertical only
2018-07-02 16:35:45 +02:00
alekseisasin
debe142c18
Merge pull request #3914 from Ultimaker/CURA-5334_extruder_def_for_all
CURA-5334 Add extruder definitions for all single-extrusion machines
2018-07-02 15:56:45 +02:00
Jack Ha
a283dd1d94 Merge branch 'master' of github.com:Ultimaker/Cura 2018-07-02 15:14:14 +02:00
Jack Ha
17c4b65453 Fix pause at height that uses new latest temperature CURA-5491 2018-07-02 15:13:44 +02:00
Jack Ha
3761123513 Merge branch 'master' into CURA-5334_extruder_def_for_all 2018-07-02 14:11:24 +02:00
Ian Paschal
adc7fc58e9 Fixed method naming conflict 2018-07-02 13:53:35 +02:00
Ian Paschal
b55abee783 Code style did not rename this variable 2018-07-02 13:05:22 +02:00
Ian Paschal
8f7370db6c Merge remote-tracking branch 'origin/master' into feature_send_material_profiles 2018-07-02 12:37:56 +02:00
Diego Prado Gesto
0692192d58 Merge branch '3.4' 2018-07-02 09:10:57 +02:00
Lipu Fei
dc8d9e0f96
Merge branch 'master' into mypy_fixes 2018-06-29 13:45:55 +02:00
Diego Prado Gesto
56c7c6f2b2 CURA-5518 Check whether the the findDefinitionContainers return any
element or not.
2018-06-29 10:41:54 +02:00
fieldOfView
7e90546163 Fix firmware upload on Windows...
by correctly creating a local path from a url-encoded path

Fixes #3731 and #3987
2018-06-29 10:34:15 +02:00
Jaime van Kessel
b4f59a7822 Removed unneeded application reference in construction of meshreaders 2018-06-29 09:25:38 +02:00
Ghostkeeper
0cb6e506d2
Rewrite code style of _getScaleFromUnit
It should be much more readable now.

Discovered while investigating #3847.
2018-06-28 16:39:53 +02:00
Mark
5fe812b4a4 Add downloadnumber to model and plugin view 2018-06-26 15:29:35 +02:00