7407 Commits

Author SHA1 Message Date
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
MaukCC
40f48f7825
Update cartesio_0.4.inst.cfg 2017-02-24 12:39:15 +01:00
MaukCC
a4c65fda67
Update cartesio_0.8.inst.cfg 2017-02-24 12:39:15 +01:00
MaukCC
2ba70c8453
Update cartesio_0.8.inst.cfg 2017-02-24 12:39:15 +01:00
MaukCC
264b488b31
Update cartesio_0.25.inst.cfg 2017-02-24 12:39:15 +01:00
MaukCC
d4f4ada2f0
Update cartesio_0.4.inst.cfg 2017-02-24 12:39:15 +01:00
MaukCC
c96e23e51c
Update cartesio_0.4.inst.cfg 2017-02-24 12:39:14 +01:00
MaukCC
047a078fb1
Update cartesio_0.25.inst.cfg 2017-02-24 12:39:14 +01:00
MaukCC
f123aec8bd
Update cartesio_0.25.inst.cfg 2017-02-24 12:39:14 +01:00
MaukCC
cadbecd1d1
Update cartesio_0.4.inst.cfg 2017-02-24 12:39:14 +01:00
MaukCC
2f9cbd38e9
Update cartesio_extruder_0.def.json 2017-02-24 12:39:14 +01:00
MaukCC
58c50a7022
Update cartesio_extruder_0.def.json 2017-02-24 12:39:14 +01:00
MaukCC
596fcc09b4
Update cartesio_extruder_0.def.json 2017-02-24 12:39:14 +01:00
MaukCC
39f6314395
Update cartesio_extruder_1.def.json 2017-02-24 12:39:13 +01:00
MaukCC
e5442bbe9e
Update cartesio_extruder_3.def.json 2017-02-24 12:39:13 +01:00
MaukCC
c7b7ec9723
Update cartesio_extruder_2.def.json 2017-02-24 12:39:13 +01:00
MaukCC
0c0f5c7e57
Update cartesio_extruder_1.def.json 2017-02-24 12:39:13 +01:00
MaukCC
a11ef02468
Update cartesio_extruder_0.def.json 2017-02-24 12:39:13 +01:00
MaukCC
67d3e59ea4
Update cartesio_extruder_0.def.json 2017-02-24 12:39:13 +01:00
MaukCC
b3acfb31f9
Update cartesio_extruder_1.def.json 2017-02-24 12:39:13 +01:00
MaukCC
97ba04acc0
Update cartesio_extruder_1.def.json 2017-02-24 12:39:13 +01:00
MaukCC
8022613a7b
Update cartesio_extruder_0.def.json 2017-02-24 12:39:12 +01:00
MaukCC
7b68b27b4a
Update cartesio_extruder_1.def.json 2017-02-24 12:39:12 +01:00
MaukCC
7d41ca7b33
Update cartesio_extruder_1.def.json 2017-02-24 12:39:12 +01:00
MaukCC
cf6c99c5b1
Update cartesio.def.json 2017-02-24 12:39:12 +01:00
MaukCC
031714d4f0
Update cartesio_0.8.inst.cfg 2017-02-24 12:39:12 +01:00
MaukCC
ad0d95c863
Update cartesio_0.4.inst.cfg 2017-02-24 12:39:12 +01:00
MaukCC
bebc5be17d
Update cartesio_0.25.inst.cfg 2017-02-24 12:39:12 +01:00
MaukCC
17abe51d0a
Update cartesio.def.json 2017-02-24 12:39:12 +01:00
MaukCC
7a25930166
Update cartesio.def.json 2017-02-24 12:39:11 +01:00
MaukCC
4469e5ce66
Update cartesio.def.json 2017-02-24 12:39:11 +01:00