Commit graph

4475 commits

Author SHA1 Message Date
fieldOfView
fcb45b3b82 Fix a crash when a variant has no hardware_type 2018-04-09 12:08:32 +02:00
fieldOfView
523e6a59e3 Exclude non-printing-meshes from bounding box of parents
Non-printing-meshes inside a group should not affect push apart or drop to build plate
2018-04-09 11:29:49 +02:00
Ghostkeeper
572721e20d
Catch ContainerFormatError when deserialising containers
Only the deserialize() functions themselves may pass the ContainerFormatError on, because their callers will have to handle those errors anyway.

Contributes to issue CURA-5045.
2018-04-06 13:26:16 +02:00
Lipu Fei
cadb2c62b7 Fix open file with Cura
CURA-5203

When open a file that's associated with Cura, dialogs that need to
pop up may not work because QML is still in the middle of initialization,
so we need to wait for QML to finish before doing anything else such
as opening files.
2018-04-06 11:55:07 +02:00
Diego Prado Gesto
8c0d58c227 CURA-5197 Add Cura booting time to the logs. 2018-04-05 15:28:44 +02:00
Lipu Fei
e36ef583b7 Minor changes and cleanup 2018-04-05 15:14:15 +02:00
Lipu Fei
6ae9694998 Add CuraPackageManager 2018-04-05 15:14:15 +02:00
Lipu Fei
19bc2b78f4 Add Version upgrade 3.3 to 3.4
Need to distinguish between quality and quality_changes in the cura directory,
so we need to move all custom quality profiles into the quality_changes directory.
2018-04-05 15:14:15 +02:00
Lipu Fei
c3fe53123b Create module cura.ReaderWriters
CURA-4644

Move all reader writer classes into cura.ReaderWriters.
2018-04-05 15:14:15 +02:00
fieldOfView
bc84c1f6e6 Prevent preheat timeout from occurring during a print 2018-04-04 13:47:40 +02:00
Diego Prado Gesto
322fe7d61f CURA-5137 Rename Plugin Browser into Toolbox 2018-03-30 14:15:00 +02:00
Aleksei S
261945b469 Merge branch 'master' of github.com:Ultimaker/cura 2018-03-29 17:05:51 +02:00
Aleksei S
1a1e65da1e Remove business case from 'homeHead' function for UM2
CURA-4844
2018-03-29 17:03:25 +02:00
Ghostkeeper
d244a37feb
Merge branch '3.3' 2018-03-29 16:57:55 +02:00
Jack Ha
2a3b25265b
CURA-5174 update camera zoom range 2018-03-29 16:57:36 +02:00
Diego Prado Gesto
a5e38bb486 CURA-5175 Add variants to the version upgrade.
Upgrade the version number in the variants and add the hardware_type
metadata.
2018-03-29 16:54:30 +02:00
Aleksei S
720a85dd06 Remove comment
CURA-4844
2018-03-29 14:31:25 +02:00
Jack Ha
2bf3fa35ac CURA-5174 update camera zoom range 2018-03-29 14:25:00 +02:00
Jack Ha
f9e7d119af CURA-5019 thumbnail: do not scale the second color of support meshes or the checkboard pattern is not visible anymore 2018-03-29 14:10:50 +02:00
Jack Ha
54c85fd0ea CURA-4844 fix some typos 2018-03-29 13:25:26 +02:00
Aleksei S
c81d5d9741 Merge branch 'master' of github.com:Ultimaker/cura 2018-03-29 11:54:43 +02:00
Aleksei S
290adbd906 Fix: bed leveling for UM+
CURA-4844
2018-03-29 11:53:31 +02:00
Jack Ha
c1bc078813 CURA-5019 support and infill type nodes are now correctly rendered in the thumbnail 2018-03-29 10:59:53 +02:00
Jack Ha
c9dc429b2b CURA-5045 solve merge conflicts 2018-03-29 09:22:19 +02:00
Ghostkeeper
b30df14073
Merge branch '3.3' 2018-03-29 08:55:06 +02:00
Diego Prado Gesto
acff530871 CURA-5169 Fix a typo 2018-03-28 15:54:42 +02:00
Lipu Fei
9efad28599 Fix setQualityChangesGroup when quality_type is not_supported
CURA-5169
2018-03-28 12:55:43 +02:00
Lipu Fei
e3c578aa18 Revert "Use global_stack.extruders instead of ExtruderManager.extruderIds"
CURA-5168

