3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-22 10:21:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
17030 commits 341 branches 300 tags 735 MiB
Commit graph

4475 commits

Author SHA1 Message Date
Arjen Hiemstra
88e8138004 Override ContainerStack::deserialize 
This ensures we have the right set of containers in the stack
 2017-03-21 17:44:36 +01:00
Arjen Hiemstra
95a6bef50f Add properties for the individual containers in the global stack 2017-03-21 17:43:42 +01:00
Arjen Hiemstra
37b4326e99 Mark addContainer as override 2017-03-21 17:43:14 +01:00
Arjen Hiemstra
f32f8b60df Explictly import Extruder/Global stack 
For some reason, things were not being imported properly. This fixes
that.
 2017-03-21 17:42:57 +01:00
Arjen Hiemstra
3ee3e0aee3 Add a private class to GlobalStack that defines the expected indices of each container type 2017-03-21 17:39:06 +01:00
Lipu Fei
622ff4e662 Add default for preference "view/invert_zoom" 2017-03-21 13:56:12 +01:00
Lipu Fei
9e5513ade6 Use QUrl to parse fileUrl 
CURA-3495
 2017-03-21 13:56:11 +01:00
Lipu Fei
f3167bb84b Add dialog for opening a project file 
CURA-3495
 2017-03-21 13:56:09 +01:00
Jaime van Kessel
70dbeaf256 Merge branch '2.5' of github.com:Ultimaker/Cura 2017-03-21 13:24:06 +01:00
Jaime van Kessel
90a92dce19 If a container_changes can not be found, handle it more gracefully 
CURA-3560
 2017-03-21 13:23:50 +01:00
Jaime van Kessel
00258e570f If a container_changes can not be found, handle it more gracefully 
CURA-3560
 2017-03-21 11:13:10 +01:00
Lipu Fei
555cd58f5e Save with code names for profile override preference 
CURA-3561
 2017-03-21 09:09:17 +01:00
Arjen Hiemstra
4904e449a0 Start overriding getProperty in GlobalStack 
Since we have the "resolve" property, we should transparently handle it
so lookup can just use "value".

Contributes to CURA-3497
 2017-03-20 17:30:00 +01:00
Arjen Hiemstra
0656dd53c3 Override setNextStack in GlobalStack and raise an error if called 
Since the global stack should never have a next stack

Contributes to CURA-3497
 2017-03-20 17:28:42 +01:00
Arjen Hiemstra
b9f01b30c8 Convert generic "ContainerStack" to an Extruder or Global stack 
Dependendant on the "type" metadata key, we create either an
ExtruderStack or a GlobalStack instance to replace the ContainerStack
instance. This should allow for transparent upgrades to the new classes.

Contributes to CURA-3497
 2017-03-20 17:28:01 +01:00
Arjen Hiemstra
12c50dbac8 Introduce a GlobalStack class 
This will allow us to codify some of the assumptions made about the
global stack

Contributes to CURA-3497
 2017-03-20 17:26:12 +01:00
Arjen Hiemstra
3b0fdecb60 Introduce an ExtruderStack class 
This will allow us to codify some of the assumptions made about
extruders.

Contributes to CURA-3497
 2017-03-20 17:22:11 +01:00
Jack Ha
df09d49217 Merge branch '2.5' 2017-03-20 14:10:07 +01:00
Jack Ha
2b17f9665f Fix prime tower location/visualization on buildplate. CURA-3525 2017-03-20 14:09:55 +01:00
jack
42e7a0defa Merge pull request #1535 from LipuFei/feature_CURA-3495_open_in_one 
CURA-3495 Open project/models menu item
 2017-03-20 10:59:40 +01:00
Ghostkeeper
2f1d957f99
Split support_interface_enable into roof and bottom 
You can activate the roof and bottom separately now. If you want, of course. The original interface setting sets both of them unless overwritten.

Contributes to issue CURA-3491.
 2017-03-20 10:47:37 +01:00
Ghostkeeper
2d9b2216a3
Allow printing support roof and bottom with different extruders 
Note that currently the support_interface_extruder_nr is still used by the engine for some things and therefore the build volume calculations may not be 100% correct. I'll fix that up soon.

Contributes to issue CURA-3491.
 2017-03-17 15:55:18 +01:00
