108 Commits

Author SHA1 Message Date
Jaime van Kessel
b25e760c53 Remove incorrect enum usage
This only needs to happen in code that uses PyQt, not in qml code
2022-06-17 15:26:30 +02:00
Remco Burema
0232b4f639 Upgrade SDK version to 8.0.0 for Cura 5.0 2022-04-20 10:57:38 +02:00
Jaime van Kessel
ddb3ed1693 Fix crash in image reader and ensure it actually works
CURA-9125
2022-04-13 16:58:37 +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
j.delarago
2f96f7b410 RegularExpressionValidator requires newer version of QtQuick
CURA-8640
2022-04-04 10:45:00 +02:00
c.lamboo
3c9e2a1b08 Update RegExpValidator to RegularExpressionValidator
Due to Qt6 API change

CURA-8640
2022-03-30 15:10:37 +02:00
j.spijker@ultimaker.com
55cb86ebbd
use namespace AlignmentFlag
Contributes to CURA-8640
2022-03-24 11:58:42 +01:00
Jelle Spijker
3f8907d02a
Merge branch 'master' into CURA-8640_PyQt6
# Conflicts:
#	cura/CuraApplication.py
#	resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
#	resources/qml/Preferences/Materials/MaterialsView.qml
2022-03-24 11:53:44 +01:00
j.delarago
3c7498feed Move ToolbarButton and ToolTip from Cura into Uranium. This makes it possible to use new styled ToolbarButton in plugins/Tools for the rotate tool.
Removed the ContentAlignment enum in ToolTip in favour of using the Text.ContentAlignment enum. For some reason references to this enum fail everywhere when ToolTip is moved into Uranium. There is some evil time-wasting magic cast on this component!

CURA-8943
2022-03-03 15:53:30 +01:00
casper
67c80e8a37 Update image loader dialog
- Changed the slider to a Cura.Spinbox
- Use Cura-styled buttons

CURA-8688
2022-02-18 14:02:09 +01:00
Jaime van Kessel
b45b3faa3c Replace textField in JobSpecs
CURA-8685
2022-02-15 15:32:29 +01:00
Jaime van Kessel
77b46868a6 Replace imagereader controls with styled variants
CURA-8685
2022-02-15 15:24:30 +01:00
Jaime van Kessel
cef3b5db16 Fix mergeconflict
CURA-8684
2022-01-31 17:30:03 +01:00
Ghostkeeper
6db4a55f6e
Merge branch 'replace_controls_1_for_controls_2' into CURA-8684_QtControls_replacement_Buttons,_Actions_&_'Exclusivity'
Conflicts:
	plugins/ImageReader/ConfigUI.qml
	plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
	plugins/PerObjectSettingsTool/SettingPickDialog.qml
	resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
	resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
	resources/qml/Preferences/GeneralPage.qml
	resources/qml/Preferences/Materials/MaterialsPage.qml
	resources/qml/Preferences/Materials/MaterialsView.qml
	resources/qml/Preferences/ProfilesPage.qml

These conflicts are all arising from headers/includes being updated at the same time, or from the two branches marking the other one's components as needing OldControls.
This introduced more OldControls markers which don't get marked as merge conflicts by Git. This happens when an element could just be left as the original name but from the new import (e.g. a Button stays a Button in Controls 2, but should be marked as from OldControls on the branch that doesn't update the Button).
2022-01-31 16:53:45 +01:00
casper
4cb4e0e38c Re-enable validators in ImageLoaderPlugin
CURA-8684
2022-01-31 15:47:42 +01:00
casper
1ecc1ad753 Update styling in image loader plugin
CURA-8684
2022-01-31 13:43:08 +01:00
casper
264ce3bdd1 Make texts fields selectable by mouse for various components
This enables mouse-selectable for
- The image reader dialog
- Layer view text field (in simulation view)
- The TextField with unit component (for instace used to set the scale
 of models)
- Rename dialog(s)
- Currency text field
- The settings filter text field

CURA-8684
2022-01-31 10:28:00 +01:00
casper
d3f01034a2 Highight default action and listen to keyboard actions in image dialog
CURA-8684
2022-01-25 10:54:09 +01:00
casper
ee38c9c05b Update QtControls to v2.0 in image reader plugin
CURA-8684
2022-01-21 12:24:40 +01:00
Ghostkeeper
7a5db88fd8
Update slider to Controls 2
Because Controls 1 is going out.
The rest of the controls elements here are left as they were since they need to be styled.

