Jaime van Kessel
42b50bf749
Fixed typo in function
...
CL-541
2018-01-03 17:14:52 +01:00
Jaime van Kessel
801875fb30
Merge branch 'network_rewrite' of github.com:Ultimaker/Cura into network_rewrite
2018-01-03 17:00:49 +01:00
Jaime van Kessel
487fca31dd
Chopped up bunch of functions.
...
As per review request. CL-541
2018-01-03 16:59:05 +01:00
Simon Edwards
3173eb6740
Avoid mega-tons of object copying when building compressed gcode
...
CL-541
2018-01-03 16:15:12 +01:00
ChrisTerBeke
182e7de07d
Merge branch 'master' into network_rewrite
2018-01-03 14:17:48 +01:00
ChrisTerBeke
7eb507484b
hide sidebar header when in monitoring mode
2018-01-03 14:12:45 +01:00
Jaime van Kessel
e12a2fbd6a
Fixed typing
...
CL-541
2018-01-03 14:07:34 +01:00
Jaime van Kessel
c1bf87bd8f
Removed commented out code
...
CL-541
2018-01-03 13:54:15 +01:00
Jaime van Kessel
ef46f51497
Camera delete now triggers the correct function
...
CL-541
2018-01-03 13:44:38 +01:00
Lipu Fei
6997c2d2dc
Add timeout for Jenkinsfile
2018-01-03 11:58:14 +01:00
Lipu Fei
f6168c07f0
Fix material_diameter bindings for metarial menu and page
...
CURA-4708
2018-01-03 11:27:30 +01:00
Aleksei S
43db2ee2f9
Added ElideRight for the text which is out of boundaries
...
CURA-4692
2018-01-03 10:34:23 +01:00
Simon Edwards
5e3666f073
Fill out the type hints in NetworkedPrinterOutputDevice.py
...
CL-541
2018-01-02 17:21:51 +01:00
Ghostkeeper
1aebe32ba6
Fix winding order of left endpoint triangles
...
Otherwise the left side is invisible due to backface culling.
2018-01-02 16:16:52 +01:00
Lipu Fei
b246a102ed
Fix MachineSettings dialog
...
CURA-4708
- Move material diameter and nozzle size to extruder tabs
- Fix value bindings
2018-01-02 12:40:43 +01:00
ChrisTerBeke
0b7519dff2
Merge pull request #3033 from Ultimaker/CURA-4708_fix_definition_changes_extruder_stacks
...
CURA-4708 Fix definition_changes containers for extruder stacks
2018-01-02 10:53:52 +01:00
Lipu Fei
2e4ffc83b5
Add material_diameter to fdmextruder definition
...
CURA-4708
2018-01-02 10:50:06 +01:00
Lipu Fei
16dfc094eb
Fix version upgrade 30 to 31
...
CURA-4708
A merge mistake. No need to be there.
2018-01-02 10:47:21 +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
Ruben D
147278e455
Merge branch 'thetobby-patch5'
2017-12-30 18:30:36 +01:00
Ruben D
a645e2647a
Merge branch 'patch5' of github.com:thetobby/Cura into thetobby-patch5
2017-12-30 18:30:22 +01:00
Ruben D
80ba5fc97d
Fix PYTHONPATH pass-through
...
This makes sure that any pythonpath on the user's environment is also used for these tests. The same fix as here: 31106cd60a
2017-12-30 17:11:11 +01:00
Ruben D
28919a57a4
Fix testing whether tests exist on older CMake
...
The string equality works on the 3.6 but not on 3.5. This works on 3.5, so I hope it also works on 3.6 (but I don't have that computer with me right now).
2017-12-30 16:58:52 +01:00
Torbjørn
391adbdfb3
Remove ID from definition files
2017-12-30 02:24:23 +01:00
Ghostkeeper
719bd5a707
Fix slicing non-printable meshes that fall outside of build volume
...
Non-printable meshes don't care whether they are in the build volume or not.
Contributes to issue CURA-4734.
2017-12-29 18:08:58 +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
1bcdc0357e
If there is no added printer, disallow closing the window
...
The state of having no printer added is very weird to the user. Let's prevent that from happening by accident.
Contributes to issue CURA-4736.
2017-12-29 14:32:43 +01:00
Ghostkeeper
8b504c8acc
Fix scroll position after collapsing category not in focus
...
When collapsing a category, the height of the category is briefly set to 0 and then animated there properly. If the setting list becomes so small then that the scroll bar disappears, the view should automatically get scrolled up. But because the focus changed at the same time it would move the scrollbar such that the category header was in view. This clashed, causing the scroll position to end up not completely at the top even though the scroll bar did disappear. Setting the focus after collapsing the scroll bar prevents this.
Contributes to issue CURA-4732 and fixes #2935 .
2017-12-29 14:07:34 +01:00
Ghostkeeper
cda600f12d
Don't halt build when encountering duplicate tests
...
I had duplicate tests because multiple plug-ins were interfering with each other. We shouldn't crash on that.
Contributes to issue CURA-4692.
2017-12-29 13:16:52 +01:00
Ghostkeeper
c786f7a69b
Add Portuguese to language drop-down
...
So that we can select it.
Contributes to issue CURA-4692.
2017-12-29 11:53:58 +01:00
Ghostkeeper
ac8f3a31be
Include period in translation source text
...
I suspect that this was originally done this way to prevent breaking a string freeze. I'm now correcting it so that languages that don't use this period will also be able to properly end their sentence (such as Japanese or Chinese).
Contributes to issue CURA-4692.
2017-12-29 11:51:28 +01:00
Ghostkeeper
da4372beef
Corrections for Portuguese translation
...
Without really knowing the language, I was able to make these corrections.
Contributes to issue CURA-4692.
2017-12-29 11:49:04 +01:00
Ghostkeeper
5b47c58e80
Add European Portuguese translation
...
This is a new translation from Bothof.
Contributes to issue CURA-4692.
2017-12-29 11:22:55 +01:00
Ghostkeeper
bf2972200d
Clarify infill/skin overlap setting descriptions a bit
...
Discovered during work on CURA-4732.
2017-12-28 18:09:44 +01:00
Ghostkeeper
10f9ae4082
Resolve binding loop
...
Let's align the icons to the text instead of the text to the icons. This makes it all align from left to right and allows the button to take the width of the childrenRect properly.
2017-12-28 16:21:29 +01:00
Ghostkeeper
9b41cc05af
Further fix for MonitorButton
...
Forgot this one here.
Contributes to issue CURA-4741.
2017-12-28 15:46:06 +01:00
Ghostkeeper
5f240229f9
Fix reference to addAdditionalComponents and updateAdditionalComponents
...
Nobody ever tested this, I think...
Contributes to issue CURA-4741.
2017-12-28 15:45:03 +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
Aleksei S
d0a3575c0c
Don't print the model if it is outside of the buildplate
...
CURA-4734
2017-12-22 14:48:45 +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
Jaime van Kessel
d6b0fcc92e
Progress message is now also shown when still compressing g-code
...
CL-541
2017-12-22 13:50:55 +01:00
Jaime van Kessel
562b2454b8
Added missing notifications for Connect prints
...
CL-541
2017-12-22 13:48:51 +01:00
Lipu Fei
2cffb1759f
Revert "Version upgrade for nozzle_size"
...
This reverts commit 54bc7dd348d77efa7f2dc3f420200df9864b8d37.
CURA-4708
2017-12-22 13:30:06 +01:00
Lipu Fei
26a136f7c5
Revert "Simplified upgrade funtion, typos, check extruder count"
...
This reverts commit fd6d3e76a3754dae14f83a45d20685b4ddae6062.
CURA-4708
2017-12-22 13:29:55 +01:00