GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-11 06:19:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,053 Commits 290 Branches 260 Tags
Commit Graph

3053 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
a070684ade Fixed minor issue for inheritance button 
It didn't always reset to correct value. CURA-1278
 2016-06-09 09:59:06 +02:00
fieldOfView
a21498c375 Add weights to generic quality profiles 
CURA-1278
 2016-06-09 08:29:05 +02:00
fieldOfView
ecfd7e5993 Move InstanceContainersModel has_settings into metadata to clean up the model 
CURA-1668
 2016-06-09 08:21:18 +02:00
fieldOfView
a6dd9e7415 Fix initialization of ContainerSettingsModel 
CURA-1668
 2016-06-09 08:14:06 +02:00
fieldOfView
b85a8ca404 Update ContainerSettingsModel when its containers have property changes 
CURA-1668
 2016-06-09 07:54:13 +02:00
fieldOfView
e702fef44b Add header to profile settings table 2016-06-08 22:07:57 +02:00
fieldOfView
f764ac8362 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-08 17:51:07 +02:00
fieldOfView
ca308c5b05 Add notice if a profile has no settings, and if the current settings are "empty" 
CURA-1668, CURA-696
 2016-06-08 17:50:54 +02:00
Jaime van Kessel
85d5247deb Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-08 17:47:46 +02:00
Jaime van Kessel
fcd6f0959f Inheritance button now only shows if there is a function in the container stack at some point 
CURA-1278
 2016-06-08 17:47:23 +02:00
fieldOfView
07b51d0ca8 Strike out profile value if it is overridden by the current setting 
CURA-1668
 2016-06-08 17:04:04 +02:00
fieldOfView
2d63ce889f Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-08 16:45:35 +02:00
fieldOfView
da467b9b28 Only shown the current settings column when the currently active quality profile is selected 
CURA-1668
 2016-06-08 16:45:20 +02:00
Ghostkeeper
4d418a7c1a
When switching active extruder, get the extruder train from definition id 
Not from extruder container stack ID.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-08 16:36:01 +02:00
Ghostkeeper
7dbafa06d1
Make SidebarHeader use ExtrudersModel 
This model is also used by the extruder selection drop-downs, and it's automatically filled already so that was double logic.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-08 16:36:01 +02:00
fieldOfView
2d998c127b Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-08 16:35:23 +02:00
fieldOfView
485ae53660 Show quality profile and user profile settings side-by-side on Profiles manager 
Introduces ContainerSettingsModel, which can combine the settings of instances from multiple containers into one model.

Towards CURA-1668
 2016-06-08 16:35:10 +02:00
Arjen Hiemstra
1131623278 Disable the property editor when the value of the setting is not used 
Contributes to CURA-1278
 2016-06-08 16:34:19 +02:00
fieldOfView
8608468802 Add a method to get the id of the current user profile 
CURA-1668
 2016-06-08 16:32:39 +02:00
Tim Kuipers
cc7369c594 profiles fix: duplicated UM2+ profile changes from 2.1 to the UM2E+ profiles (CURA-1662) 2016-06-08 15:43:22 +02:00
Tim Kuipers
8a7e549a27 Merge fix of 2.1 
Max Retraction count 45 ==> 90 wasn't taken along
 2016-06-08 15:40:15 +02:00
Tim Kuipers
21ad4713a7 Merge branch '2.1' 2016-06-08 15:35:45 +02:00
Jaime van Kessel
cf15f9e2a1 Added handling of special case when only user & definition were set 
CURA-1278
 2016-06-08 15:31:28 +02:00
Jaime van Kessel
3881ed8a61 Fixed behaviour of inheritance button 
CURA-1278
 2016-06-08 14:58:05 +02:00
Tim Kuipers
6a2be5a34a Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-08 14:20:17 +02:00
Tim Kuipers
061cbfe46b JSON fix: make base of raft with thicker lines than nozzle size (CURA-695) 2016-06-08 14:20:06 +02:00
Ghostkeeper
59c8a4e66d
Fix validation of extruder-type settings 
Based on how ints are validated, since the data is the same.

Contributes to issues CURA-1278 and CURA-340.
 2016-06-08 14:16:13 +02:00
