GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-16 07:55:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,105 Commits 295 Branches 268 Tags
Commit Graph

4105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Ha
97f9bcacf1 Tooltip for bed temperature displays values where it resolves from. CURA-2007 2016-08-08 13:39:54 +02:00
Jack Ha
c0dd19ce08 Seems to work, except for the tooltip (shows global value). CURA-2007 2016-08-04 19:23:23 +02:00
Jack Ha
30898f9642 Merge branch 'feature_quality_changes' into cura-2008 2016-08-04 18:26:14 +02:00
Jack Ha
bfabf8d11a Merge, fix qml files. Contributes to CURA-2007. 
Merge branch 'feature_quality_changes' into cura-2007

Conflicts:
	resources/qml/Settings/SettingItem.qml
	resources/qml/Settings/SettingView.qml
 2016-08-04 18:22:36 +02:00
Arjen Hiemstra
4a02a9d1e3 Fix updating changed state for all stacks 
Contributes to CURA-2006
 2016-08-04 18:11:36 +02:00
Arjen Hiemstra
bc8c55f8fb Properly return True in updateQualityChanges 
Since it is declared as returning bool

Contributes to CURA-2006
 2016-08-04 18:05:45 +02:00
Arjen Hiemstra
7b9c982c62 Properly fix machinemanager access 
Contributes to CURA-2006
 2016-08-04 18:04:32 +02:00
Arjen Hiemstra
324d1415d7 Fix updating active quality 
Contributes to CURA-2006
 2016-08-04 17:55:16 +02:00
Arjen Hiemstra
354a467d8e Fix circular import bullcrap 
Contributes to CURA-2006
 2016-08-04 17:51:43 +02:00
Arjen Hiemstra
d150acb79c Change setActiveQuality to set quality of extruders & global and also set change containers 
Contributes to CURA-2006
 2016-08-04 17:41:01 +02:00
Arjen Hiemstra
e2045cdb7f Remove obsolete container switcheroo 
Contributes to CURA-2006
 2016-08-04 17:40:16 +02:00
Arjen Hiemstra
5361efcf2c Return the name/id of the quality changes container if it is set for activeQuality 
Contributes to CURA-2006
 2016-08-04 17:39:52 +02:00
Arjen Hiemstra
10de07c08e Remove some code that was moved to ContainerManager 
Contributes to CURA-2006
 2016-08-04 17:39:09 +02:00
Arjen Hiemstra
6d49fb87af Use ContainerManager::createQualityChanges when creating a quality from current settings 
Contributes to CURA-2006
 2016-08-04 17:38:19 +02:00
Arjen Hiemstra
2ee2bc7348 Properly implement ContainerManager::createQualityChanges 
Contributes to CURA-2006
 2016-08-04 17:37:15 +02:00
Arjen Hiemstra
b76ebbb850 Ensure we have an empty quality changes container in the extruder stack 
Contributes to CURA-2006
 2016-08-04 17:36:39 +02:00
Arjen Hiemstra
70dee38c95 Show quality_changes instance containers for custom containers in the profile menu 
Contributes to CURA-2006
 2016-08-04 17:35:33 +02:00
Arjen Hiemstra
9d0acf5b03 Properly send global settings to the global stack 
Contributes to CURA-2006
 2016-08-04 17:35:01 +02:00
Arjen Hiemstra
7613274686 Properly hide link icon if setting is not settable per extruder 
Contributes to CURA-2006
 2016-08-04 17:34:41 +02:00
Arjen Hiemstra
ec383b46b9 Emit blurSettings for ContainerManager::merge/clear user containers 
Contributes to CURA-2006
 2016-08-04 17:33:35 +02:00
Arjen Hiemstra
b6d0c40852 Store "quality_changes" type containers in the quality directory 
Contributes to CURA-2006
 2016-08-04 17:32:38 +02:00
Jack Ha
2402ba3d0e Bed temperature is now either a resolved value or a global value. 
Contributes to CURA-2007
 2016-08-04 14:30:48 +02:00
Arjen Hiemstra
4eb4a90ded Call the new clearUserContainers/updateQualityChanges from the relevant actions 
Contributes to CURA-2006
 2016-08-04 02:13:24 +02:00
Arjen Hiemstra
9ef709962f Start implementing a createQualityChanges method in ContainerManager 
It will be used to create the quality change containers from the
existing user containers.

Contributes to CURA-2006
 2016-08-04 02:12:32 +02:00
