Commit graph

3575 commits

Author SHA1 Message Date
Ghostkeeper
6b74b0d499
Set default gradual infill step height to 1.5mm
All of the profiles currently in Cura that set the gradual infill steps also set the step height (to 3 to 5 layer heights). I'd have chosen 4 layer heights as default based on that, but our material experts say that 1.5mm is about right for most models.

Contributes to issue CURA-3732.
2017-05-05 17:25:34 +02:00
Ghostkeeper
fc1a5e89c3
Change gradual infill upon clicking infill buttons
It sets the gradual infill to the value stored in the listmodel.

Contributes to issue CURA-3732.
2017-05-05 17:16:18 +02:00
Ghostkeeper
ad1b1e0455
Detect whether the current infill is gradual
And highlight the correct infill button in that case.

Contributes to issue CURA-3732.
2017-05-05 17:13:32 +02:00
Ghostkeeper
df0a971326
Improve tooltip wording for gradual infill button
Contributes to issue CURA-3732.
2017-05-05 16:59:35 +02:00
Mark
b590e7b86c [WIP] Add place for the extra gradual infill icon
CURA-3732
2017-05-03 17:05:56 +02:00
Jack Ha
a5033bae54 Enable Support settings that are applicable to support meshes. CURA-2747 2017-05-03 13:40:33 +02:00
Jack Ha
5d15d6e792 Merge branch 'master' into feature_multiextruder_machinesettings 2017-05-02 17:26:27 +02:00
Ghostkeeper
d006db5b2c
Slightly reduce minimum window size
This should make it possible to work with Cura on 1024x768 screens. I interpolated this from the 800p screens, since it seems to render smaller on my computer anyway.
2017-05-02 13:39:12 +02:00
Tim Kuipers
c69000da75 Merge branch 'feature_support_stair_width' 2017-05-02 13:22:19 +02:00
Ghostkeeper
7a9a4ae290
Revert "Change Label to Text because of ugle font rendering"
This reverts commit 8c9eccd1f4. This element is in a modal window, where the fonts should get the system themeing.
2017-05-02 12:58:29 +02:00
Mark
0e1748b705 Small layout fix so the comboboxes are aligned 2017-05-02 12:55:37 +02:00
Jaime van Kessel
2bc4355f00 Merge branch 'fix_hover_effects' of https://github.com/fieldOfView/Cura 2017-05-02 09:40:08 +02:00
Mark
be21cd7f7d Fix preference category double name 2017-05-01 13:25:13 +02:00
fieldOfView
f18947681a Disambiguate theme name 2017-04-30 23:25:14 +02:00
fieldOfView
93197cd173 Add hover effect to mode switch text labels 2017-04-30 23:21:49 +02:00
fieldOfView
0c6a5328c8 Add hover effect to mode switch control
While simplifying theme additions
2017-04-30 22:52:54 +02:00
fieldOfView
98aca20197 Fix hover effect on "enable support" checkbox 2017-04-30 22:27:07 +02:00
Mark
b05954f99f Merge pull request #1740 from Ultimaker/feature_extruder_buttons
Add Extruder selection buttons to the Toolbar
2017-04-28 15:02:47 +02:00
Lipu Fei
37ec14c239 Merge pull request #1710 from alephobjects/theme-picker
Theme picker
2017-04-27 15:32:14 +02:00
Victor Larchenko
58a857403c Added resetting of theme 2017-04-27 16:37:01 +06:00
Arjen Hiemstra
60339eb44b Minor codestyle fix 2017-04-26 16:18:23 +02:00
Arjen Hiemstra
80bf6988ca Remove unnecessary Catalog and SettingPropertyProvider 2017-04-26 16:18:14 +02:00
Arjen Hiemstra
b4f27f0af7 Remove checkable property and MouseArea in favor of onClicked on the button
It turns out, setting checkable: true causes binding breakage. Without
checkable, checked still works and we can use onClicked of the button
directly.
2017-04-26 16:17:54 +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
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
Arjen Hiemstra
89e6313143 Add buttons to select the extruder for the selection to the toolbar
Contributes to CURA-3577
2017-04-25 16:11:31 +02:00
Arjen Hiemstra
48baf272b4 Fix the extruder icons to have a proper square aspect ratio
Contributes to CURA-3577
2017-04-25 16:10:44 +02:00
Arjen Hiemstra
c85f635125 Add support for overriding the background color of a Tool button
Contributes to CURA-3577
2017-04-25 16:09:51 +02:00
Arjen Hiemstra
09f23f5f91 Styling fixes in Toolbar QML 2017-04-25 11:31:59 +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
Jaime van Kessel
33d92f9596 Merge branch 'master' of github.com:Ultimaker/Cura into feature_extruder_buttons 2017-04-24 16:39:15 +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
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
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
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
Victor Larchenko
e5eb0c9a14 Merge remote-tracking branch 'um/master' into theme-picker 2017-04-21 14:29:01 +06:00
Arjen Hiemstra
e108bd0627 Add extruder selection to Context menu
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
c21895de97 Add a multiplySelection method to CuraActions
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
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