GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-16 17:26:42 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,259 Commits 290 Branches 260 Tags
Commit Graph

3259 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
b93137545f Support for importing a profile. 
Contributes to CURA-1667 Profile import/export
 2016-06-09 14:14:50 +02:00
Simon Edwards
97d64a0749 Move ProfileReader and ProfileWriter over to Cura itself. 
Contributes to CURA-1667 Profile import/export
 2016-06-09 14:14:49 +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
Arjen Hiemstra
d57e2b2e22 Add an ID role and addGlobal property to ExtrudersModel 
Contributes to CURA-340
 2016-06-09 13:47:34 +02:00
fieldOfView
1a573345f2 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-09 13:41:46 +02:00
fieldOfView
8f4f67d552 Show "Protected profiles" / "Custom profiles" section on profiles page 
CURA-855
 2016-06-09 13:41:33 +02:00
Arjen Hiemstra
627d5e3c0d Merge branch 'master' of github.com:ultimaker/Cura 
* 'master' of github.com:ultimaker/Cura:
  Determine readonly state from location in filesystem instead of a metadata property
  Change focus upon extruder switch
  Fix extruder number attached to extruders
  Fix duplicating the first item on the Profiles page
  Fix spelling
  Document setActiveExtruderIndex
  Inheritance button now works if instance containers contain functions
  JSON cleanup: removed settable_per_x when they were obvious and default (CURA-1560)
  feat: use settable_per_[mesh|extruder|meshgroup|globally] instead of global_only (CURA-1560)
  JSON feat: replaced global_only with four properties settable_per_[mesh|extruder|meshgroup] and settable_globally for fdmextruder settings (CURA-1558)
  JSON feat: replaced global_only with four properties settable_per_[mesh|extruder|meshgroup] and settable_globally (CURA-1558)
 2016-06-09 13:31:08 +02:00
Arjen Hiemstra
8729dce531 Store the actual extruder stack in ExtruderManager instead of just the ID 
Contributes to CURA-340
 2016-06-09 13:30:17 +02:00
Jaime van Kessel
3df1bc4e62 Fixed minor issue in buildExtruderMessage 
CURA-1681
 2016-06-09 13:23:09 +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
Jaime van Kessel
8ebc75e09a Merge branch 'master' of github.com:Ultimaker/Cura into feature_send_extruder_settings 2016-06-09 13:05:50 +02:00
Jaime van Kessel
d93044a338 Added setting sending per extruder 
CURA-1681
 2016-06-09 13:04:07 +02:00
Tim Kuipers
b6649eab3a dox: documented proto file (CURA-1681 CURA-1682) 2016-06-09 12:08:10 +02:00
Jaime van Kessel
a01b554ee3 Added extruder to proto message 
CURA-1681
 2016-06-09 11:56:41 +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
Ghostkeeper
4bdd5713f1
Fix extruder number attached to extruders 
It reads that from position in the extruder definition file.

Contributes to issues CURA-1278 and CURA-340.
 2016-06-09 11:48:37 +02:00
Jaime van Kessel
899e4cc175 Fixed sending of per-object settings to engine 
CURA-1681
 2016-06-09 11:46:52 +02:00
Jaime van Kessel
123c2f5c85 Moved global settings into slice message (as per API changes) 
CURA-1681
 2016-06-09 11:33:15 +02:00
fieldOfView
5da3665832 Fix duplicating the first item on the Profiles page 
CURA-1585
 2016-06-09 11:22:33 +02:00
Tim Kuipers
ce9d8b6dd0 proto file typo fix (CURA-1681 CURA-1682) 2016-06-09 10:48:44 +02:00
Ghostkeeper
1149a96d70
Fix spelling 2016-06-09 10:45:48 +02:00
Ghostkeeper
14b9294a39
Document setActiveExtruderIndex 
Contributes to issues CURA-340 and CURA-1278.
 2016-06-09 10:45:48 +02:00
Jaime van Kessel
20f657af88 Updated proto file 
Objects & global settings are now sent in one message.
Also added support for extruder settings

CURA-1681
 2016-06-09 10:40:28 +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
a6dd9e7415 Fix initialization of ContainerSettingsModel 
CURA-1668
 2016-06-09 08:14:06 +02:00
fieldOfView
b85a8ca404 Update ContainerSettingsModel when its containers have property changes 
CURA-1668
 2016-06-09 07:54:13 +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
4d418a7c1a
When switching active extruder, get the extruder train from definition id 
Not from extruder container stack ID.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-08 16:36:01 +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