Commit graph

3049 commits

Author SHA1 Message Date
ChrisTerBeke
f589ce9570 Copy first extruder values when they are available when upgrading - CURA-4835 2018-01-22 11:25:23 +01:00
Jack Ha
ba29d64592 CURA-4821 Fix one at a time slicing for builtiplexer 2018-01-22 11:07:38 +01:00
Lipu Fei
b92ebadfd0 Fix quality_changes for single-extrusion machines
CURA-4839

- Add newly created quality_changes container to ContainerRegistry
- If an extruder is created by CuraContainerRegistry, in project
  loading, do not try to override extruder's quality changes.
2018-01-19 15:05:05 +01:00
Lipu Fei
e7a19bcce5 Fix has_machine_quality value parsing
CURA-4837
2018-01-19 14:34:25 +01:00
Lipu Fei
79e79dd84c Only import profiles that match with the active machine
CURA-4837
2018-01-19 14:08:52 +01:00
Diego Prado Gesto
0fbcd2d2ec Merge branch '3.2' 2018-01-19 13:50:30 +01:00
ChrisTerBeke
d035ace40d Add method to set active extruder count to machine manager so other plugins can use it, add empty definitions container template 2018-01-19 13:32:25 +01:00
Lipu Fei
7c85db4a18 Fix material_diameter copy over for Extruders
CURA-4835
2018-01-19 12:30:56 +01:00
ChrisTerBeke
ce709bf24a Remove debug print - CURA-4829 2018-01-19 10:48:45 +01:00
ChrisTerBeke
8412e8535a Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2 2018-01-19 10:37:00 +01:00
ChrisTerBeke
e4a111dd2e Delay adding global stack when creating new machine until after extruder stacks are created - CURA-4828 2018-01-19 10:36:25 +01:00
Diego Prado Gesto
a6acf4a4af CURA-4829 Do not save the quality changes profile in the GCode if the
containers are empty.
Change the message when trying to import a GCode as a profile, but not profile was stored.
2018-01-19 10:34:04 +01:00
Jack Ha
68347afc48 CURA-4033 fix init order of print information 2018-01-18 14:40:15 +01:00
ChrisTerBeke
5e99fd6c1e Fixes for print information when running in headless mode 2018-01-18 09:05:40 +01:00
ChrisTerBeke
422d047317 Merge branch 'master' into feature_headless_docker 2018-01-17 17:02:04 +01:00
ChrisTerBeke
4d0eaf6093 Merge branch 'feature_headless_docker' of https://github.com/Ultimaker/Cura into feature_headless_docker 2018-01-17 17:01:58 +01:00
Jack Ha
8a53549bce CURA-4033 split update bounds for a single node in buildvolume and also call it from readMeshFinished 2018-01-17 17:01:03 +01:00
ChrisTerBeke
c1308de753 Merge branch '3.2' 2018-01-17 11:40:06 +01:00
Diego Prado Gesto
26371c9c3a CURA-4815 When creating the unique name for a machine, don't look at the
definition instance container for the id, just look at the container
stack ids.
2018-01-17 10:57:11 +01:00
Lipu Fei
cb0ac9b0c8
Merge pull request #3137 from Ultimaker/feature_multiple_BP
Feature: Printers with different build plates
2018-01-17 10:55:46 +01:00
Ian Paschal
fad43be23b Fixes CURA-4789
Emits `sceneChanged` which `PrintInformation` listens for and then resets with. Same result re: print time, but also will update anythign else which is listening for `sceneChanged`.
2018-01-16 17:03:52 +01:00
Ian Paschal
ba1f915633 Fix for CURA-4789
`deleteAll()` within `CuraApplication.py` now resets the print information by calling its `setToZeroPrintInformation()` method, rather than by reinstatiating the `PrintInformation` class.
2018-01-16 16:30:10 +01:00
Jack Ha
07f0906b1c Merge branch '3.2' 2018-01-16 16:05:38 +01:00
Jack Ha
fc2cbb61fa Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2 2018-01-16 15:37:02 +01:00
Jack Ha
54698ada7f CURA-4807 fix not choosing 'not supported' if there are valid options after changing variant; partly undoing 4abbd4b988 2018-01-16 15:36:57 +01:00
ChrisTerBeke
cbd6a996fa Remove unused Signal import 2018-01-16 15:10:46 +01:00
ChrisTerBeke
02b681a8f2 Fixes for slicing 2018-01-16 15:10:16 +01:00
Ghostkeeper
cbf9a08c6e
Merge branch '3.2' 2018-01-16 13:45:11 +01:00
Ghostkeeper
f948203a63
Fix crash when clearing build plate
We shouldn't delete the singleton PrintInformation object. We should rather just zero out the print information. And instead of doing that explicitly in deleteAll, listen to scene changes from PrintInformation in order to keep the logic related to the print information contained within its class.

