GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-17 22:46:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,026 Commits 290 Branches 260 Tags
Commit Graph

5951 Commits

Author SHA1 Message Date
Jaime van Kessel
0f910ae7a2 Merge branch 'master' of github.com:Ultimaker/Cura into project_save_dialog 2016-12-08 12:37:40 +01:00
Jaime van Kessel
1752c56272 Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-08 12:37:20 +01:00
Jaime van Kessel
7ed5a7768a Use logException instead of just log for project loading 
CURA-1263
 2016-12-08 11:59:37 +01:00
Jaime van Kessel
36d743384c Initial work for adding a save dialog for project saving 
CURA-1263
 2016-12-08 11:56:42 +01:00
Arjen Hiemstra
3449108d59 Update 3MFWorkspaceReader to handle the new format of ContainerStack 
Contributes to CURA-3098
 2016-12-08 11:53:15 +01:00
Jaime van Kessel
bc8a9c30cf Use right type for logging 
CURA-1263
 2016-12-08 10:58:17 +01:00
jack
9d2768c27a Merge pull request #1215 from Ultimaker/upgrade_to_2.4 
CURA-2953 Version upgrade 2.3 to 2.4
 2016-12-07 16:58:31 +01:00
Arjen Hiemstra
b1e8b01549 Reduce time spent in "Preparing to slice" by optimizing vertex data sending 
This effectively is a limited form of MeshData::getTransformed that ignores
normals and performs a faster transformation.

Contributes to CURA-2687
 2016-12-06 17:35:26 +01:00
Simon Edwards
e1d7a9faec Properly support the extrauder trains. 
CURA-2953 Version upgrade 2.3 to 2.4
 2016-12-06 17:03:35 +01:00
Jaime van Kessel
9f13338c17 Codestyle 2016-12-06 14:28:25 +01:00
Jaime van Kessel
3e54c86c88 Updated documentation for MachineActions 2016-12-06 14:21:57 +01:00
Jaime van Kessel
5aa394b197 Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-06 11:39:37 +01:00
Jaime van Kessel
58e7e6ef5a Added default_printing_temperature property 
CURA-2586
 2016-12-06 11:38:56 +01:00
Jack Ha
e846a9aebc Added logging for CURA-2918 2016-12-06 10:46:47 +01:00
Simon Edwards
724cc99f59 Make things neater. 
CURA-2953 Version upgrade 2.3 to 2.4
 2016-12-05 13:31:24 +01:00
Jaime van Kessel
16447f7173 Authentication data is now stripped from project file before saving 
CURA-1263
 2016-12-05 12:46:53 +01:00
Jaime van Kessel
8f023524d2 Small textual changes for project handling 
CURA-1263
 2016-12-05 11:44:42 +01:00
Jaime van Kessel
535250e714 Loading a project no longer destroys authentication 
CURA-1263
 2016-12-05 11:43:27 +01:00
Jaime van Kessel
ceb6017cf4 Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-05 11:28:20 +01:00
Jack Ha
7a35e4170b Moved translation functionality needed for 3mf into ThreeMFReader. Fix CURA-3089, impacts CURA-382 2016-12-05 11:28:06 +01:00
Jaime van Kessel
1860b8667b Changed extension of 3mf projects to curaproject.3mf 
CURA-1263
 2016-12-05 11:27:36 +01:00
Simon Edwards
13af609830 Merge branch 'master' into upgrade_to_2.4 2016-12-05 11:01:33 +01:00
Simon Edwards
3d9c27a7f7 CURA-2953 Version upgrade 2.3 to 2.4 2016-12-05 11:00:33 +01:00
Jaime van Kessel
56daf80f2f removed pixelRatioSize, as this made the screen look weird on osx 
CURA-1263
 2016-12-05 09:23:37 +01:00
Jaime van Kessel
db18635049 Instead of emitting signals for all containers, only emit them for top 
This significantly speeds up project loading. CURA-1263
 2016-12-02 16:27:58 +01:00
Jaime van Kessel
a1acfe167c Fixed UI spacing if there is no material conflict in project load 
CURA-1263
 2016-12-02 15:31:55 +01:00
