3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 12:17:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
10057 commits 306 branches 270 tags 779 MiB
Commit graph

10057 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ghostkeeper
0cc4f90920
Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-12 16:34:19 +02:00
Ghostkeeper
1bac7c2b2a
Don't register registry at ContainerStack class any more 
The fixture does this for us automatically now. It's not entirely neat since this is not cleaned up afterwards, but it does make sense to put it there in the fixture, logically.

Contributes to issue CURA-3427.
 2017-05-12 16:32:55 +02:00
Jaime van Kessel
7ee5a66c64 CuraContainerStack now overrides getBottom, so it always returns a definition 2017-05-12 16:32:00 +02:00
Ghostkeeper
def93f8dc9
Define fixture for DefinitionContainer instances 
Removes a few lines from the tests, making them simpler. Not much though.

Contributes to issue CURA-3427.
 2017-05-12 16:31:18 +02:00
Ghostkeeper
a2b0b1076a
Add test for when setting_version doesn't match its definition 
Contributes to issue CURA-3427.
 2017-05-12 16:28:31 +02:00
Jaime van Kessel
4474b16847 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-12 16:28:06 +02:00
Jaime van Kessel
77204fc4b0 Type hinting & unused code removal 2017-05-12 16:27:37 +02:00
Ghostkeeper
2888189f57
Add test for when an instance container has no setting_version 
The setting_version is interpreted as 0 then.

Contributes to issue CURA-3427.
 2017-05-12 16:25:14 +02:00
Ghostkeeper
52ffac677f
Add test for happy path of filtering by setting_version 
If the setting_version is correct, the container should get registered.

Contributes to issue CURA-3427.
 2017-05-12 16:21:33 +02:00
Mark
4cb19781d7 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-12 16:19:02 +02:00
Mark
08c0779dde Remove unused file, context menu takes care of the multiply object dialog 2017-05-12 16:18:46 +02:00
Jaime van Kessel
2b64e92a99 Removed unused imports 2017-05-12 16:13:09 +02:00
Ghostkeeper
ab7b9913c7
Add test for registering global stacks 
This test tests adding container stacks and seeing if they convert well.

Contributes to issue CURA-3427.
 2017-05-12 16:11:51 +02:00
Ghostkeeper
e50b0884f0
Add test for registring containers 
This test tests adding container stacks and seeing if they convert well.

Contributes to issue CURA-3427.
 2017-05-12 15:59:38 +02:00
Lipu Fei
3996230ff9 Load GlobalStack before ExtruderStacks for project loading 
CURA-3756
 2017-05-12 15:52:16 +02:00
Ghostkeeper
adefbaf72e
Add more unhappy-path tests 
One for the new setting_version. One for the misconception of version numbers being a major-minor version or something, because it's not stored that way.

Contributes to issue CURA-3427.
 2017-05-12 15:01:27 +02:00
Ghostkeeper
04ef2bf1f0
Update setting_version tests 
Included a bit of a more difficult case.

Contributes to issue CURA-3427.
 2017-05-12 14:58:11 +02:00
Ghostkeeper
55b2392a1d
Load setting version from metadata 
I'm not really awake today, am I? The functionality happened to still work because of how our real data is structured right now, but the tests still failed. Those are successful now.

Contributes to issue CURA-3427.
 2017-05-12 14:55:19 +02:00
Tim Kuipers
0d9514a5d0 Merge pull request #1821 from smartavionics/mb-smooth-spiralized-contours-not-per-model-or-extruder 
Just like magic_spiralize, smooth_spiralized_contours should not be settable per model/extruder. (CURA-3771)
 2017-05-12 14:53:18 +02:00
Ghostkeeper
9820dac4a6
Actually use setting_version to get the setting version number 
This was sort of hidden because we've always incremented the normal version number up until now.

Contributes to issue CURA-3427.
 2017-05-12 14:51:44 +02:00
Ghostkeeper
20e9d19587
Update tests to account for new way of getting version numbers 
The normal version number is multiplied by a million. Currently these tests fail, so nice to have them.

Contributes to issue CURA-3427.
 2017-05-12 14:50:43 +02:00
Ghostkeeper
5bc613c3e0
Don't use string for default version 
No need to go via string and cast that to int, just return int directly.

Contributes to issue CURA-3427.
 2017-05-12 14:44:46 +02:00
Ghostkeeper
ebd730a68d
Also add setting_version to fdmextruder 
Since it obviously doesn't inherit from fdmprinter.

Contributes to issue CURA-3427.
 2017-05-12 14:43:05 +02:00
Jaime van Kessel
c1903dcccb Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-12 14:35:07 +02:00
Jaime van Kessel
167f616a7c Decreased interval of extruder timer 2017-05-12 14:34:45 +02:00
Lipu Fei
fe11819ce9 Handle "new" resolve strategy for definition&quality changes 
CURA-3756
 2017-05-12 14:34:41 +02:00
