16579 Commits

Author SHA1 Message Date
Ghostkeeper
87cbc3907c
Convert to string before storing in configparser
Because configparser can only handle strings.

Contributes to issue CURA-5929.
2018-11-13 12:05:14 +01:00
Ghostkeeper
2486a5b5da
Improve generic profiles for fabtotum and zyyx
These printers had profiles for zyyx_pro and fabtotum material suites, which were specific to those materials, but caused the generic materials to no longer have any profile. Let's use these machine-specific profiles for the generic materials as well. For the specific materials this changes nothing because the same profiles are still matched. For the generic materials this should improve the quality if the quality profile is tuned in any way to the machine.
2018-11-13 11:48:02 +01:00
Ghostkeeper
7bd55f5064
Add test for read() function
This is complex.
I don't want to get into the actual translations from the DoD here.

Contributes to issue CURA-5929.
2018-11-12 16:28:29 +01:00
Ghostkeeper
bfe5ae6f9c
Merge branch '3.6' 2018-11-12 15:48:22 +01:00
Ghostkeeper
fe66d15b9e
Disable Polish language
The translation didn't arrive in time for the 3.6 release.

Contributes to issue CURA-5870.
3.6.0
2018-11-12 15:47:42 +01:00
Ghostkeeper
7e87a303cb
Remove config_section parameter
Just always take 'profile'. We don't need to test with anything else. Just adjust the data to it.

Contributes to issue CURA-5929.
2018-11-12 13:49:13 +01:00
Ghostkeeper
e18ea4bca4
Expect a NoSectionError if testing with a section that is missing
We want to get that error in order to debug.

Contributes to issue CURA-5929.
2018-11-12 13:47:24 +01:00
Ghostkeeper
53c9cdc3fe
Add alternative scenarios for prepareLocals
Contributes to issue CURA-5929.
2018-11-12 13:42:14 +01:00
Ghostkeeper
91e8c177fe
Add test for prepareLocal
Contributes to issue CURA-5929.
2018-11-12 13:35:18 +01:00
Ghostkeeper
0bf7bf4cbe
Fix handling dictionaries without 'defaults' section
According to the test, this should return an empty dict then.

Contributes to issue CURA-5929.
2018-11-12 13:33:44 +01:00
Ghostkeeper
bbbb08c793
Add test for prepareDefaults
Contributes to issue CURA-5929.
2018-11-12 13:02:28 +01:00
Ghostkeeper
6d1b64465a
Fix URL in error message
Contributes to issue CURA-5929.
2018-11-12 12:50:18 +01:00
Ghostkeeper
27aff4e5da
Fix typing issues
Because this function now has typing, it's raising a load of issues with it.

Contributes to issue CURA-5929.
2018-11-12 12:48:49 +01:00
Ghostkeeper
6022ed0f23
Update target version in DoD
There are no changes to these settings, luckily.
This target version is now only here for documentation (like source_version was). It is no longer actually used by the code.

Contributes to issue CURA-5929.
2018-11-12 12:06:00 +01:00
Ghostkeeper
6ad682b00d
Don't serialise legacy profile via Profile instance
That profile instance was being explicitly set to version 1 (but then serialised as version 4) and then deserialised with upgrade, so the upgrade was thinking it was upgrading from version 1 to 4, but it was actually upgrading a file which was already at version 4. We shouldn't use the Profile() instance at all but just perform the upgrade on simple string data generated by the configparser.
This also updates the format to the newest version (since that was easiest for me to reimplement) but we don't need to ever update this again because it gets passed through the version upgrade system, which upgrades it from version 4000005 to the latest version in the future.

Contributes to issue CURA-5929.
2018-11-12 12:02:49 +01:00
Ghostkeeper
9d94b0d63e
Rename input vs. output parsers
Technically you could re-use the variable name but that is confusing.

Contributes to issue CURA-5929.
2018-11-12 11:16:33 +01:00
Ghostkeeper
9c555bf67f
Add typing and always add error message if loading failed
There were some places where it would return None. Then in the QML it would give a QML error that the null object has no dictionary items.

Contributes to issue CURA-5929.
2018-11-12 11:02:43 +01:00
alekseisasin
32c16041e8
Merge pull request #4773 from Ultimaker/change_ultimaker_author_id
Change the Ultimaker author_id to UltimakerPackages
2018-11-12 10:43:15 +01:00
Mark
3d1a9a6f5b Increase lines shown from 3 to 6 2018-11-12 09:28:48 +01:00
Vlad Gribinchuk
d8d92eb4b0 Merge remote-tracking branch 'upstream/master' into feature_minimum_support_area 2018-11-09 20:45:37 +02:00
Diego Prado Gesto
a9523fd894 Change the Ultimaker author_id to UltimakerPackages. Apparently this is
the new author_id.

