3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-21 13:47:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 18
19507 commits 306 branches 270 tags 779 MiB
Commit graph

19507 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
fieldOfView
6cf8536404 Rename pause button to pause/resume button for clarity 
CURA-1851
 2016-08-04 18:22:35 +02:00
fieldOfView
d3333540de Show printer in "indeterminate" state when we are not authenticated 
CURA-1851
 2016-08-04 18:16:05 +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
Ghostkeeper
50cd98f2bb
Allow extruderValue(s) to fallback to global 
If a setting is not defined in the extruder stack, fall back to global. At least it still tries to get the extruder value from the correct stack first. If that stack has no value, then so be it, use global anyway.

Contributes to issue CURA-2024. Also could affect issue CURA-2006.
 2016-08-04 16:54:43 +02:00
Ghostkeeper
93f6f5d8d3
Don't use extruderValue on settings that have no global_inherits_stack 
It's unnecessary and seems to break things.

Contributes to issue CURA-2024.
 2016-08-04 16:54:43 +02:00
fieldOfView
cf06df8b07 Add a sidebar state for when a printer is not accepting commands 
CURA-1851
 2016-08-04 16:39:46 +02:00
fieldOfView
5f3c051ec6 Code cleanup 
CURA-1990
 2016-08-04 16:02:05 +02:00
fieldOfView
0faa7f4abb Fix error in PrinterOutputDevice.acceptsCommands 
CURA-1851
 2016-08-04 15:49:07 +02:00
fieldOfView
ed669925ad Disable print monitor if the printer is not (yet) ready to receive commands 
CURA-1851
 2016-08-04 15:06:22 +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
fieldOfView
ef36c70d83 Check if the printer is ready to receive *before* doing work. 
This has very little to do with CURA-1990
 2016-08-04 14:23:57 +02:00
Ghostkeeper
f3a119f9bb
Use correct extruder's value when inheriting global_inheritance_stack settings 
This uses the new function extruderValue() which picks the value from a different extruder. Every setting that has the global_inheritance_stack property is now referenced via the extruderValue() setting in all functions.

Contributes to issue CURA-2024.
 2016-08-04 13:35:13 +02:00
fieldOfView
31861d82dc Show message while aborting 
CURA-1990
 2016-08-04 13:27:42 +02:00
fieldOfView
ca5d0fcb05 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-04 13:26:15 +02:00
Ghostkeeper
de7f32da19
Convert global_inherits_stack to int before slicing 
Sometimes it was accidentally converted to a float when it passes through Javascript.

Contributes to issue CURA-2055.
 2016-08-04 13:25:51 +02:00
fieldOfView
de3edffe3e Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-04 13:25:41 +02:00
fieldOfView
a74d5dd8cb Show error text in print monitor 
CURA-1990
 2016-08-04 13:25:28 +02:00
fieldOfView
c4850a6ff2 Show error state after aborting a print 
CURA-1990
 2016-08-04 12:57:13 +02:00
Ghostkeeper
b89a9a8113
Allow freezing temperatures 
But not on Ultimaker printers, because they crash.
 2016-08-04 12:50:03 +02:00
Ghostkeeper
ee95e90b4b
Fix display update bug in per-object panel 
Setting .value creates a new Python attribute in the object. Setting with setProperty creates the setting property, like we wanted.

Contributes to issue CURA-2011.
 2016-08-04 12:36:33 +02:00
Ghostkeeper
d97c9f6e4c
Don't use extruder fallback on single-extrusion machines 
Due to a gnawing feeling in the back of my head, I tested this with an UM2 and adding settings failed there. This fixes it.

Contributes to issue CURA-2011.
 2016-08-04 11:36:45 +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