Arjen Hiemstra
0934ae70a8 Introduce clearUserContainers and updateQualityChanges methods in ContainerManager 
They are moved from MachineManager which is really getting too large and
complicated.

Contributes to CURA-2006
 2016-08-04 02:11:35 +02:00
Arjen Hiemstra
95c3aa8251 Split ContainerManager::mergeContainer into a checking bit and a function that does the actual work 
Contributes to CURA-2006
 2016-08-04 02:10:28 +02:00
Arjen Hiemstra
6eed25f145 Only write property changes to extruder stack if we actually should 
Now global settings are once again stored in the global stack

Contributes to CURA-2006
 2016-08-04 02:09:02 +02:00
Arjen Hiemstra
4de4053490 Properly implement "set as active extruder" menu entry 
Contributes to CURA-2006
 2016-08-04 02:08:06 +02:00
Arjen Hiemstra
aa8561fec7 Remove globalPropertyChanged 
There should be no need for this if we properly store settings where
they should be stored.

Contributes to CURA-2006
 2016-08-04 02:05:12 +02:00
Arjen Hiemstra
d42f390ed6 Add the new empty quality_changes container to new machines 
Contributes to CURA-2006
 2016-08-04 02:03:57 +02:00
Arjen Hiemstra
ab99100c56 Introduce an empty quality_changes container 
Contributes to CURA-2006
 2016-08-04 02:02:47 +02:00
Arjen Hiemstra
81f3422e36 Make settable_per_* properties read-only 
Contributes to CURA-2006
 2016-08-04 02:02:14 +02:00
fieldOfView
aba027373b Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-03 22:15:17 +02:00
fieldOfView
16e9c1b2bd Tweak general preference page spacing 2016-08-03 22:14:39 +02:00
fieldOfView
7d48ad7872 Fix qml warning in Printers page after adding a printer 2016-08-03 18:15:06 +02:00
Ghostkeeper
eeec460635 Merge branch 'feature_support_bottoms' 2016-08-03 17:40:28 +02:00
Ghostkeeper
557044b11c
Remove print statement 
Wasn't meant to be committed, I reckon.

Contributes to issue CURA-2022.
 2016-08-03 12:39:01 +02:00
Ghostkeeper
df1b6b8e88
Only get from extruder if global_inherits_stack is valid 
Sometimes it is set to give -1 for some settings.

Contributes to issue CURA-2040.
 2016-08-03 10:27:17 +02:00
Arjen Hiemstra
78aaf4caf0 Use the new extruderValues() function to determine max_warning of layer_height 
Contributes to CURA-2009
 2016-08-02 19:42:40 +02:00
Arjen Hiemstra
791d51df2a Expose an extruderValue() function to value functions 
It can be used to get the value of a specific extruder

Contributes to CURA-2009
 2016-08-02 19:42:40 +02:00
Arjen Hiemstra
a7187e7fe3 Document getExtruderValues 2016-08-02 19:42:40 +02:00
Arjen Hiemstra
3c35830cb8 Expose an extruderValue() function to value functions 
It returns the value of a setting of a specific extruder.

Contributes to CURA-2009
 2016-08-02 19:42:40 +02:00
Arjen Hiemstra
b102a6cedd Expose an extruderValues() function to value functions 
It returns a list of values for all extruders so that things like max()
work.

Contributes to CURA-2009
 2016-08-02 19:42:40 +02:00
Ghostkeeper
f568014e67
Add setting with value from support extruder stack 
Upon adding the setting (making it visible) it takes the setting from the support extruder stack. It doesn't update afterwards.

Contributes to issue CURA-2011.
 2016-08-02 16:49:38 +02:00
Ghostkeeper
5bd3d83c9e
Fix typos in documentation 
Contributes to issue CURA-2011.
 2016-08-02 16:49:38 +02:00
fieldOfView
95b06f317a Fix "create" button on profiles page 
CURA-2036
 2016-08-02 16:13:17 +02:00
fieldOfView
f39b48459e Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-02 15:57:18 +02:00
fieldOfView
ab843b8187 Reset qml component when resetting a Machine Action 
Contributes to CURA-2019 and fixes CURA-1978
 2016-08-02 15:57:01 +02:00
Arjen Hiemstra
0f1c59c925 Properly catch when either extruder or global quality is not properly set 
Cornercase, but it avoids bubbling odd error messages to the UI.

Fixes CURA-1997
 2016-08-02 15:20:03 +02:00
Arjen Hiemstra
4f9fab9418 Set the right default extruder for the main property provider 
Fixes CURA-2024
 2016-08-02 14:49:57 +02:00