GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-06 20:28:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,199 Commits 290 Branches 260 Tags
Commit Graph

5199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
d29c817289
Actually apply translated settings 
Don't know when this changed or why it hasn't propped up until then...

Contributes to issue CURA-844.
 2016-09-29 11:56:46 +02:00
Ghostkeeper
f435dcd896
Document parameters of _offsetHull 
Makes it clear that the input is a Polygon instance, not a Numpy array.

Contributes to issue CURA-2407.
 2016-09-29 09:32:43 +02:00
Jaime van Kessel
b0c20eafbd Prime colission now blocks slicing 
CURA-2375
 2016-09-28 16:50:13 +02:00
Jaime van Kessel
78b052f66c Only start change timer if there is a global stack 2016-09-28 16:41:04 +02:00
Jaime van Kessel
dc6e4f172e Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-28 16:03:58 +02:00
Jaime van Kessel
666cba0566 Merge branch 'master-CURA-1445' of https://github.com/thopiekar/Cura 2016-09-28 15:59:49 +02:00
Simon Edwards
062611a92a Handle the startup situation where there is no global stack. Fixed a bug where the wrong stack was used instead of the first extruder. 
Contributes to CURA-2477 Profile menu should only contain valid options for all materials
 2016-09-28 15:56:10 +02:00
Jaime van Kessel
7b7c161d93 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-28 15:20:59 +02:00
Simon Edwards
a7c58c33f7 Fixed up the profiles menu to handle multiple extruders better. 
Contributes to CURA-2477 Profile menu should only contain valid options for all materials
 2016-09-28 15:15:18 +02:00
Jaime van Kessel
3de4d4987c Prime positions now also intersect with oneother 
CURA-2375
 2016-09-28 15:14:38 +02:00
fieldOfView
299d05fa71 Prepend extruder id to extruder quality profiles 
extruder quality profiles are not shown to the user, so the prepended extruder id is never visible. This way imported profiles behave the same way as normally created profiles.

CURA-2478
 2016-09-28 14:23:29 +02:00
fieldOfView
54d07ae29b Fix error when no machine is active 2016-09-28 14:20:58 +02:00
Jaime van Kessel
bf1cfe9e7e Importing profile now works again if profile name already existed 
CURA-2478
 2016-09-28 12:02:33 +02:00
Ghostkeeper
608c442bb9
Fix remaining merge conflict 
Must've done something wrong? No, it's they who are wrong!

Contributes to issue CURA-2407.
 2016-09-28 11:53:03 +02:00
Ghostkeeper
4fc30615ab
Remove forgotten unused function 
This function is now in the Polygon class in Uranium.

Contributes to issue CURA-2407.
 2016-09-28 11:50:38 +02:00
Ghostkeeper
777a89ce46
Don't offset border with Horizontal Expansion any more 
This is now done in the convex hull of the mesh itself.

Contributes to issue CURA-2407.
 2016-09-28 11:50:38 +02:00
Ghostkeeper
7c573e3c29
Recompute convex hull if xy_offset changes 
With room for more settings.

Contributes to issue CURA-2407.
 2016-09-28 11:48:07 +02:00
Ghostkeeper
0bcc8f9a5d
Rename _roundHull to _offsetHull 
And a few variables that had a similar name. This better reflects the new function of this method.

Contributes to issue CURA-2407.
 2016-09-28 11:48:07 +02:00
Ghostkeeper
f3afcb1b36
Document _roundHull 
The code documentation is generalised and moved to the function documentation.

Contributes to issue CURA-2407.
 2016-09-28 11:48:06 +02:00
Ghostkeeper
aa69c1beee
Re-use _roundHull method 
This code was duplicated.

Contributes to issue CURA-2407.
 2016-09-28 11:48:06 +02:00
Ghostkeeper
5f2533e8a4
Also apply horizontal expansion on normal rounding 
Might have to rename this function later.

Contributes to issue CURA-2407.
 2016-09-28 11:48:06 +02:00
Ghostkeeper
622233bfd8
Remove duplicate code for creating circle approximations 
This code is now in the Polygon class, so we can re-use it.

Contributes to issue CURA-2407.
 2016-09-28 11:48:06 +02:00
Ghostkeeper
18d67dc552
Move generating approximated circle to Polygon class 
This is not specific to the build volume. It's more of a Polygon thing. Moved to Uranium.

Contributes to issue CURA-2407.
 2016-09-28 11:48:06 +02:00
Jaime van Kessel
ed9a7da17e Ensure that name abbreviation is correctly set when creating jobname 
CURA-2469
 2016-09-28 11:39:52 +02:00
Simon Edwards
fe41098f1f Duplicate and Remove profile were recently broken in the cross fire. Fixed again. 
Contributes to CURA-2320 Filtering Quality-Changes profiles on material?
 2016-09-28 10:57:26 +02:00
Jaime van Kessel
01d479e521 Updated documentation 
CURA-2375
 2016-09-28 09:42:00 +02:00
Jaime van Kessel
603a0a10d6 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-28 09:37:07 +02:00
Jaime van Kessel
9f1dd325bb Prime tower area is now also drawn in error mesh 
CURA-2375
 2016-09-28 09:36:43 +02:00
