Commit graph

4475 commits

Author SHA1 Message Date
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
fieldOfView
975e7f04b4 Remove unused incorrect code
The property is called activeMaterialIds, but it returns the stack ids. The code is superceeded by allActiveMaterialIds.
2017-08-08 11:27:45 +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
Lipu Fei
18fddf50c7 Add type hinting for container_id in ExtruderStack
CURA-4049
2017-07-18 09:22:45 +02:00
Lipu Fei
e6ce98b36d Make machine_nozzle_offset is not None before using it
CURA-4053
2017-07-17 13:01:15 +02:00
Youness Alaoui
7e7e15a12b Fix MachineManager connection to OutputDeviceManager signals late.
If a PrinterOutputDevice is able to connect quickly to a machine, then
by the time the MachineManager is created and connects to the signal,
it will be too late, and it might miss that there is already connected
devices.

# Conflicts:
#	plugins/USBPrinting/USBPrinterOutputDeviceManager.py
2017-07-12 14:06:08 +02:00
Arjen Hiemstra
95b825a4c5 Emit propertiesChanged on the global stack from the extruder stack
But only when the setting that changed has a relation that is not
settable per extruder.

Fixes CURA-3521
2017-07-11 12:03:23 +02:00
Ghostkeeper
fc93617698
Don't invert Y direction of offset for disallowed areas 2017-07-11 11:59:55 +02:00
14bitVoid
0f9125633b Multiply skirt/brim widths with initial layer line width 2017-07-11 02:51:24 +02:00
Ghostkeeper
012d299d98
Prevent circular import
When this is imported during the __init__, it'll long have been imported elsewhere and won't need to import it again but still guarantees that it is actually imported if no other module does it first.

Contributes to issue CURA-4024.
2017-07-10 16:42:38 +02:00
Ghostkeeper
8822307e02
Cache preferences instance during start-up
Perhaps a bit faster and less code duplication.

Contributes to issue CURA-4024.
2017-07-10 11:54:27 +02:00
Ghostkeeper
9bfe18393f
Make sure the preferences file doesn't always get upgraded
When the setting is equal to the default the setting_version won't get written to the preferences file. In that case the version upgrade system assumes that the setting_version was 0 or 1 and upgrades it.

This makes sure that the setting is never equal to the default so that it always gets written.

Found while working on CURA-4024.
2017-07-10 11:45:03 +02:00
Ghostkeeper
f0d327c0d0
Set setting_version properly on new stacks so you don't need to upgrade
I don't think stacks had a setting_version property previously.

Contributes to issue CURA-4024.
2017-07-10 11:22:35 +02:00
Ghostkeeper
81e07b1530
Use stack properties instead of .findContainer(type = ...)
Recently we changed the empty containers such that there is only one empty container instance and it doesn't have the proper type any more. Instead we have properties on the stack that allows us to find the container with the proper type. It's faster and easier to use.
We've had a few bugs about this so I decided to update all of them to remove those for the future, except the ones in plugins/MachineSettingsAction/MachineSettingsAction.py because we have a pending pull request that fixes those. Fixing them would give merge conflicts for fieldOfView.

It doesn't really belong to CURA-4024 but I'm sticking it under that nomer anyway to get it reviewed.
2017-07-10 10:35:03 +02:00
Lipu Fei
b95426bee3 Add setting_version for Preferences
CURA-3975
2017-07-06 14:33:01 +02:00
Lipu Fei
5bf080950f Fix upgrade from 2.5 to 2.6 to 2.7
CURA-3975

- Set Preferences setting_version in CuraApplication so Preferences can
  get upgraded correctly
- Fix upgrade script for 2.5 to 2.6
- Fix upgrade script for 2.6 to 2.7 which relies on the upgrade of 2.5
  to 2.6
2017-07-06 14:19:26 +02:00
Lipu Fei
ead94a8456 Cura should register actual stack MIME types instead of the generic Uranium stack type
CURA-3975

When the ContainerRegister loads all container files, it decides which
actual class to use based on the registered MIME type of that file.
Because Cura registers the GlobalStack and ExtruderStack files as the
generic Uranium MIME type, the register loads them as Uranium
ContainerStacks. This commit solves this problem.
2017-07-06 11:30:05 +02:00
Lipu Fei
3d48024a47 Override getConfigurationTypeFromSerialized for GlobalStack
CURA-3975

GlobalStack has metadata type "machine", which is different from what is
registered in the VersionUpgradeManager "machine_stack". This commit
makes sure that Cura can find the correct upgrade route for the
GlobalStack files.
2017-07-06 10:26:02 +02:00