GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-10 21:49:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,127 Commits 290 Branches 260 Tags
Commit Graph

492 Commits

Author SHA1 Message Date
Victor Larchenko
620a3891da D6: Moved decorator to cura 2016-12-23 15:53:16 -05:00
Victor Larchenko
4aa59950ca D5: Added decorator 2016-12-23 15:53:16 -05:00
Victor Larchenko
8987aa2048 T466: Revert the previous commit since it messed up the file rights. 2016-12-23 15:53:15 -05:00
Victor Larchenko
64d7bb0c2a T466: Added ability to print loaded gcode 2016-12-23 15:53:14 -05:00
Jaime van Kessel
c25c4c1d77 Moved conflict boxes to be aligned with "headers" 
CURA-1263
 2016-12-19 13:04:55 +01:00
Ghostkeeper
76c2e87749
Fix more plural forms 
Forgot these ones.

Contributes to issue CURA-1263.
 2016-12-16 17:17:10 +01:00
Jaime van Kessel
c4e061be60 Changed margins on save & load workspace dialog 
CURA-1263
 2016-12-16 14:38:31 +01:00
Jaime van Kessel
fa3f473b61 Changed order of buttons 2016-12-16 11:35:08 +01:00
Jaime van Kessel
a7135a0f5f Added machine type to load menu 
CURA-1263
 2016-12-16 10:38:30 +01:00
Jaime van Kessel
2be773c9a3 Added num user settings to workspace loading 
CURA-1263
 2016-12-16 10:26:30 +01:00
Jaime van Kessel
8676f3db40 Added workaround for curaproject.3mf extensions not being handled on osx 
CURA-3130
 2016-12-16 09:36:40 +01:00
Jack Ha
a9a9390aa6 Solved (with an ugly fix) that after loading some projects, 'Slicing...' appears without doing anything. CURA-1263 2016-12-14 16:52:49 +01:00
Jaime van Kessel
998f127499 Material resolve box is reset properly 
CURA-1263
 2016-12-14 10:18:05 +01:00
Simon Edwards
d4619da358 Merge branch 'master' into python_type_hinting 2016-12-13 14:39:35 +01:00
Simon Edwards
74e5798509 Lots of import fixes. Eliminated the import hacks such as those used inside UM/Settings/__init__.py. 
CURA-2917
 2016-12-12 16:05:35 +01:00
Jaime van Kessel
0d9355daab All added containers are now set as dirty, so they are saved 
CURA-1263
 2016-12-12 11:07:29 +01:00
jack
8fdc0a40ce Merge pull request #1235 from Ultimaker/project_save_dialog 
Project save dialog
 2016-12-12 10:41:49 +01:00
Jack Ha
ab16722047 Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-08 12:45:50 +01:00
Jack Ha
701eba3a0e Made 3mf mesh centering more robust. 2016-12-08 12:45:38 +01:00
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
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
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
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
484c7df5bc Added a bunch of thread yields 
CURA-1263
 2016-11-25 16:25:24 +01:00
Jaime van Kessel
ef7004fb72 User changes are deserialized by workspacereader if there is no machine conflict 
CURA-1263
 2016-11-25 16:17:46 +01:00
Jaime van Kessel
fa174763cf The 3mf workspace reader no longer locks application if it is accedently called from main 
CURA-1263
 2016-11-22 14:57:44 +01:00
Jaime van Kessel
60d2d0d092 Workspace reader is now a lot more transactional; 
Instead of adding the instance containers on the go, we add them right before serializing the stack.
This enables us to remove them if the stack serialization goes wrong

CURA-1263
 2016-11-22 14:15:12 +01:00