Contributes to issue CURA-8686.
2022-01-20 17:58:11 +01:00
Remco Burema
abe7c1bf7f
Search/replace Qt5->Qt6.
part of upgrading Qt to v6.2: CURA-8591
2021-12-28 14:46:02 +01:00
Remco Burema
8aa071056b
Now unused API field only took integers originally.
We want to keep it this way so people can still make plugins work for older versions of Cura, like 3.6, where the 'api' field with just a single major version, instead of the 'supported_sdk_versions', which can be either a version-string like '7.6.0' or a list of version strings.
2021-06-17 11:15:33 +02:00
Remco Burema
04002056ae
Update SDK/API from 7.5.0 to 7.6.0 for 4.10
CURA-8320
2021-06-15 16:08:07 +02:00
Ghostkeeper
08be77adad
Increment SDK version to 7.5.0
The Cura 4.9 release will have expanded functionality. If you have a plug-in that uses this functionality, marking it as using SDK 7.5.0 will notify older Cura releases that they can't use that plug-in.
2021-04-06 13:28:08 +02:00
Remco Burema
5e7eb2fc93
No need for leading 0 in load-image num-fields.
fixes #8906
2020-12-11 17:18:23 +01:00
Ghostkeeper
d53568c5db
Fix linear-scaling height map thickness
Previously it was using this 'peak_height' which is the total height of the model in scale_vector.y. However it was then multiplying the height map with that scale vector and adding the base height again a second time. So the scaling part was too thick and included the base height, and the total height of the mesh was also too big.
I also reduced an unnecessary re-calculation of the height_from_base parameter. And as a result we don't need the peak_height variable at all any more.

Fixes #8902.
2020-12-09 12:16:56 +01:00
Kostas Karmas
03dc8d00fe Up the SDK version to 7.4.0
In preparation for release of the 4.8.

CURA-7795
2020-10-22 11:29:25 +02:00
Kostas Karmas
bd54ef8d5a Update the SDK version to 7.3.0 for 4.7
CURA-7641
2020-08-07 11:12:27 +02:00
Michal Schulz
0a8f94f82e Correctly select the color mode from GUI - this fixes bug #8040 2020-07-07 12:02:01 +02:00
Nino van Hooff
5a3bcb6161 Fix image reader peak height
CURA-7429
2020-05-07 14:29:30 +02:00
Nino van Hooff
7302e8ba7f Update missed sdk versions from 7.1 to 7.2.0 for Cura 4.6
CURA-7383
2020-04-21 11:46:12 +02:00
Ghostkeeper
4f50f42796
Merge branch '4.6' 2020-04-02 17:21:03 +02:00
Jaime van Kessel
6df2f84c07
Prevent crash when releasing released lock
CURA-C2
2020-04-02 16:51:32 +02:00
Ghostkeeper
869f26a5ba
Fix crash when entering nonsense numbers like '-'
We shouldn't accept those in the input field at all in my opinion but that is for another time.

Fixes Sentry issue CURA-F5.
2020-04-01 16:34:49 +02:00
Ghostkeeper
96482398f5
Code style 2020-03-05 23:58:12 +01:00
Ghostkeeper
6f707f3149
Bump SDK version number of Cura 4.5 to 7.1
We've added new things to our API. This allows plug-in developers to use them.

Contributes to issue CURA-7205.
2020-02-10 10:45:07 +01:00
Tim Kuipers
a7e4d76d05 make lithophane alpha channel control total final width multiplier.
That way the picture is not always square. We can use the alpha channel to encode the actual shape
2019-12-16 13:31:11 +01:00
Nino van Hooff
90f580494b Change default image reader algorithm from logarithmic to linear
The log curve might have some benefits but is also harder to understand
and configure, so let's keep the default at linear.

CURA-6540
2019-11-01 10:31:34 +01:00
Tim Kuipers
1c13402670 rename single letter variable 2019-10-25 11:17:28 +02:00
Tim Kuipers
a01f91d4e3 omit irrelevant log base 2019-10-25 11:16:32 +02:00
Tim Kuipers
76a538322d simplify formula to make it more numerically stable 2019-10-25 11:16:13 +02:00
Nino van Hooff
8a963a0c4e Merge remote-tracking branch 'origin/log_litho' into log_litho
# Conflicts:
#	plugins/ImageReader/ConfigUI.qml
#	plugins/ImageReader/ImageReader.py
2019-10-25 10:26:12 +02:00
Nino van Hooff
6e65fe5772 Only show the transmittance input when the color model is Translucency
CURA-6540
2019-10-25 09:57:39 +02:00
Tim Kuipers
03f7fab124 lil fix 2019-10-24 17:26:28 +02:00
Tim Kuipers
449ad19822 based transmittance on measurements on print
ratio of luminance of 1.4mm thickness to luminance at 0.4mm
2019-10-24 17:26:28 +02:00
Tim Kuipers
5915947a7a fix litho thickness computation 2019-10-24 17:26:28 +02:00
Tim Kuipers
364483f653 explain litho transmittance better 2019-10-24 17:26:28 +02:00
Tim Kuipers
a8b3d7e49d make naming of Logarithmic Conversion Function intelligible 2019-10-24 17:26:28 +02:00
Tim Kuipers
2b55b85a12 fix luminance computation 2019-10-24 17:26:28 +02:00
Tim Kuipers
b88183f4a1 fix translucency model using new permittance setting 2019-10-24 17:26:28 +02:00