GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-25 07:39:25 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,268 Commits 291 Branches 265 Tags
Commit Graph

4268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
f51cffdf2e We now ask the stack for the position (instead of definition) 2016-07-25 13:50:47 +02:00
Thomas Karl Pietrowski
93a0637b23 Merge pull request #866 from thopiekar/master-CURA-1445-only 
CURA-1445: Using getDisplayString(ISO8601) in SliceInfo
 2016-07-25 13:42:26 +02:00
Thomas Karl Pietrowski
d9839ee41d SliceInfo: Using getDisplayString(ISO8601) instead 2016-07-25 13:40:19 +02:00
fieldOfView
87abed39f0 Fix two warnings on startup 
CURA-1758
 2016-07-25 11:41:54 +02:00
fieldOfView
ac0de58ecb Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-25 11:30:47 +02:00
fieldOfView
374ec8e577 Don't show user/quality emphasis on Per Object Settings 2016-07-25 11:30:30 +02:00
Jaime van Kessel
5d19113f8e Merge branch 'feature_stripe_shader' of github.com:Ultimaker/Cura 2016-07-25 10:51:45 +02:00
Jaime van Kessel
6883747671 Merge branch 'feature_remove_global_tab' of github.com:Ultimaker/Cura 2016-07-25 10:47:52 +02:00
Jaime van Kessel
000c4d5f41 Fixed issue where changing a setting would cause mismatch between stacks 
CURA-1758
 2016-07-25 09:58:33 +02:00
Ghostkeeper
4e9bfc6573
Display some skirt/brim settings if skirt/brim enabled 
Some needed to be updated because they concern both skirt and brim. Others missed the check entirely.

Contributes to issue CURA-1678.
 2016-07-22 17:23:03 +02:00
Ghostkeeper
54685e8898
Rename setting skirt_minimal_length to skirt_brim_minimal_length 
Also updated the description and made it a bit more accurate. Because this concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.
 2016-07-22 17:12:34 +02:00
