23916 Commits

Author SHA1 Message Date
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
Tim Kuipers
7ab215f4d6 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-02-08 10:22:20 +01:00
Tim Kuipers
847ab01272 Revert "JSON: feat: modifier mesh setting (83"
This reverts commit 682ef482af7e3c526c723d020ab7b2aa77321e20.
2016-02-08 10:21:53 +01:00
fieldOfView
ccf53147b3 Add margins around infillmodel options, so an infill option is always selected 2016-02-08 09:20:47 +01:00
fieldOfView
2f022244c1 Edit UM2Extender+ profiles to use UM2+ profiles 2016-02-08 09:20:47 +01:00
fieldOfView
6e11c2409b Use working profile instead of "active" profile 2016-02-08 09:20:46 +01:00
fieldOfView
828752af30 Remove dialogs that were moved to Uranium 2016-02-08 09:18:35 +01:00
fieldOfView
5542073e44 Fix error on profile rename 2016-02-08 09:18:35 +01:00
fieldOfView
d30f8322ba Make material profiles have values for the same settings 2016-02-08 09:18:34 +01:00
fieldOfView
57046a43e8 Rename material profiles for consistency 2016-02-08 09:18:34 +01:00
fieldOfView
a53b898670 Rename [profile] to [settings] in material profiles 2016-02-08 09:18:34 +01:00
fieldOfView
277dd71759 Align variant naming in profiles and machine definitions 2016-02-08 09:18:33 +01:00
fieldOfView
f97e2fa6aa Prepare "Add profile" dialog 2016-02-08 09:18:33 +01:00
fieldOfView
bfa45245cc machine_type is a reference to the id, not the name 2016-02-08 09:18:33 +01:00
fieldOfView
9bd13cf9a7 Add JARJAR machine definitions from cura-private-data 2016-02-08 09:18:32 +01:00
fieldOfView
747f5fbd55 Add converted UM2+ profiles (variant/material specific) 2016-02-08 09:18:32 +01:00
fieldOfView
cbbc6d1a18 Add converted material profiles 2016-02-08 09:18:31 +01:00
fieldOfView
ce562713c3 Reimport default profiles from 15.04.04 2016-02-08 09:18:31 +01:00
fieldOfView
3d85646d07 Move general profiles into profiles/general 2016-02-08 09:18:31 +01:00
fieldOfView
faefbb6b8e Rename materials model to MachineMaterialsModel 2016-02-08 09:18:30 +01:00
fieldOfView
47d299b8c3 Add material profile selection to sidebar 2016-02-08 09:18:30 +01:00
Thomas-Karl Pietrowski
dd95ea71cf i18n: de: Moving the name of the removable drive to the right position
In my point of view this is the most locial order of it.
For the future we should think about putting the name of the removable drive into quotation marks,
so it will output: "Auf Wechseldatenträger 'Your SD card' gespeichert als 'Your Code.gcode'".
2016-02-07 16:02:03 +01:00
Thomas-Karl Pietrowski
e3163155bd Merge remote-tracking branch 'upstream/2.1' into 2.1-i18n-de-spelling 2016-02-07 11:20:16 +01:00
Bob Burrough
dd0b04ead4 Merge pull request #631 from Ultimaker/revert-626-cmake_files_qtcreator
Revert "Cmake files qtcreator"
2016-02-06 11:59:37 -08:00
Bob Burrough
53c1eaeba1 Revert "Cmake files qtcreator" 2016-02-06 11:59:26 -08:00
Arjen Hiemstra
8d2fc1f7e1 Do not close the engine from our side when finished with slicing
The engine will close itself when done. Closing it from our side
actually introduces errors as things can still be busy processing
2016-02-06 18:08:47 +01:00
filushka
51adfd9067 Merge pull request #626 from Ultimaker/cmake_files_qtcreator
Cmake files qtcreator
2016-02-05 10:50:49 -08:00
Ghostkeeper
bdfdc1191c Move Uranium's translation to Uranium repository
Sorry, that was wrong. Also, why am I not doing this in a feature branch? Sorry.

Contributes to issue CURA-526.
2016-02-05 10:51:27 +01:00
Thomas-Karl Pietrowski
6d475ce08c i18n: de: Better translation for "Print Job"
The old translation is actually "Printer Job". Correcting this to "Druckauftrag".
2016-02-04 22:09:48 +01:00
Thomas-Karl Pietrowski
14f0998904 i18n: de: Improve translation of spitted string
I don't know where "Ready to " also appears, but after loading an object I just found this mixed translation.
"Bereit Auf Wechseldatenträger speichern" -> "Bereit zum Speichern auf Wechseldatenträger"
2016-02-04 22:04:08 +01:00
Tim Kuipers
682ef482af JSON: feat: modifier mesh setting (83
CURA-833)
2016-02-04 20:20:45 +01:00
Jaime van Kessel
ede0cbcfe6 Removed old code in per object settings that caused crash. 2016-02-04 16:04:52 +01:00
Ghostkeeper
a334e8876d Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-04 12:59:29 +01:00
Ghostkeeper
736d04ba8d Fix getting container properties
Due to an optimisation earlier, the model and selected index in the per-object settings panel couldn't be found. This was giving errors and making the per-object settings unusable.

Contributes to issue CURA-458.
2016-02-04 12:33:39 +01:00