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

23916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arjen Hiemstra
89b175bc5c Merge branch '15.06' 
* 15.06:
  Do not cause "dictionary changed size during iteration" errors when changing view
  Adds an idle-state for the layerview slider
  Adds an idle-state for the safebutton
  Sets the platform activity on true when a model is loaded
  Sets the platform activity on true when a model is loaded
  Create functions that get & set platform activity
  Send M104 to set the temperature to 0
  Do not store files that fail to load in recent files
 2015-07-13 13:52:33 +02:00
Arjen Hiemstra
fb7b7ca7b8 Do not cause "dictionary changed size during iteration" errors when changing view 
Connecting to a signal while it is emitting causes errors.
 2015-07-13 13:52:17 +02:00
Tamara Hogenhout
608283f5f4 Adds an idle-state for the layerview slider 
When there is no model, the layerview slider goes back into the idle state

fixes #128
 2015-07-10 19:28:19 +02:00
Tamara Hogenhout
81aa047ae3 Adds an idle-state for the safebutton 
When there is no model, the safebutton goes back into the idle state

contributes to #128
 2015-07-10 18:43:47 +02:00
Tamara Hogenhout
a687c9c89e Sets the platform activity on true when a model is loaded 
Also solved a problem with the deleteSelection trigger

contributes to #128
 2015-07-10 18:41:24 +02:00
Tamara Hogenhout
d41f1a410c Merge branch '15.06' of https://github.com/Ultimaker/Cura into 15.06 2015-07-10 17:53:55 +02:00
Tamara Hogenhout
c4b923eb74 Sets the platform activity on true when a model is loaded 
Also solved a problem with deleteSelection trigger

contributes to #128
 2015-07-10 17:52:15 +02:00
Tamara Hogenhout
a5f00f30ca Create functions that get & set platform activity 
The platform activity is determined by whether there is a mesh in the build platform or not

Contributes to #128
 2015-07-10 17:50:15 +02:00
Arjen Hiemstra
6859481fd4 Send M104 to set the temperature to 0 
This makes it possible to continue communication after cancelling a
print.

Contributes to #82
 2015-07-10 16:02:01 +02:00
Arjen Hiemstra
3e27c8b791 Do not store files that fail to load in recent files 
Contributes to Ultimaker/Cura#103
 2015-07-10 15:58:34 +02:00
Tim Kuipers
6b48072140 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-07-10 13:14:05 +02:00
Tim Kuipers
968508b6e8 feat: infill wipe dist; wireframe restructure & renaming; bugfix: draft_shield_height inherit_function 2015-07-10 13:13:52 +02:00
Arjen Hiemstra
fec2207b50 Merge branch '15.06' 
* 15.06:
  Also add the parent class' command line arguments
  Only process the layer data if the layer view is active.
  Write to the correct variable so bed temperature is properly updated
  Correct a copy-paste error in getConnectionList
  Properly close all open USB connections on shut down
  Catch errors when trying to close the connection thread
  Enlarge the zone where you can use scrolling to look trough the layer mode.
  tiniest detail concerning the padding of the layer count label
  Adds layer count
 2015-07-10 13:10:15 +02:00
Arjen Hiemstra
8fa0468787 Also add the parent class' command line arguments 
Contributes to #96
 2015-07-10 11:25:40 +02:00
Arjen Hiemstra
f4153fa63e Only process the layer data if the layer view is active. 
Contributes to #109
 2015-07-10 11:25:40 +02:00
Arjen Hiemstra
ba80cdba67 Write to the correct variable so bed temperature is properly updated 
Contributes to #82
 2015-07-09 16:34:04 +02:00
Arjen Hiemstra
b458a4c6e3 Correct a copy-paste error in getConnectionList 
Contributes to #82
 2015-07-09 16:34:04 +02:00
Arjen Hiemstra
20874d88ad Properly close all open USB connections on shut down 
Contributes to #82
 2015-07-09 16:34:04 +02:00
Arjen Hiemstra
a83bcedb22 Catch errors when trying to close the connection thread 
Contributes to #82
 2015-07-09 16:34:04 +02:00
Tamara Hogenhout
ae89ef37c0 Enlarge the zone where you can use scrolling to look trough the layer mode. 
Also make it more visible

fixes #118
 2015-07-09 16:27:31 +02:00
Tim Kuipers
43d1aead76 included retraction_extra_prime_amount 2015-07-09 11:38:15 +02:00
Arjen Hiemstra
078295d6e1 Write to the right device after changes in Uranium API 2015-07-08 22:04:50 +02:00
Arjen Hiemstra
c2e672591c Remove the output_device related stuff from CuraApplication and fix the qml 
This is now properly handled by the Output Device API in Uranium
 2015-07-08 21:42:20 +02:00
