11407 Commits

Author SHA1 Message Date
Lipu Fei
8782e2e529 Rename parameters
CURA-4581
2017-11-21 15:12:56 +01:00
Jack Ha
92e273fba9 Merge branch '3.1' of github.com:Ultimaker/Cura into 3.1 2017-11-21 15:12:26 +01:00
Jack Ha
602e8c0e66 Changed 'Check material compatibility' to 'Check compatibility' because it's not only materials possibly being incompatible 2017-11-21 15:12:17 +01:00
Lipu Fei
f18cb951fc Use workspaceLoaded signal instead of projectFileLoaded
CURA-4581
2017-11-21 13:49:25 +01:00
Diego Prado Gesto
d415c5fcbb CURA-4526 Add transparency to the nozzle so the user can see the lines
and layers through the nozzle.
2017-11-21 13:42:46 +01:00
Lipu Fei
b09ffaf9e2 Remove "Fine" 0.1mm quality for BAM
CURA-4595
2017-11-21 13:35:59 +01:00
Diego Prado Gesto
f216e2df24 Merge branch '3.1_with_simulation_view' into 3.1 2017-11-21 13:31:18 +01:00
Diego Prado Gesto
abe9ba3795 CURA-4526 Stop simulation when changing preferences.
Hide nozzle node when in compatibility mode.
2017-11-21 13:23:47 +01:00
Ghostkeeper
def7b6994d
Store correct ID in metadata after deserialising
Contributes to issue CURA-4243.
2017-11-21 12:50:10 +01:00
Diego Prado Gesto
feb0a08fd9 CURA-4581 The project name is cached instead of set 2017-11-21 12:34:08 +01:00
Ghostkeeper
4fa38c26e8
Don't add any extra metadata to the end of the list you're iterating over
Stupid mistake. This causes infinite loops.

Contributes to issue CURA-4243.
2017-11-21 11:46:14 +01:00
Ghostkeeper
0831451371
Fix returning resulting metadata
Forgot to change that back.

Contributes to issue CURA-4243.
2017-11-21 11:05:11 +01:00
Ghostkeeper
c4debbea8b
Implement deserializeMetadata
Let's hope this works...

Contributes to issue CURA-4243.
2017-11-21 10:59:01 +01:00
Diego Prado Gesto
2df06bbbb9 CURA-4526 Add Simulation View plugin 2017-11-21 10:51:57 +01:00
Diego Prado Gesto
b6e997c88d CURA-4526 Delete LayerView plugin because it will be replaced with the
SimulationView.
This commit also adapts the code in order to accept the messages coming
from the engine, with information about feedrates and line thicknesses.
Add also some changes in the GCodeReader that reads feedrates and
line thickness from the gcode file.
2017-11-21 10:47:29 +01:00
fieldOfView
b4b39f0949 Tweak compatibility mode collapsed view panel 2017-11-20 20:32:45 +01:00
fieldOfView
532331bd44 Add a collapse button to the Simulation View panel
See https://github.com/Ultimaker/Cura/pull/2732
2017-11-20 20:24:38 +01:00
ChrisTerBeke
7556271d2b Fix merge conflict 2017-11-20 18:20:06 +01:00
Mark
43f339f927 Update fdmprinter.def.json 2017-11-20 18:14:08 +01:00
Jack Ha
7219d84b91 CURA-4104 added settings for flow rate compensated extrusion 2017-11-20 18:13:28 +01:00
jack
f197508694 Merge pull request #2814 from Ultimaker/feature_maximum_resolution
Maximum mesh resolution
2017-11-20 18:09:11 +01:00
Lipu Fei
d00f3ba79b Fix for loop 2017-11-20 18:08:13 +01:00
Lipu Fei
8cad79831a Fix empty containers in stack upgrade 2017-11-20 18:07:51 +01:00
Ghostkeeper
b875f06baf Add setting to set the maximum mesh resolution
Implements issue CURA-4590.
2017-11-20 18:04:34 +01:00
Diego Prado Gesto
a4ed3bb2c6 CURA-4577 Fix the previous change 2017-11-20 17:59:57 +01:00
ChrisTerBeke
85eab3606b Simplify relative positioning xyz value updates - CURA-4577 2017-11-20 17:58:46 +01:00
Aleksei S
10b5a19043 Fix merge conflict 2017-11-20 17:56:54 +01:00
fieldOfView
a42d054505 Tweak simulation view panel margins 2017-11-20 17:49:00 +01:00
Diego Prado Gesto
dd8e5e2c6e CURA-4577 Take into account relative movements in GCodes 2017-11-20 17:48:05 +01:00
ChrisTerBeke
657a91c525 Merge pull request #2685 from Ultimaker/container_stack_improvements
Container stack improvements
2017-11-20 17:42:26 +01:00
Ghostkeeper
da14ce5bef Add to all installation to lib/ folders
Some systems have a suffix there to indicate the address size, such as lib64.
2017-11-20 17:40:41 +01:00
Ghostkeeper
085e933e34 Move ironing into shell category
It is no longer considered experimental.
2017-11-20 17:39:10 +01:00
Ghostkeeper
df1a11ca07 Don't crash if support density is 0
Found while working on CURA-4523.
2017-11-20 17:38:39 +01:00
ChrisTerBeke
a08ab656eb Merge branch '3.1' 2017-11-20 17:18:32 +01:00
fieldOfView
1483683992 Move play button to path slider 2017-11-20 17:17:16 +01:00
Lipu Fei
775271faac Fix module importing in SimulationView
CURA-4526
2017-11-20 15:57:20 +01:00
Ghostkeeper
2be79eeb62
Merge branch '3.1' 2017-11-20 15:37:39 +01:00
Ghostkeeper
604105752d
Fix import in plugin subdirectory
Contributes to issue CURA-4526.
2017-11-20 15:36:54 +01:00
Lipu Fei
b439581e2d
Merge pull request #2816 from Ultimaker/CURA-4104
CURA-4104 added settings for flow rate compensated extrusion
2017-11-20 15:27:56 +01:00
Aleksei S
6e73b398c7 Merge branch '3.1' 2017-11-20 14:35:47 +01:00
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
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