Contributes to issue CURA-4810.
2018-01-16 13:44:49 +01:00
Lipu Fei
51b49c89f4 Switch to LayerView after GCode has been fully loaded
CURA-4805
2018-01-16 13:09:35 +01:00
Lipu Fei
8a570c4b01 Show user profiles based on Not Supported
CURA-4807
2018-01-16 11:57:20 +01:00
Lipu Fei
abece3c415 Add quality_type = not_supported to empty_quality_changes
CURA-4807
2018-01-16 11:57:20 +01:00
Jack Ha
2d9e25312e Merge branch '3.2' 2018-01-16 11:50:00 +01:00
Jack Ha
a0738c2977 CURA-4808 fix extruder setting change trigger slice. re-introduce extrudersAdded signal, probably needed because of timing issues (extruder added after loading global container). it's the inversion of 225b03e98e 2018-01-16 11:49:45 +01:00
Ghostkeeper
27c0ca4dea
Move some things outside of try-catch clause
Only the pre-read should really be in there. Otherwise we'd hide some mistakes in our code.

Contributes to issue CURA-4810.
2018-01-16 10:53:14 +01:00
Diego Prado Gesto
da4c98b204 Merge branch 'master' into feature_multiple_BP 2018-01-16 09:59:21 +01:00
ChrisTerBeke
d19b2fb8d9 Fix merge conflicts with master 2018-01-16 09:11:30 +01:00
Diego Prado Gesto
0f497545bc CURA-4461 Create properties to know when a buildplate is compatible or usable. Show colors indicating the compatibility. Also minor fixes 2018-01-15 18:00:49 +01:00
Ghostkeeper
e7c5120f9c
Merge branch '3.2' 2018-01-15 16:52:28 +01:00
Lipu Fei
9a5b215814 Do not show not supported when there are supported profiles
CURA-4796
2018-01-15 15:16:43 +01:00
Lipu Fei
784707bb85 Stay on the same build plate after everything is removed
CURA-4795
2018-01-15 14:42:22 +01:00
Ian Paschal
dac67ef2fc
Merge pull request #3134 from Ultimaker/3.2
Fix for CURA-4789
2018-01-15 14:41:23 +01:00
Ian Paschal
5280501660 Fix for CURA-4789
`deleteAll()` within `CuraApplication.py` used to only delete all scene nodes but now also resets the print information, as deleting all scene nodes _should_ do that by default. Timer now resets to 0, and project name is reset.
2018-01-15 14:40:01 +01:00
Lipu Fei
a3c2635648 Fix profile manager to support not supported custom profiles
CURA-4796

Profile manager should be able to show custom profiles that are based on
the not supported profile correctly.
2018-01-15 14:29:52 +01:00
Lipu Fei
1d104f367d Do not show not supported in profile manager
CURA-4796
2018-01-15 14:29:51 +01:00
Lipu Fei
4abbd4b988 Show custom qualities based on not supported
CURA-4796
2018-01-15 14:29:51 +01:00
Ghostkeeper
5d947b8981
Merge branch '3.2' 2018-01-15 13:58:40 +01:00
Lipu Fei
dc596d0e1e Only remove selectable nodes in deleteAll()
CURA-4795

Otherwise, after loading a project file, all nodes including the
machine will be removed and you don't see the machine any more.
2018-01-15 11:12:09 +01:00
Lipu Fei
87dc3535bb Use isinstance() for SceneNode type check
CURA-4525
2018-01-15 09:59:41 +01:00
Jack Ha
c5c357d126 Fixed merge conflicts of cherry picking dimensions fix 2018-01-15 09:48:17 +01:00