3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 22:54:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
22028 commits 306 branches 272 tags 787 MiB
Commit graph

2094 commits

Author SHA1 Message Date
Jack Ha
955ed00c39 CURA-5334 added big phat error when single extruder printer does not have correct extruder 2018-06-11 16:56:35 +02:00
Jack Ha
24844edd90 CURA-5334 fix typo in method name _fixSingleExtrusionMachineExtruderDefinition 2018-06-11 16:10:25 +02:00
Jack Ha
b3f6e5c9e0 CURA-5327 renamed MachineManager._updateMaterialWithVariant to updateMaterialWithVariant 2018-06-11 15:52:28 +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
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
e5e96bc600 Merge branch 'master' into mypy_fixes 
Contributes to CURA-5330
 2018-06-08 15:29:22 +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
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
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
7f7a195627 Fix merge conflicts from 3.4 2018-06-05 09:02:52 +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
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
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
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
Ghostkeeper
e4a0345fe4
Fix more minor typing mistakes 
Contributes to issue CURA-5330.
 2018-06-01 16:40:57 +02:00
Ghostkeeper
c3bac474ab
Use CuraContainerRegistry instead of ContainerRegistry 
Because we're calling functions of CuraContainerRegistry.

Contributes to issue CURA-5330.
 2018-06-01 16:33:32 +02:00
Ghostkeeper
ff4a214c24
Add function typing 
This makes MyPy discover a lot of typing errors because it now starts analysing all of these functions.

Contributes to issue CURA-5330.
 2018-06-01 14:53:54 +02:00
Ghostkeeper
b920b9de4f
Fix type of setProperty 
And properly pass on the extra parameters.

Contributes to issue CURA-5330.
 2018-06-01 14:53:54 +02:00
Ghostkeeper
e38228ac24
Remove unused target_container parameter 
It's not compatible with ContainerInterface anyway.

Contributes to issue CURA-5330.
 2018-06-01 14:53:54 +02:00
Ghostkeeper
a6ffbbde8f
Add missing typing 
Contributes to issue CURA-5330.
 2018-06-01 14:53:54 +02:00
Ghostkeeper
e77592d718
Add missing typing for CuraContainerStack 
This was already largely done, but not 100%.

Contributes to issue CURA-5330.
 2018-06-01 14:53:13 +02:00
Ghostkeeper
4157636552
Merge branch '3.4' 2018-06-01 14:03:05 +02:00
Ghostkeeper
2fbcc22123
Fix adding printers due to unused 'parent' parameter 
The 'parent' parameter was unused, so I removed it. But I didn't remove all things that called it, apparently. I just removed some. I didn't try the stackbuilder.

Contributes to issue CURA-5330.
 2018-06-01 14:02:32 +02:00
Lipu Fei
e859861517 No need to set parent for ExtruderStack 2018-06-01 13:55:28 +02:00
Lipu Fei
41e94cd2a1 Fix merge problems from 3.4 2018-06-01 13:51:43 +02:00
Lipu Fei
61a3668a4f Merge remote-tracking branch 'origin/3.4' 2018-06-01 13:51:00 +02:00
Diego Prado Gesto
85560abca3 CURA-5439 Show the keep or discard changes dialog also when the user 
applies a configuration using the Sync button.
 2018-06-01 13:26:14 +02:00
Lipu Fei
eb949472e8 Merge remote-tracking branch 'origin/master' into WIP_improve_initialization 2018-05-31 13:47:27 +02:00
Diego Prado Gesto
931d4716e1 CURA-5404 Retrieve the material settings' values from the variant before 
retrieving it from the definition if there are not defined in the material.
 2018-05-30 16:58:11 +02:00
Lipu Fei
80d4989843 Show keep/discard user settings dialog upon variant change 
CURA-5417
 2018-05-30 09:03:36 +02:00
Lipu Fei
7cf2832183 Fix quality_group is None check in _setQualityGroup() 
CURA-5423
 2018-05-29 13:43:32 +02:00
Lipu Fei
1c3bae3fe4 Show keep/discard dialog upon material change if there are user changes 
CURA-5417
 2018-05-29 10:52:06 +02:00
Diego Prado Gesto
5704a7b184 Merge branch 'master' into WIP_improve_initialization 
Conflicts:
	cura/AutoSave.py
	cura/BuildVolume.py
	cura/CuraApplication.py

Contributes to CURA-5164
 2018-05-25 09:40:42 +02:00
Lipu Fei
196bd3a730 Add non-thumbnail-visible flag for creating previews 
CURA-5373

Addition to the non-slicable meshes, the support meshes should also not
be included in the previews.
 2018-05-23 16:32:38 +02:00