Jaime van Kessel
c1bf87bd8f
Removed commented out code
...
CL-541
2018-01-03 13:54:15 +01:00
Jack Ha
bfa33c721c
CURA-4525 solved merge conflicts
2018-01-03 13:52:55 +01:00
Jaime van Kessel
ef46f51497
Camera delete now triggers the correct function
...
CL-541
2018-01-03 13:44:38 +01:00
Jack Ha
dd989a1a51
CURA-4525 refresh objects list of all items after changing build plate
2018-01-03 13:43:09 +01:00
Jack Ha
c8243a0ddd
CURA-4525 fix convex hull, changed size of object list
2018-01-03 12:47:09 +01:00
Simon Edwards
5e3666f073
Fill out the type hints in NetworkedPrinterOutputDevice.py
...
CL-541
2018-01-02 17:21:51 +01:00
Lipu Fei
70d5d4415f
Merge branch 'master' into CURA-4708_fix_definition_changes_extruder_stacks
2018-01-02 10:41:44 +01:00
Ghostkeeper
2e197f0f34
Move all per-extruder settings
...
Also move things that we didn't think of previously, such as extruder offsets. You can't enter them as a user in the interface if it was single-extrusion, but you could've edited the files.
Contributes to issue CURA-4708.
2018-01-02 08:36:46 +01:00
Ghostkeeper
a87465186e
Fix off-by-one bug when importing profiles with extruder stacks
...
Since machine_extruders contains only the extruder stacks (not the global stack) but profile_index counts through all stacks including the global stack, we need to increase the length of machine_extruders by 1 when comparing.
I also swapped the comparison around since I think it's more logical this way around.
Contributes to issue CURA-4738.
2018-01-02 08:19:31 +01:00
Ruben D
689a18ee57
Rename sidebar_collapsed and code style
...
sidebar_collapsed is more consistent with other options and setting names we use. Better change it before the next release rolls out otherwise we'd have to do a version upgrade.
Also changed some code style things to be in line with our guidelines.
Contributes to issue CURA-4234.
2017-12-30 19:35:46 +01:00
Ghostkeeper
4a3109c885
Don't crash when loading model before a printer is loaded
...
The model won't load successfully and you get a message that it failed to load, but Cura won't crash at least.
Contributes to issue CURA-4736.
2017-12-29 14:47:55 +01:00
Ghostkeeper
a4d83331ad
Code style: Space around binary operator
...
Contributes to issue CURA-4672.
2017-12-28 14:30:47 +01:00
Ghostkeeper
4b9ddc186a
Code style: Space after binary operator
...
Contributes to issue CURA-4672.
2017-12-28 14:28:12 +01:00
ChrisTerBeke
727da34bd3
Merge branch 'master' into feature_headless_docker
2017-12-22 14:21:36 +01:00
ChrisTerBeke
07ad74d7f9
Always construct scene and build platë node tree
2017-12-22 14:20:54 +01:00
Lipu Fei
0c28c61e05
Create new SettingInstances when moving user changes settings
...
CURA-4708
2017-12-22 14:09:13 +01:00
Lipu Fei
0cd392fbd2
Create new SettingInstance when moving extruder DC settings
...
CURA-4708
2017-12-22 14:08:22 +01:00
Lipu Fei
a7d51326c0
Move extruder-specific DC settings
...
CURA-4708
Read code comments.
2017-12-22 14:06:11 +01:00
Aleksei S
05acb2e00f
Prvent integer infinitive value after arranging all models
...
CURA-4672
2017-12-22 13:04:25 +01:00
ChrisTerBeke
4bc47585e6
Improvement in booting order
2017-12-22 12:27:45 +01:00
Lipu Fei
3fb3b5826f
Make sure user containers have unique IDs
...
CURA-4708
2017-12-22 12:26:30 +01:00
Lipu Fei
3f9f00673a
Fix addExtruderStackForSingleExtrusionMachine()
...
CURA-4708
- Create definition_changes container for the newly created
ExtruderStacks.
- Move extruder-specific definition_changes settings from the machine's
container to the extruder's container
2017-12-22 12:26:29 +01:00
Jaime van Kessel
eb27695d52
If a reserved job is moved to a printer that can do it, it' s correclty removed from the old printer
...
CL-541
2017-12-22 12:04:02 +01:00
Aleksei S
b454b43ae0
Merge branch 'master' of github.com:Ultimaker/cura
2017-12-22 12:02:18 +01:00
Aleksei S
f591822836
Set minimum distance between models
...
CURA-4672
2017-12-22 12:00:08 +01:00
ChrisTerBeke
1bfe296be7
Move all QML registrations together
2017-12-22 11:59:38 +01:00
ChrisTerBeke
5b43a32986
Extract UI boot from non-UI boot
2017-12-22 11:56:47 +01:00
ChrisTerBeke
3246480111
Merge branch 'master' into feature_headless_docker
2017-12-22 11:42:35 +01:00
ChrisTerBeke
f75d91071a
Remove invisible flag from allowed command line options to trigger non-gui mode
2017-12-22 11:39:58 +01:00
ChrisTerBeke
b29047abd3
Small fixes for disable user data triggering preferences window
2017-12-22 11:38:56 +01:00
Jaime van Kessel
52d25042eb
Machines now re-appear after timeout
...
CL-541
2017-12-22 11:29:13 +01:00
ChrisTerBeke
56435f12c0
Add additional debug logging in machine manager for changing stack setup
2017-12-21 17:12:39 +01:00
ChrisTerBeke
0e1cd99578
Add flag to ignore discard or keep dialog when changing print setup
2017-12-21 17:08:44 +01:00
Jack Ha
663ceab069
Undo emit transformationChanges (caused a crash), themed objects in objects list. CURA-4525
2017-12-21 16:53:43 +01:00
Aleksei S
c3954c40ac
Merge branch 'master' of github.com:Ultimaker/cura
2017-12-21 16:25:54 +01:00
Aleksei S
447c6e7e23
Added Disable link style
...
CURA-4630
2017-12-21 16:25:13 +01:00
Lipu Fei
4e90204620
Only push aways other objects if they are printing meshes
...
CURA-4705
2017-12-21 15:51:24 +01:00
Jack Ha
9ff15bf72d
Fixed not always updating objects list when changing build plate number by adding signals. CURA-4525
2017-12-21 15:42:23 +01:00
Jaime van Kessel
c6458358ba
Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite
2017-12-21 15:38:17 +01:00
Jack Ha
fda4badab1
Checked build plates in context menu now actually match the selected item's build plates; changed collapse arrow. CURA-4525
2017-12-21 15:08:46 +01:00
Jack Ha
0839125076
Fix platform physics not working across different build plates. CURA-4525
2017-12-21 13:31:19 +01:00
Jaime van Kessel
9754aa5397
Material & hotend updated callback is enabled for LegacyUM3 again
...
CL-541
2017-12-21 13:16:44 +01:00
Jack Ha
9f8eae006c
Fix push free. CURA-4525
2017-12-21 13:15:10 +01:00
Jack Ha
c05e6b43ff
Fixed platform physics. CURA-4525
2017-12-21 13:11:32 +01:00
Jack Ha
312bd137c2
Fix merge error, a variable got renamed. CURA-4525
2017-12-21 11:03:32 +01:00
Jack Ha
5152b2ae65
Solved merge conflicts. CURA-4525
2017-12-21 10:52:51 +01:00
Lipu Fei
0a0db39f02
deepcopy value from the stack
...
CURA-4705
2017-12-21 09:27:53 +01:00
Jaime van Kessel
041b1830fe
Re-added manual printer adding
...
CL-541
2017-12-20 16:30:40 +01:00
Jaime van Kessel
23330cd086
Camera feed is also stopped when NetworkCamera is destroyed
...
CL-541
2017-12-20 15:39:52 +01:00
Jaime van Kessel
95b1e8f68c
Ensured that multiple requests from the same camera are no longer possible
...
CL-541
2017-12-20 15:38:47 +01:00
