GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-12 12:41:51 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,424 Commits 295 Branches 268 Tags
Commit Graph

7424 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
43dff1296c Move retraction distance to material settings 
I've discussed this with Tom, Kristel, Diana, Marvin and Oscar. This setting should really be dependent on material since the material influences the speed it can handle the most.

Contributes to issue CURA-346.
 2016-04-25 16:23:36 +02:00
Ghostkeeper
ceb9df8c5d Ignore PyCharm IDE files 2016-04-25 16:23:36 +02:00
Ghostkeeper
4548c38af6 Structure gitignore 2016-04-25 16:23:36 +02:00
Simon Edwards
f92ff3e864 Only talk to the CuraEngine socket from the same (Main) thread, and be a lot more careful about handling the StartSliceJob when restarting CuraEngine. 
Fixes CURA-1434
 2016-04-25 15:53:02 +02:00
Jaime van Kessel
e073860389 Devices are now correctly removed 
CURA-49
 2016-04-25 15:21:44 +02:00
Jaime van Kessel
f9a1b75c7c Added timeout to get request (so we detect disconnect a lot faster) 
CURA-49
 2016-04-25 15:00:00 +02:00
fieldOfView
cde23edfed Prevent wizard pages from closing when they are "accepted" by pressing return. 
Also removes some code replication in wizard pages.
CURA-1354
 2016-04-25 13:51:22 +02:00
Jaime van Kessel
b3490ee9b9 Codestyle & documentation 
CURA-49
 2016-04-25 12:01:53 +02:00
Jaime van Kessel
4090e461df Setting progress won't cause devision by zero anymore 
CURA-49
 2016-04-25 11:45:16 +02:00
Jaime van Kessel
bb1a616c1f Removed hardcoded url 
CURA-49
 2016-04-25 11:44:20 +02:00
Jaime van Kessel
982258ece7 Cleaned up more code 
CURA-49
 2016-04-25 11:42:13 +02:00
Jaime van Kessel
8b764c7585 Code cleanup & documentation 
CURA-49
 2016-04-25 11:39:31 +02:00
Jaime van Kessel
41a07c000d Added extra status catching for when active machine instance is None 
CURA-49
 2016-04-25 10:24:15 +02:00
Jaime van Kessel
bc8f8473e5 Name refactor 
CURA-49
 2016-04-25 10:22:06 +02:00
Jaime van Kessel
27b3fa1d45 Removed send-gcode job (no longer need job because we use qt sending) 
CURA-49
 2016-04-25 10:20:46 +02:00
Thomas-Karl Pietrowski
7d2b329e78 Just a stupid mistake 
.reverse() does not return anything (None)
 2016-04-21 20:23:07 +02:00
Thomas-Karl Pietrowski
3a61cf3152 Little typo 2016-04-21 19:41:10 +02:00
Thomas-Karl Pietrowski
1a52454165 This should be fine now.. 2016-04-21 19:09:15 +02:00
Thomas-Karl Pietrowski
61069e9a71 Making the fix working with a list of PATHS seperated by os.pathsep 
Needs testing but should work. (fingers crossed)
 2016-04-21 17:34:33 +02:00
Jaime van Kessel
c700a684d3 We now use QT stuff for uploading, as this doesn't mess up the GIL 
CURA-49
 2016-04-21 15:57:26 +02:00
Ghostkeeper
134867f833
Fix indenting tabs -> spaces 
Contributes to issue CURA-695.
 2016-04-20 17:18:10 +02:00
Tim Kuipers
4913f89b9b Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-20 15:25:38 +02:00
Tim Kuipers
6799a76a7c JSON fix: combing mode default enum value (CURA-694) 2016-04-20 15:25:23 +02:00
Ghostkeeper
067dda821f Merge pull request #711 from thopiekar/master-marker-for-nvidia-workaround 
[master] Adding marker for the Nvidia workaround
 2016-04-20 09:36:04 +02:00
