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

8066 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fieldOfView
a1d9b1a37f Force update after unlinking material. 2017-04-29 21:19:54 +02:00
fieldOfView
67b8302d40 Add a notice to linked materials and allow "unlinking" a material. 2017-04-29 21:08:48 +02:00
fieldOfView
23cd6b1c2c Fix rendering of readonly description/adhesion info 2017-04-29 16:43:26 +02:00
fieldOfView
02b978272f Add "Create" button to create a new, unique material. 
The new custom material is still based on generic_pla, but it gets a new GUID and uses itself as base_file so it is not conjoined to another material.
 2017-04-27 11:19:46 +02:00
Mark
d0a95426cb Remove space.. 2017-04-26 13:19:01 +02:00
Mark
f573802e8d Fix to make the extruders line up below the label 
CURA-3609
 2017-04-26 13:01:14 +02:00
Lipu Fei
a5079bfcb3 Merge pull request #1726 from fieldOfView/fix_general_page_scrolling 
Make the general settings page options draggable only vertically
 2017-04-26 11:19:47 +02:00
Jaime van Kessel
1739abbca0 Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-26 09:56:28 +02:00
fieldOfView
9371b28cb3 Add color swatch for "by material" view style and show proper extruder names 2017-04-25 18:55:25 +02:00
fieldOfView
49880d54ad Remove code repetition while touching up layout 2017-04-25 18:45:43 +02:00
fieldOfView
0b9f451103 Apply color to layerview legend labels directly 
The Label style property should not be confused with e TextField style property
 2017-04-25 18:15:04 +02:00
fieldOfView
2493bd6fe6 Merge branch 'master' into themed-layer-view 2017-04-25 18:06:12 +02:00
Ghostkeeper
6e5f7ac28a
Merge branch 'feature_support_top_bottom_speed' 
Contributes to issue CURA-3491.
 2017-04-25 16:46:30 +02:00
Ghostkeeper
15593de404
Fix extruder number dependency of support roof pattern 
It was depending on support bottom extruder.

Contributes to issue CURA-3491.
 2017-04-24 17:31:07 +02:00
Arjen Hiemstra
ada614e413 Workaround a tiny display issue with checkable MenuItems 
If there are no changes to make, we still need to reset the selected
extruders. This is a workaround for checked menu items being deselected
while they actually should still be selected.

Contributes to CURA-3609
 2017-04-24 17:11:37 +02:00
Arjen Hiemstra
89310cb41e Select the group when right clicking an object that is part of a group 
Instead of selecting the individual object.

Contributes to CURA-3609
 2017-04-24 17:10:00 +02:00
Arjen Hiemstra
86d3cbadca Also search through groups when figuring out the extruders of the selection 
Contributes to CURA-3609
 2017-04-24 17:09:18 +02:00
Arjen Hiemstra
b4c557679c Change the selected extruder for all child nodes of a group 
Instead of setting the extruder for the group node, go through all
children and set their extruders instead. Fixes extruder selection on
groups.

Contributes to CURA-3609
 2017-04-24 17:08:19 +02:00
Jaime van Kessel
01f33d3f28 Merge pull request #1732 from Ultimaker/feature_extruder_contextmenu 
Add Extruders to Context Menu and Refactor
 2017-04-24 14:55:57 +02:00
Ghostkeeper
2eae1cdf22
Move support roof settings above support bottom settings 
This was deemed the most logical ordering.

Contributes to issue CURA-3491.
 2017-04-24 14:28:10 +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
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
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
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
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
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