Commit graph

3049 commits

Author SHA1 Message Date
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
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
fb598a2444 Operation stopped no longer cause a re-slice.
No idea why this was the case as the result of an operation should decide
if a reslice should be triggered (eg; transformation causes scenechanged to be triggered)
CURA-829
2016-02-10 13:19:12 +01:00
Jaime van Kessel
8402189b42 Removed unused code 2016-02-10 10:28:03 +01:00
Jaime van Kessel
bf3ce61b7f SidbarSimple now uses container proxy correctly
Fixes CURA-823
2016-02-10 10:26:59 +01:00
Ghostkeeper
9151740be7 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-09 18:01:55 +01:00
Ghostkeeper
bc18b078ab Let Removable Drive auto-detect file format from machine
Instead of only writing g-code, the Removable Drive output device will now try to write a file format that the current machine supports. It just picks the first one it finds.

Contributes to issue CURA-611.
2016-02-09 17:57:19 +01:00
Ghostkeeper
29e01a698b Match MIME types in printers with writer plugins
The MIME types as specified in the printer definitions need to match the MIME types specified in the mesh writer plugins.

Contributes to issue CURA-611.
2016-02-09 17:16:38 +01:00
Arjen Hiemstra
15aec5914a Use a preference for the autosave delay and reduce it to 10 seconds
It only triggers after we have stopped changing things, so having a
shorter delay is not that dangerous. Using preference as per
@ghostkeeper 's suggestion.

Contributes to CURA-511
2016-02-09 16:26:29 +01:00
fieldOfView
3369750b97 Make sure Machine names are always unique and non-zerolength
Applies the same rename behavior introduced in the profiles rework to machine names. Machine names are always accepted, but if they are non-unique a number is added (recursively).

If no name is specified, a logical default is chosen. Robust against leading/trailing spaces, and case insensitive.

Contributes to CURA-425
2016-02-09 15:33:27 +01:00
Ghostkeeper
0fc17ffda0 Move file types to machine metadata
Much better place than machine settings...

Contributes to issue CURA-611.
2016-02-09 15:25:49 +01:00
Ghostkeeper
80698c47de Add machine_file_format setting
This will determine which file formats a machine is able to save to. The setting is currently not yet used. It will be used to filter the output formats under the Save to File dialogue.

Contributes to issue CURA-611.
2016-02-09 13:50:02 +01:00
Ghostkeeper
5693d639f1 Merge pull request #618 from Ultimaker/feature_profiles
Profiles rework
2016-02-09 09:49:28 +01:00
Jaime van Kessel
4194a9772f Updates description of support_z_height
CURA-788
2016-02-08 16:34:56 +01:00
Ghostkeeper
6e59f49bd5 Fix per-object setting categories hiding when folding them
When the categories were folded closed, they were suddenly hidden because then the settings' height became 0. Now it uses the actual height of the children regardless of whether they are visible or not, which makes them properly remain visible while closed.

Contributes to issue CURA-548.
2016-02-08 16:18:45 +01:00
Ghostkeeper
f05da7212a Define which settings are global-only
And when, in case it depends on something like the print sequence.

Contributes to issue CURA-458.
2016-02-08 15:59:58 +01:00
Ghostkeeper
72125d84bf Fix problem with casting to QVariant
This is a magical fix that Nallath and I found for a problem that shouldn't exist in the first place and sometimes doesn't exist at all and in the same time is a superposition of existing and not existing and it's all very complicated and an extremely weird hack. Casting this object to itself properly makes it castable to QVariant.

Contributes to issue CURA-458.
2016-02-08 15:29:15 +01:00
Arjen Hiemstra
69d8160207 Make sure we properly restart the backend when it quits on itself
This prevents issues where the backend would not properly restart
2016-02-08 13:51:18 +01:00
Ghostkeeper
e8ada1fd06 Merge pull request #629 from thopiekar/2.1-i18n-de-spelling
i18n: de: Another set of translation improvements
2016-02-08 11:39:54 +01:00