Commit graph

17030 commits

Author SHA1 Message Date
Jaime van Kessel
34b76f3c1e Implemented _setTargetHotendTemp
CURA-1339
2016-04-14 13:04:16 +02:00
Jaime van Kessel
9e8d61aea2 Added missing pyqtslot decorator
CURA-1339
2016-04-14 13:03:54 +02:00
fieldOfView
50c2760af1 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-14 12:29:50 +02:00
fieldOfView
003f973ba4 Prevent profiles being added if there is no active machine 2016-04-14 12:29:28 +02:00
Arjen Hiemstra
e5cc84cb3e Handle negative layers in the Layer view
Offset all layers by the minimum layer count. This makes raft just a
minor special case when processing layers instead of needing to adjust
everything.

Contributes to CURA-653
2016-04-14 12:17:40 +02:00
fieldOfView
2afea115da Fix width of troubleshooting guide link in Simple mode sidebar 2016-04-14 11:56:36 +02:00
fieldOfView
5c723cc9d6 Fix string comparison in fdmprinter.json
CURA-1394
2016-04-14 11:49:46 +02:00
Jaime van Kessel
0c09df71d9 wizard now sets Target temperature
CURA-1339
2016-04-14 11:09:30 +02:00
Jaime van Kessel
58b216828a Added handling for when connection was never correctly added to list
CURA-1339
2016-04-14 11:06:11 +02:00
Jaime van Kessel
4f3489233c Added home head & bed implementations
CURA-1339
2016-04-14 11:02:43 +02:00
Jaime van Kessel
5f2e0ceec8 Fixes so the QML displays right temperatures again
CURA-1339
2016-04-14 11:02:16 +02:00
Jaime van Kessel
ceb8ef86f8 Added home bed & head functions
CURA-1339
2016-04-14 11:00:03 +02:00
Jaime van Kessel
0a46567c17 USB printing now uses printeroutputdevice for temperatures
CURA-1339
2016-04-13 16:57:08 +02:00
Jaime van Kessel
45b3e8fbd6 Hotend temperatures now follow same logic as bed
CURA-1339
2016-04-13 16:56:44 +02:00
Ghostkeeper
6223c0e2e9 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-13 16:23:27 +02:00
Jaime van Kessel
5ff5a957ae Added _setBedTemperature
CURA-1339
2016-04-13 16:08:17 +02:00
Ghostkeeper
7435010dd4
Code style: No whitespace at end of line
Contributes to issue CURA-494.
2016-04-13 15:59:48 +02:00
Ghostkeeper
f222c870f1
Codestyle: No whitespace at end of line
Contributes to issue CURA-494.
2016-04-13 15:56:56 +02:00
Jaime van Kessel
0cd1031ec7 Changed USB printing to reflect changes in output device API
CURA-1339
2016-04-13 15:15:37 +02:00
Jaime van Kessel
2b9aa1dbb5 PrinterOutput device now uses connection state
This is instead of the multiple booleans that were used in USB printer

