Commit graph

3956 commits

Author SHA1 Message Date
Diego Prado Gesto
a6815e7c61 CURA-5330 Add typing to Backup 2018-06-08 16:31:43 +02:00
Diego Prado Gesto
51462b20c3 CURA-5330 Add typing to PrinterOutputModel constructor 2018-06-08 15:56:20 +02:00
Diego Prado Gesto
1982c9b84c CURA-5330 Change TYPE_CHECKING flag 2018-06-08 15:54:28 +02:00
Diego Prado Gesto
fcdb1aef52 CURA-5330 Add typing in ExtruderOutputModel 2018-06-08 15:53:33 +02:00
Diego Prado Gesto
ace7e89ea0 CURA-5330 Add typing to PrintJobOutputModel 2018-06-08 15:48:47 +02:00
Diego Prado Gesto
e1ecbdf8fe CURA-5330 Add typing in QualityGroup 2018-06-08 15:46:24 +02:00
Diego Prado Gesto
e5e96bc600 Merge branch 'master' into mypy_fixes
Contributes to CURA-5330
2018-06-08 15:29:22 +02:00
Lipu Fei
bddd32a5b6 Fix branded materials model binding
CURA-5336

When the global stack gets changed, the model should update itself
so it refers to the correct extruder stack.
2018-06-07 15:50:08 +02:00
Ghostkeeper
8202b62343
Merge branch '3.4' 2018-06-07 11:38:13 +02:00
Ghostkeeper
624bbbeb4a
Account for the fact that createMachine can return None
Contributes to issue CURA-5337.
See also #3787.
2018-06-07 11:37:48 +02:00
Jack Ha
f828c135f8 CURA-5249 replaced the extruder value of -1 by the more explicit defaultExtruderPosition, so now Cura is aware of the actual extruder position being used. Fixes linked icon next to support settings, like support_angle. 2018-06-07 11:35:09 +02:00
Lipu Fei
3b46816632 Also check btemporary value
CURA-5449
2018-06-07 11:29:21 +02:00
Lipu Fei
04ecc55e3c
Merge pull request #3850 from Ultimaker/uranium_package_manager
Move package manager to Uranium
2018-06-07 11:03:45 +02:00
Ghostkeeper
c42b275c5d
Merge branch '3.4' 2018-06-06 16:58:01 +02:00
Diego Prado Gesto
1019f2dd65 CURA-5449 Do not check if the name is the correct group name if the
output device is manual create device and it is marked as temporary.
Wait until all the information is retrieved when the request finishes.
2018-06-06 14:54:26 +02:00
Jack Ha
96f2e6e1ed CURA-5402 hopefully solved merge conflicts 2018-06-06 14:39:53 +02:00
Jack Ha
87293e089d Merge branch 'master' of github.com:Ultimaker/Cura 2018-06-06 11:02:10 +02:00
Jack Ha
17b127e8c1 CURA-5249 replaced the extruder value of -1 by the more explicit defaultExtruderPosition, so now Cura is aware of the actual extruder position being used. Fixes linked icon next to support settings, like support_angle. 2018-06-06 11:00:09 +02:00
Lipu Fei
6818342b90 Merge remote-tracking branch 'origin/3.4' 2018-06-05 13:34:04 +02:00
Lipu Fei
4652c3be0f Always try to remove old package files before installing new
CURA-5442
2018-06-05 12:47:01 +02:00
Diego Prado Gesto
4af107dc81 Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4 2018-06-05 11:00:54 +02:00
Diego Prado Gesto
1285e1b5e5 CURA-5357 Move the plugin info in packages.json only when the
installation succeeded.
2018-06-05 11:00:05 +02:00
Lipu Fei
4598b7a831 Merge remote-tracking branch 'origin/3.4' 2018-06-05 09:55:57 +02:00
Lipu Fei
96ddf61f81
Merge pull request #3878 from Ultimaker/feature_update_old_plugins
Feature update old plugins
2018-06-05 09:55:07 +02:00
Lipu Fei
7f7a195627 Fix merge conflicts from 3.4 2018-06-05 09:02:52 +02:00
Lipu Fei
bbd019f9e5 Fix job name UI binding
CURA-5367

