Commit graph

12112 commits

Author SHA1 Message Date
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
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
e0c69eb675 Pressing enter on project overview will load the project file
CURA-4735
2018-01-19 12:51:09 +01:00
Lipu Fei
7c85db4a18 Fix material_diameter copy over for Extruders
CURA-4835
2018-01-19 12:30:56 +01:00
ChrisTerBeke
c7071c18dd Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2 2018-01-19 11:33:01 +01:00
ChrisTerBeke
99c40d09e9 Hitting enter on project loading dialog now loads the project instead of just closing the dialog - CURA-4735 2018-01-19 11:32:55 +01:00
Diego Prado Gesto
f25aad8091 CURA-4821 Remove debug output 2018-01-19 11:18:46 +01:00
Diego Prado Gesto
1f4e7421c1 Revert "CURA-4821 Remove debug info"
This reverts commit d03ecf3cba.
2018-01-19 11:17:42 +01:00
Lipu Fei
02291bb6a3 better name: "Compatible material diameter" in Machine Settings
CURA-4832
2018-01-19 11:15:55 +01:00
ChrisTerBeke
ce709bf24a Remove debug print - CURA-4829 2018-01-19 10:48:45 +01:00
ChrisTerBeke
a76c84ca30 Finally remove annoying firmware check log line for non-UM3 printers 2018-01-19 10:42:04 +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
Diego Prado Gesto
d03ecf3cba CURA-4821 Remove debug info 2018-01-19 09:16:22 +01:00
Mark
74e9bf051c Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2 2018-01-18 16:28:51 +01:00
Mark
a774012bd2 Default objectlist to collapsed CURA-4525 2018-01-18 16:28:46 +01:00
Diego Prado Gesto
2e4b4036e7 Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2 2018-01-18 15:50:06 +01:00
Diego Prado Gesto
ece63bfea8 CURA-4821 The previous cached layer data is removed when a GCode is loaded. Temporary solution for one buildplate. 2018-01-18 15:47:01 +01:00
Lipu Fei
322420092d Fix extruder handling in project loading
CURA-4824

When a machine is getting overriden, it should not try to create the
ExtruderStack for the single-extrusion machine loaded from the project
file, otherwise that ExtruderStack will become an extra one.
2018-01-18 13:49:41 +01:00
Ghostkeeper
afcf35cb0e
Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2 2018-01-18 13:25:16 +01:00
Ghostkeeper
dc08e7f043
Merge branch 'mb-move-wall-order-opt-setting' of https://github.com/smartavionics/Cura into smartavionics-mb-move-wall-order-opt-setting 2018-01-18 13:23:16 +01:00
Jack Ha
1796a182fa CURA-4525 fix crashing cura due to empty build plate 2018-01-18 11:54:30 +01:00
Diego Prado Gesto
5c0e2d39a3 Avoid zero thickness to be shown in layer view. 2018-01-17 11:54:22 +01:00
Diego Prado Gesto
e6169a7c61 Fix some typos 2018-01-17 11:53:31 +01:00
Diego Prado Gesto
cc89ddf5f7 Revert "Avoid zero thickness to be shown in layer view."
I saw that with these changes, Cura crashes when loading a GCode.
This reverts commit 8dd21892d3.
2018-01-17 11:39:38 +01:00
Diego Prado Gesto
8dd21892d3 Avoid zero thickness to be shown in layer view.
Also fix some typos.
2018-01-17 11:34:25 +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
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
cffeff0299 CURA-4805 remove modifiable settings when loading non sliceable file (gcode) 2018-01-16 15:58:14 +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
Lipu Fei
b0d2ef0f72 Correct default material diameter value for single-extrusion machines
CURA-4812
2018-01-16 15:04:21 +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
Diego Prado Gesto
0a4c30603f Change style of Add/Remove printers link in Monitor tab 2018-01-16 13:07:27 +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
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
Ghostkeeper
1e892dc45c
Remove unused variables
Contributes to issue CURA-4810.
2018-01-16 10:53:14 +01:00
Ghostkeeper
063eb8e5cd
Don't give an error when reading normal 3MF files
We have a signalling return value for this case. Let's use it.

Contributes to issue CURA-4810.
2018-01-16 10:53:02 +01:00
Jack Ha
24eff5f8b8 Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2 2018-01-16 10:47:38 +01:00
Jack Ha
71e4d42409 CURA-4795 set build plate of newly loaded 3mf files to active build plate 2018-01-16 10:47:30 +01:00
Ghostkeeper
39aec54a56
Fix reference to Tevo Black Widow model
Also fix some whitespace mistakes according to code style. Lots of tabs in there, whitespace at the end of a line, brackets on the same line, etc.
2018-01-16 09:28:29 +01:00
Ghostkeeper
8aa51658e2
Decimate Tevo Black Widow model
The original file size was too big. This is much better.
2018-01-16 09:28:29 +01:00
Aleksei S
9a3c9921ca Fix: remove unnecesary cura slice request
CURA-4785
2018-01-15 17:21:43 +01:00
Ghostkeeper
064a8e6f6c
Elide labels next to checkboxes
To the available width, if there is a width.
This won't work for right-to-left languages though...

Contributes to issue CURA-4692.
2018-01-15 16:41:33 +01:00