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

24795 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
528c8e2226
Also store setting_version in preferences file for project files 
This allows the version upgrade system to update these preferences in order to display the correct list of visible settings.
 2020-07-20 11:48:29 +02:00
maht
f3103e5808
Update FileMenu.qml 2020-07-17 12:01:49 +02:00
maht
2cdec12a2e
Merge pull request #1 from mahtDFR/mahtDFR-Cura 
Update FileMenu.qml
 2020-07-17 11:31:27 +02:00
maht
1ce7f1838f
Update FileMenu.qml 2020-07-17 11:29:18 +02:00
maukcc
6514c9d11d HMS434 update 
materials exlusion
infill standard to 100%
 2020-07-17 10:29:18 +02:00
Nino van Hooff
59df16cbad Add support structure to advanced and expert visibility presets 
CURA-6711
 2020-07-17 09:56:20 +02:00
Nino van Hooff
242caca0de Move support structure (normal, tree) out of experimental 
CURA-6711
 2020-07-17 09:55:44 +02:00
Jaime van Kessel
0d4ed17ad3
Merge branch 'CURA-6711_support_structure_dropdown' of github.com:Ultimaker/Cura 2020-07-16 13:40:57 +02:00
Nino van Hooff
8464121001 Fix prime tower adhesion size 
CURA-6980
 2020-07-16 13:04:06 +02:00
Kostas Karmas
bacd68021f Merge branch 'master' of https://github.com/Ultimaker/Cura 2020-07-16 09:35:42 +02:00
Kostas Karmas
e9da3b7e9a Revert "Make all settingitems async" 
This reverts commit d1afc6390258510450e6f061757025f62e257dcb.
It creates a problem in Windows where settings with dropdown menus
do no load anymore.
 2020-07-16 09:34:36 +02:00
Nino van Hooff
18cdce6ef0 Add support_structure to custom visible settings if support_tree_enable 
is in that list

CURA-6711
 2020-07-15 16:08:18 +02:00
Nino van Hooff
bc51db321f Merge branch 'master' into CURA-6711_support_structure_dropdown 2020-07-15 11:57:34 +02:00
Nino van Hooff
ad5eff4bc1
Merge pull request #8045 from Ultimaker/CURA-6684_Ignore_extra_skin_wall_count_in_concentric 
CURA-6684: Hide Extra Skin Wall Count in concentric
 2020-07-14 15:41:02 +02:00
Ghostkeeper
5bc6f5510f
Merge branch 'patch-2' of https://github.com/Sophist-UK/Cura into Sophist-UK-patch-2 2020-07-14 13:48:17 +02:00
Nino van Hooff
617b07061d Take support_enable into account when evaluating support_structure. 
Unsure whether this is necessary, but we decided to do this to make
the evaluation logically equivalent to the existing code currently
in master.

CURA-6711
 2020-07-14 09:44:40 +02:00
maht
da265fccb6
Updated change_log.txt for 4.6.2 4.6.2 2020-07-13 16:45:04 +02:00
Nino van Hooff
3ceb9da27c Merge remote-tracking branch 'origin/master' 2020-07-13 16:42:11 +02:00
maht
bbcd37e5bc
Updated change_log.txt for 4.6.2 2020-07-13 16:42:00 +02:00
Nino van Hooff
bc34c8dd0b Version upgrade support_tree_enable -> support_structure 
CURA-6711
 2020-07-13 15:51:14 +02:00
Jaime van Kessel
ce53e56967
Merge branch 'master' of github.com:Ultimaker/Cura 2020-07-13 14:12:30 +02:00
Jaime van Kessel
efe261c040
Add resolve for bridge_settings_enabled 
CURA-7247
 2020-07-13 14:12:03 +02:00
Nino van Hooff
ac2ef48d46 Merge remote-tracking branch 'origin/master' 2020-07-13 14:05:01 +02:00
Ghostkeeper
c38ee8a365
Clear focus when changing tools 
This is a fix for a bug on MacOS where the delete key wasn't working. A text field from the tools was in focus, which caught the key event, preventing objects from being deleted.

Fixes #7754 and CURA-7585.
 2020-07-13 13:47:51 +02:00
Kostas Karmas
5d5d30f9f7 Hide "Extra Skin Wall Count" if roofing pattern is also concentric 
Now the ESWC will disappear if:
 * the "Top/Bottom Pattern" is Concentric
 * AND the "Bottom Pattern Initial Layer" is Concentric
 * AND there are top surface skin layers and the roofing pattern is Concentric

CURA-6684
 2020-07-13 13:41:11 +02:00
