Commit graph

3956 commits

Author SHA1 Message Date
Lipu Fei
c0db82e7a3 Merge remote-tracking branch 'origin/3.3' 2018-04-17 11:18:27 +02:00
Lipu Fei
0f5f059a7c Add missing __init__.py
CURA-5242
2018-04-17 11:06:30 +02:00
Mark
f61efb8e20 resolve merge conflict 2018-04-17 10:39:35 +02:00
Lipu Fei
62521e93db Make sure that project writer runs on Qt thread
CURA-5229

 - Move @call_on_qt_thread to a separate module
 - Make sure that project writer runs on Qt thread because itself and the
   calls it makes can create new QObjects such as InstanceContainers, and
   this must happen on the Qt thread.
2018-04-16 15:32:12 +02:00
Lipu Fei
58e18ded18 Remove unneeded code
CURA-5202
2018-04-16 15:24:18 +02:00
Ian Paschal
85ebe741a8 CURA-5035 Don't show authors with 0 packages 2018-04-13 17:27:57 +02:00
Ian Paschal
523518020c CURA-5035 Better linking between Toolbox and CuraPluginManager 2018-04-13 16:25:01 +02:00
Ghostkeeper
133f6f43fe
Merge branch '3.3' 2018-04-13 16:14:23 +02:00
Ian Paschal
5d395f549a CURA-5035 Added already installed plugins 2018-04-12 17:22:50 +02:00
Diego Prado Gesto
f23491377f CURA-5197 Add Cura booting time to the logs. 2018-04-12 16:52:09 +02:00
Ghostkeeper
942afe2c3f
Merge branch '3.3' into feature_show_config_errors 2018-04-12 16:20:42 +02:00
Lipu Fei
7eba73adc5 Handle excluded_materials in getAvailableMaterials()
CURA-5223

Move the handling of excluded_materials into MaterialManager
getAvailableMaterials().
2018-04-12 16:12:07 +02:00
Lipu Fei
0f966115e6 WIP: Make CuraPackageManager aggregate PluginRegistry data
CURA-4644
2018-04-12 15:46:53 +02:00
Lipu Fei
6d2e49c228 Merge remote-tracking branch 'origin/3.3' 2018-04-12 14:04:29 +02:00
Lipu Fei
33949c3b71 Update build plate compatibility upon extruder enabled/disabled
CURA-5219
2018-04-12 14:02:56 +02:00
Lipu Fei
1c4c3a4a0b Fix quality changes that are based on no-long-available quality_type
CURA-5218
2018-04-12 13:58:20 +02:00
Lipu Fei
8d3c3c0e80 Fix the case that a quality_type is not available
CURA-5218
2018-04-12 13:58:20 +02:00
Lipu Fei
8a181ea395 Save curapackage into cache for delayed installation
CURA-4644

Do not rely on the originally provided curapackage file because they can be
gone after Cura restarts. Copy the curapackages into cache for delayed
installation.
2018-04-12 13:25:24 +02:00
Lipu Fei
406b64b331 Remove unneeded code
CURA-4644
2018-04-12 13:14:58 +02:00
Lipu Fei
596e0be7b6 CuraPackageManager handles packages and plugins
CURA-4644
2018-04-12 12:57:58 +02:00
Ian Paschal
94b15b0498 Merge branch 'CURA-4644-package-reader' into feature_material_marketplace 2018-04-11 11:08:18 +02:00
Lipu Fei
40eedbcf70 Add more info dialog
CURA-5204
2018-04-10 15:33:32 +02:00
Lipu Fei
56e80bb518 Merge branch '3.3' 2018-04-10 13:25:45 +02:00
Lipu Fei
4e625da168 Increase delay time for open file with double-clicking
CURA-5203
2018-04-10 13:23:23 +02:00
Lipu Fei
b55570f3fb Merge branch '3.3' 2018-04-10 13:13:38 +02:00
Lipu Fei
b314d2bbe2 Fix extruder nr handling for -1 Not Overriden
CURA-5213
2018-04-10 12:56:20 +02:00
Lipu Fei
107c10b860 Merge branch '3.3' 2018-04-10 11:41:13 +02:00
Lipu Fei
95f4515e93 Make it possible to skip project file check in readLocalFile()
CURA-5203
2018-04-10 11:40:47 +02:00
Lipu Fei
4615c756a7 More clear error handling for container deserialization
CURA-5045

 - If a container cannot be deserialized in project loading, it should fail
   right on the spot because even if it continues, it still won't work.
 - In other places, at least log deserialization errors if any of them show
   up.
2018-04-09 14:51:05 +02:00
Aleksei S
10ebabb7f6 Home head only by X- and Y axis, do extra bedHome (G28 Z)
CURA-4844
2018-04-09 13:13:52 +02:00
Aleksei S
c7b6bb8188 Merge branch '3.3' 2018-04-09 12:53:53 +02:00
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