GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-03 09:14:24 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,199 Commits 289 Branches 260 Tags
Commit Graph

5199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
ad80678bc2 Gracefully handle case if no material was found 
CURA-2494
 2016-10-05 09:40:16 +02:00
Jack Ha
e66548099a Fixed signal routing when switching between different machines. CURA-2232 2016-10-04 15:25:22 +02:00
fieldOfView
85d1fa8a39 Fix error on profiles page when there is no active machine 2016-10-04 14:51:04 +02:00
fieldOfView
77370d8599 Fix error duplicating profiles 
CURA-2478
 2016-10-04 14:49:56 +02:00
fieldOfView
7b42f52be9 Properly use classmethod to make sure ContainerManager is a singleton 
CURA-2478
 2016-10-04 14:28:39 +02:00
fieldOfView
4f1000c70e Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-10-04 14:15:05 +02:00
fieldOfView
d47f3c482f Static methods cannot call class methods 2016-10-04 14:14:55 +02:00
Jaime van Kessel
e4c6b58611 Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-04 14:08:10 +02:00
fieldOfView
d4556ba4c5 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-10-04 14:06:06 +02:00
fieldOfView
ff12f999be Fixed error when duplicating protected profiles 
CURA-2478
 2016-10-04 14:05:55 +02:00
Tim Kuipers
93186dedd0 JSON fix: disable prime position by default for each machine (CURA-2521) 2016-10-04 14:02:34 +02:00
Jaime van Kessel
c99b460927 Merge branch 'feature_better_warning_formulas' of github.com:Ultimaker/Cura 2016-10-04 13:51:51 +02:00
Tim Kuipers
ed0f8c0235 Merge branch 'master' into feature_better_warning_formulas 2016-10-04 13:43:04 +02:00
Jaime van Kessel
601fdf51fc Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-04 13:40:39 +02:00
Jaime van Kessel
bac0ea94a1 Removed nozzle offset from prime area 
CURA-2520
 2016-10-04 13:40:31 +02:00
Arjen Hiemstra
5a14c5e5ba Replace manual function calls to updateCurrentIndex with an explicit binding 
This is mostly in support of Uranium PR #165 . That changes
SettingPropertyProvider so that the "properties" property does not
always change. However, in general this is the more correct approach.

Relates to CURA-2232
 2016-10-04 13:22:20 +02:00
fieldOfView
fc310f2732 Fix duplicating profiles 
CURA-2478
 2016-10-04 13:21:17 +02:00
fieldOfView
eb1cb3c0f2 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-10-04 13:14:27 +02:00
fieldOfView
10dc8f98b8 Highlight quality_changes values in manage profiles tabs... 
and strike out values that are overridden by a user value

CURA-2514
 2016-10-04 13:14:04 +02:00
Ghostkeeper
d0019cee16
Fix bounding box string in Turkish 
This is a key and should not have been translated.

Contributes to issue CURA-570.
 2016-10-04 12:02:08 +02:00
Ghostkeeper
9f41d81e86
Sort language list by language code 
This makes it slightly easier to find your language. English is an exception, it is always put in front.

Contributes to issue CURA-570.
 2016-10-04 11:41:37 +02:00
Ghostkeeper
5339fc8e8d
Put translation drop-down in their native language 
This makes it slightly easier to select your native language if you don't know the current language. Of course, you have to find the drop-down first... But this is how many applications do it.

Contributes to issue CURA-570.
 2016-10-04 11:41:37 +02:00
Ghostkeeper
04545406cd
Add Turkish language to drop-down 
The translation files are already in there (though the template all languages were based on is not entirely complete). But it wasn't yet in the drop-down so it couldn't be selected.

Contributes to issue CURA-570.
 2016-10-04 11:41:37 +02:00
Jack Ha
1ad39a3332 Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-04 11:13:47 +02:00
Jack Ha
7c18d320c4 SettingView: Only removeUnusedValue when no resolve. Contributes to CURA-2232 2016-10-04 11:13:33 +02:00
Jaime van Kessel
2e9fa7ece1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-04 11:04:06 +02:00
Ghostkeeper
3b6d8f40aa
Also hide support interface line width if support is disabled 
Also, the extruderValue call is superfluous since the setting is already limited to this extruder.
 2016-10-04 11:00:29 +02:00
