3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 05:23:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
10922 commits 312 branches 275 tags 718 MiB
Commit graph

10922 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ghostkeeper
202f7f87f8
Remove ID from definition files 
Sometimes it's out of sync. Sometimes even missing. Let's just not use that any more.

Contributes to issue CURA-4243.
 2017-11-02 12:53:06 +01:00
Ghostkeeper
cf7bad1bbb
Make _profile_name a class method 
This way we can execute it statically while getting the metadata.

Contributes to issue CURA-4243.
 2017-11-02 10:18:52 +01:00
Ghostkeeper
d369f92020
Make get[ConfigurationType|Version]FromSerialized class methods 
This way we can call them before an instance has been created, in order to upgrade the serialized forms.

Contributes to issue CURA-4243.
 2017-11-01 16:18:08 +01:00
Ghostkeeper
e48b151d40
Express getConfigurationTypeFromSerialized as function of its parent 
This prevents code duplication a bit and allows us to make it a classmethod.

Contributes to issue CURA-4243.
 2017-11-01 16:17:26 +01:00
Ghostkeeper
07947d5d2c
Override getIdsFromFile to load multiple IDs 
This should result in all IDs in the XML file, since there are multiple per file here.

Contributes to issue CURA-4243.
 2017-11-01 14:53:52 +01:00
Ghostkeeper
ddf5ab0494
Make _parseCompatibleValue a class method 
It might as well be static, since it doesn't need an instance.

Contributes to issue CURA-4243.
 2017-11-01 14:52:57 +01:00
Ghostkeeper
74bd527b03
Load product_id_map from file 
For now this file is hard-coded. We should eventually try to generate this in the build system.

Contributes to issue CURA-4243.
 2017-11-01 14:52:03 +01:00
Ghostkeeper
a08875c5eb
Remove redundant setting of name 
It's just copied along with the rest of the metadata now.

Contributes to issue CURA-4243.
 2017-10-31 11:11:56 +01:00
Ghostkeeper
d24fa3bc3b
Set name directly in metadata when clearing 
Because the setName function checks if the name is equal to the previous name, but at that point the previous name doesn't exist.

Contributes to issue CURA-4243.
 2017-10-31 08:23:57 +01:00
Ghostkeeper
8eaec149fa
Make sure the ID stays in the metadata when clearing it 
Previously the ID was also exempted from the clear.

Contributes to issue CURA-4243.
 2017-10-30 15:54:26 +01:00
Ghostkeeper
3a9c8d16a2
Fix remaining references to instance_container._id 
These must've slipped through the cracks.

Contributes to issue CURA-4243.
 2017-10-30 15:07:46 +01:00
Ghostkeeper
839c8ccc52
Fix 'Could not get metadata of container <empty string>' 
Turns out that the side bar header was requesting the metadata before the active material was set. Now I'm just saying that if the active material was not set, it should not be compatible.

Contributes to issue CURA-4243, side-ways.
 2017-10-30 11:15:41 +01:00
Ghostkeeper
8bbb6c1af5
Load and serialize container ID and name properly: not in metadata 
We shouldn't write the name or ID, who are now in the metadata.
Also we should load the name and ID properly from the file.

Contributes to issue CURA-4243.
 2017-10-27 16:50:13 +02:00
Ghostkeeper
a31c39b225
Use setters and getters for name and ID 
Because their implementation changed, these would have been implemented in some other way. Instead I use the getters and setters which are inherited from the parent class and therefore are already updated.

Contributes to issue CURA-4243.
 2017-10-27 16:35:58 +02:00
Ghostkeeper
7ac3c1446b
Make ignored metadata keys a set 
It needs to be a set now for Uranium.

Contributes to issue CURA-4243.
 2017-10-27 16:25:52 +02:00
Ghostkeeper
6c4c7fff4d
Use findContainersMetadata whenever possible 
This ensures that we only load those containers that we actually need the data of.

Contributes to issue CURA-4243.
 2017-10-20 15:09:45 +02:00
Ghostkeeper
f7e048aee5
Remove unused variable 
Contributes to issue CURA-4243.
 2017-10-19 16:37:03 +02:00
Ghostkeeper
2fc198a7ad
Move manual criterion into base criteria filter 
This code was filtering on certain criteria, and then filtering the results based on an additional metadata field. Let's just move that last field in the original criteria too...

Contributes to issue CURA-4243.
 2017-10-19 15:48:19 +02:00
Ghostkeeper
7745113704
Re-use stack variable 
We're creating the variable but then requesting the 0th element from the list each time... That can be more logical and more efficient.

Contributes to issue CURA-4243.
 2017-10-19 15:32:21 +02:00
