GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-17 09:06:42 +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
Jaime van Kessel
67db4a4778 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-19 15:52:52 +01:00
Jaime van Kessel
31ed8400ef Added a bit of error handling 2016-02-19 15:52:36 +01:00
Ghostkeeper
63a8b96049 Make layer processing abort when starting slice 
This involved adding an abort flag to the layer processing job, and making the job check back on that flag periodically. If processing a single layer takes forever then it will never stop the job at all, so it assumes that the concurrent programming in Python is Fair.

Contributes to issue CURA-864.
 2016-02-19 12:25:47 +01:00
Jaime van Kessel
c0d167e751 Changing values in simple mode no longer influences local model 
CURA-865
 2016-02-19 10:42:38 +01:00
Ghostkeeper
bcbb28dd9f Fix application menu save-to-file option 
Turns out that named parameters never worked. I've changed it into key-word arguments, but then not really key-word arguments but a QVariantMap.

Contributes to issues CURA-611 and CURA-898.
 2016-02-18 13:30:24 +01:00
fieldOfView
b8113a9740 Reset menu selection without modifying the model 
Contributes to CURA-853
 2016-02-17 22:04:05 +01:00
Jaime van Kessel
e093c956f2 Removed stray debug print 2016-02-17 17:02:41 +01:00
Arjen Hiemstra
40ea87fa05 Properly save setting visibility when auto saving 
Contributes to CURA-511
 2016-02-17 14:38:38 +01:00
Tim Kuipers
765185364f JSON: quickfix: made Auto Temp always not displayed (CURA-868) 2016-02-17 10:36:30 +01:00
fieldOfView
09c04d7c68 Add sidebar header icon for "machine" category 2016-02-16 22:43:36 +01:00
fieldOfView
27062d8e99 Always make sure imported profiles are available for the currently active machine 
The profile name of an imported legacy profile gets set in ProfilesModel.importProfile()

Contributes to CURA-874
 2016-02-16 21:50:57 +01:00
Ghostkeeper
ccd937a56f Make boolean trap more readable 
This doesn't entirely remove it but it looks a bit better. In other calls, the variable name that's filled in the parameter sort of makes it clear what the boolean indicates.

Contributes to issue CURA-611.
 2016-02-15 16:56:42 +01:00
Ghostkeeper
4ccf4fe718 Change global-only behaviour of some adhesion settings 
They don't always work when set per-object. So don't allow it.

Contributes to issue CURA-458.
 2016-02-15 15:30:52 +01:00
Jaime van Kessel
4a862d0e0c Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-15 14:49:43 +01:00
Jaime van Kessel
5381c9c74b More codestyle changes 2016-02-15 14:28:27 +01:00
fieldOfView
f61d7fe9b2 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-15 14:27:26 +01:00
fieldOfView
5613a5de20 Reset menu selection when canceling profile switch 
Contributes to CURA-853
 2016-02-15 14:19:32 +01:00
Jaime van Kessel
9bf783df4d Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-15 14:18:12 +01:00
Jaime van Kessel
54e5020975 Codestyle fixes 2016-02-15 14:18:01 +01:00
Ghostkeeper
69331696f0 Revert UM2+ machine names 
This was causing problems in the listing of the printers due to the variants. I still don't really know why it was causing these problems but I've reverted the changes and it seems to have been fixed now.

Contributes to issue CURA-440.
 2016-02-15 11:03:44 +01:00
Ghostkeeper
9379b0a97b Update translation from machine name to hex file 
There was an incongruence in the translation from the machine name to hex file. Sometimes the machine name was wrong. Sometimes the hex file was wrong.

Contributes to issue CURA-440.
 2016-02-12 17:09:42 +01:00
