GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 17:45:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,410 Commits 294 Branches 267 Tags
Commit Graph

3410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Karl Pietrowski
c8070cff05 Don't ignore the directory but the link, too. 2016-06-09 18:43:54 +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
Ghostkeeper
3206650f39
Fix signal, repair per-object settings 
This was the wrong type of signal, which gave an error.

Contributes to issue CURA-340.
 2016-06-09 17:05:21 +02:00
Ghostkeeper
9f3752276f
Fix check if machine's extruders are processed 
Luckily this did never occur anyway since the rest of the code was sound.

Contributes to issue CURA-340.
 2016-06-09 17:05:21 +02:00
Ghostkeeper
9d618282ed
Save default material colour statically 
So if you wish to change that colour, you only need to change it in one place.

Contributes to issue CURA-340.
 2016-06-09 17:01:21 +02:00
Ghostkeeper
beb263025b
Make ExtruderSelector invisible if there is no choice in extruders 
It doesn't yet update well if you keep the panel open while switching machines.

Contributes to issue CURA-340.
 2016-06-09 17:01:21 +02:00
Jaime van Kessel
e793ce1a2c Use ID instead of definition 2016-06-09 16:57:40 +02:00
fieldOfView
d31153cdbb Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-09 16:55:17 +02:00
fieldOfView
392d237b47 Fix filtering UM2+ profiles 
Profiles did not show before selecting a material
CURA-1278
 2016-06-09 16:55:04 +02:00
Jaime van Kessel
1db74b00fd Merge branch 'feature_send_extruder_settings' of github.com:Ultimaker/Cura 2016-06-09 16:41:22 +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
Ghostkeeper
bd76c3e30f
Add drop-down in per-object settings to select extruder 
Actually selecting an extruder has no effect because there are dragons in that area and I need better armour with bonus damage against bugs before I venture in there.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-09 15:47:06 +02:00
Tim Kuipers
12a7b99cf7 fix: merge b3cfa62 went wrong, no slicing happened (CURA-1558) 2016-06-09 15:43:18 +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
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