Commit graph

2239 commits

Author SHA1 Message Date
Ghostkeeper
5e63c0df48
Add major grid cells
This draws a grid of 1x1cm.

Contributes to issue CURA-4150.
2017-08-17 09:56:11 +02:00
Ghostkeeper
484740f2ff
Remove grid pattern
It'll be replaced by grid lines instead of grid surfaces.

Contributes to issue CURA-4150.
2017-08-16 13:26:17 +02:00
Lipu Fei
1c747a962f Merge remote-tracking branch 'CURA-4032' 2017-08-15 16:11:44 +02:00
alekseisasin
7ad7fb0a3c Merge pull request #2200 from fieldOfView/fix_monitoritem_size
Adapt camera image to available space
2017-08-15 14:45:34 +02:00
Lipu Fei
9aa65eab44 Merge branch '2.7' 2017-08-15 14:43:36 +02:00
Lipu Fei
e67286c0d8 Do not add extruder stacks for single-extrusion machines
CURA-4167

In the current architecture, single-extrusion machines don't have
extruder stacks.
2017-08-15 14:19:23 +02:00
Lipu Fei
67f820af04 Pass tray_icon_name to QtApplication
CURA-4032
2017-08-14 15:26:17 +02:00
alekseisasin
bc4b1d9c4d Merge remote-tracking branch 'origin/2.7' 2017-08-14 15:11:33 +02:00
Ghostkeeper
3316f3aa13
Add warning contexts to not translate XML tags
This went wrong a few times with previous translations. Let's hope that this prevents it from happening again.

Contributes to issue CURA-4113.
2017-08-14 14:06:20 +02:00
Ghostkeeper
7ab6a551c1
Clarify that XML material tags don't get translated
Some of the translators got this wrong last time. Let's see how good they read this next time...

Contributes to issue CURA-4113.
2017-08-14 13:54:11 +02:00
Lipu Fei
dce575f661 Remove wall_extruder_nr from ExtruderManager.getUsedExtruderStacks
CURA-4145
2017-08-14 13:39:56 +02:00
Lipu Fei
bb1316fc88 Check if a material is being used based on base_file
CURA-4129
2017-08-14 08:48:07 +02:00
Lipu Fei
3e870d2e40 Always update raft thickness and extra z clearance before rebuilding the build volume
CURA-4154
2017-08-11 12:27:45 +02:00
Lipu Fei
4bac499c22 Use QualityManager._getFilteredContainersForStack() to get qualities
CURA-4151

The quality searching code in _configureProfile() for importing quality
profiles doesn't take into account base materials. Use the function in
QualityManager to solve this problem.
2017-08-10 12:14:43 +02:00
Lipu Fei
6fd3963e8f Fix material searching in isContainerUsed()
CURA-4129

Searching for used materials should also take into account the material
container ID.
2017-08-09 09:47:36 +02:00
Lipu Fei
e414621250 Fix code style 2017-08-09 09:27:42 +02:00
Lipu Fei
ab3d8349b6 Also skip empty containers when getting layer height for a quality profile
CURA-4133

On some machines such as UM2, there is no material. Getting the layer
height in this case will result back to the global stack itself, which
is the layer height of the current setting. This is a problem for
"Normal" (or "Fine") quality because it uses the machine's default layer
height.
2017-08-09 09:24:04 +02:00
Lipu Fei
8c6abc85fc Rename variable in for loop
CURA-4129
2017-08-08 16:32:40 +02:00
Lipu Fei
bb1475d1fd Search for instance containers with type material
CURA-4129
2017-08-08 16:32:02 +02:00
Ghostkeeper
b9cdeb68d6
Don't crash when there is no global quality container
We fill the stack with an empty container rather than with None in that case.

Contributes to issue CURA-3301.
2017-08-08 14:40:02 +02:00
Ghostkeeper
fe406f530c
Never fill None for quality changes profile
We want it to be the empty profile instead. This gets passed on all the way to _replaceQualityOrQualityChangesInStack where the metadata is requested.

Contributes to issue CURA-3301.
2017-08-08 13:51:40 +02:00
Ghostkeeper
a75387ff3e
Only use Z-hop setting for the used extruders
Otherwise the unused extruders still influence the build volume.
2017-08-08 11:40:19 +02:00
Lipu Fei
4a34f141d1 Check if a material container is used by GUID
CURA-4129

isContainerUsed() is used to enable/disable the "Remove" button on the
Material Manager dialog. When a custom material is created, it creates
multiple containers, one for each extruder variant. In the dialog, it
only checks if the material for the currently active extruder is being
used or not. This causes a problem when 2 extruders are of different
types and one uses a custom material. Then, the "Remove" button will
not be correctly enabled/disable in the Material Manager dialog when
the other extruder is activated.
2017-08-07 13:17:47 +02:00
Lipu Fei
09576241db Generate unique names for definition changes containers
CURA-4107
2017-08-07 10:59:24 +02:00
Lipu Fei
76e8090dbd Remove duplicated function createDefinitionChangesContainer()
CURA-4107
2017-08-07 10:59:24 +02:00
Ghostkeeper
cf1309c650
Don't update next stack if there is no next stack
Not all extruder stacks have a next stack. Well currently every extruder stack should have a next stack, but the code is built around the possibility that there isn't a next stack elsewhere too.

