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

181 Commits

Author SHA1 Message Date
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
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
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
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
Jaime van Kessel
7ff1b937e3 Perobject settings now use correct stacks to calculate values 
CURA-1754
 2016-07-29 15:19:50 +02:00
Jaime van Kessel
1147e915c1 Setting a instance to the same state no longer causes display to break 
CURA-1985
 2016-07-28 09:27:20 +02:00
fieldOfView
d64eff9947 Fix updating the Per Object Settings color swatch 
CURA-1971
 2016-07-26 18:54:55 +02:00
fieldOfView
ac0de58ecb Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-25 11:30:47 +02:00
fieldOfView
374ec8e577 Don't show user/quality emphasis on Per Object Settings 2016-07-25 11:30:30 +02:00
fieldOfView
7302baa7da Add icon to settings that can only be set globally (for all extruders) 
CURA-1758
 2016-07-21 15:12:25 +02:00
Jaime van Kessel
b5aa7c3545 Remove the extruder id from settingoverride decorator if the machine does not have multi extrusion 
CURA-1876 & CURA-1768
 2016-07-12 10:34:58 +02:00
fieldOfView
c36af13daf Fix PerObjectSettings, which were broken due to the material editing merge 
CURA-342
 2016-07-07 18:25:20 +02:00
Arjen Hiemstra
38ce6cd4b8 Make PerObjectSettingVisiblityHandler inherit SettingVisiblityHandler and some other cleanup 2016-06-23 13:33:51 +02:00
Arjen Hiemstra
10d572eae3 Fix expanded settings for Per Object settings tool 2016-06-23 13:32:04 +02:00
fieldOfView
08411e943c Reenable Per Object Settings tool in simple mode if the current printer has multiextrusion 
and tweak Per Object Settings panel size

CURA-333
 2016-06-22 18:46:24 +02:00
fieldOfView
11b120a483 Redesign extruder selection widget 
Adds a colorswatch instead of coloring the whole widget (which looks like a warning state)

CURA-340
 2016-06-13 18:23:53 +02:00
fieldOfView
213e20bf4b Enable per object settings for objects inside a group 
CURA-1054
 2016-06-13 16:55:10 +02:00
Ghostkeeper
d89c9d8827
Make getSelectedActiveExtruder return its misbegotten gains 
It was getting a value from the decorator, then keeping it to itself all greedy like. It must return what it found.

Contributes to issue CURA-340.
 2016-06-10 17:04:26 +02:00
Ghostkeeper
204bf4d7dd
Update visibility of extruder dropdown on change 
It currently only works when switching to a dual-extrusion printer, since the model is not updated when switching away to a non-dual-extrusion printer...

Contributes to issue CURA-340.
 2016-06-10 17:04:26 +02:00
Ghostkeeper
598ff1e398
Fix changing active extruder from per-object drop-down 
Apparently this is the way you do it.

Contributes to issue CURA-340.
 2016-06-09 19:06:17 +02:00
Ghostkeeper
f5f711b7dc
On extruder switch create OverrideDecorator if needed 
The SettingOverrideDecorator is only applied if the node has a per-object setting. Now it also creates a decorator also if you've ever switched the extruder, which was needed because the decorator contains the information which extruder to print with.

Contributes to issue CURA-340.
 2016-06-09 19:06:17 +02:00
Ghostkeeper
beb263025b
Make ExtruderSelector invisible if there is no choice in extruders 
It doesn't yet update well if you keep the panel open while switching machines.

Contributes to issue CURA-340.
 2016-06-09 17:01:21 +02:00
Ghostkeeper
bd76c3e30f
Add drop-down in per-object settings to select extruder 
Actually selecting an extruder has no effect because there are dragons in that area and I need better armour with bonus damage against bugs before I venture in there.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-09 15:47:06 +02:00
Tim Kuipers
b3cfa62775 Merge branch 'feature_settings_restricted_to_settingsbases' 2016-06-09 13:11:30 +02:00
Ghostkeeper
af484b03d8
Fix typo in variable name 2016-06-08 11:29:24 +02:00
Tim Kuipers
2e2437d163 feat: use settable_per_[mesh|extruder|meshgroup|globally] instead of global_only (CURA-1560) 2016-06-08 10:50:40 +02:00
Jaime van Kessel
9a14a3e8b7 Per object settings no longer watches "state" property 
CURA-1278
 2016-06-07 15:46:37 +02:00
