GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-30 01:55:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,143 Commits 294 Branches 267 Tags
Commit Graph

8143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fieldOfView
57f936e5ff Remove definition_changes containers when a stack is removed 2017-04-24 13:56:37 +02:00
fieldOfView
8b5ac81404 Fix extruder_stack global values are moved to 
ExtruderManager.getMachineExtruders() result is not sorted, the result of getActiveExtruderStacks() is
 2017-04-24 13:20:20 +02:00
Arjen Hiemstra
bca27ad11f Document findItemIndex function in ContextMenu 2017-04-24 13:13:00 +02:00
Arjen Hiemstra
27256cae9e Revert import change 2017-04-24 13:12:36 +02:00
Arjen Hiemstra
8c4ec804e7 Add type hinting to _onContextMenuRequested 2017-04-24 13:12:21 +02:00
Arjen Hiemstra
78603bed63 Rename setSelectionExtruder to setExtruderForSelection 
This matches more closely with the naming of the other selection
actions.
 2017-04-24 13:12:00 +02:00
Arjen Hiemstra
e571b8aeac Remove superfluous return statement 2017-04-24 13:11:16 +02:00
fieldOfView
3e9fdb5db1 Prevent the DiscardOrKeepProfileChangesDialog from popping up (twice) if there are user changes 2017-04-24 13:11:10 +02:00
Arjen Hiemstra
49bdb78219 Use cura. for imports instead of relative imports` 
Matches the style of the rest of the file.
 2017-04-24 13:11:04 +02:00
Jaime van Kessel
fb0df3109c Fixed inhertiance manager getting update from a Category setting 2017-04-24 13:10:33 +02:00
Jaime van Kessel
2297a6e80b Fixed inhertiance manager crashing if there is no parent 2017-04-24 13:05:39 +02:00
fieldOfView
fab0fa1dde Move setting values that are settable per extruder from/to global stack when setting extruder count 2017-04-24 12:58:20 +02:00
fieldOfView
c1fa927118 Make the general settings page options draggable only in the vertical direction 
... to match other scrollviews. Fixes #1723
 2017-04-22 23:07:13 +02:00
fieldOfView
d2d36b8c98 Lower extruder_nr settings when they exceed the number of extruders 2017-04-22 12:17:16 +02:00
fieldOfView
2ca24ba7e6 Restore both material and variant to match 1st extruder when switching to single extrusion 2017-04-22 11:20:55 +02:00
fieldOfView
8d42f9c187 Move some convoluted logic from QML into Python 2017-04-22 10:13:58 +02:00
fieldOfView
933ee408e4 Code style 2017-04-22 09:47:00 +02:00
fieldOfView
0966ef5338 Fix QML warnings when switching to an extruder tab 2017-04-21 21:48:20 +02:00
fieldOfView
656e7a8046 Change the scope of the head polygon functions to be inside the main tab 2017-04-21 21:27:15 +02:00
fieldOfView
ba229444b7 Pause autoslicing while the MachineSettingsAction is open 
Each setting-change would cause a reslice, which is unnecessary.
 2017-04-21 21:05:28 +02:00
fieldOfView
4d12ab1296 Merge branch 'master' into feature_multiextruder_machinesettings 2017-04-21 19:31:44 +02:00
Ghostkeeper
2fda85a6aa
Hide estimated time left if print is aborted or completed 
In fact, only show it if a time estimate is meaningful. We keep showing the estimate while a print is paused though.

Contributes to issue TRI-1550.
 2017-04-21 14:29:40 +02:00
Ghostkeeper
fb674ec135 Merge remote-tracking branch 'origin/master' 2017-04-21 14:28:22 +02:00
Victor Larchenko
e47ca7a68d Merge remote-tracking branch 'um/master' into gcode-keywords 2017-04-21 14:36:22 +06:00
Victor Larchenko
e5eb0c9a14 Merge remote-tracking branch 'um/master' into theme-picker 2017-04-21 14:29:01 +06:00
Arjen Hiemstra
3d5e535b69 Select the object underneath the cursor on context menu request 
Contributes to CURA-3609
 2017-04-20 17:53:05 +02:00
Arjen Hiemstra
05e1de2fb3 Deprecate the delete/multiply/center methods in CuraApplication 
Since they should no longer be used by the UI.

Contributes to CURA-3609
 2017-04-20 17:42:06 +02:00
Arjen Hiemstra
e108bd0627 Add extruder selection to Context menu 
Contributes to CURA-3609
 2017-04-20 17:42:06 +02:00
Arjen Hiemstra
9fd0239cd5 Add a selectedObjectExtruders property to ExtruderManager 
It exposes a list of the extruders used by the current selection.

Contributes to CURA-3609
 2017-04-20 17:42:06 +02:00
Arjen Hiemstra
5f65cb25c6 Add a setSelectionExtruder method to CuraActions 
Can be used to set the extruder used for the selection

Contributes to CURA-3609
 2017-04-20 17:42:06 +02:00
Arjen Hiemstra
61f542c215 Add a SetObjectExtruderOperation class 
It handles setting an extruder for an object.

Contributes to CURA-3609
 2017-04-20 17:42:06 +02:00
Arjen Hiemstra
03ccdec861 Call the right methods of CuraActions in Actions.qml 
Contributes to CURA-3609
 2017-04-20 17:42:06 +02:00
Arjen Hiemstra
b56802a523 Add a deleteSelection method to CuraActions 
It does the same as CuraApplication::deleteSelection but this is a
better place for it.

Contributes to CURA-3609
 2017-04-20 17:42:06 +02:00
Arjen Hiemstra
c21895de97 Add a multiplySelection method to CuraActions 
Contributes to CURA-3609
 2017-04-20 17:41:53 +02:00
Arjen Hiemstra
905e59354b Change MultiplyObjectsJob to work on a list of objects 
This makes MultiplyObjectsJob able to handle a list of objects instead
of a single object ID.

Contributes to CURA-3609
 2017-04-20 17:41:53 +02:00
Arjen Hiemstra
97fd35c21d Add a centerSelection method to CuraActions 
Can be used to center all selected objects.

Contributes to CURA-3609
 2017-04-20 17:41:53 +02:00
Arjen Hiemstra
8e95c894fb Add material and variant names to ExtruderModel 
Contributes to CURA-3609
 2017-04-20 17:41:53 +02:00
Arjen Hiemstra
dd73c53ece Introduce center and multiply actions that work on the entire selection 
Instead of working on a single object.

Contributes to CURA-3609
 2017-04-20 17:41:53 +02:00
Arjen Hiemstra
06cc0e9a63 Move the ContextMenu to its own file 
Contributes to CURA-3609
 2017-04-20 17:39:43 +02:00
Lipu Fei
71706a5df5 Merge pull request #1702 from daid/master 
Only update the target bed temperature, without submitting it to the printer. To prevent race conditions.
 2017-04-20 09:40:38 +02:00
daid
50acaaf91f Some minor changes on review. 2017-04-20 09:35:48 +02:00
Ghostkeeper
16bc9db06d
Simplify gradual infill steps maximum formula 
The case where it reaches '20' is incorrect, it should never give an error, so it should've been 999999 or something. This case is also overly complex.
Say that P is 'infill_line_distance > 0' and Q is 'spaghetti_enabled'...
Then it would be the logarithmic if (P and not Q)...
Then it would be 0 or 20 if (not (P and not Q)), which is ((not P) or Q)...
Then it would be 20 if (((not P) or Q) and not Q), which is (not P)...
And it would be 0 if (((not P) or Q) and Q), which is Q.

So therefore it can be simplified to: 20 if (not P) else 0 if Q else logarithmic. But 20 became 999999, hence the above formula.

Contributes to issue CURA-3700.
 2017-04-19 16:24:39 +02:00
fieldOfView
62f2fe062b Enable settings when machine_extruder_count is set to 1 but multiple extruders are defined 2017-04-19 16:20:01 +02:00
daid
26a2fb80dc Only update the target bed temperature, without submitting it to the printer. To prevent race conditions. 2017-04-19 15:01:47 +02:00
Tim Kuipers
50a99eb2b1 fix: dont err on gradual infill when printing hollow (CURA-3700) 2017-04-19 13:50:06 +02:00
Jaime van Kessel
0e381f389a Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-19 13:34:07 +02:00
jack
2cd3565d4b Merge pull request #1672 from Ultimaker/feature_CURA-3529_upgrade_cura_dir 
CURA-3529: Set dir names in config to allow UM detect old cura dir
 2017-04-19 13:28:49 +02:00
Lipu Fei
7db0f0ebb7 Make toggle button labels clickable 2017-04-19 12:46:25 +02:00
Ghostkeeper
f0d4ea43c2
Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-19 10:39:05 +02:00
Ghostkeeper
eed9ea1b3b
Merge branch 'IMADE3D-revise_jellybox_support' 2017-04-19 10:37:56 +02:00