Commit graph

4475 commits

Author SHA1 Message Date
Ghostkeeper
2eedc96f36
Convert to Doxygen documentation
Like the rest of Cura and Uranium.
2018-06-11 15:06:48 +02:00
Lipu Fei
48bac1a0f7 Do not move locked nodes
CURA-5347
2018-06-11 14:45:46 +02:00
Lipu Fei
74e3785a03 Fix material update upon loading a machine
CURA-5327
2018-06-11 13:42:38 +02:00
Lipu Fei
7a6e711276 Update SettingOverrideDecorator upon extruder enabled/disabled
CURA-5456

When an extruder gets disabled, the SettingOverrideDecorator should
update its associated extruder to an enabled one so the whole setup can
be sliced.
2018-06-11 13:29:36 +02:00
Lipu Fei
a04bf7d814 Merge remote-tracking branch 'origin/3.4' 2018-06-11 11:32:51 +02:00
Lipu Fei
310a99fba7 Fix deepcopy in SettingOverrideDecorator
Obvious mistake...
2018-06-11 11:32:25 +02:00
Lipu Fei
c779795618 Remove unnecessary updateMaterialForDiameter()
CURA-5327
2018-06-11 10:55:10 +02:00
Lipu Fei
8ea3c879f4 Fix quality profile update
CURA-5453

Should take into account that the custom profile being updated may not
have a quality_changes container for each stack, and Cura should create
one if this is the case, so the user changes results can be stored.
2018-06-11 10:48:22 +02:00
Lipu Fei
ef4218830b Fix package manager initialization 2018-06-11 09:37:45 +02:00
Lipu Fei
553e9bcdc2
Merge branch 'master' into CURA-5334_extruder_def_for_all 2018-06-11 09:11:38 +02:00
Lipu Fei
19b02cd6e8 Use MachineManager to update material container
CURA-5327

The old update function in ExtruderManager is not functioning correctly.
2018-06-11 08:13:16 +02:00
Lipu Fei
dfdda24093 Update extruder definition if necessary
CURA-5334
2018-06-11 07:23:53 +02:00
Lipu Fei
cecd7b55a1 No need to fix material diameter or nozzle size
CURA-5334
2018-06-08 17:05:31 +02:00
Diego Prado Gesto
2dfedf3ae4 CURA-5330 Add typing in CuraContainerRegistry and
QualityProfilesDropDownMenuModel
2018-06-08 17:02:59 +02:00
Diego Prado Gesto
7f34d7615e CURA-5330 Add typing to CuraSceneNode 2018-06-08 16:56:52 +02:00
Diego Prado Gesto
8c2ba64f32 CURA-5330 Add typing to NetworkedPrinterOutputDevice 2018-06-08 16:47:52 +02:00
Diego Prado Gesto
a6815e7c61 CURA-5330 Add typing to Backup 2018-06-08 16:31:43 +02:00
Ghostkeeper
b9d47f6092
Add function typing
This allows MyPy to detect mistakes in the typing of these functions.

Contributes to issue CURA-5330.
2018-06-08 16:31:32 +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
Ghostkeeper
3b510af8f5
Add default 'None' for onFinished
I don't always need to know whether it was successful.

Contributes to issue CURA-5034.
2018-06-08 14:31:19 +02:00
Lipu Fei
384618b5c4 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-08 13:54:31 +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