Commit graph

8170 commits

Author SHA1 Message Date
Lipu Fei
a0c3767184
Merge pull request #4048 from Ultimaker/CURA-5408-material-profiles
CURA-5408 weight for materials + bug fixes
2018-07-13 07:54:58 +02:00
Jack Ha
abbbdb17e6 Fix if you randomly click around in the materials then some spool_weights of 0 gets mixed up. The cause was that base.containerId was not updated at the same time as properties.guid. CURA-5408 2018-07-12 15:17:46 +02:00
Diego Prado Gesto
395c5d3a8b CURA-5458 Add three dots in the options that will open a new window.
Add the Save option together with the New and Open, and then separate it
from the Export options.
2018-07-12 15:16:01 +02:00
Mark
e53e62ccab CURA-5458 Use Save and Export 2018-07-12 14:54:10 +02:00
Jack Ha
56d5fc8a62 Merge branch 'master' into CURA-5408-material-profiles 2018-07-12 14:43:33 +02:00
Ghostkeeper
abf1610923
Rename Custom FDM Printer to Custom FFF printer
FFF is easier to type... But that's probably not the real reason why we need to do this.

Contributes to issue CURA-5461.
2018-07-11 13:30:27 +02:00
Aleksei S
995a95b8ab Merge branch 'master' of github.com:Ultimaker/Cura 2018-07-11 13:24:12 +02:00
Aleksei S
596a7b7169 Added signal to prevent window closing if USB printer is printing
CURA-5384
2018-07-11 13:23:30 +02:00
fieldOfView
aa259cfb06 Enforce focus on save button to ensure edits to jobname happen before saving
Fixes #4007
2018-07-11 09:28:40 +02:00
Andreea Scorojitu
07195cc95c
Merge pull request #3976 from MarmaladeForMeat/master
Update Chinese translation
2018-07-10 16:54:49 +02:00
Lipu Fei
7658ad34e2
Revert "Move "Exclude Materials" metadata to materials" 2018-07-10 16:27:07 +02:00
Jack Ha
e739a74900 Merge branch 'master' into CURA-5408-material-profiles 2018-07-10 15:48:10 +02:00
Jack Ha
5eb2230d82 Fix default value for getMaterialPreferenceValue other than spool_weight, added cleanup code for saving default values. CURA-5408 2018-07-10 15:40:13 +02:00
Ghostkeeper
a18f77abdd
Move exclude_materials into material profiles
They are there not 'hardware compatible' any more.

Contributes to issue CURA-5460.
2018-07-10 15:26:23 +02:00
Ghostkeeper
f712fc0f36
No longer add incompatible materials to materials menus
This removes the need for the 'compatible' role but I'll keep it in for now in case we want to change the design of this later.

Contributes to issue CURA-5460.
2018-07-10 15:26:23 +02:00
Ghostkeeper
c0fc0a7eba
Disable material if not compatible
Similar to how it's displayed in the printer.

Contributes to issue CURA-5460.
2018-07-10 15:26:23 +02:00
Ghostkeeper
16226bdd48
Move exclude_materials into the material profiles
An accompanying commit should be done in the fdm_materials repository.

Contributes to issue CURA-5460.
2018-07-10 15:26:23 +02:00
Ghostkeeper
f0ef236df0
Change tab to spaces 2018-07-10 13:33:30 +02:00
Jack Ha
e7c1d31bee Fixed change material diameter, changed signature of getContainerMetaDataEntry. CURA-5408 2018-07-10 13:14:11 +02:00
Lipu Fei
e5a11c1f7b Fix getContainerMetaDataEntry()
CURA-5408
2018-07-09 15:12:53 +02:00
Ian Paschal
a596c5a034 Code-style fixes
Contributes to CURA-5408
2018-07-09 14:39:13 +02:00
Aleksei S
52f6037576 Merge branch 'master' of github.com:Ultimaker/Cura 2018-07-09 14:21:17 +02:00
Aleksei S
77bd6cf749 Read material weight from container
CURA-5408
2018-07-09 14:20:51 +02:00
Ian Paschal
9bf4541e06
Merge pull request #3697 from smartavionics/mb-supported-skin-fan
Added support_fan_enable and support_supported_skin_fan_speed settings.
2018-07-06 23:17:42 +02:00
alekseisasin
a499a6bb66
Merge pull request #4027 from Ultimaker/feature_prime_tower_shells
Prime Tower Shells
2018-07-06 14:39:29 +02:00
Ghostkeeper
ec00e5b721
Remove references to deleted settings
Also convert the values for prime_tower_min_volume to make it behave similar to what the minimum volume used to be. This feature fixed a bug with the computation from volume to thickness. Now it's correct but we have to correct the old values to be still the same (approximately) as what used to be the end result.

