Commit graph

8170 commits

Author SHA1 Message Date
Lipu Fei
725ea847a7 Add material_diameter into fdmprinter
When saving a material to a file, it will save all the settings in that
container, which needs to create SettingInstances for all the cached
ones, and for those instances, their definitions will be retrieved from
the machine definition.

material_diameter is one of the settings, but it only exists in the
extruder definitions, so when it tries to save a material profile, a lot
of warnings/errors will occur due to the missing "material_diameter" in
fdmprinter. Adding it back fixes this problem.
2018-09-18 10:35:44 +02:00
Lipu Fei
6929d96119 Merge remote-tracking branch 'origin/3.5' 2018-09-17 16:14:49 +02:00
Ghostkeeper
c6fa9474d6
Merge branch '3.5' 2018-09-17 14:41:45 +02:00
Diego Prado Gesto
6c9c68e004 Active the focus when the selected item changes.
In this case, if the user was updating some information in one material
and then select other material, the new data is stored.

Contributes to CURA-5682.
2018-09-17 14:41:45 +02:00
Diego Prado Gesto
74fcc10f59 Merge branch '3.5' into CURA-5682_material_manager_leftovers 2018-09-17 12:11:00 +02:00
Diego Prado Gesto
bafc2b98c9 Reuse MaterialBrandSection component for Favorites, Generic and branded
materials.

This component will show different children depending on the
hasMaterialTypes flag.

Adjust some small UI issues.

Contributes to CURA-5682.
2018-09-17 12:08:41 +02:00
Jaime van Kessel
2d7e41263d Merge branch '3.5' of github.com:Ultimaker/Cura 2018-09-17 11:39:29 +02:00
Jaime van Kessel
58c7524164 Also rename dagoma_neva_magis profiles to dagoma_magis 2018-09-17 11:38:51 +02:00
Jaime van Kessel
0c9ec8d455 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-09-17 11:35:46 +02:00
Orel
093c5487bf - Rename Dagoma Magis profile.
- Remove machine_gcode_flavor definition as the default value fits the
needs.
2018-09-17 11:30:00 +02:00
Diego Prado Gesto
f871a89825 Clean up the code by removing duplicate code. Also try to unify the
MaterialsBrandSection to use the same component for favorites, generic
and branded materials.

Contributes to CURA-5682.
2018-09-17 09:09:14 +02:00
Mark Burton
8efc5fe345 Now zig_zaggify_infill is enabled for gyroid infill. 2018-09-14 18:05:55 +01:00
Ghostkeeper
2369a10ce1
Disallow setting support wall line count per mesh
Because as soon as support is generated it can merge with the polygons of other support areas that are not directly beneath this model. They cannot have a different number of walls any more then because it is the same polygon.

Contributes to issue CURA-5603.
2018-09-14 16:31:40 +02:00
Jaime van Kessel
41860b1e89 Merge branch 'CURA-5689_dont_ignore_small_z_gaps_by_default' of github.com:Ultimaker/Cura 2018-09-14 15:44:37 +02:00
Jaime van Kessel
2590b03540 Merge branch 'master' of github.com:Ultimaker/Cura 2018-09-14 15:42:11 +02:00
Jaime van Kessel
c9d3847fdb Update description of ignore small_z_gaps 2018-09-14 15:41:51 +02:00
Remco Burema
0ff893c349 [CURA-5689] Make 'Ignore Small Z Gaps' false by default. WARNING: Increases default slicing time! 2018-09-14 13:49:56 +02:00
Diego Prado Gesto
972f0bef43 WIP Fix an error in which the current selected material was not
correctly selected when there is more than one brand (stupid mistake).
Also fix problems when the user changes some material information.

Contributes to CURA-5682.
2018-09-14 10:54:07 +02:00
Lipu Fei
8298f76d91 Add material_diameter into fdmprinter
When saving a material to a file, it will save all the settings in that
container, which needs to create SettingInstances for all the cached
ones, and for those instances, their definitions will be retrieved from
the machine definition.

material_diameter is one of the settings, but it only exists in the
extruder definitions, so when it tries to save a material profile, a lot
of warnings/errors will occur due to the missing "material_diameter" in
fdmprinter. Adding it back fixes this problem.
2018-09-14 09:43:26 +02:00
Jaime van Kessel
757c8754b1 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-09-13 16:23:55 +02:00
Jaime van Kessel
9627f216b2 Actually ensure that walls don't get slower than 1 mm/s
CURA-5724
2018-09-13 16:22:36 +02:00
Mark Burton
3ee9ed0cf3 Add gyroid infill pattern. 2018-09-13 15:15:29 +01:00
Tim Kuipers
945cc7c3e6 JSon feat: support brim settings 2018-09-13 14:25:57 +02:00
Tim Kuipers
eb253827be JSON setting: option to let support be replaced by brim or not 2018-09-13 13:48:08 +02:00
Tim Kuipers
6068ed10c1 JSON fix: connect_infill_polygons by default only when polygons can be connected via the outline.
Also let the user be able to edit the setting in some more situations,
for example when choosing concentric infill when the infill_line_distance = nozzle_size
2018-09-13 13:12:51 +02:00
Ghostkeeper
cc77632357
Merge branch 'master' into refactor_singleton_settingsbase 2018-09-13 11:52:13 +02:00
Lipu Fei
7ec62315e0 Remove shortcut for About
CURA-5642

