Commit graph

3647 commits

Author SHA1 Message Date
Ian Paschal
22d3cd928f CURA-5090 Remove layer view data after clearing buildplate 2018-03-16 15:57:19 +01:00
Ghostkeeper
4d5013d3ad
Remove unused variable
The variable name is re-used lower in the code. This value is unused though.
2018-03-16 15:08:57 +01:00
Ian Paschal
19de9b263b
Merge pull request #3505 from fieldOfView/feature_support_eraser_ux
Further improvements of the Support Eraser
2018-03-16 14:59:29 +01:00
fieldOfView
4be947af55 Fix codestyle 2018-03-16 14:55:20 +01:00
Ghostkeeper
5a5766f11a
Choose correct stream depending on output mode
We need a binary stream if we're writing in a binary format.

Contributes to issue CURA-5097.
2018-03-16 14:54:56 +01:00
Ghostkeeper
e74191f2db
Cache preferred format
I think that makes the code a bit easier to read. This is not really done to make it faster, just more semantic.

Contributes to issue CURA-5097.
2018-03-16 14:54:48 +01:00
fieldOfView
f05944bf29 Switch to translate tool when ctrl-clicking 2018-03-16 14:47:01 +01:00
fieldOfView
78a7299fc5 Maintain a selection when removing a mesh, so the tool stays active 2018-03-16 14:38:56 +01:00
fieldOfView
83168886d6 Parent added meshes to the parent node instead of creating a group
This requires a small change in PlatformPhysics, or otherwise the added mesh would still drop down.
2018-03-16 13:22:43 +01:00
Ian Paschal
f8283352c4
Merge pull request #3492 from fieldOfView/feature_support_eraser_ux
Support Eraser improvements
2018-03-16 13:20:00 +01:00
fieldOfView
8e26d27e80 Fix crash when clicking a non-slicable node 2018-03-16 13:15:24 +01:00
Diego Prado Gesto
36c5e0ad15 CURA-4870 Change message of the dialog when the connection with a printer/group already exists 2018-03-16 12:07:05 +01:00
Ghostkeeper
32cee75e47
Respect order of preference of output formats
Contributes to issue CURA-5097.
2018-03-16 11:49:51 +01:00
Lipu Fei
d78e2d56f7 Fix quality and variant processing in project loading
From version 22 to 24, there is an upgrade for "quality" that changes
it to "quality_changes", but for "quality", we don't have any upgrades.
2018-03-16 10:33:22 +01:00
Lipu Fei
579df7537b Fix upgrade from 26 to 27
Missing definition changes container.
2018-03-16 10:03:38 +01:00
fieldOfView
2a811c62d8 Ignore the first press after the selection has been cleared
if the selection is cleared with this tool active, there is no way to switch to another tool than to re-select an object (by clicking it) because the tool buttons in the toolbar will have been disabled. The mouse-event happens after the selection is changed, so we need to keep track of what the selection was previously by monitoring the selection state.
2018-03-15 23:58:22 +01:00
fieldOfView
d1d1307e6e Merge branch 'master' into feature_support_eraser_ux 2018-03-15 22:43:24 +01:00
Diego Prado Gesto
99d653cea5 CURA-4870 Don't allow to connect more than one instance to the same
group.
2018-03-15 20:01:47 +01:00
Ghostkeeper
b0f7a5b358
Fix translation of there being no file formats available
This entry said that it had a context, but it had none. As a result, the whole string was seen as a context.
2018-03-15 16:53:26 +01:00
Lipu Fei
440a56b7fa Fix settings export in gcode 2018-03-15 16:42:11 +01:00
Ian Paschal
f2512a92a7
Merge pull request #3154 from fieldOfView/fix_per_meshgroup_settings
Enable setting per mesh group settings when printing One at a Time
2018-03-15 16:38:50 +01:00
alekseisasin
67261ccd4b
Merge pull request #3144 from fieldOfView/feature_preheat_extruder
Feature preheat extruder
2018-03-15 16:38:18 +01:00
fieldOfView
b9bf78d36c Remove group when "parent" is the only node in the group 2018-03-15 15:05:56 +01:00
fieldOfView
c3c096aaa0 Select the picked node so the group does not get drawn 2018-03-15 14:57:11 +01:00
Lipu Fei
98b325c9d5 Fix material serialization crash 2018-03-15 14:54:37 +01:00
Aleksei S
097c97b6f8 Fix: Refresh list of available printers in network
after clicking refresh button.
2018-03-15 14:33:27 +01:00
fieldOfView
a0c44192da Add support eraser meshes to group so it does not drop 2018-03-15 14:27:33 +01:00
fieldOfView
c25711797e Click support eraser mesh to remove it from the scene 2018-03-15 12:46:22 +01:00
fieldOfView
dbabf3bda9 Merge branch 'master' into feature_preheat_extruder
# Conflicts:
#	cura/PrinterOutput/ExtruderOutputModel.py
#	cura/PrinterOutput/PrinterOutputModel.py
2018-03-15 11:21:37 +01:00
fieldOfView
11be8f158f Merge branch 'master' into feature_support_eraser_ux 2018-03-15 11:10:49 +01:00
fieldOfView
dee70f35f4 Fix setting visibility when searching 2018-03-15 11:03:27 +01:00
fieldOfView
8fe2077413 Merge branch 'master' into fix_per_meshgroup_settings 2018-03-15 10:40:18 +01:00
Jack Ha
98b0559c9a Merge branch 'master' into speedup 2018-03-14 16:14:14 +01:00
Jack Ha
e3dd7a449d CURA-5090 speedups by using qtimers on updating mostly visual elements 2018-03-14 16:09:59 +01:00
Jaime van Kessel
0d23ea2194 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-14 14:45:20 +01:00
Jaime van Kessel
ad3c5466d1 Added bunch of typing to clusteroutput device 2018-03-14 14:45:01 +01:00
Jaime van Kessel
962c5f3260 Added bit of defensive coding to cluster output device 2018-03-14 14:39:06 +01:00
Lipu Fei
22573a685d Fix quality definition comparison in quality importing
CURA-4946
2018-03-14 14:31:30 +01:00
Ghostkeeper
877d061a1b
Catch FileNotFoundError when updating custom firmware
In case there is a bug there, we won't crash the thread.
2018-03-14 14:24:08 +01:00
Jaime van Kessel
fa9dc7a1df Fixed send custom firmware 2018-03-14 14:20:03 +01:00
Diego Prado Gesto
ff676c98a6 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-14 13:56:24 +01:00
Diego Prado Gesto
1111fbaa78 CURA-4870 Changing the version upgrade to include new metadata entries
for the container stacks.
2018-03-14 13:53:04 +01:00
Lipu Fei
984e6ddd08
Merge pull request #3274 from fieldOfView/feature_setting_visibility_profiles
Setting Visibility Presets sidebar menu
2018-03-14 13:25:59 +01:00
Ghostkeeper
3636c4a51b
Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-14 11:44:41 +01:00
Ghostkeeper
daf77517ac
Merge branch 'master' of https://github.com/slundell/Cura into slundell-master
Conflict in USBPrinterOutputDevice was caused by us adding a try-except block around a piece of code where Slundell removed one of the lines of code.
2018-03-14 11:35:06 +01:00
Lipu Fei
86afd6f5ff Do not overwrite existing metadata with in material deserializeMetadata()
CURA-5056
2018-03-14 10:32:57 +01:00
Lipu Fei
dc427488a2 Fix extruder position check in project loading
CURA-5056

The field is now "position" instead of "extruder"
2018-03-14 10:30:32 +01:00
Jack Ha
7ebd83f815 CURA-4400 get setting type from definition instead of whole stack improves speed of this call by a factor of 10 2018-03-14 10:21:10 +01:00
fieldOfView
7e4cb1c36e Disable Support Eraser if anti_overhang_mesh is disabled 2018-03-14 10:08:00 +01:00
Jack Ha
1d4b2eac4b CURA-5048 solved merge conflict 2018-03-14 09:03:17 +01:00