3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 13:17:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
15890 commits 307 branches 270 tags 779 MiB
Commit graph

6772 commits

Author SHA1 Message Date
Jaime van Kessel
081b2a28fe Expose Account API to QML 
This is done by adding the API as an SingletonType to Cura.

CURA-5744
 2018-09-21 17:23:30 +02:00
Jaime van Kessel
83d53158bd Merge branch 'master' of github.com:Ultimaker/Cura 2018-09-21 09:34:34 +02:00
Jaime van Kessel
054a49c63d Fix issue with inheritance manager button 
Removed one of the special detection cases, since it incorrectly removed a value from a stored profile

CURA=5646
 2018-09-21 09:33:25 +02:00
alekseisasin
520a181f88
Merge pull request #4383 from Ultimaker/check_setting_visibility 
Test incremental inclusion of setting visibility presets
 2018-09-20 16:41:58 +02:00
Jaime van Kessel
2dbaa304a0 Set textFormat for the setting items to PlainText 
Based on the Qt guide on making qml run much faster, it seems that the default of textFormatting (auto)
is quite expensive. As we make a *lot* of settingItems, which we don't want to format, it's better to set it to plain.
I haven't checked how much faster it actually is, but i didn't see visual changes, so it's at least a safe step.
 2018-09-20 15:22:35 +02:00
Diego Prado Gesto
7ce3521831 Merge branch '3.5' 2018-09-20 08:57:50 +02:00
Diego Prado Gesto
4111318c7a Remove duplicate shortcut in French, so the CI won't fail on it. 2018-09-20 08:56:01 +02:00
Ghostkeeper
f99c48575e
Merge branch '3.5' 2018-09-19 17:31:52 +02:00
Ghostkeeper
ea4015c2cf
Fix missing report links 
My IDE crashed while doing a replace all. I see that it missed a few.

Contributes to issue CURA-5741.
 2018-09-19 17:31:39 +02:00
Ghostkeeper
95c9f9a2d5
Merge branch '3.5' 2018-09-19 17:27:00 +02:00
Ghostkeeper
ec42a96179
Update version number and fix reporting link 
I don't know, did we always have it refer to Uranium's issues page?

Contributes to issue CURA-5741.
 2018-09-19 17:25:57 +02:00
Ghostkeeper
f6b56a6506
Merge branch '3.5' 2018-09-19 17:16:14 +02:00
Ghostkeeper
91ed1171c2
Update translation sources for Cura 3.5 
This is updated from the new cura.pot template.

Contributes to issue CURA-5741.
 2018-09-19 17:15:09 +02:00
Ghostkeeper
f9923e5fe7
Remove duplicate messages 
These were duplicate because CMake of this plug-in put a copy of the JSON file in the build directory.

Contributes to issue CURA-5741.
 2018-09-19 17:13:53 +02:00
Ghostkeeper
10e0175947
Update translation templates for Cura 3.5 
These are the new strings for Cura 3.5.

Contributes to issue CURA-5741.
 2018-09-19 17:10:58 +02:00
Ghostkeeper
04b74d2285
Fix typo in Extra Infill Wall Count description 
Some very observant user found this small typo. Thanks.
 2018-09-19 13:58:09 +02:00
Ian Paschal
7ad6fc4cad
Merge pull request #4385 from Ultimaker/monitor_confirmation_dialogues 
Add confirmation dialogues before making destructive changes in UM3/S5 monitor
 2018-09-19 13:14:39 +02:00
Lipu Fei
3b62284276 Merge remote-tracking branch 'origin/3.5' 2018-09-18 16:15:55 +02:00
Lipu Fei
a33ce8178a Support mulitple bundled_packages JSON files 
CURA-5718
 2018-09-18 15:53:56 +02:00
Ghostkeeper
ac4ee8c428
Fix context of pause, resume and abort labels 
More in line with what we have in the rest of our code base.

Discovered during work on CL-1053 and CURA-5729.
 2018-09-18 11:25:35 +02:00
Aleksei S
c764b31e06 Update unit test for 'visibilit_settings' and removed unused settings from expert.cfv 
CURA-5734
 2018-09-18 11:10:24 +02:00
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
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
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