Diego Prado Gesto
1a47ec85ca Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-10-19 13:58:19 +02:00
Diego Prado Gesto
b49610f0c8 Merge branch 'CURA-4248_BAM' 2017-10-19 13:57:30 +02:00
Diego Prado Gesto
0e74f9d881 CURA-4248 - Fix some mistakes in the formulas in quality profiles 2017-10-19 13:54:10 +02:00
Ghostkeeper
5a125aa514
Rename printCoreRow to variantRow 
Because on only one of our printers it's actually a print core. Internally we've always called it the variant.
 2017-10-19 13:38:08 +02:00
Lipu Fei
946b8ae92d Remove executable bit for non-executable files 2017-10-19 10:28:57 +02:00
Diego Prado Gesto
d3e8915b30 Merge branch 'master' into CURA-4248_BAM 2017-10-19 10:26:25 +02:00
Lipu Fei
475f6223d4 Remove executable bit for json files 2017-10-19 10:24:38 +02:00
A.Sasin
5a8fa92c3f Added semicolon 
CURA-4449
 2017-10-19 09:01:15 +02:00
alekseisasin
10127240b5 Merge pull request #2593 from petterreinholdtsen/patch-1 
List model/x3d+xml in the desktop file
 2017-10-18 18:06:22 +02:00
ChrisTerBeke
f4eb2ee256 Merge pull request #2612 from fieldOfView/fix_splashscreen_sub_version_size 
Fix size of "beta" classifier on splash screen for HiDPI screens
 2017-10-18 16:46:56 +02:00
ChrisTerBeke
3ddb277477 Remove double sidebar header item, fixes #2605 2017-10-18 16:01:14 +02:00
ChrisTerBeke
b2dbefc823 Update helper text for custom changes in recommended settings - CURA-4333 2017-10-18 15:44:02 +02:00
ChrisTerBeke
795eda64e3 Merge branch 'master' into CURA-4248_BAM 2017-10-18 15:08:51 +02:00
ChrisTerBeke
f07c5ab470 remove unused ignore 2017-10-18 14:31:03 +02:00
ChrisTerBeke
7d58208507 Fix BAM draft quality weight - CURA-4248 2017-10-18 14:19:11 +02:00
ChrisTerBeke
49af7a5643 Update BAM qualities - CURA-4248 2017-10-18 14:18:29 +02:00
ChrisTerBeke
5580f7ecbb Add BAM quality profiles 2017-10-18 14:08:09 +02:00
ChrisTerBeke
78ba3c3aa0 Move BAM equations to BAM quality profiles as they are very specific - CURA-4248 2017-10-18 13:51:06 +02:00
Ghostkeeper
b119119ed2
Merge branch '3.0' 2017-10-18 13:09:38 +02:00
Ghostkeeper
e897431c95
Fix default quality level for Creality CR-10 printers 
Instead of having a default layer height of 0.2mm, we change the default quality profile to be the one with a layer height of 0.2mm. This fixes up the quality slider.
 2017-10-18 13:03:33 +02:00
ChrisTerBeke
4b6f04604c Set values for support interface density and pattern depending on BAM settings - CURA-4248 2017-10-17 17:21:40 +02:00
Ghostkeeper
4d0c0f606e
Use new version for downloading plugins 2017-10-17 16:44:27 +02:00
ChrisTerBeke
c0903f539e Merge branch 'master' into CURA-4248_psp 2017-10-17 13:07:22 +02:00
ChrisTerBeke
276232dae5 Merge pull request #2613 from Ultimaker/CURA-4333_Notification_icon_for_recommended_mode 
Cura 4333 notification icon for recommended mode
 2017-10-17 13:05:45 +02:00
ChrisTerBeke
91589ed29d Add surface energy property to get correct behaviour - CURA-4248 2017-10-17 13:03:29 +02:00
Diego Prado Gesto
40f548ba99 Merge branch 'CURA-4252_improve_zeroconf_service' 2017-10-17 13:02:58 +02:00
ChrisTerBeke
c553834a82 Merge branch 'master' into CURA-4248_psp 2017-10-17 12:45:28 +02:00
ChrisTerBeke
d426c259d0 Add material adhesion tendency setting, update support top and bottom distance values - CURA-4248 2017-10-17 12:39:26 +02:00
Diego Prado Gesto
b9a9ef8823 CURA-4457 Add parenthesis in conditional statement 2017-10-17 10:12:29 +02:00
Lipu Fei
44d5323779 Run crash dialog on Qt thread so the GUI gets updated correctly 
CURA-4195
 2017-10-17 09:38:43 +02:00
Lipu Fei
396d960f4a Fix code style 
CURA-4195
 2017-10-17 09:30:49 +02:00