Aleksei S
2c18127cc1
Tests: Removed python circular import dependency and added empty containers
...
CURA-4687
2017-12-15 09:43:02 +01:00
ChrisTerBeke
4b1c0dff7a
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-12-14 19:51:42 +01:00
ChrisTerBeke
5d27443dd0
Merge pull request #2970 from Ghostkeeper/layerview_backface_culling
...
Layer view backface culling
2017-12-14 19:51:32 +01:00
ChrisTerBeke
cac561600e
Use pyqtProperty instead of slot to bind backend
2017-12-14 15:44:11 +01:00
ChrisTerBeke
9db320bf35
Remove unused backend property
2017-12-14 15:34:58 +01:00
ChrisTerBeke
47e5303a89
Catch situations where backend is not correctly set
2017-12-14 15:16:17 +01:00
ChrisTerBeke
c056fcb23d
Fix monitor sidebar machine selection - CURA-4234
2017-12-14 14:58:51 +01:00
Jack Ha
cda6aa2547
CURA-4234 splitted MachineSelection into a separate file and add it to PrintMonitor as well, because now it's part of the sidebar
2017-12-14 14:49:18 +01:00
Aleksei S
497bc756b7
Merge branch 'master' into CURA-4234_expand_collapse
2017-12-14 09:42:05 +01:00
Ruben D
f69375691f
Reduce vertices per tube by 1
...
Since the tubes are symmetrical, instead of using an extra vertex to flip the winding order, I just mirror all horizontal coordinates so that the triangles flip inside out.
2017-12-13 18:58:05 +01:00
Jack Ha
f3a6f50e2c
CURA-4234 fix topbar resize issues and removed hard coding numbers
2017-12-13 16:47:38 +01:00
Aleksei S
88af41769e
Check multiple models with non_printing settings
...
CURA-4703
2017-12-13 16:04:01 +01:00
Jack Ha
a44cea7ac6
Update log line
2017-12-13 14:48:25 +01:00
Jack Ha
3605edc565
CURA-4234 remove debugging logline
2017-12-13 14:16:35 +01:00
Jack Ha
63eec848fc
CURA-4234 view mode button now also moves with the sidebar
2017-12-13 14:15:27 +01:00
Jack Ha
4519f9b46a
CURA-4234 rename to cura/sidebar_collapse, fix spelling errors, styling
2017-12-13 14:04:02 +01:00
Jack Ha
80afda1912
Merge branch 'master' into CURA-4234_expand_collapse
2017-12-13 13:53:35 +01:00
Jack Ha
bae2193bfb
Merge branch 'master' of github.com:Ultimaker/Cura
2017-12-13 13:39:22 +01:00
Jack Ha
19b56404c6
Fix empty quality slider on start.
...
It seemed that:
- MachineManager was not connected to all the correct signals
- After connecting to the correct signal, ProfilesModel was not yet updated when looping over it in SidebarSimple
Because ProfilesModel's constructor already requests the MachineManager, we cannot do connect itemsChanged the way around as well.
CURA-4707
2017-12-13 13:33:05 +01:00
Ghostkeeper
9ea0119011
Rename 'exception' to 'error'
...
Error is a less technical term, so it's more user friendly.
2017-12-13 12:58:24 +01:00
Lipu Fei
6e6dc493f1
Fix material loading for unknown names
2017-12-13 12:27:55 +01:00
Aleksei S
c6c4c5be34
Merge branch 'master' of github.com:Ultimaker/cura
2017-12-13 12:03:06 +01:00
Aleksei S
5c5f08e9ca
Do not slice a model if it is only one on a build plane and has setting from non_printing_mesh
...
CURA-4703
2017-12-13 11:58:59 +01:00
Lipu Fei
7cd3449781
Fix material loading
2017-12-13 11:26:16 +01:00
Lipu Fei
e14d78b32a
Generate more possible machine IDs in XML material profile
2017-12-13 10:16:06 +01:00
Ruben D
e36099a380
Draw backside of travel lines inverted
...
This adds a front-facing primitive towards the back side of every travel line, causing those lines to be visible from both sides regardless of backface culling. This doubles the number of vertices for travel moves, but due to backface culling it comes down to approximately the same performance as the original.
2017-12-13 01:44:05 +01:00
Ruben D
79d7de050e
Enable backface culling for layer view
...
This effectively doubles the rendering performance of layer view.
2017-12-13 01:42:24 +01:00
Ruben D
3666b35ff3
Fix winding order of 3D tubes
...
Adding a copy of the first vertex causes the winding order to reverse.
2017-12-13 01:41:36 +01:00
Jack Ha
e10ba065ca
CURA-4707 better signal to connect solving this issue
2017-12-12 17:06:23 +01:00
Jack Ha
a85bea4bae
CURA-4707 fix extruder setting not triggering reslice
2017-12-12 16:37:21 +01:00
Jack Ha
f28846acb9
Merge branch 'master' into CURA-4234_expand_collapse
2017-12-12 15:43:32 +01:00
Aleksei S
3516d01f3d
Move back machine selection
...
CURA-4234
2017-12-12 15:30:19 +01:00
Diego Prado Gesto
d70bd0ebc9
CURA-4649 Blocking printers that have localhost IP address.
2017-12-12 13:45:35 +01:00
Aleksei S
6968c089db
Add sidebar_collapse to the saved preferences, typos, move back machine selection to the top bar
...
CURA-4234
2017-12-12 11:26:17 +01:00
ChrisTerBeke
ca413e0496
Add extra checks to ensure backend exists, use same state everywhere
2017-12-12 11:16:40 +01:00
ChrisTerBeke
19e459d930
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-12-12 10:55:05 +01:00
ChrisTerBeke
84aa9367c7
Cleanup
2017-12-12 10:54:54 +01:00
Aleksei S
fb91edd7eb
Solve arrange and multiply models issue
...
CURA-4703
2017-12-12 10:43:19 +01:00
Ghostkeeper
948301c531
Remove duplicate setting definition
...
I think this was a merge conflict.
Contributes to issue CURA-4523.
2017-12-12 09:28:42 +01:00
Ghostkeeper
9a94e73b63
Merge branch 'master' into feature_tree_support
2017-12-12 08:40:57 +01:00
Aleksei S
00529f37d9
After sidebar expanding the builplate stays in center of the screen
...
CURA-4234
2017-12-11 18:51:53 +01:00
Ghostkeeper
75df653d47
Merge branch 'feature_local_container_server'
2017-12-11 15:51:17 +01:00
Aleksei S
300f29e11b
Add expand button to menu
...
CURA-4234
2017-12-11 15:30:13 +01:00
Lipu Fei
c6cdc1d1db
Container cfg files need to be parsed without interpolation
...
CURA-4701
2017-12-11 14:35:27 +01:00
Aleksei S
a5cb4cd316
Expand/Collapse sidebar
...
CURA-4234
2017-12-11 10:53:48 +01:00
Ghostkeeper
097cc72d89
Document why we're only returning full profiles
...
It's a limitation of the quality manager that would require major refactoring there to fix.
Contributes to issue CURA-4243.
2017-12-11 09:44:56 +01:00
Thomas Karl Pietrowski
79cb1a1293
closeAllWindows seems to take no effect - use exit instead
...
Looks like it does not work, because there was never a window or any other window on top of QApplication.
.exit() should let us out of the main loop.
2017-12-10 01:08:06 +01:00
Thomas Karl Pietrowski
1cd107965c
Close all windows, if there is no main window
2017-12-10 00:39:20 +01:00
Thomas Karl Pietrowski
f1d5bc38dc
Adding help arguments manually
...
.. and also print and exit as it normally does, when enabled.
2017-12-09 23:01:26 +01:00
Thomas Karl Pietrowski
b4aed1da22
Simplify getting known args
2017-12-09 22:27:15 +01:00
