3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-10-10 23:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 16
3162 commits 330 branches 295 tags 714 MiB
Commit graph

1483 commits

Author SHA1 Message Date
Tim Kuipers
67058c3d45 fix: definition visibility got borked (CURA-1443) 
machine definition visibility should be a metadata property and should be set to true for only those definitions which are actually machines
 2016-06-10 14:52:15 +02:00
Tim Kuipers
6bb1793d12 fix: moved jerk_travel visibility from json to CuraApplication (CURA-1443) 2016-06-10 13:48:43 +02:00
Tim Kuipers
795291a117 fix/feat: introduced and fixed inheritance for all acceleration and jerk settings (CURA-1443) 2016-06-10 13:32:57 +02:00
Tim Kuipers
b2d57207a4 fix: global_only ==> settable_per_X for acceleration and jerk settings (CURA-1560 CURA-1443) 2016-06-10 13:20:55 +02:00
Tim Kuipers
149af8af28 Merge branch 'master' into feature_accelerations_and_jerk_per_feature_settigns_rework 2016-06-10 12:29:06 +02:00
fieldOfView
7d2a7bd157 Abbreviate headers 
CURA-1668
 2016-06-09 21:40:07 +02:00
fieldOfView
0d7a7d9299 Update wording to make storing/updating/discarding current settings more clear 
CURA-970
 2016-06-09 19:18:46 +02:00
fieldOfView
d34d398e96 Change the implementation of creating a profile from the current settings 
The newly created profile now combines the settings of the active quality profile and the current settings

CURA-970, CURA-1585
 2016-06-09 18:40:42 +02:00
fieldOfView
4da69a4d3e Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-09 17:49:49 +02:00
fieldOfView
c6b1706460 Fix customisedSettings button (profiles dropdown) layout and behavior 
CURA-1685
 2016-06-09 17:49:33 +02:00
Tim Kuipers
b0198aedb0 JSON fix: line_width didn't supply any settable_per info (CURA-1558) 2016-06-09 17:27:20 +02:00
Tim Kuipers
959305ddf7 JSOn fix: removed buggy default:true for numeric values (CURA-1558) 2016-06-09 17:26:43 +02:00
fieldOfView
0952dd0327 Removed warnings about undefined properties 
CURA-1278
 2016-06-09 16:01:08 +02:00
fieldOfView
887a5f4f80 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-09 15:51:40 +02:00
fieldOfView
38c6c3cb01 Minor fixes to SidebarHeader 
CURA-1689
 2016-06-09 15:51:28 +02:00
Arjen Hiemstra
90ddff1c7f Remove obsolete debug statement 
Contributes to 1685
 2016-06-09 15:35:37 +02:00
Arjen Hiemstra
98c9f202a2 Do not produce an error when a setting has been filtered out 
Contributes to CURA-340
 2016-06-09 15:32:41 +02:00
Arjen Hiemstra
abf634c0b0 Filter visible settings based on if they can be set per extruder 
Contributes to CURA-340
 2016-06-09 15:14:32 +02:00
Arjen Hiemstra
3a75e1fb79 Fix setting the active extruder 
Contributes to CURA-340
 2016-06-09 15:12:37 +02:00
Arjen Hiemstra
4a43b50b7a Remove unused action properties from Sidebar 2016-06-09 15:07:57 +02:00
Arjen Hiemstra
88d87e8e85 Cleanup sidebarheader and fix extruder selection 
Contributes to CURA-340
 2016-06-09 14:32:13 +02:00
Arjen Hiemstra
725086b0dd Remove ProfileSetup and move its contents to SidebaarHeader 
Contributes to CURA-340
 2016-06-09 14:32:13 +02:00
Simon Edwards
c03588c6e5 Profile export now goes via the plugin system, and does the same filename checks as before. 
Contributed to CURA-1667 Profile import/export
 2016-06-09 14:14:48 +02:00
fieldOfView
8f4f67d552 Show "Protected profiles" / "Custom profiles" section on profiles page 
CURA-855
 2016-06-09 13:41:33 +02:00