Contributes to issue CURA-4121.
2017-08-07 09:47:53 +02:00
Ghostkeeper
584e1b6abb
Set the next stack before adding the user container
Since the user container may trigger a propertyChanged signal, which then requests the next stack.

Contributes to issue CURA-4121.
2017-08-07 09:45:16 +02:00
alekseisasin
3cbf0640a5 Added method to close the application (after clicking quit button) to prevent loss of custom material
CURA-3298
2017-08-03 11:57:27 +02:00
fieldOfView
92859697c5 Fix error about empty qml url 2017-08-03 10:57:47 +02:00
alekseisasin
153d1f2d0c Added method to close the application (after clicking quit button) to prevent loss of custom material
CURA-3298
2017-08-02 16:32:09 +02:00
Lipu Fei
f95bd1b47f Generate unique names for definition changes containers
CURA-4107
2017-08-02 08:58:19 +02:00
Lipu Fei
6e06837084 Remove duplicated function createDefinitionChangesContainer()
CURA-4107
2017-08-02 08:50:32 +02:00
Lipu Fei
792feaade6 Always create a definition changes container for a newly created stack
CURA-4107

A newly created stack will have an empty definition changes container by
default, but when a machine or extruder gets activate, Cura will create
a definition changes container for it if it has an empty one. This lazy
creation caused the problem when after Cura creates a multi-extrusion
machine for the first time, switching to a different extruder tab will
cause an extruder stack change, which eventually triggers an unnecessary
auto-slice.
2017-08-01 09:40:51 +02:00
Ghostkeeper
927ba20401
Disable centre on select by default
Apparently that was chosen or the user experience because the workflow for working with a lot of small objects becomes easier.
2017-07-31 17:23:58 +02:00
Jaime van Kessel
e636dbdd10 Merge pull request #2107 from fieldOfView/feature_pyserial_usb_detection
Use pyserial to list serial ports
2017-07-27 09:31:35 +02:00
Lipu Fei
2aa8e590bf Merge pull request #2056 from Ultimaker/top_most_skin_feature
Top most skin feature (CURA-3940)
2017-07-26 14:58:08 +02:00
Lipu Fei
9c1d23fe5b Make sure MachineManager initializes after ContainerRegistry does
CURA-4084

When MachineManager gets created, it will find and set the current
active machine. This requires the ContainerRegistry to be initialized
first.
2017-07-26 14:09:18 +02:00
Lipu Fei
93731b8d1f Trigger auto-slice based on stackValidation instead of stack/setting changes
CURA-4084

Stack error checks are scheduled with a delay, and when a container is
changed (e.g. Quality), the auto-slice may get triggered before the
error check is done. Because the error check result is cached, the
auto-slicing will use the previous result instead of new. So, the
auto-slicing should be triggered when a stack validation is finished
instead of when a stack/setting gets changed.
2017-07-26 14:09:18 +02:00
Lipu Fei
4564b2a843 Rebuild disallowed area when a limit_to_extruder_nr has been changed
CURA-4069

Trigger to rebuild the disallowed area when a limit to extruder feature
has been changed.
2017-07-24 10:40:14 +02:00
Tim Kuipers
5f97d2cbde fix: account for roofing extruder when checking which extruder is used (CURA-4069, CURA-3940) 2017-07-21 15:53:05 +02:00
Lipu Fei
3d378ebc5f Merge remote-tracking branch 'upstream/CURA-4057' 2017-07-21 14:14:27 +02:00
Lipu Fei
b0be901079 Do not check support_interface_extruder_nr if it is used
CURA-4069

support_bottom_extruder_nr and support_roof_extruder_nr are the support
interface extruder numbers, so checking those two is enough and there is
no need to check the interface extruder number.
2017-07-21 13:40:13 +02:00
Lipu Fei
1b0268f09c Use extruder_nr as integers for comparison
CURA-4069
2017-07-21 13:32:46 +02:00
Lipu Fei
9a92b58ac3 Check all limit_to_extruder features in getUsedExtruderStacks()
CURA-4069

getUsedExtruderStacks() doesn't take into account some new limit to
extruder features, The BuildVolume uses it to determine disallowed
areas, and this makes it give incorrect results.
2017-07-21 13:28:12 +02:00
Ghostkeeper
75af56b1a1
Only use line widths of used extruders for brim/skirt size
No lines are drawn for the rest of the extruders.

Contributes to issue CURA-4072.
2017-07-21 12:56:37 +02:00
Jaime van Kessel
6e55bf2d8f If output device has a contorl item, that one is used.
If a printerOutput device does not define anything, the fallback is used.

CURA-4057
2017-07-20 13:30:57 +02:00
Arjen Hiemstra
b839cb74f4 Do not only check if activeMaterialId is None, also check for empty
Fixes CURA-4065
2017-07-20 12:01:21 +02:00
Jaime van Kessel
216b1a7a14 Added control item to printOutputDevice
CURA-4057
2017-07-20 11:39:12 +02:00
Ghostkeeper
3c545ba7c9
Clarify context of print info bounding box size translation
Lots of translators did this wrong.

Contributes to issue CURA-3998.
2017-07-18 13:10:16 +02:00
Arjen Hiemstra
573d25982e Minor cleanup of SettingOverrideDecorator
We never use the _instance variable except in deepcopy, so no need to
store that.

Contributes to CURA-3719
2017-07-18 11:23:43 +02:00