Commit graph

5199 commits

Author SHA1 Message Date
fieldOfView
30a679ddf9 Reduce loadingtime of XmlMaterialProfiles by 25%
XmlMaterialProfile did a lot of findInstanceContainers() by GUID and base_file. If base_file is always set, matching GUID is superfluous.

This shaved off 20% loading time of the application (43 vs 34 seconds) on a cached load.
2016-08-26 17:18:35 +02:00
fieldOfView
43438dd84f Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-26 17:02:35 +02:00
fieldOfView
0e2d35a88d Use parseBool instead of inline variation
CURA-2138
2016-08-26 17:02:21 +02:00
Jaime van Kessel
af4ea9183c Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-26 16:23:47 +02:00
Jaime van Kessel
7a7b634108 Eject message is now hidden when eject is done
CURA-2200
2016-08-26 16:23:23 +02:00
fieldOfView
3b1c11bfcf Put materials into branded material submenus
CURA-2194
2016-08-26 15:43:50 +02:00
Jaime van Kessel
fcfbf78f9e Implemented importing multiple profiles from .curaprofile file
CURA-2099
2016-08-26 14:37:21 +02:00
fieldOfView
baad88fb6c Remove incorrectly copy/pasted code
CURA-2199
2016-08-26 13:22:21 +02:00
fieldOfView
e19a7914b1 Prevent error when the active printerOutputDevice has no cameraImage 2016-08-26 13:21:32 +02:00
Jaime van Kessel
ced6cd7320 Exporting a profile now exports all profiles in a zipped container
CURA-2099
2016-08-26 12:55:31 +02:00
fieldOfView
0799a9e278 Move branded materials into a submenu
CURA-2194
2016-08-26 11:59:19 +02:00
Ghostkeeper
13e9a4f1a5
Merge branch 'innovo3d-master' 2016-08-26 10:17:47 +02:00
Ghostkeeper
e9dc05c8dc Merge branch 'master' of https://github.com/innovo3d/Cura into innovo3d-master 2016-08-26 10:15:57 +02:00
Jaime van Kessel
e7f2acfeab Build volume message now shows for default of 30 sec 2016-08-26 09:51:41 +02:00
Jaime van Kessel
8046e72a10 Added missing file 2016-08-26 09:35:21 +02:00
Jaime van Kessel
e6aec0c64b Use curas own visibility page instead of default by Uranium 2016-08-25 21:21:44 +02:00
Jaime van Kessel
f963ab0fde Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-25 20:46:52 +02:00
Jaime van Kessel
c7126775d5 Fix spelling mistake 2016-08-25 20:46:36 +02:00
fieldOfView
9f2c5a4c92 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-25 17:07:45 +02:00
fieldOfView
94b8e1aff0 Add UM2Ex+ profiles for Nylon, PC, CPE+ and TPU
Contributes to CURA-2138. Ideally these would not have to be copies from the UM2+ profiles. This should be picked up for CURA-1780
2016-08-25 17:07:28 +02:00
Jaime van Kessel
bda6b3067a Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-25 14:34:33 +02:00
Jaime van Kessel
8810fd83cc Slecting object no longer causes slice to trigger
CURA-2181
2016-08-25 14:34:05 +02:00
Ghostkeeper
223489a637
Make mesh-specific global setting solution permanent
We've considered various other solutions but this is the only real solution available to us.

Contributes to issue CURA-2173.
2016-08-25 14:33:53 +02:00
Jaime van Kessel
4f594c9cf3 Removed the timeout for the eject SD card message 2016-08-25 14:21:26 +02:00
fieldOfView
5119a7b6be Add a smidgen of documentation to the previous commit
CURA-2173
2016-08-25 14:08:37 +02:00
fieldOfView
3ca7e2bb8d Momentary fix for CURA-2173
We're not sure about the location and implementation but it fixes an important bug for now. At the very least this needs documentation.
2016-08-25 13:57:21 +02:00
fieldOfView
1b4283257f Make Simple Mode reflect global settings (Support, Adhesion) 2016-08-25 13:41:39 +02:00
Jaime van Kessel
656a56632e Socket is now re-created if terminate is called and there is no engine process
CURA-2158
2016-08-25 11:44:46 +02:00
fieldOfView
983d0dd999 Merge commit 'dd647ca07c' 2016-08-25 10:55:31 +02:00
Jaime van Kessel
f9c66526b6 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-25 10:50:38 +02:00
Jaime van Kessel
6c0aa0fa4f Tweaks to slicing engine restart behavior
CURA-2158
2016-08-25 10:49:35 +02:00
fieldOfView
5a710175a1 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-25 10:46:34 +02:00
fieldOfView
043343d536 Select correctly "inherited" profile when switching to a material that has no qualities of its own
CURA-2095
2016-08-25 10:46:19 +02:00
Jack Ha
77b58d8231 MaterialsPage material label is now also updated after rename. CURA-1969 2016-08-25 10:37:11 +02:00
Jack Ha
2ae998737f Added materialspage Display Name field and made it work. CURA-1969 2016-08-25 09:54:22 +02:00
innovo3d
2e5ffbfe54 Another update to Inventor Json file
Added speed support interface speed
2016-08-24 18:54:37 -05:00
innovo3d
c3ae924ae5 Updated innovo_inventor.def.json settings
Added M140 to turn off heated bed
Changed default extruder temp to 205
Changed print speed defaults
Removed infill overlap override
Removed machine preferences
2016-08-24 18:48:11 -05:00
Seva Alekseyev
8ba9ff53e5 X3D loading performance: vertex organization for faster transforms 2016-08-24 17:28:31 +02:00
Seva Alekseyev
a43efcde05 Code review issues 2016-08-24 17:28:30 +02:00
Seva Alekseyev
13ead1e4de Holeless Disk2D fix 2016-08-24 17:28:30 +02:00
Seva Alekseyev
a27f82e64b Merging all shapes into a single mesh during X3D loading 2016-08-24 17:28:30 +02:00
Seva Alekseyev
5cb9f97986 Slicing logic now index-aware, correctly processes scenes with vertex reuse 2016-08-24 17:28:30 +02:00
Seva Alekseyev
8190b9875e In X3D import, setSelectable(true) for the whole scene 2016-08-24 17:28:30 +02:00
Seva Alekseyev
d9e07f66a6 Fixes for quad geometries 2016-08-24 17:28:30 +02:00
Seva Alekseyev
db5d238898 Fix for the Extrusion node, the trickiest geometry of them all 2016-08-24 17:28:30 +02:00
Seva Alekseyev
43de0e1c06 Bug fix 2016-08-24 17:28:30 +02:00
Seva Alekseyev
87bff34eb6 Support for explicit length unit override in X3D header 2016-08-24 17:28:30 +02:00
Seva Alekseyev
e4049296d9 Initial support for the X3D scene file format (see http://www.web3d.org/).
For now, just mesh import. Supports all geometry nodes in Rendering, Geometry3D, CAD geometry modules. No support for materials, color, or textures. Normals in the file (if any) are ignored. Light sources, viewpoints, sensors, world, shaders, scripts also ignored.
2016-08-24 17:28:30 +02:00
Jaime van Kessel
8df5bba6e9 Removing auto rename if certain properties are changed 2016-08-24 17:11:29 +02:00
Jaime van Kessel
221da85783 Backend state is now set to processing when cura frontend is done sending
This is instead of waiting for the backend to send it's first progress message.
This gives the feel of a more snappy response.
2016-08-24 16:59:12 +02:00