fieldOfView
f498f0237c Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-09 13:16:38 +02:00
fieldOfView
cd803bc36e Determine readonly state from location in filesystem instead of a metadata property 
CURA-1684
 2016-06-09 13:16:23 +02:00
Tim Kuipers
b3cfa62775 Merge branch 'feature_settings_restricted_to_settingsbases' 2016-06-09 13:11:30 +02:00
Ghostkeeper
6a520cad47
Change focus upon extruder switch 
This applies a setting that is currently being typed by the user. Otherwise it would take the currently being typed value along to the next tab, since it can't update a setting value while it is in focus.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-09 11:48:37 +02:00
fieldOfView
5da3665832 Fix duplicating the first item on the Profiles page 
CURA-1585
 2016-06-09 11:22:33 +02:00
Ghostkeeper
1149a96d70
Fix spelling 2016-06-09 10:45:48 +02:00
Jaime van Kessel
e4e307cd2a Inheritance button now works if instance containers contain functions 
CURA-1686
 2016-06-09 10:25:01 +02:00
Jaime van Kessel
a070684ade Fixed minor issue for inheritance button 
It didn't always reset to correct value. CURA-1278
 2016-06-09 09:59:06 +02:00
fieldOfView
a21498c375 Add weights to generic quality profiles 
CURA-1278
 2016-06-09 08:29:05 +02:00
fieldOfView
ecfd7e5993 Move InstanceContainersModel has_settings into metadata to clean up the model 
CURA-1668
 2016-06-09 08:21:18 +02:00
fieldOfView
e702fef44b Add header to profile settings table 2016-06-08 22:07:57 +02:00
fieldOfView
f764ac8362 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-08 17:51:07 +02:00
fieldOfView
ca308c5b05 Add notice if a profile has no settings, and if the current settings are "empty" 
CURA-1668, CURA-696
 2016-06-08 17:50:54 +02:00
Jaime van Kessel
85d5247deb Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-08 17:47:46 +02:00
Jaime van Kessel
fcd6f0959f Inheritance button now only shows if there is a function in the container stack at some point 
CURA-1278
 2016-06-08 17:47:23 +02:00
fieldOfView
07b51d0ca8 Strike out profile value if it is overridden by the current setting 
CURA-1668
 2016-06-08 17:04:04 +02:00
fieldOfView
2d63ce889f Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-08 16:45:35 +02:00
fieldOfView
da467b9b28 Only shown the current settings column when the currently active quality profile is selected 
CURA-1668
 2016-06-08 16:45:20 +02:00
Ghostkeeper
7dbafa06d1
Make SidebarHeader use ExtrudersModel 
This model is also used by the extruder selection drop-downs, and it's automatically filled already so that was double logic.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-08 16:36:01 +02:00
fieldOfView
2d998c127b Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-08 16:35:23 +02:00
fieldOfView
485ae53660 Show quality profile and user profile settings side-by-side on Profiles manager 
Introduces ContainerSettingsModel, which can combine the settings of instances from multiple containers into one model.

Towards CURA-1668
 2016-06-08 16:35:10 +02:00
Arjen Hiemstra
1131623278 Disable the property editor when the value of the setting is not used 
Contributes to CURA-1278
 2016-06-08 16:34:19 +02:00
Tim Kuipers
cc7369c594 profiles fix: duplicated UM2+ profile changes from 2.1 to the UM2E+ profiles (CURA-1662) 2016-06-08 15:43:22 +02:00
Tim Kuipers
8a7e549a27 Merge fix of 2.1 
Max Retraction count 45 ==> 90 wasn't taken along
 2016-06-08 15:40:15 +02:00
Tim Kuipers
21ad4713a7 Merge branch '2.1' 2016-06-08 15:35:45 +02:00
Jaime van Kessel
cf15f9e2a1 Added handling of special case when only user & definition were set 
CURA-1278
 2016-06-08 15:31:28 +02:00