Jaime van Kessel
7ef14b08a4 Merge branch 'feature_resolvement_functions' of github.com:Ultimaker/Cura 2016-10-04 10:53:40 +02:00
Jaime van Kessel
faf98e40f8 Inherit button now correctly removes values if needed for multi extrusion machines 
CURA-2374
 2016-10-04 10:46:13 +02:00
Jaime van Kessel
72bd268e2d Export now exports correct extruder profiles as well 
CURA-2496
 2016-10-04 10:37:48 +02:00
fieldOfView
556431b984 Fix error when no machine is selected 2016-10-03 22:40:28 +02:00
fieldOfView
f55c35df6e Load extruder profiles into the correct extruder 
CURA-2478
 2016-10-03 22:40:05 +02:00
fieldOfView
144dcb5a65 Slightly more defensive programming in case of extruder mismatch 2016-10-03 22:18:38 +02:00
fieldOfView
046d0b5956 Rename extruder quality changes files when renaming a custom profile 
CURA-2484
 2016-10-03 22:17:56 +02:00
fieldOfView
e1d70ed4b6 Fix selecting quality_changes profiles for extruders 
Now that containers in a quality_changes set don't share a common name, the quality_changes containers for extruders have a metadata entry "global_profile" pointing to the global quality_changes container id.

Contributes to CURA-2478 and CURA-2484
 2016-10-03 21:58:34 +02:00
Tim Kuipers
6240baaaca JSON fix: better warning formulas (CURA-905) 2016-10-03 17:56:03 +02:00
Tim Kuipers
9b342a9a3e JSON fix: removed circular dependency (CURA-905) 2016-10-03 17:35:28 +02:00
Tim Kuipers
2513c64d7d JSON fix: more feasible warnings (CURA-905) 2016-10-03 17:29:25 +02:00
fieldOfView
e7da471199 Fix showing profile values for extruders 
The profiles page would show the setting values in the quality profile, ignoring the quality_changes profile, because it could not find the appropriate quality_changes profile for the extruders

CURA-2478
 2016-10-03 17:04:46 +02:00
Jaime van Kessel
0e74b8eb08 setActiveMaterial now uses id instead of entire container to set quality 
CURA-2494
 2016-10-03 15:58:05 +02:00
Jaime van Kessel
527a503eac Added more logging to indicate changing of certain containers actually succeeded 2016-10-03 15:54:18 +02:00
Jaime van Kessel
18ba42122d Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-03 15:44:20 +02:00
Jaime van Kessel
7d9d751121 ProfilesModel is now updated when active variant or material is changed 
Contributes to CURA-2494
 2016-10-03 15:43:42 +02:00
fieldOfView
2f57d0fb6e Import profiles for the current machine 
Takes into consideration printers that use quality-profiles from other printers, while gracefully handling mismatches in the number of extruders

Fixes CURA-2500, contributes to CURA-2478
 2016-10-03 15:29:25 +02:00
Simon Edwards
5d1b77c551 Rename ProfilesPageModel.py to QualityAndUserProfilesModel.py. Step 2 of 2. 
Contributes to CURA-2414 Quality changes profiles are created incorrectly
 2016-10-03 15:19:32 +02:00
Simon Edwards
a0f345285d Rename ProfilesPageModel.py to QualityAndUserProfilesModel.py. Step 1 of 2. 
Contributes to CURA-2414 Quality changes profiles are created incorrectly
 2016-10-03 15:19:32 +02:00
Jaime van Kessel
513c05b78c Extruders model now listens to global container changed, instead of definition changed. 
This solves issue where switching between machines with the same definition did not cause extruder materials to be updated

CURA-2493
 2016-10-03 15:03:25 +02:00
Tim Kuipers
4e4171fc53 JSON fix: resolveOrValue for support_type (CURA-2410) 2016-10-03 14:52:33 +02:00
Tim Kuipers
4c46985c75 JSON fix: resolveOrValue for retraction_combing (CURA-2410) 2016-10-03 14:51:28 +02:00
Tim Kuipers
91bed05d63 JSON fix: resolveOrValue for prime_tower_size (CURA-2410) 2016-10-03 14:50:20 +02:00