Commit graph

3880 commits

Author SHA1 Message Date
Lipu Fei
4b27d036bc
Merge pull request #3659 from Ultimaker/fix_gcode_line_width
Adjust filament diameter to calculate line width in the gcode parser
2018-04-13 10:38:47 +02:00
Ghostkeeper
1769a69792
Don't crash Cura when material file is wrongly formatted
That was the whole point of this change. Instead degrade gracefully. It won't load the material file but give an error message saying that the material is corrupt. Then it won't be able to load the stack as well because the material doesn't exist, and give an error about the stack as well.

Contributes to issue CURA-5045.
2018-04-12 16:56:05 +02:00
Ghostkeeper
e96c50a582
Fall back to FDMPrinter if definition can't be loaded
Some of the settings will be different. But at least it won't crash.

Contributes to issue CURA-5045.
2018-04-12 16:54:21 +02:00
Diego Prado Gesto
1a6a39da93 CURA-5197 Add log output with number of models in the buildplate after
slice.
2018-04-12 16:53:00 +02:00
Ghostkeeper
942afe2c3f
Merge branch '3.3' into feature_show_config_errors 2018-04-12 16:20:42 +02:00
Lipu Fei
6d2e49c228 Merge remote-tracking branch 'origin/3.3' 2018-04-12 14:04:29 +02:00
Mark Burton
e50be5cbe7 No! G90 does not command absolute extrusion, M82 does that. 2018-04-12 13:44:27 +02:00
Diego Prado Gesto
01c846dbd8
Merge pull request #3651 from smartavionics/mb-fix-gcode-reader-g90
No! G90 does not command absolute extrusion, M82 does that.
2018-04-12 13:40:32 +02:00
Diego Prado Gesto
2d30315ecf CURA-5220 Skip storing the settings in the GCode if they already are. 2018-04-12 11:49:38 +02:00
Mark Burton
b7b48927c2 Append a \n to each saved line of gcode otherwise the whole file ends up as one line! 2018-04-12 11:49:19 +02:00
Diego Prado Gesto
2df95b6e35
Merge pull request #3655 from smartavionics/mb-fix-gcode-reader-missing-newlines
Append a \n to each saved line of gcode otherwise the whole file ends up as one line!
2018-04-12 11:30:16 +02:00
Diego Prado Gesto
03ec123c3c Use the correct filament diameter to calculate line width in the gcode
parser.
2018-04-12 11:00:43 +02:00
Mark Burton
da1790fd37 Append a \n to each saved line of gcode otherwise the whole file ends up as one line! 2018-04-11 17:08:55 +01:00
Ghostkeeper
0f148dd2e2
Merge branch '3.3' 2018-04-11 13:31:59 +02:00
Ghostkeeper
7d806e7ae9
Fix rendering before the extruder number decoration is set
If a render is triggered before this decorator is set it would crash. The rest of the code is robust against this being None, but here it would give a TypeError.
2018-04-11 11:59:54 +02:00
Mark Burton
c4a9c38c33 No! G90 does not command absolute extrusion, M82 does that. 2018-04-11 09:12:22 +01:00
Mark Burton
f023f6ea13 Add comment. 2018-04-11 08:54:17 +01:00
Mark Burton
1ce5920d48 Fix holes in spiralized objects that can occur at start of layer.
The gcode reader assumed that each layer starts with a move to the initial position but
for spiralized code that isn't true because the previous layer always ends up in the right
location. So we now start each layer with a fake move to the end position of the previous layer.
This won't actually cause a real move to occur but it ensures that the first line segment
in the new layer has the correct initial point.
2018-04-11 08:28:13 +01:00
Mark
586cb0a405 change default setting 2018-04-10 16:04:48 +02:00
Lipu Fei
40eedbcf70 Add more info dialog
CURA-5204
2018-04-10 15:33:32 +02:00
Lipu Fei
0fbb067508 Clean up code in SliceInfo
CURA-5204

 - Remove some unused imports
 - Do not depend on ExtruderManager
2018-04-10 13:34:59 +02:00
Lipu Fei
107c10b860 Merge branch '3.3' 2018-04-10 11:41:13 +02:00
Lipu Fei
95c6258d0f Handle plugin not found due to mixed plugin metadata
CURA-5202