CURA-1339
2016-04-13 15:09:25 +02:00
Jaime van Kessel
5830690107 Added setter for progress
CURA-1339
2016-04-13 14:11:18 +02:00
Jaime van Kessel
598c5be976 Temperatures are now stored in the class
CURA-1339
2016-04-13 14:08:10 +02:00
Arjen Hiemstra
9b88f06970 Merge branch '2.1' 2016-04-13 13:53:51 +02:00
Jaime van Kessel
0f097f0f64 Added property for target bed temp
CURA-1339
2016-04-13 13:48:32 +02:00
Jaime van Kessel
f963ad5021 Renamed _setBedTemperature to setTargetBedTemperature
CURA-1339
2016-04-13 13:46:10 +02:00
Jaime van Kessel
623596ca59 Added isConnecting
CURA-1339
2016-04-13 13:45:07 +02:00
Jaime van Kessel
e5adea4ab2 PrinterOutputdevice is now also a QObject
CURA-1339
2016-04-13 13:36:22 +02:00
Jaime van Kessel
70eb042895 More fleshing out of the printerOutputDevice
CURA-1339
2016-04-13 13:31:18 +02:00
Jaime van Kessel
8e853ffecb Added documentation
CURA-1339
2016-04-13 13:19:57 +02:00
Jaime van Kessel
a4314638ab Added delete to printerOutput device to ensure it is properly closed
CURA-1339
2016-04-13 09:57:36 +02:00
Tim Kuipers
cdd2466bec Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-13 09:57:30 +02:00
Tim Kuipers
592d98d4fd JSON: refactor: combing bool ==> enum; introduction of noskin combing (CURA-694) 2016-04-13 09:56:34 +02:00
Jaime van Kessel
de9721e5de Added temperature & position stubs
CURA-1339
2016-04-13 09:56:13 +02:00
Tim Kuipers
cc06c632a1 JSON: refactor: combing bool ==> enum; introduction of noskin combing (CURA-694) 2016-04-13 09:50:51 +02:00
fieldOfView
3ad65e315f Terminate CuraEngine if it is still running when Cura is closed
CURA-1388
2016-04-12 18:05:33 +02:00
Ghostkeeper
ea6a4d5f27
../resources/i18n/nl/fdmprinter.json.po 2016-04-12 17:39:03 +02:00
fieldOfView
db7777a6e7 Move Rotation "tooltip" out of cura.qml and make it useful for other tools as well
Tool hint is now a child of Toolbar.qml, where it fits with the tools for which it is useful.

CURA-1014
2016-04-12 17:09:32 +02:00
Jaime van Kessel
6dd0a0d61a Added printer specific output device
CURA-1339
2016-04-12 16:45:58 +02:00
Ghostkeeper
7cc31c3d2e Update translations
Updates the translations with the updated strings. Made by Bothof.

Contributes to issue CURA-1190.
2016-04-12 16:34:45 +02:00
Arjen Hiemstra
4253a3f9ef Round convex hull data to 0.1mm, then remove duplicates
This greatly reduces convex hull complexity while at the same
time not introducing much error into the convex hull. This keeps
things responsive when dealing with more complex models.

Contributes to CURA-1387
2016-04-12 15:40:10 +02:00
Jaime van Kessel
63eb1793ad Renaming USBPrinterConnection
CURA-1339
2016-04-12 15:15:02 +02:00
fieldOfView
6e1265a822 Add width, height in addition to minimumWidth, minumumHeight to fix retina issue on OSX
Without these additions, windows (preferences, wizards, about) open larger than fullscreen, making some controls inaccessible

Fixes CURA-504
2016-04-12 10:23:43 +02:00
fieldOfView
967c062357 Fix import error starting up with an empty profile
CURA-1376
2016-04-12 07:41:42 +02:00
fieldOfView
a862f29794 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-11 20:59:45 +02:00
fieldOfView
0259457d2e Prevent overly long names for printers and profiles
Contributes to CURA-1342
2016-04-11 20:58:53 +02:00
Tim Kuipers
a57125292d JSON fix: syntax mistake 2016-04-11 19:10:16 +02:00
Tim Kuipers
3c919e9652 Revert "JSOn/profiles: changed infill overlap to mm (CURA-786)"
This reverts commit 24f1726585.
2016-04-11 19:04:36 +02:00
Tim Kuipers
59f5bcb1cd feat: infill overlap in mm (besides %) (CURA-786) 2016-04-11 18:57:37 +02:00
Tim Kuipers
de64e812ff removed old duplicate profiles introduced by rename and merge (CURA-1349) 2016-04-11 18:51:06 +02:00
Tim Kuipers
a144a51da4 Manual Merge branch 'fix_setting_issues_2.1_merge' of https://github.com/Ultimaker/Cura
This is a manual merge. I did a checkout on specific files from another branch

That branch branched from 2.1 and I cherry-picked all commits which were on master but not on 2.1 manually by reviewing each of them

This way of merging bypasses all problems we had with the standard merges from 2.1 into master

CURA-1349
2016-04-11 18:50:41 +02:00