Arjen Hiemstra
ca1b199c7e Fix PerObjectSettings to use the right objects when instantiating setting items 
Contributes to CURA-1592
 2016-06-07 13:19:37 +02:00
Ghostkeeper
c50d0a97da
Load extruder combobox synchronously 
Asynchronously causes Qt 5.4 to give a segfault.

Contributes to issues CURA-351 and CURA-1278.
 2016-06-05 16:18:07 +02:00
Jaime van Kessel
1ae69b25fa Added documentation 2016-06-02 16:07:09 +02:00
Jaime van Kessel
2ed518c47e Removed no longer used code 
CURA-1278
 2016-06-02 16:02:47 +02:00
Jaime van Kessel
edd5eecc3d Per object settings no longer show depth identation, revert/inherit buttons 
CURA-1278
 2016-06-02 15:53:00 +02:00
Jaime van Kessel
c994cb6bef Slicing no longer occurs when a perObject setting is in error state 
CURA-1288
 2016-06-02 14:19:39 +02:00
Jaime van Kessel
ca218d7a1f Removed too generic exception handling 
CURA-1278
 2016-06-02 13:52:11 +02:00
Jaime van Kessel
1af6e63b35 Removed unused model 2016-06-02 13:41:46 +02:00
Jaime van Kessel
29ed8c2f5b Increased width of per-object settings panel 
CURA-1278
 2016-05-31 11:33:02 +02:00
Jaime van Kessel
152f362562 Hide button is now in correct location 
CURA-1278
 2016-05-31 11:12:22 +02:00
Jaime van Kessel
72d7bd5769 Added hide button to per object settings 
CURA-1278
 2016-05-31 11:06:26 +02:00
Jaime van Kessel
5289d5b4ac Codestyle 
CURA-1278
 2016-05-31 11:02:22 +02:00
Jaime van Kessel
89c1136d7f Per object settings can now be added & changed 
CURA-1278
 2016-05-27 15:28:54 +02:00
Jaime van Kessel
c914446060 Initial changes for perobject stuff 
CURA-1278
 2016-05-27 11:26:41 +02:00
Jaime van Kessel
81cdb3fd8c Added wildcard to filtering 
CURA-1278
 2016-05-25 11:28:58 +02:00
Jaime van Kessel
5f54d611cf Per object settings filter now uses correct bool types (instead of strings) 
CURA-1278
 2016-05-25 11:16:57 +02:00
Jaime van Kessel
fd3788ba7c Removed stray = sign. 
CURA-1278 CURA-1592
 2016-05-25 11:06:48 +02:00
Jaime van Kessel
fc7f349801 Added rudimentary filtering 
Current implementation looks for an exact mach, whereas we should look for text in property.

CURA-1278
 2016-05-20 17:21:09 +02:00
Jaime van Kessel
e9380ba83d Added rudimentary display of settings again 
CURA-1278
 2016-05-20 15:08:17 +02:00
Jaime van Kessel
bcff683fb0 Removed old perobject setting code, so plugin is actually loaded (instead of crashing) 
CURA-1278
 2016-05-20 14:15:06 +02:00
Ghostkeeper
de9a66e1f4 Merge branch '2.1' 
Conflicts:
	plugins/RemovableDriveOutputDevice/OSXRemovableDrivePlugin.py
	plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py
	plugins/USBPrinting/PrinterConnection.py
	resources/machines/fdmprinter.json
	resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
 2016-03-17 15:24:00 +01:00
Jaime van Kessel
4fb9a6a699 Per object settings now also uses visible depth 
CURA-1160
 2016-03-15 16:15:13 +01:00