3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 07:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
28611 commits 307 branches 272 tags 787 MiB
Commit graph

28611 commits

This branch
This branch
All branches
Author SHA1 Message Date
j.delarago
5df5d6c37d Fix popup alignment 
CURA-8640
 2022-04-08 16:34:59 +02:00
j.delarago
938ff691c4 Add arrows in submenus 
CURA-8640
 2022-04-08 16:29:24 +02:00
Jaime van Kessel
d94ef39cba Fix warnings for extruder icon 2022-04-08 16:08:24 +02:00
Ghostkeeper
7aafd95429
Implement sub-submenus for material selection 
Getting a bit complex with the timers there and which pop-ups need to stay open. But it seems to be working reliably now.

Contributes to issue CURA-8640.
 2022-04-08 15:57:42 +02:00
Ghostkeeper
b40900e146
Fix layout of subitems 
Contributes to issue CURA-8640.
 2022-04-08 15:57:42 +02:00
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage 
CURA-8640
 2022-04-08 15:55:34 +02:00
Ghostkeeper
3de824e1a4
Show submenu with material types 
It's quite a hassle to get it to keep displaying...

Contributes to issue CURA-8640.
 2022-04-08 14:58:39 +02:00
Ghostkeeper
11b557b3d9
Replace material sub-menus with custom Popup 
The sub-menus were giving segfaults for some reason. We couldn't figure out how to circumvent that. So now we're at a last resort: Implement the whole thing ourselves, but with Popup instead of Menu.

Contributes to issue CURA-8640.
 2022-04-08 11:57:19 +02:00
Jelle Spijker
4abdd675f6
Merge branch 'master' into qt6_beyond_the_splash 2022-04-08 10:26:12 +02:00
Jaime van Kessel
efc5438090 Remove unneeded clear 2022-04-08 09:16:22 +02:00
Jaime van Kessel
9e4798c98b Set ownership of MaterialBrandsModel to cpp 
This hopefully prevents the crash for MacOS
 2022-04-07 20:10:58 +02:00
Jaime van Kessel
262520f193 Remove setting parent from basematerial 2022-04-07 18:05:27 +02:00
Ghostkeeper
855eaec81c
Scale convex hull only by X/Y shrinkage, and handle 0% gracefully 
Only the X/Y shrinkage influences the convex hull collision area. Not the Z, nor the parent setting.

Also, don't scale the collision area to 0. This value is not allowed by the setting system, so it'd indicate an error when slicing, but before slicing the convex hull gets calculated which results in degenerate polygons. Don't do that. Instead, we'll just let it pretend the scale factor is 1.

Contributes to issue CURA-9091.
 2022-04-07 14:17:56 +02:00
Casper Lamboo
dec359da1d
Merge pull request #11641 from Ultimaker/PP-129_increase-filter-distance 
increase filter distance
 2022-04-07 13:59:56 +02:00
Casper Lamboo
c4748ba332
Merge branch 'master' into PP-129_increase-filter-distance 2022-04-07 13:54:27 +02:00
Casper Lamboo
00fcd9d006
Merge pull request #11725 from Ultimaker/feat_transition_filter_limit 
Feat/Fix: transition filter limit
 2022-04-07 13:52:29 +02:00
Jelle Spijker
455c163b60 Merge branch 'master' into qt6_beyond_the_splash 2022-04-07 12:01:17 +02:00
Joey de l'Arago
defe2ad39c
Merge pull request #11774 from Ultimaker/PP-54_decrease-resolution 
Pp 54 decrease resolution
 2022-04-07 10:16:16 +01:00
j.delarago
b7ad18d149 Merge branch 'master' into PP-54_decrease-resolution 
# Conflicts:
#	resources/definitions/ultimaker.def.json
#	resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg
#	resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg
#	resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg
#	resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg
 2022-04-07 11:14:30 +02:00
Jaime van Kessel
706c32706b
Merge pull request #11767 from Ultimaker/PP-115_improve-default-linewidths 
Pp 115 improve default linewidths
 2022-04-07 11:09:55 +02:00
Jaime van Kessel
0cb5a147ed
Merge pull request #11776 from Ultimaker/PP-154_adjust_horizontal_expansion 
Reduced horizontal expansion offset to the theoretically correct valu…
 2022-04-07 10:49:39 +02:00
j.delarago
6bb4f52b27 Fix crash on slicing. 
A Component with 0 width and height does not load values from registered Objects correctly.

This 0 width/height was caused by a binding loop for height in the contentItem.

CURA-8640
 2022-04-06 17:22:17 +02:00
j.delarago
b2b1961b57 Merge branch 'master' into qt6_beyond_the_splash 
# Conflicts:
#	cura/PrinterOutput/PrinterOutputDevice.py
 2022-04-06 15:24:30 +02:00
