424 Commits

Author SHA1 Message Date
Tim Kuipers
261e8d9b08 updated protobuff generated files to include SlicingFinished msg (CURA-427) 2016-01-22 10:58:24 +01:00
Ghostkeeper
fbd5471f5b Set machine_nozzle_size when importing legacy profile
Machine_nozzle_size was just a machine setting when this dictionary of doom was made.

Contributes to issue CURA-37.
2016-01-21 15:01:50 +01:00
Ghostkeeper
0d16fdf3ba Use a uniform-color shader for selection
In layer view, the selection shader is now a uniform-color shader. This shader does not use the vertex colours but makes the entire silhouette the same colour.

Contributes to issue CURA-625.
2016-01-21 14:24:57 +01:00
Ghostkeeper
e23a9ea997 Move the changing of the setting after import out of try-except
It should never give an exception, so if it does, crash and burn the application.

Contributes to issue CURA-37.
2016-01-20 14:42:32 +01:00
Ghostkeeper
edc2b2c7e2 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-18 17:36:59 +01:00
Ghostkeeper
bc0207cd14 Add invisible preference for file type of output
This preference can't be made visible since a string freeze is into effect, but at least a user could go into the .cfg file and set the setting manually.

Contributes to issue CURA-611.
2016-01-18 17:36:41 +01:00
Tamara Hogenhout
c48051e39d marked the string as translatable
Contributes to #CURA-526
2016-01-18 12:19:59 +01:00
Ghostkeeper
136eb65105 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-17 14:42:27 +01:00
Ghostkeeper
0e8cc11676 Update protobuf file
Cura's protobuf-generated file was out of sync with CuraEngine, resulting in socket errors.

Contributes to issue CURA-605.
2016-01-17 14:35:06 +01:00
Kurt Loeffler
44217fbf94 Changed the translation string context in the ComboBox items in the image import dialog to their correct value of "@item:inlistbox". 2016-01-15 09:55:10 -08:00
Ghostkeeper
8dc6353738 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-14 11:54:02 +01:00
Ghostkeeper
db2af1fa0d Fix line width
The Expression of Doom is put into the Dictionary of Doom!

Contributes to issue CURA-37.
2016-01-14 11:53:32 +01:00
Kurt Loeffler
b28bfc9602 Reworked UI so that it matches 15.04 UI, and made each field in the UI do the same thing that they do in 15.04. 2016-01-13 20:08:42 -08:00
Arjen Hiemstra
b8cf51349c Add an AutoSave plugin that autosaves preferences, instances and profiles
Currently using a 1 minute timer, so we do not constantly trigger a save
when editing profiles.

Contributes to CURA-511
2016-01-13 23:12:56 +01:00
Ghostkeeper
ac1ada87e6 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-13 17:05:25 +01:00
Ghostkeeper
e82988f5e4 Correctly parse legacy speed settings with strange floats
If the legacy profile contains float values serialised to '0.0' or '0.00' instead of just '0', this now works correctly instead of evaluating the string comparison to false.

Contributes to issue CURA-37.
2016-01-13 17:04:28 +01:00
Ghostkeeper
9feb609fba Don't add a setting if evaluation failed
If the eval failed that is likely caused by a variable not existing. It now continues with evaluating other settings and just doesn't add the setting that depends on non-existing legacy settings. This happens when the imported profile is not complete or corrupt.

Contributes to issue CURA-37.
2016-01-13 16:59:05 +01:00
Ghostkeeper
7f1a746a45 Make infill_before_walls opposite
The perimeter_before_infill setting was opposite of infill_before_walls, so turn this boolean around.

Contributes to issue CURA-37.
2016-01-13 16:33:39 +01:00
Ghostkeeper
a4777ac2ed Correct wall thickness setting
The shell thickness also governs the top_bottom_thickness, which is not desired.

Contributes to issue CURA-37.
2016-01-13 16:32:38 +01:00
Ghostkeeper
8b72834c9b Remove skin_no_small_gaps_heuristic
Apparently this setting doesn't exist in the legacy Cura.

Contributes to issue CURA-37.
2016-01-13 16:24:20 +01:00
Ghostkeeper
5d4cceb47c Don't add a setting if it's the default
If the imported setting is the default in the new Cura, don't add it to the profile.

Contributes to issue CURA-37.
2016-01-13 16:16:00 +01:00
Ghostkeeper
3195684892 Parse speed settings as string
In the evaluation that's passed from the Dictionary of Doom, the settings are still strings so you can only parse the settings as string...

Contributes to issue CURA-37.
2016-01-13 15:55:09 +01:00
Ghostkeeper
ef3b5792b4 Fix retraction combing import
Retraction combing was an enum (a fact which was not documented). This enum must be parsed to a boolean. The 'no skin' option now evaluates to true since it is not implemented in the new Cura.

Contributes to issue CURA-37.
2016-01-13 15:52:38 +01:00
Ghostkeeper
731fd41ecd If specific speed setting is 0, use print_speed
Something that was not in the translation document: If a speed setting for a specific part is 0 (such as infill_speed) then the global print speed should be used.

Contributes to issue CURA-37.
2016-01-13 15:42:15 +01:00
Tamara Hogenhout
6711cd3070 Fixin some i18n function calls and such
because some strings could not be translated