Contributes to issue CURA-5457.
2018-07-05 13:22:17 +02:00
Ghostkeeper
807e8410c0
Give warning when sum of volumes exceeds volume of prime tower
It could happen that the desired volume is not entirely reached in the inner shells because of rounding the volume up to the nearest perimeter on the outer shells.

Contributes to issue CURA-5457.
2018-07-05 10:31:23 +02:00
Ghostkeeper
192a581d6d
Don't round the warning threshold
The threshold is not visible. It's not necessary to round.

Contributes to issue CURA-5457.
2018-07-05 09:50:05 +02:00
Mark
20180e3804
Merge pull request #4022 from Ultimaker/remove_id_raise3d
Remove ID from Raise3D definition
2018-07-05 09:44:42 +02:00
Ghostkeeper
9e18bb8b4c
Remove ID from Raise3D definition
These IDs are not used and should never be added again.
2018-07-04 17:31:58 +02:00
Diego Prado Gesto
3b406b5467 Merge branch 'master' of github.com:Ultimaker/Cura 2018-07-04 14:32:05 +02:00
Diego Prado Gesto
4722b5387b CURA-5334 Add extruder definition for Wanhao printers, Uni Print 3d and
Tevo Tornado. Those definitions were added without extruder definitions.
2018-07-04 14:22:22 +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
Mark Burton
9e0b79469b Set default value of wall_overhang_speed_factor to 100, i.e. print overhang at the normal speed. 2018-07-04 11:50:30 +01:00
Mark Burton
9186dc2c89 Default value for wall_overhang_angle is now 90 so overhang detection is disabled by default. 2018-07-04 11:50:22 +01:00
Mark Burton
5f23bcf8e9 Allow wall_overhang_angle to be 90 and add blurb that describes how this disables overhang processing. 2018-07-04 11:50:10 +01:00
Mark Burton
41900e33b8 Add wall_overhang_angle and wall_overhang_speed_factor settings.
# Conflicts:
#	resources/definitions/fdmprinter.def.json
2018-07-04 11:49:53 +01:00
Mark Burton
404551e30a Remove bridge_wall_max_overhang - no longer required with new overhang settings.
# Conflicts:
#	resources/definitions/fdmprinter.def.json
2018-07-04 11:49:08 +01:00
Mark Burton
a8685b10be Change some settings to be settable per mesh rather than per extruder.
# Conflicts:
#	resources/definitions/fdmprinter.def.json
2018-07-04 11:48:27 +01:00
Diego Prado Gesto
5b251fc6dc CURA-5334 Remove machine nozzle size from machine definitions and move
it to extruder definitions.
2018-07-04 12:00:38 +02:00
Ian Paschal
bc05839940 CURA-5537 improve styling of toolbox 2018-07-03 15:54:20 +02:00
Mark
1f51d83fa7
Merge pull request #3982 from fieldOfView/fix_dark_theme_artefact
Fix a bright line/gap between the viewport and sidebar due to rounding
2018-07-02 16:50:56 +02:00
Mark
f3d92ecdbf
Merge pull request #3986 from fieldOfView/fix_always_ask
Clarify Profile Override preference options
2018-07-02 16:43:20 +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
e11ce2674f CURA-5334 formatting 2018-07-02 15:10:27 +02:00
Aleksei S
914b3a648b Added setting for initial layer support distance
CURA-5527
2018-07-02 14:21:13 +02:00
Jack Ha
3761123513 Merge branch 'master' into CURA-5334_extruder_def_for_all 2018-07-02 14:11:24 +02:00
Jack Ha
e842ca37fb CURA-5334 adding more material_diameter properties 2018-07-02 13:48:21 +02:00