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

28744 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Rijk van Manen
7884ba4d5b update minimum linewidth 
since these settings are new to cura, I think it is safe to update them in fdmprinters. PP-115
 2022-04-04 16:09:48 +02:00
Rijk van Manen
44a33e0fed follow the defaults set in ultimaker.def.json 
Only UM2+C keeps his on resolution settings, since this  printer has a lower segments per second performance, and we are not going to work on it. PP-54
 2022-04-04 14:29:40 +02:00
Rijk van Manen
df72cd8da4 new default settings for ultimaker printers 
A higher resolution does not improve visual quality, a lower resolution means you need to improve firmware. PP-54
 2022-04-04 14:28:40 +02:00
j.delarago
359bcc1bee Textfield was in incorrect style 
CURA-8640
 2022-04-04 11:09:50 +02:00
j.delarago
e2e0a5cdee Inheriting components don't have full access to the context of their parent in QT6 (I assume?) 
The buttonRow in Dialog must be exposed through an alias now (buttonArea).

This fixes minimumHeight failing to evaluate buttonRow.height

CURA-8640
 2022-04-04 11:08:29 +02:00
j.delarago
2f96f7b410 RegularExpressionValidator requires newer version of QtQuick 
CURA-8640
 2022-04-04 10:45:00 +02:00
j.delarago
e593322b43 When getting active focus textinput value was being cleared. However if text was inputted then this would stay between active focus states. 
This commit forces the value to be assigned the value in the textInput when active focus is given.

CURA-8640
 2022-04-04 10:38:09 +02:00
j.delarago
e20ded248f Fix spinbox height being almost 0 and padding being missing between buttons and text input. 
CURA-8640
 2022-04-04 09:25:22 +02:00
j.delarago
0f84fc3abe Merge remote-tracking branch 'origin/qt6_beyond_the_splash' into qt6_beyond_the_splash 2022-04-01 17:26:28 +02:00
j.delarago
bac9a0da87 Fix textField vertical alignment 
CURA-8640
 2022-04-01 17:26:18 +02:00
Jaime van Kessel
c9b9a41bb8 Fix injection of parameters in signals 2022-04-01 17:17:28 +02:00
Jaime van Kessel
5f71518f9d Use correct enum values for materialsview 2022-04-01 16:25:11 +02:00
Jaime van Kessel
d34d6f739a Merge branch 'qt6_beyond_the_splash' of github.com:Ultimaker/Cura into qt6_beyond_the_splash 2022-04-01 16:22:18 +02:00
Jaime van Kessel
402c53c5f1 Fix warning about Duration 2022-04-01 16:19:35 +02:00
c.lamboo
0c90d2ee81 Merge remote-tracking branch 'origin/qt6_beyond_the_splash' into qt6_beyond_the_splash 2022-04-01 16:13:45 +02:00
c.lamboo
baa1d9b87d Use weights from figma 
Checked with @Lorenzo

CURA-8640
 2022-04-01 16:13:31 +02:00
j.delarago
02e4f869b6 Merge remote-tracking branch 'origin/qt6_beyond_the_splash' into qt6_beyond_the_splash 2022-04-01 16:09:05 +02:00