Contributes to #CURA-526
2016-01-12 15:24:47 +01:00
Kurt Loeffler
82b5bbc283 Verify image has been loaded correctly. 2015-12-31 09:46:57 +01:00
Kurt Loeffler
447fdc8fbc Made changed from code review and updated MeshReader plugins to support changes made to Uranium branch MeshReaderDialog. This branch now must be paired with that Uranium branch. 2015-12-31 09:46:57 +01:00
Kurt Loeffler
f5939df085 Put ImageReader plugin in a new clean branch from 2.1. The plugin new uses numpy for geometry generation and image smoothing. 2015-12-31 09:46:56 +01:00
fieldOfView
4bf4a20d44 Add small hover-effect to small buttons 2015-12-30 09:53:25 +01:00
fieldOfView
a900b02ae8 Added weight to viewmode plugins for sorting in the viewmode 2015-12-30 09:53:25 +01:00
fieldOfView
091f744838 Reuse code 2015-12-22 09:26:21 +01:00
fieldOfView
c900e27c19 Stop slicing immediately when a ToolOperation is started 2015-12-22 08:58:04 +01:00
Ghostkeeper
482f0461fc Add check for profile version
The profile reader now checks whether the profile version is the same as the target version in the Dictionary of Doom.

Contributes to issue CURA-37.
2015-12-18 10:50:54 +01:00
Ghostkeeper
68496349a9 Fix import of top and bottom thickness
The legacy settings had a boolean for these, but in the current version is should just be a float.

Contributes to issue CURA-37.
2015-12-18 10:19:28 +01:00
Ghostkeeper
84613d99c4 Fix import of platform_adhesion
This setting should never be set to None.

Contributes to issue CURA-37.
2015-12-18 10:10:08 +01:00
Ghostkeeper
d2513f9bbb Fix prime_tower_size import
It was using math.sqrt incorrectly and also was trying to divide strings by each other, while they were floats.

Contributes to issue CURA-37.
2015-12-18 10:03:34 +01:00
Ghostkeeper
0454b37243 Fix importing math to eval
We expose only math, so it can do mathematical operations on the setting values when translating.

Contributes to issue CURA-37.
2015-12-18 10:00:00 +01:00
Ghostkeeper
bfa332e227 Fix ternary operator in import of support_enable
The ternary operator of Python is different.

Contributes to issue CURA-37.
2015-12-18 09:54:35 +01:00
Ghostkeeper
5358b700ca Fix ternary operator in import of support_enable
The ternary operator of Python is different.

Contributes to issue CURA-37.
2015-12-18 09:52:50 +01:00
Ghostkeeper
99a13ba3aa Fix getting settings from JSON file
When reading a node of a JSON file, apparently it only lists the keys instead of key-value pairs. You have to get the values separately.

Contributes to issue CURA-37.
2015-12-18 09:14:55 +01:00
Ghostkeeper
6bde0e3404 Sync translation category name from JSON
The category was named 'translation' instead of 'translations'.

Contributes to issue CURA-37.
2015-12-18 09:10:52 +01:00
Ghostkeeper
644038af97 Missing imports
Test before commit. Test before commit. Test before commit. Test before commit!

Contributes to issue CURA-37.
2015-12-18 09:06:43 +01:00
Ghostkeeper
166c8a3048 Fix call to configparser.options
It needs to have the section from which to read the options.

Contributes to issue CURA-37.
2015-12-18 09:01:22 +01:00
Ghostkeeper
abb92afc27 Fix call to prepareLocals
Turns out the 'self.' is required...

Contributes to issue CURA-37.
2015-12-17 14:54:48 +01:00
Ghostkeeper
f2a95ae89c Correct the configparser
The import was missing. Also, the parser was not called on the correct stream.

Contributes to issue CURA-37.
2015-12-17 14:30:53 +01:00
Ghostkeeper
57f5e60fa5 Fix link to LegacyProfileReader
This was preventing the entire plugin from being loaded.

Contributes to issue CURA-37.
2015-12-17 14:02:29 +01:00
Ghostkeeper
77453cf80f Remove old version of LegacyProfileReader
This shouldn't have been committed. I suspect this came in via checking out a branch where this was still on the working tree and then going to a branch where it wasn't, and it kept the files and I thought LegacySettings was the plugin I had to commit.

Contributes to issue CURA-37.
2015-12-17 14:01:42 +01:00
Ghostkeeper
513941097f Initial LegacyProfileReader plugin implementation
This plugin reads a profile from legacy Cura versions. It hasn't been tested much except that there are no syntax errors. It is currently being blocked by issue 34.

Contributes to issue CURA-37.
2015-12-17 13:49:53 +01:00
Ghostkeeper
9671ae3c74 Introduce blanco LegacySettings plugin
This plugin will be implemented to import settings from legacy versions of Cura.

Contributes to issue CURA-37.
2015-12-17 13:49:53 +01:00
Ghostkeeper
afd63c53c0 Escape characters of escape_characters dict at initialisation
Instead of escaping it each time you read a function with that ugly inline for loop, escape the characters when initialising the dict itself.

Contributes to issue CURA-34.
2015-12-17 13:35:16 +01:00