Ghostkeeper
3042b6af5f
Rename skirt size to bed adhesion size 
Because it concerns not only the skirt, but also the brim and raft (and X/Y offset but I didn't include that in the name).

Contributes to issue CURA-1678.
 2016-07-22 17:06:35 +02:00
Ghostkeeper
d4f96ab62d
Rename setting skirt_line_width to skirt_brim_line_width 
Also updated the description. Because this concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.
 2016-07-22 17:00:30 +02:00
Ghostkeeper
5e2f1688b4
Rename setting jerk_skirt to jerk_skirt_brim 
Because it concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.
 2016-07-22 16:53:41 +02:00
Ghostkeeper
23f643aabc
Rename setting acceleration_skirt to acceleration_skirt_brim 
Also updated the description. Because this concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.
 2016-07-22 16:49:31 +02:00
Ghostkeeper
cb4c1fd08c
Rename skirt_speed to skirt_brim_speed 
Also updated the description. Because this concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.
 2016-07-22 16:45:11 +02:00
Jaime van Kessel
be252fb84f We now check if a setting can also be removed to get the same state 
THis should prevent the reset buttons from showing up when there is nothing going on.

CURA-1758
 2016-07-22 15:31:37 +02:00
fieldOfView
6cc6e79e65 Stripe objects that are outside the build volume 
This way they can not be confused with objects that are rendered with a (future) grey materialcolor.
 2016-07-22 14:24:52 +02:00
Jaime van Kessel
fa61a9e3f0 Removed bunch of unneeded global inheritance stuff 
CURA-1758
 2016-07-22 14:04:35 +02:00
fieldOfView
a2972e26f5 Remove the "from" convert_function for extruder settings 
Fixes CURA-1974
 2016-07-22 13:45:53 +02:00
fieldOfView
9171908c8b Show weights as well as lengths 
CURA-1038
 2016-07-22 13:44:45 +02:00
fieldOfView
1f53ce0d4d Fix weight calculation 
CURA-1038
 2016-07-22 13:43:26 +02:00
Jaime van Kessel
83ec6e849a Multiple changes when quality profiles have different values should no longer break the link 
CURA-1758
 2016-07-22 13:16:35 +02:00
Jaime van Kessel
df46a61d38 Active stack should no longer influence changing of targeted settings 
CURA-1758
 2016-07-22 11:44:37 +02:00
Jaime van Kessel
cafb46cb1d First container is now updated withouth recursion possible 
We now use a set of keys that we are handling in order to prevent the lock

CURA-1758
 2016-07-22 10:43:26 +02:00
Johan K
4c402e5bb7 Removed the layer data empty guard in ProcessSlicedLayers as the problem was solved in the backend. 2016-07-22 10:22:07 +02:00
Johan K
c6790981d6 Merge branch 'master' of https://github.com/Ultimaker/Cura into layerview_dev 2016-07-22 10:21:41 +02:00
Jaime van Kessel
8307dba643 Revert "Commented out 2 lines of code that caused issues with reset" 
This reverts commit 568d30d17b85dc1fd5bd4ab784e750ac237cdb39. Turned out this causes recursion issue when changing materials
 2016-07-22 09:33:44 +02:00
Jaime van Kessel
7e48b6ad4c Removed global_inherit_stack from support enable and support type 
CURA-1758
 2016-07-22 09:03:14 +02:00
Jaime van Kessel
87b9b17f98 Now the right extruder is actually used (instead of randomly mixing it up) 
CURA-1758
 2016-07-21 21:42:02 +02:00
Jaime van Kessel
568d30d17b Commented out 2 lines of code that caused issues with reset 
The documentation doesn't mention why the code is there, so i've commented them out for the time beeing

CURA-1758
 2016-07-21 21:19:25 +02:00
Jaime van Kessel
4346d5a233 Settings now point to the right extruder stack 
CURA-1758
 2016-07-21 20:54:02 +02:00
fieldOfView
dd78561e25 Remove global tab 
CURA-1758
 2016-07-21 15:35:20 +02:00
fieldOfView
d4744735c6 Remove global inheritance for most settings 
CURA-1758
 2016-07-21 15:33:35 +02:00
fieldOfView
caa202e3d6 Make sure values from loaded profile permeate to other stacks 
CURA-1758
 2016-07-21 15:28:10 +02:00
fieldOfView
a64e0fa8e8 Fix copyValueToExtruders (rebase-accident) 
CURA-1758
 2016-07-21 15:12:31 +02:00
fieldOfView
baf9d81e47 Massively simplify the strategy 
This removes the *_global_variant, *_global_material and *_global_quality profiles and instead uses the same profiles for the global stack as for extrude 0.

CURA-1758
 2016-07-21 15:12:31 +02:00
fieldOfView
0857017ac6 Add a context-menu item to copy a value to all extruders. 
CURA-1758
 2016-07-21 15:12:30 +02:00
fieldOfView
89b601791d Fix possible error when a printer fails to load 
CURA-1758
 2016-07-21 15:12:30 +02:00
fieldOfView
fa8b58844d Initialise multiextrusion global stacks to new empty profiles 
_EmptyInstanceContainer does not allow setting properties and does not emit signals

CURA-1758
 2016-07-21 15:12:30 +02:00
fieldOfView
2e75430d0e Update the global container when switching variant/material/quality profiles 
CURA-1758
 2016-07-21 15:12:29 +02:00
fieldOfView
81f9467ca0 Update the global value when the "global_inherits_stack" value changes 
CURA-1758
 2016-07-21 15:12:29 +02:00
fieldOfView
16315b6e1d Fix reset value icon on non-per-extruder-settable settings 
CURA-1758
 2016-07-21 15:12:28 +02:00
fieldOfView
5d613bd22e Make sure _active_container_stack is properly initiated 
CURA-1758
 2016-07-21 15:12:28 +02:00
fieldOfView
a31ffc4ebf Select first extruder when switching to a printer (continued) 
The days of the global tab are numbered

CURA-1758
 2016-07-21 15:12:28 +02:00
fieldOfView
8a6f41d7e7 Initialise multiextrusion global stacks to empty profiles 
CURA-1758
 2016-07-21 15:12:27 +02:00
fieldOfView
a48b3b7398 Select first extruder when switching to a printer 
The days of the global tab are numbered

CURA-1758
 2016-07-21 15:12:27 +02:00
fieldOfView
efa2099912 Remove stray debug code 
CURA-1758
 2016-07-21 15:12:26 +02:00
fieldOfView
64c870a3cf Disable setting support_enable per extruder 
This prevents a lot of confusion with setting the support_extruder_nr to an extruder which then has support_enable set to False (resulting in no support). It is still possible to print some objects with no support using the Per Object Settings tool.

CURA-1758
 2016-07-21 15:12:26 +02:00
fieldOfView
3923d43567 Disable simple mode controls on global tab 
CURA-1758
 2016-07-21 15:12:26 +02:00