Plugin metadata that comes from the plugin server is also saved into
PluginRegistry's metadata collection, so it's all mixed. Plugins that
are just installed cannot be loaded immediately, and this causes an
error in checkCanUpgrade().
2018-04-09 15:10:25 +02:00
Lipu Fei
4615c756a7 More clear error handling for container deserialization
CURA-5045

 - If a container cannot be deserialized in project loading, it should fail
   right on the spot because even if it continues, it still won't work.
 - In other places, at least log deserialization errors if any of them show
   up.
2018-04-09 14:51:05 +02:00
fieldOfView
2def68edab Merge branch 'master' into fix_usb_rapid_commands
# Conflicts:
#	cura/PrinterOutput/GenericOutputController.py
2018-04-09 14:49:12 +02:00
Aleksei S
10ebabb7f6 Home head only by X- and Y axis, do extra bedHome (G28 Z)
CURA-4844
2018-04-09 13:13:52 +02:00
Ghostkeeper
572721e20d
Catch ContainerFormatError when deserialising containers
Only the deserialize() functions themselves may pass the ContainerFormatError on, because their callers will have to handle those errors anyway.

Contributes to issue CURA-5045.
2018-04-06 13:26:16 +02:00
Lipu Fei
872a029f99 Merge remote-tracking branch 'origin/feature_benchmarking' 2018-04-06 10:47:00 +02:00
Lipu Fei
c47fe52ca5 Merge 3.3 into master 2018-04-06 10:39:38 +02:00
Lipu Fei
19937d1be0 Fix version comparison in plugin browser
CURA-5202

It was comparing with itself so there's never a version upgrade.
2018-04-06 10:34:55 +02:00
Diego Prado Gesto
877d700180 CURA-5197 Add log output with number of models in the buildplate after
slice.
2018-04-05 15:27:05 +02:00
Lipu Fei
8c4c52f915 Remove unused functions in PluginBrowser 2018-04-05 15:13:22 +02:00
Diego Prado Gesto
53c7e2a01e Merge branch 'master' of github.com:Ultimaker/Cura 2018-04-05 08:55:45 +02:00
Diego Prado Gesto
deaff17a32 Merge branch '3.3' 2018-04-05 08:54:50 +02:00
Jaime van Kessel
18551a4a72 Ensure that the "Slice info message disable button" actually disables the sending of info. 2018-04-04 17:39:22 +02:00
Diego Prado Gesto
79a66b43ab CURA-5175 Add the get_version function to the version upgrade. 2018-04-04 14:43:20 +02:00
fieldOfView
bc84c1f6e6 Prevent preheat timeout from occurring during a print 2018-04-04 13:47:40 +02:00
Lipu Fei
04571dcb9b Merge branch 'feature_try_line_widths' 2018-04-04 10:49:49 +02:00
Ghostkeeper
60a217fc84
Rename expandAll to expandRecursive
Because it doesn't expand all settings, just a category.
2018-03-30 15:07:42 +02:00
fieldOfView
08d4200f92 Prevent sending next command before an "ok" is received 2018-03-30 14:07:53 +02:00
Diego Prado Gesto
f1e33f0cba CURA-5175 Remove version upgrade of the quality instance containers
since they never get updated.
2018-03-29 17:08:59 +02:00
Ghostkeeper
d244a37feb
Merge branch '3.3' 2018-03-29 16:57:55 +02:00
Diego Prado Gesto
a5e38bb486 CURA-5175 Add variants to the version upgrade.
Upgrade the version number in the variants and add the hardware_type
metadata.
2018-03-29 16:54:30 +02:00
Jack Ha
54c85fd0ea CURA-4844 fix some typos 2018-03-29 13:25:26 +02:00
Ghostkeeper
a6d7a61c54
Merge branch '3.3' 2018-03-29 12:01:16 +02:00
Ghostkeeper
b3d652839d
Rename quality type from 'low' to 'fast'
Not only the profile name was changed, but also the quality type.

See commit 1538486e85.

Contributes to issue CURA-5177.
2018-03-29 12:00:59 +02:00
Ghostkeeper
50b4bac672
Upgrade quality profile names
These files have been renamed.

Contributes to issue CURA-5177.
2018-03-29 12:00:59 +02:00
Aleksei S
c81d5d9741 Merge branch 'master' of github.com:Ultimaker/cura 2018-03-29 11:54:43 +02:00
Aleksei S
290adbd906 Fix: bed leveling for UM+
CURA-4844
2018-03-29 11:53:31 +02:00
Jack Ha
af7af29d6b Merge branch '3.3' 2018-03-29 10:25:59 +02:00