Commit graph

12694 commits

Author SHA1 Message Date
alekseisasin
db88d5b54c
Merge pull request #2817 from Ultimaker/print_simulation_view
Print simulation view
2017-11-20 14:34:52 +01:00
Aleksei S
9337cc8a7f Merge branch '3.1' into print_simulation_view 2017-11-20 14:32:22 +01:00
Mark
c1733dd908
Update fdmprinter.def.json 2017-11-20 14:19:58 +01:00
Aleksei S
ed3d8266b3 Merge branch 'print_simulation_view' 2017-11-20 14:17:19 +01:00
Jack Ha
12bee471eb CURA-4104 added settings for flow rate compensated extrusion 2017-11-20 14:06:03 +01:00
Aleksei S
20c21d6e79 Added "Signal.disconect" after changing views
CURA-4526
2017-11-20 13:52:22 +01:00
Ghostkeeper
a5a15df08d
Add setting to set the maximum mesh resolution
Implements issue CURA-4590.
2017-11-20 13:41:28 +01:00
jack
c0860f6b17
Merge pull request #2814 from Ultimaker/feature_maximum_resolution
Maximum mesh resolution
2017-11-20 13:35:15 +01:00
Jaime van Kessel
4197f18fc1 First steps to ensure that the Discover UM3 action works with new architecture
CL-541
2017-11-20 13:35:08 +01:00
Jaime van Kessel
1b8caa7a21 NetworkedPrinterOutputDevice now requires address in constructor
CL-541
2017-11-20 13:23:09 +01:00
Jaime van Kessel
68e80a88bc Rename usage of printer to more generic device.
The usage of "printer" is a bit confusing, as in the case of CuraConnect
it's a device that can acces multiple printers.

CL-541
2017-11-20 13:18:08 +01:00
Jaime van Kessel
9202bb11fe Added stubs for cluster & legacy output devices
CL-541
2017-11-20 13:12:15 +01:00
Ghostkeeper
a466981487
Merge branch '3.1' 2017-11-20 13:09:16 +01:00
Lipu Fei
23f2d9ddfc Fix for loop 2017-11-20 13:06:02 +01:00
Lipu Fei
74eb17203d Fix empty containers in stack upgrade 2017-11-20 13:05:18 +01:00
Ghostkeeper
2974c4d7ab
Merge branch 'cura/Cura/master' of https://github.com/maukcc/Cura into maukcc-cura/Cura/master 2017-11-20 13:04:34 +01:00
Jaime van Kessel
c1dbdc64ee Added missing ()
CL-541
2017-11-20 11:34:24 +01:00
Diego Prado Gesto
56db10d9cb CURA-4526 Change simulation behavior when clicking on Play button 2017-11-20 11:24:25 +01:00
orel Windows
565574a183 Replace the print temperature setting used in gstart code as layer 0 print temperature seems more relevant. 2017-11-20 10:59:57 +01:00
Jaime van Kessel
22f2279a76 Moved bunch of code from the old location to the new bits in archtiecture
CL-541
2017-11-20 10:59:57 +01:00
Ghostkeeper
6932194df7
Add setting to set the maximum mesh resolution
Implements issue CURA-4590.
2017-11-20 10:51:51 +01:00
orel Windows
05b4689bd6 Improve discoeasy200 profile, especially the machine gcode start as it uses 'print_temperature' which is an invalid Cura setting. 2017-11-20 10:40:25 +01:00
ChrisTerBeke
8522fbf6f5 fix merge conflict 2017-11-20 10:24:33 +01:00
Aleksei S
571ebccb89 Fix merge conflict in print information - CURA-4581 2017-11-20 10:21:13 +01:00
Diego Prado Gesto
41d0df5b5b
Merge branch 'master' into print_simulation_view 2017-11-20 09:29:18 +01:00
Diego Prado Gesto
217fb606c4 CURA-4577 Fix the previous change 2017-11-20 09:04:07 +01:00
Ruben D
6d2bcd9b3e
Fix error message when slicing with per-object setting errors
The message was generating a list of settings that had an error state by going through all extruder stacks and the global stack, but didn't bother to check the per-object stacks. I could've added it to the regular message but then the user would be confused because he can't find any errors either. So instead I opted to specify that it happened in per-model settings. It's not perfect, but should narrow down the user's search considerably.