Causes side effects.
2018-03-28 12:18:01 +02:00
Lipu Fei
90d2c29fb4 Use global_stack.extruders instead of ExtruderManager.extruderIds
CURA-5168

We want to remove ExtruderManager eventually, and keeping two separate
pieces of data can cause it to be out of sync.
2018-03-28 12:12:49 +02:00
Diego Prado Gesto
79daf3706b CURA-5158 Create a custom signal that is emitted when global container
changes and output devices change.
2018-03-28 11:07:48 +02:00
Ghostkeeper
fce703536b
Move factory reset to Uranium
This way it can be called from other crash handling routines there too, such as ConfigurationErrorMessage which may be triggered by arbitrary configuration errors in Uranium.

Contributes to issue CURA-5045.
2018-03-28 08:43:46 +02:00
Lipu Fei
70f867c4f1 Merge remote-tracking branch 'origin/3.3' 2018-03-27 16:52:10 +02:00
Ghostkeeper
2214a5f40a
Remove duplicate imports
Contributes to issue CURA-5045.
2018-03-27 16:30:10 +02:00
Ghostkeeper
da0d7a25c3
Remove semicolon
What is this? Java???

Contributes to issue CURA-5045.
2018-03-27 16:02:43 +02:00
Lipu Fei
f15771856f Add parent for stacks and containers that are created 2018-03-27 15:03:11 +02:00
Ghostkeeper
d6205d5d85
Show configuration error when extruder positions don't match
When any extruder position doesn't match when adding a container, don't add any of the extruders. Don't add faulty half-data to the registry!

Contributes to issue CURA-5045.
2018-03-27 14:38:15 +02:00
Lipu Fei
c6579b571a Merge remote-tracking branch 'origin/3.3' 2018-03-27 14:33:41 +02:00
Lipu Fei
98eed89686 Remove global changed check that prevents signal emit
CURA-5157
2018-03-27 14:32:40 +02:00
Ghostkeeper
013bb04a7d
Show configuration error if finding definition to add wasn't found
It must've gotten this ID from somewhere.

Contributes to issue CURA-5045.
2018-03-27 14:32:13 +02:00
Ghostkeeper
544c2c69b4
Remove unused imports
Contributes to issue CURA-5045.
2018-03-27 14:30:48 +02:00
Ghostkeeper
4f56221126
Remove catch of RuntimeError
The error is no longer thrown and the function has its own error message.

Contributes to issue CURA-5045.
2018-03-27 14:28:17 +02:00
Ghostkeeper
dd3b49e80d
Remove check for if variant container is a variant container
The filter on type=variant is right above it in the same function, 20 lines of code earlier. I think this check is superfluous then.

Contributes to issue CURA-5045.
2018-03-27 14:26:05 +02:00
Ghostkeeper
bc0a3e7fe2
Show error when finding duplicated variant names
Don't add the second variant we encounter then.

Contributes to issue CURA-5045.
2018-03-27 14:23:54 +02:00
Ghostkeeper
727a164722
Only show error when quality is global with material/nozzle
Don't crash. Only show an error message that indicates that there is a problem with this one.

Contributes to issue CURA-5045.
2018-03-27 14:19:36 +02:00
Ghostkeeper
7af941541b
Check before adding quality changes node
So you don't end up with half a node if we have to abort early. When this happens, show the configuration error message.

Contributes to issue CURA-5045.
2018-03-27 14:15:29 +02:00
Diego Prado Gesto
3fb14691a9 CURA-5160 Skip empty quality when load project file 2018-03-27 14:09:17 +02:00
Jack Ha
ca4cb419ff CURA-5157 prevent some startup crash after upgrading from 2.7 2018-03-27 14:08:12 +02:00
Ghostkeeper
027f4b44bb
Don't crash when finding duplicated materials
Only report it to the user.

Contributes to issue CURA-5045.
2018-03-27 13:57:52 +02:00
Jack Ha
04a135e6a3 CURA-5157 renamed extruder to position in addExtruderStackForSingleExtrusionMachine, fixes loading some upgrades from 3.0 2018-03-27 13:04:05 +02:00
Ghostkeeper
593c80225d
Show configuration error when failing to find container in ContainerNode
Instead of only logging it.

Contributes to issue CURA-5045.
2018-03-27 09:54:47 +02:00