Jaime van Kessel
4d11bdd366
Changed height
...
CURA-1429
2016-04-26 12:09:11 +02:00
Ghostkeeper
d65a0a302a
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-04-26 12:00:24 +02:00
Ghostkeeper
fe68be4f62
Merge branch 'connection_rework'
2016-04-26 11:51:09 +02:00
fieldOfView
a2ff775c08
Limit the max_value for extruders to the number of extruders
...
CuraEngine would crash if instructed to use an extruder that it knows nothing about. Extruders start counting at 0, so max_value is set to machine_extruder_count - 1.
Fixes the crash outlined in CURA-965
2016-04-26 11:19:56 +02:00
Ghostkeeper
27aef006a8
Remove retraction settings from ulti-profile
...
Paul agreed, this should not be dependent on the quality. It was meant to allow a bit slower prints due to the time it takes to do a retraction, but that is not the bottleneck here. Material hardness is the bottleneck. Grinding is.
Contributes to issue CURA-346.
2016-04-25 16:23:37 +02:00
Ghostkeeper
c67ae0f1c9
Remove retraction settings from machine definitions
...
These should be different per material, not per machine.
Contributes to issue CURA-346.
2016-04-25 16:23:37 +02:00
Ghostkeeper
58d08f2b8d
Change default retraction for nozzle switch
...
This should get overridden by the heat zone length anyway.
Contributes to issue CURA-346.
2016-04-25 16:23:36 +02:00
Ghostkeeper
b5f00ffd80
Removed superfluous override from UM2+ definition
...
The default is line_width * 2 but this defined it as machine_nozzle_size * 2. I talked it over with Tom (who added that line) and he said it was only copied from Paul's profiles. It should've been line width. Makes more sense. It's line_width * 2 so that it can go from an outer wall to the infill without retracting.
Contributes to issue CURA-346.
2016-04-25 16:23:36 +02:00
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
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
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
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
02e02a8f98
Added way to update the head position
...
CURA-1339
2016-04-19 15:30:34 +02:00
Jaime van Kessel
d33a75906a
Progress is now only emitted if it changed
...
CURA-1339
2016-04-19 12:04:22 +02:00
Youness Alaoui
df8207747a
Force PYTHONPATH to be in the top of the sys.path list.
...
This fixes https://github.com/Ultimaker/Cura/issues/704
2016-04-18 14:42:29 -04:00
fieldOfView
919e2f55e9
Replace "notice" icon with an icon that is less jarring and differs more in shape with the "reset" icon
...
Contributes to CURA-1176
2016-04-18 17:39:28 +02:00
Tim Kuipers
083c6dc630
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-04-18 16:49:12 +02:00
Tim Kuipers
1ffcb8419a
JSON: Enable Combing ==> Combing Mode (CURA-694)
2016-04-18 16:49:02 +02:00
Jaime van Kessel
232e447a74
Added bq firmware (which caused merge issue)
2016-04-18 15:48:20 +02:00
Jaime van Kessel
6abeac5c44
Added comment about us violating the API
...
CURA-1339
2016-04-18 15:26:24 +02:00
Jaime van Kessel
71b4c983d0
Merge pull request #700 from thopiekar/master-bq_hephestos2-firmware
...
USBPrinting: Adding entry for BQ Hephestos 2 firmware
2016-04-18 15:21:49 +02:00
Jaime van Kessel
2c489ed054
Connection state signal is now connected before connect is called
...
CURA-1339
2016-04-18 15:05:21 +02:00
Jaime van Kessel
8a47903374
Changed namespace of usbprintermanager (QML) to Cura from UM
...
CURA-1339
2016-04-18 15:03:13 +02:00
Jaime van Kessel
a59c113887
Added busy & error state to ConnectionState
...
CURA-1339
2016-04-18 14:47:51 +02:00
Jaime van Kessel
fb52d39936
Changed enum values to lowerCamelCase
...
CURA-1339
2016-04-18 14:43:04 +02:00
Jaime van Kessel
96e821cc3d
PrinterOutputDevice now uses safer super().__init
...
CURA-1339
2016-04-18 13:27:36 +02:00
Jaime van Kessel
0939262ffe
Removed stray debug code
...
CURA-1339
2016-04-18 11:47:23 +02:00
Jaime van Kessel
b31106a666
Added missing (renamed) file
...
CURA-1339
2016-04-18 11:45:14 +02:00