p.kuiper
e24d2d15ae Reduced horizontal expansion offset to the theoretically correct value of 0.1*layer_height if the correction is performed on both sides of the wall (then totals 0.2*layer_height). 
Relates to PP-154
 2022-04-06 13:56:28 +02:00
p.kuiper
0a8ef5162e Removed the rather hacky implementation of the shrinkage factor averaging. Issues with dual extrusion were the second extruder is not used should solved in a different way. 
Relates to PP-77
 2022-04-06 13:28:55 +02:00
Jaime van Kessel
ef6f76fc98 Fix parameter injection deprecation warning 2022-04-06 11:24:17 +02:00
Jaime van Kessel
1158856f80 Merge branch 'qt6_beyond_the_splash' of github.com:Ultimaker/Cura into qt6_beyond_the_splash 2022-04-06 11:21:01 +02:00
Jaime van Kessel
b2eec5f0d9 Fix height for swatch in extruder settings 2022-04-06 11:19:20 +02:00
j.delarago
00c7c37b34 LinearGradient is not available for 2d shapes in QT6 
Replace LinearGradient with Gradient in preview color scheme drop down

CURA-8640
 2022-04-06 10:50:33 +02:00
Jaime van Kessel
c88ed076a1 Fix resolving of URL's 2022-04-06 09:57:45 +02:00
Jaime van Kessel
605280255f Use right enum for alignment 2022-04-06 09:53:48 +02:00
Jaime van Kessel
3c6412d5d7 FIx deprecation warning 2022-04-06 09:53:27 +02:00
j.delarago
62c1e37e04 Fix button heights 
CURA-8640
 2022-04-05 17:25:19 +02:00
j.delarago
53efb78cf6 Fix combobox and label heights in general page 
CURA-8640
 2022-04-05 17:22:57 +02:00
j.delarago
f57c30fb42 Merge remote-tracking branch 'origin/qt6_beyond_the_splash' into qt6_beyond_the_splash 2022-04-05 16:10:51 +02:00
j.delarago
2ffcfafc77 Some place RegularExpressionValidator can't be found in QtQuick 2.10 but can be in 2.15 so all files using RegularExpressionValidator have been bumped to latest QtQuick 
CURA-8640
 2022-04-05 16:10:39 +02:00
Jaime van Kessel
fa2ebf3e38 Merge branch 'qt6_beyond_the_splash' of github.com:Ultimaker/Cura into qt6_beyond_the_splash 2022-04-05 16:03:58 +02:00
Jaime van Kessel
9812dade44 Fix drag & drop 2022-04-05 16:03:47 +02:00
j.delarago
aa190024d4 Update enum, this fixes connecting to printers 
CURA-8640
 2022-04-05 16:01:17 +02:00
j.delarago
6d2293db08 Remove unused Table in DigitalLibary Plugin 
CURA-8640
 2022-04-05 15:55:45 +02:00
j.delarago
fd07de9b11 Update DiscardOrKeepProfileChangesDialog.qml TableModel 
CURA-8640
 2022-04-05 15:53:56 +02:00
j.delarago
e86f860a2c Update TableView and TableModel in DigitalLibrary plugin. 
This is not backwards compatible with Cura < 5.0 due to the removal of Qt.labs

CURA-8640
 2022-04-05 15:47:08 +02:00
j.delarago
184f4b808e Bump QtQuick version to fix RegularExpressionValidator import 
CURA-8640
 2022-04-05 15:11:07 +02:00
j.delarago
b60156e3b7 Remove unused import 
CURA-8640
 2022-04-05 15:04:35 +02:00
j.delarago
4ec2edec67 Add replacement for QT.labs.models.TableModel 
Implementation is intended to function the same as before.

CURA-8640
 2022-04-05 15:03:45 +02:00
Tim Kuipers
8098c20860 disable wall_transition_filter_distance 
We don't want to filter based on the length of the filtered region, but based on the induced extra line width variation.
This diables the setting for the frontend, but doesn't fully remove it yet. TODO
 2022-04-05 14:00:42 +02:00
Tim Kuipers
de29eb7d53 change name to transitionING filter 
This is not a property of a transition, but of when the transitioning algorithm makes or leaves out transitions
 2022-04-05 13:59:01 +02:00
Tim Kuipers
d3e0b04eed update filter margin name and description 2022-04-05 13:57:56 +02:00
Rijk van Manen
86d9afe96c increase outer wall linewidth when spiralize 
This is mainly benefitting the AA04 0.3mm profiles. PP-115
 2022-04-04 16:10:47 +02:00
Rijk van Manen
04d5d43372 remove redundant overwrites 
PP-115
 2022-04-04 16:10:06 +02:00