GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-09 16:09:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,088 Commits 290 Branches 260 Tags
Commit Graph

4088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fieldOfView
6cf8536404 Rename pause button to pause/resume button for clarity 
CURA-1851
 2016-08-04 18:22:35 +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
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
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
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
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
Arjen Hiemstra
b97b694f41 Force recreating the socket when using external-backend 
This may recreate the socket with a new port number but at least it
recreates the socket now.

Partially fixes CURA-1877
 2016-08-02 13:58:16 +02:00
Arjen Hiemstra
22b6ab9c42 Set the extruder stack to a proper default when creating SettingOverrideDecorator 
Turns out it otherwise fails to send the right data.

Fixes CURA-2032
 2016-08-02 13:58:16 +02:00
Tim Kuipers
401e302ad5 Merge branch 'master' into feature_support_bottoms 2016-08-02 12:46:44 +02:00
fieldOfView
0f9b989ae8 Revert "Show "ghosts" for all objects on the buildplate in layerview" 
This reverts commit b765855ba5d3bb96d7113e485e34c4e8b8f3cd49.
 2016-08-02 12:30:22 +02:00
Tim Kuipers
dc3d22f148 JSON: disabled flow temp again (CURA-1174) 2016-08-02 11:48:47 +02:00
Arjen Hiemstra
186cd2034c Remove forced setting of extruder 0 on component complete 
This would force the object's extruder to 0 every time the per object
panel would update, causing the extruder to be reset.

Fixes CURA-2026
 2016-08-02 11:42:04 +02:00
Arjen Hiemstra
9773a16bc6 Properly set active extruder when deepcopying SettingOverrideDecorator 
Fixes CURA-2022
 2016-08-02 11:33:23 +02:00
Arjen Hiemstra
278d6c122d Merge branch 'feature_layerview_ghosts' of github.com:ultimaker/Cura 
* 'feature_layerview_ghosts' of github.com:ultimaker/Cura:
  Show "ghosts" for all objects on the buildplate in layerview
 2016-08-02 10:22:39 +02:00
fieldOfView
7d65e0d62b Add title to machine action window 2016-08-02 09:51:58 +02:00
fieldOfView
a2fa8246b6 Disable UM2 material-related settings depending on gcode flavor... 
...instead of hardcoding them as disabled.

The fdmprinter inheritance-functions for "enabled" are combined with a check for the flavor. This way it will be easier to switch an UM2 to a functional Reprap flavor in a variant. CURA-580
 2016-08-02 09:50:42 +02:00
fieldOfView
42fc25ab09 Move sorting of DefinitionContainerModel out of qml 
Add printer dialog now has sections by a configurable metadata property. A prefered section is set to always show on top.
Add weights to the Ultimaker printer definitions to create a sensible list (newest on top).

CURA-1593
 2016-08-01 19:18:56 +02:00
fieldOfView
b765855ba5 Show "ghosts" for all objects on the buildplate in layerview 
CURA-1601
 2016-08-01 17:33:00 +02:00
fieldOfView
0d9d4b88ce Hide "Type" label when no printer is selected on the manager printers page 2016-08-01 16:56:56 +02:00
fieldOfView
9b4383f361 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-01 16:38:41 +02:00
fieldOfView
68fc9af4c2 Fix removing extruder stacks and extruder user profile 
CURA-1898 broke fix for CURA-1896
 2016-08-01 16:38:31 +02:00
Ghostkeeper
e7452cd644
Make speed_layer_0 and cousin settings not per-mesh 
Fixed up some of the settable_per stuff.

Contributes to issue CURA-1507.
 2016-08-01 16:35:48 +02:00
fieldOfView
7b873fc397 Fix renaming profiles 
CURA-2017
 2016-08-01 16:05:57 +02:00