Ghostkeeper
9f38ae5b68
Add material_print_temperature back into profiles
...
The optimisation script didn't know that the temperature settings in material profiles now refers to default_material_print_temperature rather than material_print_temperature. This caused a few things to go wrong here.
Contributes to issue CURA-3433.
2017-03-01 14:30:48 +01:00
Ghostkeeper
3f059ff1d4
Reduce code duplication
...
It stays unreadable though, because of JSON.
Contributes to issue CURA-3405.
2017-03-01 14:08:33 +01:00
jack
fee73c352c
Merge pull request #1481 from Ultimaker/feature_override_profile
...
Feature override profile
2017-03-01 13:52:05 +01:00
Jaime van Kessel
6cf1fa4121
Removed uneeded global container changed signal hook
...
CURA-3221
2017-03-01 13:27:25 +01:00
Ghostkeeper
17e1fdf7a6
Increase warning temperature for initial layer as well
...
It was already changed for normal printing temperature.
Contributes to issue CURA-3433.
2017-03-01 13:25:16 +01:00
Jack Ha
8a8b97d371
CuraEngineBackend now properly postpones onSceneChanged instead of ignoring some. CURA-3413
2017-03-01 11:45:50 +01:00
Jaime van Kessel
1ba8ee2051
Fixed issue that in some cases not all changed settings for all extruders were shown
...
CURA-3221
2017-03-01 11:35:06 +01:00
Jaime van Kessel
a1281bc019
Clarified some of the text in the discard dialog
...
CURA-3221
2017-03-01 11:33:03 +01:00
Jack Ha
34d283db53
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-01 10:55:38 +01:00
Ghostkeeper
74afbbc1d4
Merge branch 'tbackdahl-VertexK8400Defs'
2017-03-01 10:54:37 +01:00
Jack Ha
0eec48b9e3
Fix reslice when deleting nodes, fix moving groups. CURA-3412
2017-03-01 10:53:53 +01:00
Ghostkeeper
de7e1247e3
Merge branch 'VertexK8400Defs' of https://github.com/tbackdahl/Cura into tbackdahl-VertexK8400Defs
2017-03-01 10:44:03 +01:00
Ghostkeeper
82b2bc13e2
Don't cool bed if there is no heated bed
...
Makes the line a bit unusable, but it was already unusable, really.
Contributes to issue CURA-3405.
2017-03-01 09:48:53 +01:00
Jaime van Kessel
9b63f1237a
Instead of the setting function we now show the calculated value for settingoverride dialog
...
CURA-3221
2017-03-01 09:48:26 +01:00
Ghostkeeper
9ea7681ba0
Fix selecting heated bed for UMO
...
This was broken by the type hinting refactors.
Contributes to issue CURA-3405.
2017-03-01 09:47:30 +01:00
Jack Ha
212a2bc4f3
Removed unused theme element. CURA-3321
2017-02-28 14:47:25 +01:00
Jack Ha
f22299c80d
Added option for show_travels in compatibility mode top layers. CURA-3321
2017-02-28 14:43:46 +01:00
Simon Edwards
807542cc1f
Fixed a merge problem.
...
CURA-3431 Not possible to export a profile
2017-02-28 14:38:28 +01:00
Tim Kuipers
cae40da7aa
JSON fix: put material_print_temperature_layer_0 back to normal print temp for all machines other than UM3 family (CURA-3359)
2017-02-28 14:23:46 +01:00
Jaime van Kessel
af21146fef
Layout improvements
...
CURA-3221
2017-02-28 14:07:12 +01:00
Jaime van Kessel
4d32bbda99
Values are now converted to string.
...
For some reason this causes a different rounding to occur. I don't know why, but it does solve the problem
CURA-3221
2017-02-28 13:42:35 +01:00
Jaime van Kessel
4d7133610d
Updated layout of dialog
...
CURA-3221
2017-02-28 13:38:15 +01:00
Jack Ha
ba6a8eb869
Legend is now in the switching layer type area, removed legend upper right. CURA-3321
2017-02-28 13:34:58 +01:00
Jaime van Kessel
85b58c9296
Pressing the discard button now actually discards the changes
...
CURA-3221
2017-02-28 12:35:08 +01:00
Jack Ha
27f013fd81
Cleanup layout, finalizing
2017-02-28 11:52:51 +01:00
Simon Edwards
454a5969c2
Removed debug.
...
CURA-3418 Cura build on Win 64 fails due to $PYTHONPATH
2017-02-28 10:25:44 +01:00
Jaime van Kessel
2462699982
Switching profiles now shows a new dialog with all the changes.
...
CURA-3221
2017-02-28 10:25:42 +01:00
Simon Edwards
f5f02ead88
Added some debug.
...
CURA-3418 Cura build on Win 64 fails due to $PYTHONPATH
2017-02-27 17:13:12 +01:00
Jack Ha
8b7aee1664
Adjusted menu, added View Mode: Layers. CURA-3321
2017-02-27 14:16:56 +01:00
Jack Ha
fa1b332733
Moved layer view menu to left, next to sliders. CURA-3321
2017-02-27 14:06:17 +01:00
Simon Edwards
8602d984a9
Stop $PYTHONPATH from messing up the search path for DLLs.
...
CURA-3418 Cura build on Win 64 fails due to $PYTHONPATH
2017-02-27 13:38:05 +01:00
Jack Ha
8237421bcf
Undo testing QVector3D. CURA-3334
2017-02-27 13:33:55 +01:00
Jack Ha
fbc7e0f7c4
Take retraction_hop_enabled into account for extra z clearance. CURA-2729
2017-02-27 13:13:34 +01:00
Jack Ha
d300aad781
Merge branch 'master' of github.com:Ultimaker/Cura
2017-02-27 11:20:29 +01:00
Jack Ha
ccac9277a9
Undo old testcode, added testcode for CURA-3334
2017-02-27 11:20:22 +01:00
Simon Edwards
18368f3ad4
Type hints and fixes for ContainerManager.
2017-02-26 21:07:08 +01:00
Simon Edwards
4ab6b74930
Fixed a bunch of error which were reported by PyCharm's code analysis.
2017-02-26 21:05:09 +01:00
Thomas Bäckdahl
6f9fe60a6c
Velleman Vertex K8400 single and dual head
...
Definition files for single and dual head versions of Velleman Vertex
K8400 printer.
The machine uses printable coordinates x=0 to 200, y=20 to 200 and
parking position 200, 200 regardless of how many extruders you use.
Thereby the different machine_width for the two models.
The g-code can probably be improved.
USB connection not successful this far.
2017-02-24 20:57:46 +01:00
Ghostkeeper
7bb486a34b
Don't process status updates of pre-heating while request is going on
...
There was the problem that you'd click on pre-heat, so locally it would display the time-out. Then a package came in with the out-dated print status saying that the printer is not pre-heating, so the pre-heat was cancelled on Cura's side. Then the next status update came in saying that the pre-heat is now busy, so the pre-heat is resumed on Cura's side. So the button was flicking back and forth once after pressing. This commit makes Cura ignore any status updates that come while the put-request is still going on, because they may be outdated. It'll appear nicer to the user, mostly.
Contributes to issue CURA-3360.
2017-02-24 17:44:37 +01:00
Ghostkeeper
39920c95f3
Interpret cancelling pre-heat properly
...
If someone on a different computer cancels the pre-heat, this is now correctly updated locally.
Contributes to issue CURA-3360.
2017-02-24 17:14:54 +01:00
Ghostkeeper
d60014fa30
Sync remaining pre-heat time with printer
...
If multiple instances of Cura are running or Cura is restarted, it now properly syncs the remaining pre-heat time with the printer, so that all instances display the proper time.
There's still a bug in here that pressing cancel has no effect the first time since the remaining pre-heat time is updated immediately from the printer before the command to cancel got through remotely. I'll see what I can do to amend that. Also, cancelling is not yet synced.
Contributes to issue CURA-3360.
2017-02-24 14:53:00 +01:00
Ghostkeeper
537de489bf
Fix optimising CPE+, PC and TPU profiles
...
These materials are hard-coded in the optimisation script, so the optimisation script didn't know that those materials were materials and this caused a chain reaction where in the end the profile could only override XML-settings.
2017-02-24 14:12:32 +01:00
Ghostkeeper
c24e629ab3
Merge branch 'maukcc-master'
2017-02-24 12:40:54 +01:00
MaukCC
e80ac13615
Update cartesio_0.8.inst.cfg
2017-02-24 12:39:16 +01:00
MaukCC
93e800bae7
Update cartesio_extruder_0.def.json
2017-02-24 12:39:16 +01:00
MaukCC
d0124dafd8
Update cartesio_0.25.inst.cfg
2017-02-24 12:39:16 +01:00
MaukCC
5a06dc5e2f
Update cartesio_0.4.inst.cfg
2017-02-24 12:39:16 +01:00
MaukCC
b9b7df1593
Update cartesio_0.8.inst.cfg
2017-02-24 12:39:15 +01:00
MaukCC
94ab027499
Update cartesio_0.8.inst.cfg
2017-02-24 12:39:15 +01:00
MaukCC
cb9e8b57de
Update cartesio_0.25.inst.cfg
2017-02-24 12:39:15 +01:00