Nino van Hooff
e39f004202 Do not increase diallowed area margin when tower brim is used 
CURA-6980
 2020-07-13 13:38:20 +02:00
Ghostkeeper
4372099e1d
Don't crash if material preferences are corrupt 
This time we don't need to catch permission errors and such since we're reading it from a string that was stored in memory (read when the preferences file was read). However we do need to catch JSON Decoding Errors since the JSON syntax might be broken by the user modifying these files or because the file wasn't saved properly before.

Fixes Sentry issue CURA-112.
 2020-07-13 11:45:16 +02:00
Sophist
a908928c89
Tweak indentation yet again 
Let's hope I have it right this time!
 2020-07-10 22:50:19 +02:00
Sophist
d16b13d20d
Tweak indentation again 2020-07-10 22:48:51 +02:00
Sophist
e921c4ae3d
Tweak indentation 2020-07-10 22:47:37 +02:00
Sophist
107d23e9e5
Include additional machine defaults for Dagoma DiscoEasy / DiscoUltimate 
Values taken from [Dagoma Marlin source code](https://github.com/dagoma3d/Marlin-By-Dagoma/blob/Dagoma-Development/LinuxAddons/Dagoma/conf/serie/E200/Base).
 2020-07-10 22:45:19 +02:00
Jaime van Kessel
e010d4f945
Only enable clipping for list text fields 
Because clipping is expensive!
 2020-07-10 16:44:55 +02:00
Jaime van Kessel
6d120c43b6
Remove unneeded null check 
The check takes ~1.5 ms. It's easily called a few hunderd times
 2020-07-10 15:57:00 +02:00
Jaime van Kessel
8b7b8b0118
Simplify the SettingCategory 2020-07-10 14:50:44 +02:00
Jaime van Kessel
e633b6408e
Use pre-calculated control height 
It's way faster to not re-compute every single time
 2020-07-10 14:34:02 +02:00
Jaime van Kessel
d1afc63902
Make all settingitems async 
We're quite a few qt versions ahead now. The issue seems to have been resolved in the meantime!
 2020-07-10 14:28:58 +02:00
Jaime van Kessel
ce3ac604f2
Remove anchient check from the code 
We removed global tabs like 4 years ago, so no need to have the check.
Speeds up the setting loading a bit more again
 2020-07-10 14:05:39 +02:00
Jaime van Kessel
c5d5cd2c59
Precompute delegate height for settingview 
Speed up the rendering of settingitems a bit
 2020-07-10 13:54:16 +02:00
Jaime van Kessel
b7296dd700
Don't update material menu when it's not visible 
Knocks off about a second of loading
 2020-07-10 13:48:47 +02:00
Jaime van Kessel
b1cd5960b8
Load a number of dialogs on demand instead of always 
Knocks off 0.4 sec of booting.
 2020-07-10 13:23:30 +02:00
Nino van Hooff
e006bad297 Update infill_rate resolve value for support_structure 
CURA-6711
 2020-07-10 11:23:28 +02:00
Nino van Hooff
00cc9ee9f5 Replace support_tree_enable by a support_structure in fdmprinter 
CURA-6711
 2020-07-10 11:22:25 +02:00
Nino van Hooff
649cc4a881 Replace support_tree_enable by a support_structure enum 
CURA-6711
 2020-07-09 17:17:40 +02:00
Kostas Karmas
e000efe493 Fix missing import 
Related to https://github.com/Ultimaker/Cura/pull/7726
 2020-07-08 17:37:00 +02:00
Konstantinos Karmas
79a816db6b
Merge pull request #7726 from Bostwickenator/master 
Add PostProcessingPlugin script DisplayProgressOnLCD
 2020-07-08 17:30:05 +02:00
Konstantinos Karmas
0b3773ed14
Merge pull request #8042 from Ultimaker/CURA-5479_revert 
Revert changes for CURA-5479
 2020-07-08 16:56:49 +02:00
Kostas Karmas
b3d6faffa8 Hide Extra Skin Wall Count in concentric 
When the Bottom Layer Initial Pattern and Top/Bottom Pattern are set to concentric
AND the Top Surface Skin Layers are 0, hide the Extra Skin Wall Count, as it has not
effect.

CURA-6684
 2020-07-08 15:54:46 +02:00
Remco Burema
8ff62844df
Merge pull request #8041 from michalsc/master 
Correctly select the color mode from GUI - this fixes bug #8040
 2020-07-08 11:16:46 +02:00
Jaime van Kessel
38256f7a98
Add cast so that mypy doesn't choke 2020-07-08 11:05:46 +02:00
Jaime van Kessel
91690524c0
Ensure that the 3mf reader doesn't make groups of one 2020-07-08 10:39:33 +02:00