It has conflict with "&Add Printer".
2018-09-13 10:54:46 +02:00
Diego Prado Gesto
6dc53cc60a Select the next selected material when it is activated or removed.
Contributes to CURA-5682.
2018-09-12 18:39:19 +02:00
Diego Prado Gesto
7e1a833e9c Merge branch '3.5' into CURA-5682_material_manager_leftovers 2018-09-12 17:12:40 +02:00
Diego Prado Gesto
3368428dbb Fix text field alignment.
The color text field was too short in many cases, when the color name is
long.

Contributes to CURA-5682.
2018-09-12 16:57:43 +02:00
Diego Prado Gesto
e3f67f1147 Fix code style.
Contributes to CURA-5682.
2018-09-12 16:37:16 +02:00
Diego Prado Gesto
6183a07d76 Activate the material right after it was created or duplicated.
Contributes to CURA-5682.
2018-09-12 16:35:01 +02:00
Diego Prado Gesto
921b11974c Improve the way the categories are highlighted.
When a material is selected, but the brand or the type is collapsed,
those components are also highlighted to indicate the path to the
material.

Reuse the MaterialBrandSection also for the generic materials, that
allow us to only mantain one component.

Contributes to CURA-5682.
2018-09-12 15:42:02 +02:00
Diego Prado Gesto
56dcc2dded Highlight the material that is currently selected.
Contributes to CURA-5682.
2018-09-12 14:09:29 +02:00
Lipu Fei
e069e0db99 Fix S5 extruder start and end locations
CURA-5672

X coordinate 310 is not at the rightmost position, and this causes the
prime tower to start printing from somewhere in the middle.
2018-09-12 13:18:43 +02:00
Diego Prado Gesto
f298d37134 WIP: Moving current selected material to the material list instead of
the page.

Change all the previous references to the currentItem in the page.
Automatically and correctly select the element that is selected in the
extruder.

Contributes to CURA-5682.
2018-09-11 22:12:54 +02:00
Diego Prado Gesto
9ba4c723f7 Fix the linked materials button.
Contributes to CURA-5682.
2018-09-11 22:07:14 +02:00
Jaime van Kessel
a809575bc8 Add bunch of ID's to qml components so it's easier to test them.
CURA-5618
2018-09-11 16:05:53 +02:00
Jaime van Kessel
c84a2213a7 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-09-11 11:01:55 +02:00
Diego Prado Gesto
19eefc71da Update SDK version for the bundled packages. 2018-09-11 09:38:23 +02:00
Diego Prado Gesto
bacae6c136 Update name of the VersionUpgrade for the version 3.5. 2018-09-11 09:38:23 +02:00
Diego Prado Gesto
fe256b3562 Fix some issues in the material preference page.
Now the generic section collapses and expands correctly. Some qml error
was also fixed.

Contributes to CURA-5682.
2018-09-10 15:57:19 +02:00
Sacha Telgenhof Oude Koehorst
5ca5aacbee
Removed layer_height override as it isn't needed. Only the initial layer height needs to be overridden. 2018-09-10 21:46:26 +09:00
Ian Paschal
1c8b086403 Improve inactive coloring
Contributes to CL-1048
2018-09-10 14:35:05 +02:00
Sacha Telgenhof Oude Koehorst
42a523cb00 Add single extruder definition for Ender-3. 2018-09-10 21:32:36 +09:00
Diego Prado Gesto
51b0497f84 Fix the collapsable panel of the Generic materials.
Contributes to CURA-5682.
2018-09-10 14:28:41 +02:00
Ian Paschal
0ecac9f01e Merge remote-tracking branch 'origin/master' into cura_connect_improvements 2018-09-10 11:46:44 +02:00
Ian Paschal
90426749a2 Change deactiveStates to inactiveStates
Contributes to CL-1047
2018-09-10 11:35:58 +02:00
Ian Paschal
97e8db577a Monitor Tab - Add grey monitor tab text
Contributes to CL-1047
2018-09-07 16:45:30 +02:00
Jaime van Kessel
c7350ff579 Merge branch 'master' of github.com:Ultimaker/Cura 2018-09-07 15:24:09 +02:00