Ghostkeeper
0a34577fdb
Add documentation for createExtruderTrain 
Contributes to issues CURA-340 and CURA-1278.
 2016-06-08 14:09:37 +02:00
Ghostkeeper
fffe9b3a94
Better naming for extruder slot 
The name of the extruder stack is now the same as the name for the extruder definition. The IDs are different though!

Contributes to issues CURA-1278 and CURA-340.
 2016-06-08 14:09:37 +02:00
Ghostkeeper
32f90ad867
Re-add per-extruder nozzles, materials, qualities 
Slightly more efficient and correct implementation.Contributes to issue CURA-340.
 2016-06-08 14:09:36 +02:00
Ghostkeeper
f6ece126c3
Don't re-create user profile if one is loaded from files 
The user profiles are also saved because they are added to the container registry. So if one exists for this extruder, don't create a new blank name, but use the pre-loaded one which contained the user settings the user had before he closed down Cura previously.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-08 14:09:36 +02:00
Arjen Hiemstra
163642f9ad Also remove the "current_settings" container when removing a machine 
Contributes to CURA-1628
 2016-06-08 14:06:14 +02:00
Tim Kuipers
482bc21a9f Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-08 13:49:37 +02:00
Tim Kuipers
e53a961ba7 JSON fix: topbottom thickness had max value for no apparent reason (CURA-1352) 2016-06-08 13:49:27 +02:00
Arjen Hiemstra
2cedc69ed1 Remove all special floating point handling code from SettingTextField 
Since we now always send setting values as string and the conversion
from float
to string already does the rounding, there is no need to also do it
here.

Contributes to CURA-1278
Contributes to CURA-389
 2016-06-08 13:46:30 +02:00
Arjen Hiemstra
b53926b9de Exclude machine_settings from the settings visible in the sidebar 
Contrivbutes to CURA-1645
 2016-06-08 13:29:36 +02:00
Ghostkeeper
8b75a230a0
Fix findContainer call without kwargs 
It has no kwargs. This needs to be provided as dictionary.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-08 11:29:25 +02:00
Ghostkeeper
8c7b3a05b6
Enumerate again over the machine's extruders 
We needed to get the index, after all.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-08 11:29:25 +02:00
Ghostkeeper
21545af5c8
Get only values from extruder trains dictionary 
Instead of getting the keys, which are labeled '0' and '1', we'd like to get the values, which are the extruder train IDs themselves.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-08 11:29:25 +02:00
Ghostkeeper
91797c3944
Log error if the machine refers to invalid extruder train ID 
This helped mostly for debugging but it should be a genuine warning.

Contributes to issues CURA-1278 and CURA-340.
 2016-06-08 11:29:25 +02:00
Ghostkeeper
675a8c140e
Give default colour if there is no material 
Otherwise it would try to call getMetaDataEntry on None.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-08 11:29:25 +02:00
Ghostkeeper
4aa495f9ef
Fix getting name and colour from extruder 
There used to be an extruder object from which we could ask these properties. But now we have a container stack in its place, so we need to get the properties in a slightly different way.

Contributes to issues CURA-1278 and CURA-340.
 2016-06-08 11:29:24 +02:00
Ghostkeeper
af484b03d8
Fix typo in variable name 2016-06-08 11:29:24 +02:00
Jaime van Kessel
761d3f1a27 Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-08 11:02:45 +02:00
Jaime van Kessel
77431b01a3 Inherit button now has the same behaviour as 2.1 again 
CURA-1278
 2016-06-08 11:02:04 +02:00
fieldOfView
41ab485af0 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-08 10:56:02 +02:00
fieldOfView
1a8fe6aa1f Fix customised settings indicator 
CURA-1585
 2016-06-08 10:55:48 +02:00
Ghostkeeper
8b1c363932
Load current machine's extruders upon creation, start and switch of machines 
This requires some trickery of initialising the extruder manager before the machine manager is initialised, so that it properly listens to global container stack changes.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-08 10:40:10 +02:00
Ghostkeeper
98a0f90dae
Remove unused variable _active_extruder_index 
This index is managed by ExtruderManager.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-08 10:38:59 +02:00
Ghostkeeper
f461ed0f5f
Document singleton 
Contributes to issues CURA-340 and CURA-1278.
 2016-06-08 10:38:59 +02:00