GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-16 14:16:41 +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
Jaime van Kessel
3cc7549c5f Merge pull request #786 from thopiekar/master 
[master] LayerView: Using resetLayerData()
 2016-06-10 14:33:16 +02:00
Ghostkeeper
f302e06654
Reslice when per-object extruder changes 
Not when you activate the dropdown but it doesn't change though.

Contributes to issue CURA-340.
 2016-06-10 14:24:21 +02:00
Ghostkeeper
df1ca39c7b
Fix getting proper container stack in decorator 
Using the filter function now but the resulting list wasn't properly accounted for.

Contributes to issue CURA-340.
 2016-06-10 14:24:21 +02:00
Thomas Karl Pietrowski
7043a04e22 Merge remote-tracking branch 'Ultimaker/master' into master-layerview-use-resetLayerData 2016-06-10 14:05:45 +02:00
Thomas Karl Pietrowski
c0472e0068 LayerView: Using resetLayerData() 
Currently resetLayerData() is not used at all, but found in two places
the same code like found in resetLayerData().
So replaced them with resetLayerData().
 2016-06-10 13:57:52 +02:00
Tim Kuipers
6bb1793d12 fix: moved jerk_travel visibility from json to CuraApplication (CURA-1443) 2016-06-10 13:48:43 +02:00
Thomas Karl Pietrowski
6c158ba845 Merge remote-tracking branch 'refs/remotes/Ultimaker/master' 2016-06-10 13:46:25 +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
Jaime van Kessel
179b6eeaac Fixed issue where not having a machine caused extruder retrieval to fail 
CURA-1689
 2016-06-10 13:16:54 +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
Jaime van Kessel
9672b3360c Changing settings in extruder stack now also triggers reslice 
CURA-1689
 2016-06-10 12:26:11 +02:00
Jaime van Kessel
02d2acd317 Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-10 11:48:55 +02:00
Jaime van Kessel
e2e9e7964c Fixed duplication if no name was changed 
CURA-1427
 2016-06-10 11:48:33 +02:00
Ghostkeeper
82aa630b9e Merge pull request #781 from thopiekar/master-ignore-debian-link 
Don't ignore the directory but the link, too.
 2016-06-10 11:42:10 +02:00
Jaime van Kessel
1aa11593fa Merge pull request #785 from thopiekar/master 
Removing unneeded import of 'os'
 2016-06-10 11:21:35 +02:00
Thomas Karl Pietrowski
b61b0a7ee2 Removing unneeded import of os' 2016-06-10 10:52:12 +02:00
Jaime van Kessel
0cf3fd3624 Removed unused imports 
CURA-1278
 2016-06-10 09:41:51 +02:00
Jaime van Kessel
962b4e84a9 Fixed renaming of profiles. 
They are now correctly renamed (and saved under different name on disk as well)

CURA-1683
 2016-06-10 09:38:47 +02:00
Jaime van Kessel
070a522abb Revert "Temporarily revert "Renaming profiles now also renames them on disk"" 
Starting work on it again, so unreverting the revert (i guess)

This reverts commit d8e8b0740ac2b1d776c13cd8078fe1b8e4f5a45d.
 2016-06-10 09:17:12 +02:00
fieldOfView
d8e8b0740a Temporarily revert "Renaming profiles now also renames them on disk" 
This reverts commit af238d5a7656b243550c426405e2b356de877365.
 2016-06-10 00:12:35 +02:00
fieldOfView
2287c2daa6 Show that a value is being calculated instead of showing "QVariant..." 
CURA-1668
 2016-06-09 21:40:53 +02:00
fieldOfView
7d2a7bd157 Abbreviate headers 
CURA-1668
 2016-06-09 21:40:07 +02:00
fieldOfView
e25402fc49 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-09 19:19:00 +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
Jaime van Kessel
ceef6a003e Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-09 19:17:57 +02:00
Jaime van Kessel
af238d5a76 Renaming profiles now also renames them on disk 
CURA-1683
 2016-06-09 19:17:31 +02:00
Ghostkeeper
598ff1e398
Fix changing active extruder from per-object drop-down 
Apparently this is the way you do it.

Contributes to issue CURA-340.
 2016-06-09 19:06:17 +02:00
Ghostkeeper
9e86cd5c85
Fix call to findContainerStack[s] 
Was a typo. Now it also checks if the stack ID is correct here. Not because it went wrong, but for defensive programming.

Contributes to issue CURA-340.
 2016-06-09 19:06:17 +02:00
Ghostkeeper
f5f711b7dc
On extruder switch create OverrideDecorator if needed 
The SettingOverrideDecorator is only applied if the node has a per-object setting. Now it also creates a decorator also if you've ever switched the extruder, which was needed because the decorator contains the information which extruder to print with.

Contributes to issue CURA-340.
 2016-06-09 19:06:17 +02:00
Thomas Karl Pietrowski
330481d2d6 Ignore settings set on Eclipse 2016-06-09 18:45:48 +02:00
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