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

5136 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ghostkeeper
4ec380ffd9
Quality-changes now have a quality_type instead of referring to quality 
This field was just renamed, I think for CURA-2320. This updates the name for the upgrade process.

Contributes to issue CURA-844.
 2016-09-27 15:12:29 +02:00
Simon Edwards
c902fef372 Removed a dead line. 
Contributes to CURA-2320 Filtering Quality-Changes profiles on material?
 2016-09-27 14:16:25 +02:00
Jaime van Kessel
5a49457bfe Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-27 14:13:34 +02:00
Jaime van Kessel
829d341f7f When import multi extrusion profile, they now all get the same name 
CURA-2462
 2016-09-27 14:13:06 +02:00
Simon Edwards
4bb6ddaf28 Correctly update the quality profiles in the extruders when changing quality changes, taking the different materials into account. 
Contributes to CURA-2320 Filtering Quality-Changes profiles on material?
 2016-09-27 14:11:19 +02:00
Jaime van Kessel
fc69b110f3 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-27 14:06:41 +02:00
Jaime van Kessel
960a390350 Ensure that the correct properties get set for writing profiles to g-code 
CURA-2462
 2016-09-27 14:05:56 +02:00
Ghostkeeper
f4d13713a2
Replace progress bar with actual ProgressBar element 
QML has this progress bar that has more functionality than the progress bar we're using. We need an indeterminate state for the pausing and resuming states, so instead of implementing that myself, I'm using the QML ProgressBar element.

Contributes to issue CURA-2060.
 2016-09-27 14:03:49 +02:00
Ghostkeeper
3b2c173cd6
Keep showing progress while pausing/resuming 
I've chosen the blue 'progress' colour to be displayed while pausing and resuming.

Contributes to issue CURA-2060.
 2016-09-27 14:03:49 +02:00
Ghostkeeper
22f0a2dabf
Add TODOs for text to be added after string freeze 
We currently have a string freeze, so we can't add these cases here.

Contributes to issue CURA-2060.
 2016-09-27 14:03:49 +02:00
Jaime van Kessel
9e47a87375 If no quality container can be found, use empty instead 
CURA-2462
 2016-09-27 13:26:44 +02:00
Jaime van Kessel
a43713e27f Offset distances are now not added, but used if they are larger 
CURA-2407
 2016-09-27 11:09:14 +02:00
Jaime van Kessel
5ac609edc9 Settings are now obtained from right extruder 
CURA-2407
 2016-09-27 09:36:04 +02:00