Commit graph

12854 commits

Author SHA1 Message Date
Jack Ha
f60ba6ddf0 Enable Abort Print button while in pre_print. 2016-08-09 10:57:28 +02:00
fieldOfView
c7a120edd5 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-09 09:56:40 +02:00
fieldOfView
f817d30abc Change colour to color for consistency 2016-08-09 09:56:23 +02:00
Tim Kuipers
68798a0c81 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-08 17:13:44 +02:00
Jack Ha
6d52319ee4 Adjusted visibility of printer monitor progress bar + percentage.
CURA-2064
2016-08-08 17:08:01 +02:00
Tim Kuipers
6477e588da JSON feat: override max z feedrate (CURA-1049) 2016-08-08 17:02:49 +02:00
Jack Ha
b365cdfd0f Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-08 16:26:20 +02:00
Jack Ha
1bd0d65e0a Added user feedback after pressing Pause / Resume in network printer.
The button displays Pausing... or Resuming... until a new status update.

CURA-2060
2016-08-08 16:25:01 +02:00
fieldOfView
20d2cd56a0 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-08 15:41:33 +02:00
fieldOfView
2c61fe3249 Tweak layout of Per Object Settings
CURA-1799
2016-08-08 15:41:20 +02:00
Jack Ha
97f9bcacf1 Tooltip for bed temperature displays values where it resolves from. CURA-2007 2016-08-08 13:39:54 +02:00
Tim Kuipers
ca8ded6c35 JSON fix: support z dist defaults to 1 layer instead of 2 (CURA-1283) 2016-08-08 13:23:03 +02:00
Ghostkeeper
d98c122bd5
Disable extruder selection drop-downs in single-extrusion machines
They don't function in single-extrusion machines.
2016-08-08 12:56:45 +02:00
fieldOfView
dff90342d2 Improve rendering of notice icon at small sizes
CURA-2048
2016-08-08 12:00:56 +02:00
Tim Kuipers
c57f13b3d3 JSON fix: turn off flow equalization by default (CURA-2065) 2016-08-08 10:13:14 +02:00
Tim Kuipers
4f3b6e254e Merge branch 'mergeinfillchanges' of https://github.com/markwal/Cura into markwal-mergeinfillchanges 2016-08-08 09:37:49 +02:00
fieldOfView
78848567e0 Add printer when pressing enter in Add Printer page instead of closing page
CURA-1354
2016-08-05 16:04:51 +02:00
fieldOfView
fa0d8f912f Don't show UMO upgrades page for UMO+ 2016-08-05 16:02:10 +02:00
fieldOfView
2edda68021 Improve validator for numeric fields
Do not accept fractional input for "int" settings
Also only accept a "-" as the first character
2016-08-05 15:12:13 +02:00
Ghostkeeper
09801db5f8
Fix support interface density and pattern global inherits stack
These depend on values that are obtained through global_inherits_stack, so they must also have global_inherits_stack.

Contributes to issue CURA-2024.
2016-08-05 13:48:04 +02:00
Mark Walker
a485b58051 Move equalize_flow settings ahead of acceleration
And add "the print speed" to the description
2016-08-04 12:18:53 -07:00
Mark Walker
1e62b43d53 Rename pressure to flow 2016-08-04 10:54:04 -07:00
Mark Walker
eddbc87ceb New settings to allow control over automatic speed
changes when MergeInfillLines adjusts speed for even pressure when
changing extrusion widths.
2016-08-04 10:34:53 -07: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
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
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
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
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
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
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
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
Ghostkeeper
b89a9a8113
Allow freezing temperatures
But not on Ultimaker printers, because they crash.
2016-08-04 12:50:03 +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
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
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
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
fieldOfView
95b06f317a Fix "create" button on profiles page
CURA-2036
2016-08-02 16:13:17 +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
Tim Kuipers
401e302ad5 Merge branch 'master' into feature_support_bottoms 2016-08-02 12:46:44 +02:00