Tim Kuipers
6d27c26260 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-12 16:19:09 +01:00
Tim Kuipers
07d0e433a8 JSON: made some essential settings visible by default: conical support, brim settings, raft settings (CURA-877) 2016-02-12 16:19:00 +01:00
Jaime van Kessel
a03f256366 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-12 16:18:09 +01:00
Jaime van Kessel
89424d5635 SceneBounding box now correctly uses deepcopy 2016-02-12 16:17:58 +01:00
Tim Kuipers
ed5e59df57 JSON: made some settings not visible by default (CURA-877) 2016-02-12 16:04:17 +01:00
Tim Kuipers
58238a5933 JSON: made line_width max value warning depend on nozzle size (CURA-876) 2016-02-12 15:56:03 +01:00
Tim Kuipers
5614302f74 JSON: made layer height max value warning depend on nozzle size (CURA-876) 2016-02-12 15:54:06 +01:00
Tim Kuipers
9545f7da36 JSON: fix: retraction settings not visible for UM2 anymore (CURA-875) 2016-02-12 15:44:04 +01:00
Tim Kuipers
1271a7407e JSON: support tower settings disabled if use_tower=Flase (CURA-870) 2016-02-12 15:26:56 +01:00
Tim Kuipers
18ef6f9a69 JSON: default tower diam and support minimal diam changed to 3mm (CURA-870) 2016-02-12 13:58:23 +01:00
Tim Kuipers
14b6ae2a4c JSON: made support_minimal_diameter child of support_tower_diameter (CURA-870) 2016-02-12 13:52:41 +01:00
Tim Kuipers
ca8de7ecf8 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-12 13:39:35 +01:00
Tim Kuipers
42e6d88e7f JSON: default cone angle inversed to get less support by default (CURA-869) 2016-02-12 13:39:19 +01:00
Ghostkeeper
563bd1ddb5 Fix setting for show overhang 
For some reason the setting was inverted. Also, someone forgot to take the case into account where the setting exists but is None (which is the case when the setting is False).

Fixes issue CURA-308.
 2016-02-12 11:11:44 +01:00
Jaime van Kessel
d0880445ad Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-02-12 09:46:48 +01:00
Jaime van Kessel
b2f37390fd Merge branch '2.1' of https://github.com/Ultimaker/Cura 2016-02-12 09:46:23 +01:00
Jaime van Kessel
10b39c5ca4 Added keys to wificonnection so they can be linked to machine instances 
CURA-49
 2016-02-11 15:51:40 +01:00
Jaime van Kessel
69a9ef4a64 Removed debug prints 
CURA-49
 2016-02-11 11:18:27 +01:00
Jaime van Kessel
ca502705c2 Reworked wifi connection to use requests instead of httpclient 
This library is far easier to use and much cleaner. CURA-49
 2016-02-11 11:14:18 +01:00
fieldOfView
f8aa4cdade Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-11 09:26:48 +01:00
fieldOfView
cd768902e9 Fix tooltips in simple mode 
Simple mode no longer showed tooltips since Simple Mode and Advanced Mode were put in a StackView.
 2016-02-11 09:25:37 +01:00
Tim Kuipers
5ae140f84c JSON: changed description and name of cooling settings (CURA-863) 2016-02-10 17:22:57 +01:00
Ghostkeeper
6bcce7ca8e Repair saving to removable drive 
Typo. Sorry.

Contributes to issue CURA-611.
 2016-02-10 15:05:44 +01:00
Arjen Hiemstra
041fa2b359 Import Arcus before importing Cura (and PyQt5) 
Workaround an issue on certain Linux systems that causes a race
condition between Arcus and PyQt5.

Contributes to CURA-434
 2016-02-10 13:55:52 +01:00
Arjen Hiemstra
894624fc2d Remove the "Using python impl of Protobuf" warning message 
Since we now have c++ bindings this has become irrelevant.

Contributes to CURA-434
 2016-02-10 13:55:52 +01:00
Arjen Hiemstra
ac25b1bdaf Always save everything when the change timer timeouts 
This prevents issues where certain things were not saved properly

Contributes to CURA-511
 2016-02-10 13:55:52 +01:00
Ghostkeeper
edb7803760 Make the machine file types filter optional for OutputDevice 
The call to OutputDevice from the save button filters by the file types available to the machine. The call to OutputDevice from the application menu doesn't.

Contributes to issue CURA-611.
 2016-02-10 13:39:49 +01:00
Jaime van Kessel
763206af32 Initial commit 2016-02-10 13:29:17 +01:00
Jaime van Kessel
f843e2d09a Initial commit 2016-02-10 13:25:58 +01:00