11418 Commits

Author SHA1 Message Date
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
Ghostkeeper
bd276a4d70
Convert Prusa i3 platform to binary STL
Smaller file size, and apparently there were some syntax errors in the original ASCII STL file as far as numpy-stl was concerned.
2017-05-05 14:56:45 +02:00
Ghostkeeper
c08eb043f0
Merge branch 'fix_float_number_line_width_um3' 2017-05-05 14:45:35 +02:00
Ghostkeeper
ce3b0d9fe4
Convert Kossel platform to binary STL
There were reportedly some errors in the file format. I've opened it and re-saved it in CloudCompare to fix these. And I also converted it to binary STL to reduce the file size somewhat.
2017-05-05 14:26:01 +02:00
14bitVoid
e9d70a8a70 Translate features for time estimates 2017-05-05 02:36:22 +02:00
14bitVoid
05f46c47f7 Dynamically fill tooltip with time estimates 2017-05-05 02:31:16 +02:00
14bitVoid
69a95e37a5 Show time estimates per feature in tooltip 2017-05-05 01:34:09 +02:00
Tim Kuipers
15367a68d7 WARNING: TO BE REMOVED! impossible settings limit_to_extruder: overlap percentage
CURA-3740

These settings inherently have to do with multiple features and
so we should find a value function which depends on
settings from the extruder trains corresponding to those features (wall, skin, infill).

However, we haven't found those functions yet and we have to do research.

Once we have found the formula these settings shouldn't depend on a single extruder any more
and so we should remove the limit_to_extruder.
2017-05-04 17:45:50 +02:00
Tim Kuipers
8d6862be50 JSON infill/skin value function (CURA-3740)
value function is an initial try to get a better value function based on both feature types of walls and skin/infill
2017-05-04 17:45:03 +02:00
Tim Kuipers
17e9e2ae53 JSON limit_to_extruder becomes enabled (CURA-3740)
Settings which govern the order of features shouldn't depend on any feature,
because the order is overruled by the extruder order.
2017-05-04 17:38:16 +02:00
Tim Kuipers
27a8b59c80 WARNING: TO BE REMOVED! impossible settings limit_to_extruder
CURA-3740

These settings inherently have to do with multiple features and
so we should find a value function which depends on
settings from the extruder trains corresponding to those features (wall, skin, infill).

However, we haven't found those functions yet and we have to do research.

Once we have found the formula these settings shouldn't depend on a single extruder any more
and so we should remove the limit_to_extruder.
2017-05-04 17:34:41 +02:00
Jack Ha
0b0011fc88 Multiply dialog now has focus on #, added shortcut Ctrl-M 2017-05-04 16:31:33 +02:00
MaukCC
7ee1498962 Update cartesio.def.json 2017-05-04 14:11:00 +02:00
MaukCC
3c4d3779b1 Update cartesio.def.json 2017-05-04 13:47:14 +02:00
Ghostkeeper
45a369e31b
Merge branch 'Sidebar-fix' 2017-05-04 13:00:03 +02:00
Lipu Fei
25be8d9abb Fix default Line Width float value representation for UM3 2017-05-04 12:55:37 +02:00
Ghostkeeper
c25e2b9b95
Revert "Include recommended/custom switch in theme"
This reverts commit a1f32b74e5b4a30e892a87deb3f7e052e94bbf54. The fix was correct but we allow the honour for Randyxxl.
2017-05-04 12:53:05 +02:00
Mark
68f5995b19 [WIP] Add place for the extra gradual infill icon
CURA-3732
2017-05-04 12:35:40 +02:00
Mark Burton
53b7e1a8ca Add smooth_spiralized_contours setting to control smoothing of contours when spiralizing.
Smoothing the contours minimises the visibility of the z-seam and for most models is
probably a good idea. Where it is less good is when the model has a fine surface details
which will get mangled by the smoothing. So we should let the user decide whether they
want to smooth or not. The default is true as most of the time it's a good thing.

# Conflicts:
#	resources/definitions/fdmprinter.def.json
2017-05-04 09:02:38 +01:00
Ghostkeeper
a1f32b74e5
Include recommended/custom switch in theme
Otherwise it stays white.
2017-05-04 09:48:54 +02:00
Ghostkeeper
945486ade9
Merge branch 'cura_containerstack'
Contributes to issue CURA-3497.
2017-05-03 17:11:55 +02:00
Mark
b590e7b86c [WIP] Add place for the extra gradual infill icon
CURA-3732
2017-05-03 17:05:56 +02:00
Ghostkeeper
b69f337ddb
Set machine_extruder_count in sync with defined extruders
The registry checks if they are in sync and complains if they aren't. The extruder count is set back to default to 1 upon adding the machine.

Contributes to issue CURA-3497.
2017-05-03 17:01:08 +02:00
Ghostkeeper
1778751397
Fix travel speed override
Was a typo by the contributor of this definition.
2017-05-03 15:39:20 +02:00
Randall Wessel
687d326fae Changed color to transparancy and spaces instead of tabs 2017-05-03 15:34:56 +02:00
Ghostkeeper
c42d092b0f
Merge branch 'master' into cura_containerstack 2017-05-03 15:21:01 +02:00
Randall Wessel
163543b86b Make background color of toggle button themeable
Background of toggle button gets same color as toolbar surrounding the
button.
2017-05-03 14:26:44 +02:00
Jaime van Kessel
5159894d5b Merge pull request #1780 from LipuFei/fix_jobspec_tofix
Fix TypeError in JobSpec.qml due to material cost being undefined
2017-05-03 14:12:03 +02:00
Jack Ha
a5033bae54 Enable Support settings that are applicable to support meshes. CURA-2747 2017-05-03 13:40:33 +02:00
Tim Kuipers
2ad8434c27 JSON difficult settings limit_to_extruder (CURA-3740) 2017-05-03 11:23:14 +02:00
Lipu Fei
ac560229a1 Fix TypeError in JobSpec.qml due to material cost being undefined 2017-05-03 10:45:39 +02:00
Tim Kuipers
034f93debc JSON remaining settings limit_to_extruder (CURA-3740) 2017-05-02 18:04:00 +02:00
Tim Kuipers
11d6434b75 JSON speed settings limit_to_extruder (CURA-3740) 2017-05-02 17:53:06 +02:00
Tim Kuipers
e63d9743de JSON shell settings limit_to_extruder (CURA-3740) 2017-05-02 17:46:58 +02:00
Jack Ha
5d15d6e792 Merge branch 'master' into feature_multiextruder_machinesettings 2017-05-02 17:26:27 +02:00
Tim Kuipers
4130308437 JSON infill settings limit_to_extruder (CURA-3740) 2017-05-02 17:26:06 +02:00
Tim Kuipers
202129dc47 JSON resolution settings limit_to_extruder (CURA-3740) 2017-05-02 17:18:02 +02:00
Tim Kuipers
6744bf192d JSON feat: extruder_nr per feature type (CURA-3740) 2017-05-02 16:51:55 +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 8c9eccd1f4f49a0d0584b3f56985f4fa16e48915. 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
d7004d3547 Merge branch 'master' of github.com:Ultimaker/Cura into cura_containerstack 2017-05-02 11:42:16 +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