Jaime van Kessel
a0813b3af3 Added warning when trying to load project with objects on buildplate 
CURA-1263
 2016-12-02 15:30:21 +01:00
Jaime van Kessel
5d1ba828bc Closing load project screen cancels loading of workspace 
CURA-1263
 2016-12-02 15:15:34 +01:00
Jaime van Kessel
f782a76324 Material labels are now also displayed in the open project dialog 
CURA-1263
 2016-12-02 14:54:42 +01:00
Jaime van Kessel
c950288b86 Minor UI changes to projectDialog 
CURA-1263
 2016-12-02 13:41:39 +01:00
Jaime van Kessel
9a03e8640b Added spacers to workspace dialog 
CURA-1263
 2016-12-02 13:39:39 +01:00
Jaime van Kessel
3345e918e8 Conflict resolvement boxes are now invisible if there is nothing to resolve 
CURA-1263
 2016-12-02 13:37:56 +01:00
Jaime van Kessel
c236f7d266 Total number of settings is now calculated for open project dialog 
CURA-1263
 2016-12-02 13:31:31 +01:00
Jaime van Kessel
04d268b1fb Machine name is now also displayed in open project dialog 
CURA-1263
 2016-12-02 13:27:39 +01:00
Jaime van Kessel
b3f1f6b4db Project load dialog now also gives information about the quality & quality changes 
CURA-1263
 2016-12-02 13:01:01 +01:00
Jaime van Kessel
6bb1b7ec80 Number of settings & mode are now displayed in open Project 
CURA-1263
 2016-12-02 11:54:28 +01:00
Jaime van Kessel
5119ee9a93 Use correct descriptor for project open 
CURA-1263
 2016-12-02 11:13:21 +01:00
Jaime van Kessel
e941d417f1 Added CuraVersion to 3mf metadata 2016-11-30 14:15:19 +01:00
Jaime van Kessel
61db5b42b7 Moved loading of meshdata in workspace to after machine has changed 
This fixes the issue where the location of the objects was not correct.
CURA-1263
 2016-11-30 12:57:10 +01:00
Jaime van Kessel
dcdfe612e7 Added more robust fault handling for preferences while loading workspace 
CURA-1263
 2016-11-30 12:04:30 +01:00
Jaime van Kessel
477ffe12aa Merge branch 'feature_polar' of https://github.com/fieldOfView/Cura 2016-11-30 09:13:05 +01:00
Jaime van Kessel
e6d280ee47 Merge pull request #1196 from fieldOfView/fix_um3_postprocessing 
Allow postprocessing before sending data to the printer
 2016-11-30 09:12:06 +01:00
fieldOfView
91e8ac6868 Allow postprocessing before sending data to the printer 
From OutputDevice.py:
"output device subclasses are completely free to implement writing however they want, though you should emit writeStarted and related signals whenever certain events happen related to the write process."
 2016-11-29 17:20:10 +01:00
Simon Edwards
b9dd2ef6f9 Numpy magic to speed up the expansion of indices-to-vectors to just vectors. CURA-2548 
Sending models to engine that have indices is slow
 2016-11-29 15:16:55 +01:00
fieldOfView
86383b2be0 Get build plate shape options from the fdmprinter definition 2016-11-29 10:54:48 +01:00
Ghostkeeper
24c0b7c736 Merge branch 'fix_x3dimport' of https://github.com/vincentmarchetti/Cura into vincentmarchetti-fix_x3dimport 2016-11-29 10:50:36 +01:00
fieldOfView
dc33d96e8c Make build plate shapes translatable 2016-11-29 10:42:24 +01:00
fieldOfView
8651a9a902 Force update when changing origin 2016-11-29 00:17:56 +01:00
fieldOfView
b9280fef12 Allow setting build plate shape 2016-11-28 23:00:49 +01:00
Ghostkeeper
28c8dbec40 Merge branch 'feature_machine_settings_fixes' of https://github.com/fieldOfView/Cura into fieldOfView-feature_machine_settings_fixes 2016-11-28 12:40:35 +01:00