Arjen Hiemstra
baf4ea9523 Use the OutputDeviceModel for selecting output device 
Replaces the stuff in CuraApplication which really should not be there
 2015-07-08 21:26:54 +02:00
Arjen Hiemstra
6e4300b299 Try to load all plugins, not just plugins with certain metadata 2015-07-08 21:26:23 +02:00
simonCor
ace5641f76 Added GRR neo profile 
Adds the machine profile for the German Reprap NEO printer.
 2015-07-08 20:25:02 +02:00
Tamara Hogenhout
ab07b0205f tiniest detail concerning the padding of the layer count label 
Fixes #117
 2015-07-08 18:05:50 +02:00
Tamara Hogenhout
53a94c23e1 Adds layer count 
Brings back the layer count, the min & max. And it does not display these untill Cura is done slicing.

Fixes #117
 2015-07-08 18:01:03 +02:00
Tim Kuipers
1c72041df0 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-07-08 17:03:22 +02:00
Tim Kuipers
f00568ecd8 feature: draft protection screen 2015-07-08 17:02:42 +02:00
Arjen Hiemstra
032e27c68c Merge branch '15.06' 2015-07-08 13:03:05 +02:00
Jaime van Kessel
9a3669b643 Added witbox profile posted on UM forum by datmos 2015-07-08 12:27:27 +02:00
Jaime van Kessel
31cd025c05 Merge pull request #120 from CoretechR/master 
Hephestos for Cura 15.06
 2015-07-07 21:51:53 +02:00
CoretechR
7546291bfe Hephestos for Cura 15.06 
Platform offset is [110,128,81.5]
 2015-07-07 19:28:34 +02:00
Arjen Hiemstra
ef86eb480f Do not use a lambda but a member function so reloading works properly 
Fixes #99
 2015-07-07 13:02:15 +02:00
Arjen Hiemstra
937ba1d317 Use a better default installation directory for Debian systems 
Contributes to Ultimaker/Uranium#42
 2015-07-07 11:47:43 +02:00
Arjen Hiemstra
a5cc805c5e Update Cura desktop file with the right icon and version 
Contributes to Ultimaker/Uranium#42
 2015-07-07 11:45:34 +02:00
Arjen Hiemstra
ef61f01812 Add a .desktop file for Linux systems 
Contributes to Ultimaker/Uranium#42
 2015-07-07 11:30:00 +02:00
Arjen Hiemstra
a9f109fd74 Fix USB printing on Linux 
Contributes to #82
 2015-07-07 11:30:00 +02:00
Arjen Hiemstra
17e5d1f835 Fix styling of USB Printing control and firmware window 
Contributes to Ultimaker/Uranium#8
 2015-07-07 11:30:00 +02:00
Jaime van Kessel
877c2d3ecb Merge pull request #97 from quillford/master 
Prusa i3 Profile
 2015-07-07 10:04:21 +02:00
Jaime van Kessel
aba12be7b7 Merge pull request #113 from quillford/patch-3 
modified README
 2015-07-06 21:45:34 +02:00
quillford
f8d2215192 Removed change in spacing in README 2015-07-06 10:48:20 -07:00
Jaime van Kessel
eb01541456 Update README.md 2015-07-06 19:45:36 +02:00
quillford
d26a89d318 modified README 2015-07-06 10:44:07 -07:00
Jaime van Kessel
5a61c4bb4e Merge pull request #112 from quillford/patch-2 
Instructions for making profiles for non UM printers
 2015-07-06 19:35:47 +02:00
quillford
5ea7e90bd5 Instructions for making profiles for non UM printers 2015-07-06 09:50:45 -07:00
Jaime van Kessel
4a2c0b2411 Merge pull request #98 from fieldOfView/fix-slider-visibility 
Improve visibility of layer slider
 2015-07-06 12:31:37 +02:00
Aldo Hoeben
e2b170b51a Improve visibility of layer slider 
The layer slider (in Layer viewmode) has poor visibility against the background if the slider overlaps the checkerboard in the 3d scene. This patch changes the color of the slider to the same color that is used for buttons, setting it apart from the checkerboard.

Fixes https://github.com/Ultimaker/Cura/issues/93
 2015-07-03 21:59:58 +02:00
quillford
45be2a449a Fixed formatting for Prusa i3 profile 2015-07-03 12:57:16 -07:00