GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 13:49:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,083 Commits 287 Branches 260 Tags
Commit Graph

58 Commits

Author SHA1 Message Date
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
Thomas-Karl Pietrowski
429e54bc8a Removing unused import 2016-03-14 17:15:57 +01:00
fieldOfView
51ad894711 Properly disable Per Object Settings toolbutton on first start 
On an empty profile, the cura/active_mode preference is not set so the code disabling the button was not called.

Fixes CURA-901
 2016-03-01 10:34:00 +01:00
Jaime van Kessel
636d6af2de Removed reference to removed profile selection 2016-02-29 14:18:00 +01:00
fieldOfView
bbd77ee998 Revert "Fix Per Object Settings toolbutton enabled state on startup" 
This reverts commit 8d7df76aa19009192247d5fb14babbdf9d7c6202.

Contributes to CURA-901
 2016-02-25 16:31:53 +01:00
fieldOfView
8d7df76aa1 Fix Per Object Settings toolbutton enabled state on startup 
Contributes to CURA-901
 2016-02-25 09:40:12 +01:00
Ghostkeeper
64aa977696 Properly update global_only on profile switch 
In the setting override model for per-object settings now gets its global_only property also updated on a profile switch. This is needed because the settings also change during a profile switch but the change event is not triggered.

Contributes to issue CURA-458.
 2016-02-24 13:05:52 +01:00
fieldOfView
390dc7e2c6 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-24 00:15:22 +01:00
fieldOfView
de28561152 Remove Profiles from Per Object Settings panel 
Also disables Per Object Settings tool button when sidebar is in simple mode.

Contributes to CURA-901
 2016-02-24 00:14:54 +01:00
Jaime van Kessel
2a938f7504 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-23 12:55:50 +01:00
Jaime van Kessel
c15709936b Grouping and per object settings now work correctly again 2016-02-23 12:55:41 +01:00
Ghostkeeper
3e4f728281 Merge pull request #638 from Ultimaker/performance_fixes 
Performance fixes
 2016-02-23 12:31:16 +01:00
Arjen Hiemstra
e6ef4405c3 Replace a bunch of Theme property accessors with getThing calls 2016-02-23 12:24:26 +01:00
Jaime van Kessel
ee1c16d1fc Grouped objects now correctly get per-object settings 
Instead of the first object, the group gets the settings.
 2016-02-23 11:27:59 +01:00
Ghostkeeper
12bace54b1 Update per-object settings list when a setting changes 
The event triggers a refresh of the global_only property. I think it shouldn't affect the computation time too much but it feels sluggish when you change a setting. Does it feel sluggish for you too, reviewer? It has been feeling sluggish for a while so I don't know if that's due to this change.

Contributes to issue CURA-458.
 2016-02-22 12:55:10 +01:00
Ghostkeeper
6e59f49bd5 Fix per-object setting categories hiding when folding them 
When the categories were folded closed, they were suddenly hidden because then the settings' height became 0. Now it uses the actual height of the children regardless of whether they are visible or not, which makes them properly remain visible while closed.

Contributes to issue CURA-548.
 2016-02-08 16:18:45 +01:00
Ghostkeeper
72125d84bf Fix problem with casting to QVariant 
This is a magical fix that Nallath and I found for a problem that shouldn't exist in the first place and sometimes doesn't exist at all and in the same time is a superposition of existing and not existing and it's all very complicated and an extremely weird hack. Casting this object to itself properly makes it castable to QVariant.

Contributes to issue CURA-458.
 2016-02-08 15:29:15 +01:00
Jaime van Kessel
ede0cbcfe6 Removed old code in per object settings that caused crash. 2016-02-04 16:04:52 +01:00
Ghostkeeper
736d04ba8d Fix getting container properties 
Due to an optimisation earlier, the model and selected index in the per-object settings panel couldn't be found. This was giving errors and making the per-object settings unusable.

Contributes to issue CURA-458.
 2016-02-04 12:33:39 +01:00
Ghostkeeper
a658140997 Remove more remnants of print sequence message 
I found this other place that was helping to display the message that warns that print sequcence is set per-object. Since the latter is no longer possible, this message shouldn't be displayed any more.

Contributes to issue CURA-458.
 2016-02-04 12:14:59 +01:00
Ghostkeeper
44872ade43 Remove superfluous warning for printsequence 
Print sequence can no longer be chosen per-object, so the warning that displays when you choose print sequence per-object is no longer necessary.

Contributes to issue CURA-458.
 2016-02-04 12:08:57 +01:00
Ghostkeeper
bf03d71427 Hide setting if global-only 
In the per-object-setting panel, a setting is no longer displayed as settable per-object if it is global-only.

Contributes to issue CURA-458.
 2016-02-04 11:43:43 +01:00
Arjen Hiemstra
5d136a1da7 ActiveTool.properties now returns a ContainerProxy object 2016-01-29 15:18:19 +01:00
Tamara Hogenhout
6711cd3070 Fixin some i18n function calls and such 
because some strings could not be translated

Contributes to #CURA-526
 2016-01-12 15:24:47 +01:00