Commit graph

8170 commits

Author SHA1 Message Date
ChrisTerBeke
b50f027c83 Add not supported role to profiles model 2017-10-24 10:25:53 +02:00
fieldOfView
6294900bc7 Disable controls when manual control is not available 2017-10-24 10:23:07 +02:00
ChrisTerBeke
35684e0aa4 Move profiles dropdown text generator to separate method 2017-10-24 09:57:48 +02:00
fieldOfView
9cd8869382 Add settable jog distance 2017-10-23 22:27:05 +02:00
fieldOfView
56fa7036b3 Add controls for jogging the head/bed 2017-10-23 21:27:53 +02:00
ChrisTerBeke
3794ae16ae Dont show layer height text in profiles drop down when there is not layer height set - CURA-4451 2017-10-23 17:41:58 +02:00
Jack Ha
c56d135b15 Merge branch 'master' of github.com:Ultimaker/Cura 2017-10-23 14:20:22 +02:00
Jack Ha
4cfd0de580 CURA-4248 hide settings in UI for Surface Energy and Adhesion Tendency 2017-10-23 14:20:10 +02:00
ChrisTerBeke
ff732720ca Set quality slider active index to -1 for user created profile, fix for CURA-4466 2017-10-23 12:45:07 +02:00
Tim Kuipers
87c1f1a377 cross_support_density_image setting 2017-10-23 11:35:20 +02:00
Tim Kuipers
6176b939d6 cross_infill_density_image setting 2017-10-23 11:35:20 +02:00
Diego Prado Gesto
eb0b08a813 CURA-4470 Hide quality slider handle when quality profile doesn't exist 2017-10-22 18:35:05 +02:00
Buco
f1d125b232 Added quality profiles
Made some changes to the main profiles and added quality profiles for each material.
2017-10-20 16:09:26 +02:00
ChrisTerBeke
3fcf20c714 Merge pull request #2564 from BagelOrb/slicing_mode
Adds a UI setting for the new slicing tolerance option in the engine.
2017-10-20 09:49:05 +02:00
Diego Prado Gesto
d2d28fbdfb CURA-4470 Fix quality slider not selecting correct quality profile
Compare selected quality by quality_type instead of id when loading a
project file from older versions of Cura.
2017-10-19 20:49:11 +02:00
Tim Kuipers
823d11f0e1 rename slicing mode ==> slicing tolerance 2017-10-19 17:14:01 +02:00
Tim Kuipers
4650a12324 slicing mode 2017-10-19 17:14:01 +02:00
ChrisTerBeke
30281f17f3 Add simple mode settings flag for user created profile - CURA-4466 2017-10-19 17:03:31 +02:00
ChrisTerBeke
3354f58ddb Remove BAM qualities 2017-10-19 15:14:28 +02:00
Diego Prado Gesto
1a47ec85ca Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-10-19 13:58:19 +02:00
Diego Prado Gesto
0e74f9d881 CURA-4248 - Fix some mistakes in the formulas in quality profiles 2017-10-19 13:54:10 +02:00
Ghostkeeper
5a125aa514
Rename printCoreRow to variantRow
Because on only one of our printers it's actually a print core. Internally we've always called it the variant.
2017-10-19 13:38:08 +02:00
Lipu Fei
946b8ae92d Remove executable bit for non-executable files 2017-10-19 10:28:57 +02:00
Diego Prado Gesto
d3e8915b30 Merge branch 'master' into CURA-4248_BAM 2017-10-19 10:26:25 +02:00
Lipu Fei
475f6223d4 Remove executable bit for json files 2017-10-19 10:24:38 +02:00
ChrisTerBeke
3ddb277477 Remove double sidebar header item, fixes #2605 2017-10-18 16:01:14 +02:00
ChrisTerBeke
b2dbefc823 Update helper text for custom changes in recommended settings - CURA-4333 2017-10-18 15:44:02 +02:00
ChrisTerBeke
795eda64e3 Merge branch 'master' into CURA-4248_BAM 2017-10-18 15:08:51 +02:00
ChrisTerBeke
7d58208507 Fix BAM draft quality weight - CURA-4248 2017-10-18 14:19:11 +02:00
ChrisTerBeke
49af7a5643 Update BAM qualities - CURA-4248 2017-10-18 14:18:29 +02:00
ChrisTerBeke
5580f7ecbb Add BAM quality profiles 2017-10-18 14:08:09 +02:00
ChrisTerBeke
78ba3c3aa0 Move BAM equations to BAM quality profiles as they are very specific - CURA-4248 2017-10-18 13:51:06 +02:00
Ghostkeeper
e897431c95
Fix default quality level for Creality CR-10 printers
Instead of having a default layer height of 0.2mm, we change the default quality profile to be the one with a layer height of 0.2mm. This fixes up the quality slider.
2017-10-18 13:03:33 +02:00
Tim Kuipers
f1a2da0f8a also enablew inital layer flow for the UM2
the normal flow isn't enabled because that is done in the firmware of the printer. The saem doesn't hold for the initial layer flow.
2017-10-18 11:30:36 +02:00
Tim Kuipers
75203e96de initial layer flow 2017-10-18 11:21:39 +02:00
ChrisTerBeke
4b6f04604c Set values for support interface density and pattern depending on BAM settings - CURA-4248 2017-10-17 17:21:40 +02:00
ChrisTerBeke
276232dae5 Merge pull request #2613 from Ultimaker/CURA-4333_Notification_icon_for_recommended_mode
Cura 4333 notification icon for recommended mode
2017-10-17 13:05:45 +02:00
ChrisTerBeke
91589ed29d Add surface energy property to get correct behaviour - CURA-4248 2017-10-17 13:03:29 +02:00
ChrisTerBeke
d426c259d0 Add material adhesion tendency setting, update support top and bottom distance values - CURA-4248 2017-10-17 12:39:26 +02:00
ChrisTerBeke
205ac7c50c Merge branch 'master' into CURA-4253_psp 2017-10-16 17:16:00 +02:00
ChrisTerBeke
5f12b5ac6a set support interface pattern depending on density - CURA-4248 2017-10-16 17:13:29 +02:00
ChrisTerBeke
69d6ca986d Update FDM printer definition to calculate PSP - CURA-4248 2017-10-16 16:48:49 +02:00
ChrisTerBeke
a444e5c883 update material xml parser to support psp values - CURA-4253 2017-10-16 15:55:46 +02:00
Buco
6fae0a3e09 Add Premium
Changed "setting_version" to 3
2017-10-16 15:43:35 +02:00
Lipu Fei
38b9df80f3 Merge remote-tracking branch 'upstream/3.0' 2017-10-16 14:54:40 +02:00
Lipu Fei
fae65d7b83 Minor fixes for customized profile in simple mode
CURA-4333

- Update comments
- Disable the quality slider when there is a customized profile
2017-10-16 13:26:28 +02:00
Buco
95f018530f Add Builder Premium
Tabs became spaces
2017-10-16 13:21:46 +02:00
Lipu Fei
9b8dc9bf55 Move simple-mode settings customization check into a separate file
CURA-4333

Simple-mode is a special mode so it makes more sense to put those code
in a separate file instead of in the more generic MachineManager.
2017-10-16 13:18:11 +02:00
Lipu Fei
e1234a09aa Add the missing parseInt()s back
CURA-4333
2017-10-16 11:42:13 +02:00
Lipu Fei
94a624e105 Merge branch 'master' into CURA-4333_Notification_icon_for_recommended_mode 2017-10-16 11:37:55 +02:00