UI should always refer to PrintInformation for the job name.
2018-06-05 08:58:09 +02:00
Lipu Fei
98aaaba594 Only update job_name to unnamed but not base_name
CURA-5367

Only update job_name to "unnamed" if it's empty. Do not change
base_name.
2018-06-05 08:33:59 +02:00
Ghostkeeper
02a3067a0c
Reset infill line distance when changing density via recommended mode
Otherwise the change has no effect.

Contributes to issue CURA-5324.
2018-06-04 16:58:13 +02:00
Jack Ha
4a878e5b1d Merge branch 'master' of github.com:Ultimaker/Cura 2018-06-04 16:30:15 +02:00
Diego Prado Gesto
36e72ae744 Merge branch '3.4' into fix_retraction_amount 2018-06-04 14:42:39 +02:00
Lipu Fei
e518d07f5a No need to give parent to ExtruderStack 2018-06-04 13:22:08 +02:00
Ghostkeeper
258a90d850
Fix parameter
Oops again. I should not do this when I have 30 seconds left on the clock.

Contributes to issue CURA-5330.
2018-06-04 13:00:57 +02:00
Ghostkeeper
360d4f14e4
Fix broken import
Oops.

Contributes to issue CURA-5330.
2018-06-04 12:59:44 +02:00
Ghostkeeper
68ddf443a1
Use explicit key-word arguments instead of kwargs
Makes it easier to use, and better self-documenting.

Contributes to issue CURA-5330.
2018-06-04 12:58:56 +02:00
Jack Ha
f29b4326cc Merge branch '3.4' 2018-06-04 12:54:07 +02:00
Jack Ha
402015aa05 Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4 2018-06-04 12:53:21 +02:00
Jack Ha
79d6a9a614 CURA-5434 fixed arrange to all build plates by reversing hull_shape and offset_shape 2018-06-04 12:53:13 +02:00
Ian Paschal
096f0775a8 CURA-5442 Compare plugin registry to package manager 2018-06-04 11:49:42 +02:00
Aleksei S
8113481b94 Merge branch '3.4' of github.com:Ultimaker/cura into 3.4 2018-06-04 11:48:19 +02:00
Aleksei S
a9095f2b77 After command "Undo" the project name was empty
CURA-5367
2018-06-04 11:46:51 +02:00
Jack Ha
c6ac344ed5 Merge branch '3.4' 2018-06-04 11:40:03 +02:00
Jack Ha
14294936c5 CURA-5434 reversed the role of offset_shape_arr and hull_shape_arr, to fix one-at-a-time arranging 2018-06-04 11:39:37 +02:00
Ghostkeeper
e5d1a53dd6
Add missing return type
Contributes to issue CURA-5330.
2018-06-04 09:55:17 +02:00
Ghostkeeper
51f24bc8c8
Call getMachineManager on CuraApplication
Because Application doesn't have it. Its child class has.

Contributes to issue CURA-5330.
2018-06-04 09:53:20 +02:00
Ghostkeeper
49c684a741
Add function typing
Contributes to issue CURA-5330.
2018-06-04 09:51:34 +02:00
Ghostkeeper
8ba592b593
Fix circular import with CuraApplication again
Contributes to issue CURA-5330.
2018-06-04 09:48:50 +02:00
Ghostkeeper
aff341eac9
Add casts for result of deepcopy
Because deepcopy should return the same object as what is provided as input.

Contributes to issue CURA-5330.
2018-06-04 09:48:30 +02:00
Ghostkeeper
9fb4511f52
Add function typing
This causes MyPy to discover errors in this file.

Contributes to issue CURA-5330.
2018-06-04 09:43:13 +02:00
Ghostkeeper
f544e3d5c0
Fix @override decorator
They need a parameter and they need to be the last decorator.

Contributes to issue CURA-5330.
2018-06-04 09:02:57 +02:00
Ghostkeeper
5a5d07865b
Fix circular imports with CuraApplication
Contributes to issue CURA-5330.
2018-06-04 09:01:30 +02:00