Contributes to CURA-5926.
2018-11-09 17:18:01 +01:00
Diego Prado Gesto
15a30a7a98 Increase the version of the bundled TPLA to match with the version that
is currently in the server.
2018-11-09 17:06:45 +01:00
Ghostkeeper
4551b73d5c
Merge branch 'master_CURA-5922_add_safety_data_sheet_links' 2018-11-09 17:04:11 +01:00
Ghostkeeper
a8017fe179
Merge branch '3.6' 2018-11-09 17:00:44 +01:00
Remco Burema
8e05c2adcb Have translation instead of plain string for Safety Data Sheets and Printing Guidelines. [CURA-5922] 2018-11-09 15:27:02 +01:00
Remco Burema
9bc85fcda7 Merge branch 'CURA-5922_add_safety_data_sheet_links' of https://github.com/Ultimaker/Cura into master_CURA-5922_add_safety_data_sheet_links 2018-11-09 15:16:22 +01:00
Ghostkeeper
7f54cacd0f
Code style
Discovered during work on CURA-5840.
2018-11-09 14:11:38 +01:00
Remco Burema
c8d9ad37ff Add Printing Guidelines links to materials in Marketplace. [CURA-5922] 2018-11-09 13:49:14 +01:00
Remco Burema
21d4cd8f9f Add Safety Data Sheet links to materials in Marketplace. [CURA-5922] 2018-11-09 13:44:42 +01:00
Ghostkeeper
161b200a67
Fix typo in label ID 2018-11-09 11:41:43 +01:00
Lipu Fei
c2e6bb8bc6 Merge remote-tracking branch 'origin/3.6' 2018-11-09 09:48:05 +01:00
Lipu Fei
80bf7bb989
Merge pull request #4757 from Ultimaker/CURA-5915_quality_profiles_upgrade
Add version upgrade for quality profiles
2018-11-09 09:20:45 +01:00
Diego Prado Gesto
3ab8568a87
Merge pull request #4679 from fieldOfView/fix_create_new_material
Use preferred material instead of generic PLA when creating a new material
2018-11-08 17:16:36 +01:00
Jaime van Kessel
d3302938b2 Fix technical data sheet not showing if there is no support_configs 2018-11-08 16:38:38 +01:00
Diego Prado Gesto
5b72fab2c1 Merge branch 'stelgenhof-master' 2018-11-08 16:30:25 +01:00
Diego Prado Gesto
3b8bc88a4d Merge branch 'master' of git://github.com/stelgenhof/Cura into stelgenhof-master 2018-11-08 16:29:40 +01:00
Diego Prado Gesto
ad73cda215
Merge pull request #4739 from Ultimaker/reduce_buildplate_resolutions
Reduce resolution of heavy build plate meshes
2018-11-08 16:12:58 +01:00
Diego Prado Gesto
94e27fbbdb Add the quality folder to the version upgrade in order to update quality
profiles.

Contributes to CURA-5915.
2018-11-08 15:42:39 +01:00
Lipu Fei
369747d106 Merge remote-tracking branch 'origin/3.6' 2018-11-08 15:28:42 +01:00
Ghostkeeper
6d66060222
Don't allow support interface offset greater than support offset
The support interface can't exceed the volume of the support now, so this is now a technical limitation.

Contributes to issue CURA-5880.
2018-11-08 13:03:37 +01:00
Ghostkeeper
f132adc135
Rename 'Offset' to 'Horizontal Expansion'
This is more consistent with other similar settings.

Contributes to issue CURA-5880.
2018-11-08 12:59:24 +01:00
Ghostkeeper
dcc6003a92
Allow negative support interface offsets
There is no technical reason why this is not allowed. You could save some material with this.

Contributes to issue CURA-5880.
2018-11-08 12:50:09 +01:00
Lipu Fei
75f2f40534 Make API version configuration for Application
CURA-5840
2018-11-08 12:04:43 +01:00
Simon Edwards
69c9ffaf61
Merge pull request #4755 from Ultimaker/CL-1040_show_print_time_in_monitor
CL-1140 Show print time in monitor tab
2018-11-08 11:53:47 +01:00
Ian Paschal
aa6ec9e44b Make text black
Contributes to CL-1040
2018-11-08 11:48:22 +01:00
Lipu Fei
de6ab02422 Merge pull request #4678 from fieldOfView/fix_networkprinter_post
Fix type error in NetworkedPrinterOutputDevice.post
2018-11-08 11:05:47 +01:00
Lipu Fei
59b8bdec54
Merge pull request #4678 from fieldOfView/fix_networkprinter_post
Fix type error in NetworkedPrinterOutputDevice.post
2018-11-08 11:02:57 +01:00
Ian Paschal
35ed234991 Show print time in monitor tab
Contributes to CL-1040
2018-11-08 10:49:22 +01:00
Ghostkeeper
d8a1d458cf
Merge branch '3.6' 2018-11-08 09:49:15 +01:00
Ghostkeeper
c5a9c6c6cc
Add translation for missing line in Korean
This one was not translated.

Contributes to issue CURA-5870.
2018-11-08 09:48:52 +01:00