Fixes #2427.
2017-11-20 01:55:57 +01:00
fieldOfView
c7f190bb26 Remove (ancient) commented out code 2017-11-18 11:30:17 +01:00
fieldOfView
1924946b59 Merge branch 'master' into feature_mesh_types
# Conflicts:
#	plugins/SolidView/SolidView.py
2017-11-18 11:28:15 +01:00
Aleksei S
f484467f86 Clean project name in PrintInformation after removing the last model
CURA-4581
2017-11-17 18:11:22 +01:00
Jaime van Kessel
b63880e57f Printer Output model now must have at least one extruder
CL-541
2017-11-17 17:00:32 +01:00
Jaime van Kessel
00a5127b19 Added home head & bed
CL-541
2017-11-17 17:00:09 +01:00
Ghostkeeper
7a42c5bcce
Fix technical mistakes of Japanese translation
There's a lot of keys that weren't added to the Japanese translation. Our program crashes on these because it can't find where it needs to fill in the argument.
2017-11-17 16:49:56 +01:00
Ghostkeeper
568e18f664
Add Japanese translation of cura.po
It's quite bad though so let's see what improvements we can make.
2017-11-17 16:49:47 +01:00
Jaime van Kessel
f0a8db3d4e Add way to set head position
CL-541
2017-11-17 16:48:36 +01:00
Ghostkeeper
91621497f0
Fix technical mistakes of Japanese translation
There's a lot of keys that weren't added to the Japanese translation. Our program crashes on these because it can't find where it needs to fill in the argument.
2017-11-17 16:38:02 +01:00
ChrisTerBeke
fb2ffb7270 Simplify relative positioning xyz value updates - CURA-4577 2017-11-17 16:31:16 +01:00
Ghostkeeper
37163ec0b4
Add Japanese translation of cura.po
It's quite bad though so let's see what improvements we can make.
2017-11-17 16:30:57 +01:00
Jaime van Kessel
3a8eef9768 Added a printerOutputController to send commands to remote.
The idea is that this class can be subclassed. CL-541
2017-11-17 16:25:44 +01:00
Jaime van Kessel
700f7179f1 Rename models to prevent conflict 2017-11-17 16:05:28 +01:00
Aleksei S
01437b2db1 Merge branch 'master' of github.com:Ultimaker/cura 2017-11-17 15:24:18 +01:00
Aleksei S
93de006271 Remove suffix .curaproject for case "import models" 2017-11-17 15:22:29 +01:00
Diego Prado Gesto
39428991de Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-17 15:07:10 +01:00
Jaime van Kessel
e35fba6f05 Added first stubs for printer output models
CL-541
2017-11-17 15:05:08 +01:00
Diego Prado Gesto
a0304255d1 CURA-4577 Take into account relative movements in GCodes 2017-11-17 15:05:08 +01:00
Diego Prado Gesto
98d48978a8 CURA-4526 Add the SimulationView plugin to Cura and deleting LayerView
plugin
2017-11-17 14:27:46 +01:00
Diego Prado Gesto
0f6d65950a CURA-4526 Add colors to themes for selected handles 2017-11-17 13:18:44 +01:00
ChrisTerBeke
f48539cc93
Merge pull request #2685 from Ultimaker/container_stack_improvements
Container stack improvements
2017-11-17 13:09:54 +01:00
Lipu Fei
2c39612bc8 Fix UM2 upgrade regarding the variant
CURA-4482

UM2 by default doesn't have variants, but if the user enables Olsson
Block, the variant option will become available. This commit fixes the
following cases:

- Make sure that the variant is set on the extruder stack but not the
  global stack
- Extruder stacks don't contain information such as has_variant. Such
  info should be retrieved from the global stack and not just from the
  definition container because they can be overriden by other
  containers.
2017-11-17 12:47:30 +01:00
Lipu Fei
e246784df2 Use parseBool() for metadata bool values
CURA-4482
2017-11-17 12:43:30 +01:00