Ghostkeeper
99f53cb832
Early cop-out if there is no printer connected 
This indeterminate state is never visible, since showProgress is false then, but it might prevent some error message behind the scenes.

Contributes to issue CURA-2060.
 2016-09-28 09:36:06 +02:00
Jaime van Kessel
799cb51c2e Prime area's can now also be blocked by disallowed area's 
CURA-2375
 2016-09-28 09:22:14 +02:00
Ghostkeeper
2bdb388ad5
Improve documentation 
This makes it more clear when that variable is -1.

Contributes to issue CURA-2407.
 2016-09-27 17:41:37 +02:00
Ghostkeeper
2721cde6f0
Fix _getSettingProperty up 
Seems to work again now.

Contributes to issue CURA-2407.
 2016-09-27 17:41:37 +02:00
Ghostkeeper
edc6955162
Use per-mesh settings if it has them 
For platform adhesion offset and that sort of thing, we now also listen to per mesh settings. It isn't yet re-computed when changing per-mesh settings though. I'm going to look how to do that next.

Contributes to issue CURA-2407.
 2016-09-27 17:41:37 +02:00
Ghostkeeper
6affb80189
Expand convex hull by horizontal expansion 
The getSetting call doesn't seem to work at the moment, but the rest of the routine works if I replace the getSetting call with an actual value.

Contributes to issue CURA-2407.
 2016-09-27 17:41:37 +02:00
Ghostkeeper
dc80d50eb5
Remove unused value for extra_margin 
Since the else clause below now raises an exception and all its if clauses define extra_margin, this initial value is now unused.

Contributes to issue CURA-2407.
 2016-09-27 17:41:37 +02:00
Ghostkeeper
6783b4b3ef
Fix function call to _getSettingProperty 
Don't know who ever tested this...

Contributes to issue CURA-2407.
 2016-09-27 17:41:37 +02:00
Ghostkeeper
61477078a4
Raise exception when encountering unknown build adhesion type 
This is to warn future programmers when they add new build adhesion types.

Contributes to issue CURA-2407.
 2016-09-27 17:41:37 +02:00
Simon Edwards
bfa92b6b40 Correctly update the selected quality and quality changes after changing material. 
Contributes to CURA-2451 Changing material does not update quality profile to correct profile
 2016-09-27 17:09:04 +02:00
Ghostkeeper
ec26a45eb9
Spelling in documentation 
This must be the Latin form.

Contributes to issue CURA-2407.
 2016-09-27 16:36:07 +02:00
Ghostkeeper
b1c49d0a91
Infill Wipe Distance belongs to moves from the wall 
Was a copy-paste mistake, I think.

Contributes to issue CURA-2407.
 2016-09-27 16:36:06 +02:00
Ghostkeeper
433f7ce53f
Separate out pieces that contribute to the disallowed border 
This makes it much more clear which settings contribute to the border in what way.

Also fixes the border size definitely.

Contributes to issue CURA-2407.
 2016-09-27 16:36:06 +02:00
Ghostkeeper
1daa71c0ec
Raise exception when encountering unknown bed adhesion 
This fails explicitly when the bed adhesion is unknown, so that any programmer who adds bed adhesion or changes existing bed adhesion enum values will get notified as quickly as possible that this build volume calculation should be updated as well.

Contributes to issue CURA-2407.
 2016-09-27 16:36:06 +02:00
Ghostkeeper
c4d3fa7fc7
Rename skirt_size to border_size 
It is not only about the skirt, but about other things like travel avoid distance as well.

Contributes to issue CURA-2407.
 2016-09-27 16:36:06 +02:00
Ghostkeeper
f7e8340235
Rename bed_adhesion_size to disallowed_border_size 
It is the size of the border around the build volume that is disallowed, which is more generic than just the size of the bed adhesion. This edge is not only for bed adhesion.

Contributes to issue CURA-2407.
 2016-09-27 16:36:06 +02:00
Ghostkeeper
743ac85b99
Rename _getBedAdhesionSize to _getEdgeDisallowedSize 
This function is not only about the bed adhesion, but also about the other things that require space around meshes but are not part of the collision box.

Contributes to issue CURA-2407.
 2016-09-27 16:36:06 +02:00
Jaime van Kessel
1f830e68bb Min & max values for extruder prime pos are now enforced for Ultimaker machines 
CURA-2375
 2016-09-27 16:12:02 +02:00
Thomas Karl Pietrowski
df63b2d620 Merge remote-tracking branch 'refs/remotes/origin/master-CURA-1445' into master-CURA-1445 2016-09-27 15:40:16 +02:00
Thomas Karl Pietrowski
ca60e517fa Revert "SliceInfo: Defining container_serialized as empty, before trying to serialize" 
This reverts commit 1fd169c6697f268588733e7a6d65e80d587b51ab.
 2016-09-27 15:39:54 +02:00
Jaime van Kessel
4d2a69a932 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-27 15:24:55 +02:00
Jaime van Kessel
c93f5dc8ac QualitySettingsModel now uses right metadata entry for filtering 
CURA-2452
 2016-09-27 15:24:27 +02:00