GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-10 17:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,259 Commits 295 Branches 268 Tags
Commit Graph

3259 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 2.1.0 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 24f1726585781b74838952691c98973c4bf6fb16.
 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
Arjen Hiemstra
d5bf9b3733 Merge branch '2.1' 
* 2.1:
  Do not round convex hull points to nearest int
  Use fdmprinter.json If we have no active machine instead of returning None
  JSON fix: max value of infill_sparse_thickness based on engine MAX_COMBINE_COUNT hardcoded value (CURA-1374)
 2016-04-11 15:40:36 +02:00
Arjen Hiemstra
51c4e277ae Do not round convex hull points to nearest int 
This might have made sense when convex hulls were not recalculated on
transformation changes but as it is now, we want to be able to specify
0.5 as a valid point for a convex hull.

Contributes to CURA-435
 2016-04-11 15:30:27 +02:00
Arjen Hiemstra
cdb235740d Use fdmprinter.json If we have no active machine instead of returning None 
This prevents issues where backend creation would end up in an infinite
loop while there was no active machine.

Contributes to CURA-1376
 2016-04-11 13:01:03 +02:00
Arjen Hiemstra
6896fbf93a Re-add CuraVersion.py.in which got deleted in 97d16ae3 
It is required for the build to work as the file gets processed to
include the proper version.
 2016-04-11 12:06:27 +02:00
Simon Edwards
8fad56c1f4 Revert a number of Settings names changes after code review. 
CURA-1177
 2016-04-11 11:13:20 +02:00
Tim Kuipers
e28bed6006 JSON fix: max value of infill_sparse_thickness based on engine MAX_COMBINE_COUNT hardcoded value (CURA-1374) 2016-04-08 16:43:18 +02:00
Jaime van Kessel
14edc8aac8 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-08 15:07:46 +02:00
Jaime van Kessel
63593ba16c Moved layerData & polygon to own file 2016-04-08 15:07:07 +02:00
Jaime van Kessel
dc1630c268 Merge branch '2.1' of https://github.com/Ultimaker/Cura 2016-04-08 15:02:30 +02:00
Tim Kuipers
2ccdf674c8 JSON fix: max value of infill_sparse_thickness based on engine MAX_COMBINE_COUNT hardcoded value (CURA-1374) 2016-04-08 14:34:36 +02:00
Jaime van Kessel
97d16ae3bd Update documentation & code cleanup 2016-04-08 14:26:28 +02:00
ckielstra
4c233e75f4 Spelling 2016-04-08 11:06:24 +02:00
Jaime van Kessel
bc0d8818cf Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-04-08 09:59:35 +02:00
Jaime van Kessel
e034e3f9e1 Extra hull area now matches the assumptions in the rest of the code 
It's now also correct according to the original documentation.
CURA-435
 2016-04-08 09:58:34 +02:00
ckielstra
75d3a13659 Spelling 2016-04-08 09:51:46 +02:00
fieldOfView
27e3f8b33f Fix color of some texts on Linux with dark theme 
Use Label{} instead of Text{}

CURA-1143
 2016-04-07 18:57:11 +02:00