Lipu Fei
9ea0f48341 Check definition changes conflicts in preRead() 
CURA-3756
 2017-05-12 14:34:41 +02:00
Ghostkeeper
a472fd8163
Remove debug print 
Oops again.

Contributes to issue CURA-3427.
 2017-05-12 14:33:44 +02:00
Ghostkeeper
1e4c394b71
Remove getting superfluous material density 
The density is already put in the 'properties' metadata entry. Don't need to put it in there doubly. Turns out that this density line was originally just superfluous.

Contributes to issue CURA-3427 or something.
 2017-05-12 14:12:36 +02:00
Ghostkeeper
98662bc6f6
Also update import to renamed package 
Oops.

Contributes to issue CURA-3427.
 2017-05-12 14:07:21 +02:00
Ghostkeeper
c8295434f3
Load setting_version from XML material profile 
The setting_version is translated from the version number. The setting_version number currently happens to be the same as the version number of XML but that won't always be the case so we introduce a translation-step as well.

Contributes to issue CURA-3427.
 2017-05-12 14:04:56 +02:00
Ghostkeeper
38f081539a
Fix deserialising density 
That density variable was never used. Hope this fixes some unaccounted-for bug.

Doesn't contribute to CURA-3427 but I'm listing it as if it does anyway.
 2017-05-12 14:01:06 +02:00
Jaime van Kessel
ef2aa3b2b2 Empty InstanceContainers are now correctly handled by setActiveMaterial again 
CURA-3789
 2017-05-12 13:59:31 +02:00
Ghostkeeper
f0f8871496
Add setting_version to all profiles 
This represents the data version number (as opposed to the format version).

Contributes to issue CURA-3427.
 2017-05-12 13:40:54 +02:00
Mark
f60765c56c Fix workspace dialog layout so checkbox and buttons dont get hidden 2017-05-12 13:24:58 +02:00
Mark
67aa6767c5 Add .DS_Store and *.qmlc 2017-05-12 13:23:29 +02:00
Ghostkeeper
0f5814e52f
Add setting_version and check against it 
This breaks all profiles since they have the wrong setting version, of course. Have to change that in every instance container now...

Contributes to issue CURA-3427.
 2017-05-12 12:58:15 +02:00
Ghostkeeper
6fd3bc4ba4
Merge branch 'smartavionics-mb-smooth-spiralized-contours-not-per-model-or-extruder' 2017-05-12 11:57:19 +02:00
Ghostkeeper
dab50f04b8
Merge branch 'mb-smooth-spiralized-contours-not-per-model-or-extruder' of https://github.com/smartavionics/Cura into smartavionics-mb-smooth-spiralized-contours-not-per-model-or-extruder 2017-05-12 11:56:52 +02:00
Jaime van Kessel
502e977c24 UM2E now has olson block upgrade selection as machine action 
CURA-3742
 2017-05-12 10:27:13 +02:00
Jaime van Kessel
9e56301048 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-12 10:24:58 +02:00
Jaime van Kessel
7508a0a981 Changed infill buttons so they work with all languages 
CURA-3634
 2017-05-12 10:24:15 +02:00
Mark Burton
bf80e6efd5 Just like magic_spiralize, smooth_spiralized_contours should not be settable per model/extruder. 2017-05-12 09:10:21 +01:00
Ghostkeeper
31684da9a6
Add Gradual Infill Steps to default advanced settings 
It's visible by default now.

Contributes to issue CURA-3732.
 2017-05-12 10:01:29 +02:00
Ghostkeeper
396f4381dd
Resolve bed adhesion type via limit-to-extruder 
The cause for this change is that TPU says we want to print with brim but CPE wants to print with raft. In those cases the resolve function would choose the raft because that's safer. However if the default extruder happens to be the TPU one you then get a raft made of TPU which is flexible. That defeats the purpose of the raft, and causes the raft to warp, clog on the nozzle, destroy the world, etc. So there, I saved the world once more.
 2017-05-12 10:00:24 +02:00
Ghostkeeper
9de041ade5
Remove theme font from system-themed dialogue 
See commit 36dedabd11.
 2017-05-12 09:45:53 +02:00
Tim Kuipers
dadb592328 JSON feat: mold roof height (CURA-3797) 2017-05-11 21:26:15 +02:00
fieldOfView
a727e4ffd0 Make sure all materials are shown 
Without this workaround, some materials that are listed above the generic materials do not show up untill the user scrolls the scrollview.
 2017-05-11 18:17:11 +02:00
Arjen Hiemstra
434aaed767 Remove extruderValue call from raft setting 
Contiributes to CURA-3738
 2017-05-11 17:56:31 +02:00
Arjen Hiemstra
94881f59f5 Remove most of the "extruderValue" calls from fdmprinter support settings 
Since limit_to_extruder is now handled by the stacks themselves, we no
longer need to account for it in the definition.

Contributes to CURA-3738
 2017-05-11 17:51:10 +02:00