Thomas-Karl Pietrowski
37ba88351a Adding marker for the Nvidia workaround 2016-04-19 20:24:56 +02:00
Thomas-Karl Pietrowski
286673e812 Making WORKAROUND a true marker 2016-04-19 20:18:07 +02:00
Thomas-Karl Pietrowski
98c84798c6 Making sure we got the realpath when using an absolute path 2016-04-19 20:17:20 +02:00
Thomas-Karl Pietrowski
8c0d7aea8a Merge branch 'pythonpath-fix-reworked' of https://github.com/thopiekar/Cura into pythonpath-fix-reworked 2016-04-19 19:39:04 +02:00
Thomas-Karl Pietrowski
102e13b152 Doing the check the other way round.. 2016-04-19 19:35:31 +02:00
Thomas Karl Pietrowski
e040029a41 Just a little typo 2016-04-19 19:18:05 +02:00
Thomas-Karl Pietrowski
839bc1fec8 Making PR #708 more concrete 
Now a check is made whether PYTHONPATH is set at all. So 'normal' installations will pass that section.
After that sys.path is checked whether the last element is PYTHONPATH.
If it is PYTHONPATH will be moved before entry at sys.path[1], because sys.path[0] is os.curdir. Inserting PYTHONPATH in front of it might be unsave.
 2016-04-19 19:11:14 +02:00
Thomas-Karl Pietrowski
a8e13f13ba Add missing import of 'os' 2016-04-19 18:56:58 +02:00
Thomas-Karl Pietrowski
e7e1dab53d Merge remote-tracking branch 'upstream/master' into pythonpath-fix-reworked 2016-04-19 18:54:27 +02:00
Arjen Hiemstra
c2ac0e8217 Fix resource paths after Uranium API change 
Contributes to CURA-1390
 2016-04-19 18:11:11 +02:00
Tim Kuipers
3e94c37f57 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-19 17:39:46 +02:00
Tim Kuipers
e7e4512fd0 JSON: fix: moved line distance computation from engine to frontend (CURA-1317) 2016-04-19 17:39:30 +02:00
Arjen Hiemstra
c329c2e12d Do not try to recreate the socket when we are shutting down anyway 
This prevents issues where closing the socket triggers socket creation
and then a deadlock occurs.

Contributes to CURA-1391
 2016-04-19 16:52:22 +02:00
Jaime van Kessel
f9bf54348d Head position is now saved 
CURA-49
 2016-04-19 15:35:56 +02:00
Jaime van Kessel
02e02a8f98 Added way to update the head position 
CURA-1339
 2016-04-19 15:30:34 +02:00
Jaime van Kessel
387dae140f UpdateThread now only joins when it's actually running 
An output device can be created and never have it's connect called.
Because the delete of the output device calls close, we need to handle this

CURA-49
 2016-04-19 12:15:45 +02:00
Jaime van Kessel
1a44c394e1 Warning message is shown if the printer is still active. 
CURA-49
 2016-04-19 12:10:53 +02:00
Jaime van Kessel
2034aeb5c1 Progress of a print job is now tracked 
CURA-49
 2016-04-19 12:05:03 +02:00
Jaime van Kessel
d33a75906a Progress is now only emitted if it changed 
CURA-1339
 2016-04-19 12:04:22 +02:00
Jaime van Kessel
688ab85dc6 Added status messages when printing with network 
CURA-49
 2016-04-19 11:59:02 +02:00
Jaime van Kessel
94ed8c8177 UpdateThread now correctly uses join upon close 
CURA-49
 2016-04-19 11:44:51 +02:00
Jaime van Kessel
cf061b2fbe Added filter machines to requestWrite 
CURA-49
 2016-04-19 11:42:39 +02:00
Jaime van Kessel
298c740abe Bed & extruder temps are now logged 
CURA-49
 2016-04-19 11:06:59 +02:00
Jaime van Kessel
48625ed129 Improved error logging & handling in update thread 
CURA-49
 2016-04-19 11:02:55 +02:00
Jaime van Kessel
404ea89ff7 Connection now correctly uses connection state 
CURA-49
 2016-04-19 10:51:24 +02:00
Jaime van Kessel
2a90c76cb8 Renamed connection to printer 
CURA-49
 2016-04-19 09:59:54 +02:00