Jack Ha
7604ae62f3 Merge branch '2.5' 2017-03-16 16:04:59 +01:00
Jack Ha
7d62a699fb Capitalize Not Supported. CURA-3390 2017-03-16 16:04:47 +01:00
Jaime van Kessel
f736e74f77 Moved setting of color for convex hull to constructor 
This should result in less color changes so should make it slightly faster
CURA-3419
 2017-03-16 15:08:06 +01:00
Jaime van Kessel
36b5c369cf Merge branch '2.5' of github.com:Ultimaker/Cura 2017-03-16 13:44:26 +01:00
Jaime van Kessel
de02d331c7 Selection tool operation stoped no longer triggers platform physics 
CURA-3465
 2017-03-16 13:42:29 +01:00
Lipu Fei
e00c68344a CURA-3495 open project/models in one dialog 2017-03-16 13:37:06 +01:00
Jaime van Kessel
e2045b2805 Starting Cura when no machines added but with a model no longer causes exceptions 2017-03-15 10:00:11 +01:00
Jaime van Kessel
138c3db26f Preferred mimetype is now used when saving to local or removable drive 
CURA-3496
 2017-03-15 09:23:47 +01:00
Jaime van Kessel
c0cdddd098 Cura no longer crashes when NaN is recieved for printtime from engine 
CURA-3516
 2017-03-14 09:59:55 +01:00
Tim Kuipers
8698b3e662 Merge remote-tracking branch 'origin/2.5' into feature_mold 2017-03-13 17:35:37 +01:00
Tim Kuipers
914aa89711 feat: model to mold (CURA-3512) 2017-03-13 17:19:29 +01:00
Jack Ha
32d5fbe557 Fixed choosing a quality that is compatible with multiple extruders as fallback. CURA-3510 2017-03-13 17:17:56 +01:00
Lipu Fei
55727f20e5 CURA-3507 Make quality lookup more robust 2017-03-13 09:45:23 +01:00
Lipu Fei
2ac4a7aca9 CURA-3482 _onMaterialMetaDataChanged() should take argument(s) 2017-03-09 14:17:25 +01:00
Jack Ha
9d6dd1580b WIP Added first arranger functions. CURA-3239 2017-03-09 10:21:25 +01:00
Lipu Fei
8b8fb8db95 Coding style fixes 2017-03-08 15:09:02 +01:00
Lipu Fei
5724ee71d0 CURA-3221 Group items into categories for the profile change summary 2017-03-08 15:08:45 +01:00
jack
2a6ae17514 Merge pull request #1504 from LipuFei/bugfix_CURA-3470-crash-qvariantlist-set 
CURA-3470 Return list instead of set for QVariantList
 2017-03-08 09:29:28 +01:00
Lipu Fei
a3dce9f6d1 CURA-3471 importProfiles() takes QVariantList 2017-03-07 20:17:29 +01:00
Lipu Fei
ba79f44783 CURA-3470 Return list instead of set for QVariantList 2017-03-07 16:42:56 +01:00
Ghostkeeper
b25a6423df
Don't offset hull if offset is 0 
This might speed things up a bit.
 2017-03-07 12:47:13 +01:00
Ghostkeeper
0abf455084
Don't always offset with 0.5mm 
This is no longer needed, since before this happens we would already get an error with calculating the 3D model. Perhaps we should introduce a minkowski offset there but performing Minkowski on a 3D model is fairly expensive.
 2017-03-07 12:43:20 +01:00
Jack Ha
42d939b34e Solved merge conflict. CURA-3321 2017-03-07 10:34:53 +01:00
Jack Ha
3468bae732 Add result type. 2017-03-07 10:31:11 +01:00
Arjen Hiemstra
8a77dd66fc Properly handle CMake options that are enabled but not "ON" 
Contributes to CURA-2787
 2017-03-06 17:26:02 +01:00
Jaime van Kessel
04c2186b74 Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-06 16:17:30 +01:00
Jaime van Kessel
356d4f9288 Heated bed timeout time now hides correctly if time ran out 
CURA-3360
 2017-03-06 14:41:33 +01:00
Tim Kuipers
87c8ff0e08 Merge branch 'mb-infill-line-angles' of https://github.com/smartavionics/Cura into smartavionics-mb-infill-line-angles 2017-03-06 14:31:57 +01:00