311 Commits

Author SHA1 Message Date
c.lamboo
d5c0fde7f2 Render labels using Text.QtRendering on OSX
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
2022-05-10 15:40:09 +02:00
c.lamboo
35f5c3f959 Revert "Render labels using Text.QtRendering on OSX"
This reverts commit f0e3c19a34d1fde3b7ec4fd95677fbefa2028b26.
2022-05-10 15:39:02 +02:00
c.lamboo
f0e3c19a34 Render labels using Text.QtRendering on OSX
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
2022-05-10 15:36:50 +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
25839c6d97 Fix direction of pointing rectangle
Turns out that using anchors doesn't quite work anymore due to qt6 upgrade. Oh well!
CURA-9137
2022-04-13 17:36:47 +02:00
Jaime van Kessel
ef6f76fc98 Fix parameter injection deprecation warning 2022-04-06 11:24:17 +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
96444dbc09 Use correct keyboard enums 2022-03-31 13:54:24 +02:00
Jaime van Kessel
f436c97abd Roughly strip out the GraphicalEffects
For some reason qt6 that we built still didn't like it.

Since we wanna know if the rest works, yeeting that stuff out for now
2022-03-28 16:11:28 +02:00
j.spijker@ultimaker.com
ff21c93f9b
Qt6 dropped QtGraphicalEffects
https://doc.qt.io/qt-6/qtgraphicaleffects5-index.html

Contributes to CURA-8640
2022-03-28 15:33:43 +02: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
Jaime van Kessel
6ef28db458 Remove unneeded semicolon
CURA-8684
2022-01-31 17:06:59 +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
ac080f3cd7 Provide height in the line type combobox of the simulation view
CURA-8684
2022-01-30 23:22:58 +01:00
casper
2290b46bf3 Use the Cura Combobox Component in simulation view
CURA-8684
2022-01-28 09:47:44 +01:00
casper
200e4df025 Fix issues in simulation view
- Correctly display text in LayerType dropdown menu
- Use UM.Label component to reduce code duplication
- Don't display QtControls default dropdown icon

CURA-8684
2022-01-26 10:25:20 +01:00
casper
8cc1604b2f Update Buttons to QtControls 2.0 in the simulation view expend menu bar
CURA-8684
2022-01-21 14:07:41 +01:00
Jaime van Kessel
b614cabae6 Put back import 2022-01-14 13:05:07 +01:00
Jaime van Kessel
2aa931cbca Remove unneded styles import 2022-01-04 09:48:02 +01:00
Jaime van Kessel
f11d728c6b Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-01-03 15:32:58 +01:00
Remco Burema
6dc6020217
Qt5->Qt6: GUI-attributes and flips params register singletons.
part of CURA-8591
2021-12-28 18:36:28 +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
fieldOfView
bec12c124f Add a description to the Simulation View plugin that better explains its purpose 2021-12-19 11:48:52 +01:00
Ghostkeeper
9140b71b19
Merge branch 'libArachne_rebased'
Conflicts:
	plugins/SimulationView/SimulationPass.py -> Reverted layer view optimisation in Master while some whitespace changed in Arachne.
	resources/definitions -> Bunch of conflicts with profile updates.
	resources/quality -> Bunch of conflicts with profile updates.
	resources/texts/change_log.txt -> Removed the Arachne change log (as they are internal versions). It'll have to be re-added when we release this version as stable.
2021-12-14 11:48:58 +01:00
Ghostkeeper
41ebd593c5
Revert "Merge branch 'bremco-graphics_buffer_update'"
This reverts commit 5e60cc6208c16d966505e7a97d9bbbb0644d2716, reversing
changes made to c9feace0fbe02beb2089ec0af7be35127d7420f7.
2021-12-08 12:02:49 +01:00
Ghostkeeper
0da37ae6e7
Revert "Workaround for if layer is None somehow."
This reverts commit f0cb9dd39ef996225ebd6d7b8d5ffc986c90e2f0.
2021-12-08 12:02:42 +01:00
Remco Burema
ac8d5fc12c
More explicit float's in shader just to be sure.
CURA-8714
2021-11-23 09:27:25 +01:00
fieldOfView
c6b6af668d Fix shader compilation on some GPUs
Some GPUs (rightly) complain about the difference between a float and an int. Fixes #10837
2021-11-18 08:04:14 +01:00
Remco Burema
c2ed0a9181
Workaround for if layer is None somehow. 2021-11-16 12:40:56 +01:00
Remco Burema
f0cb9dd39e
Workaround for if layer is None somehow. 2021-11-16 12:33:29 +01:00
Ghostkeeper
dc28370178
Remove implicit casts and comparisons of int to float
We can't change this index to an integer, because varying variables can't be integer, even though this variable will only really be tested on vertex level. Not sure if varying was the right choice, but I don't want to change that.
This prevents a crash, probably only occurring on certain GPUs.

Contributes to issue CURA-8657.
2021-11-15 15:19:57 +01:00
Jaime van Kessel
75cd792b00 Convert Layerview component to controls 2 2021-11-11 16:51:03 +01:00
Jaime van Kessel
99a5aa363f Remove unused controls imports 2021-11-11 16:28:20 +01:00
Jaime van Kessel
83be495414 Replace usage of controls label with our custom label
This prevents copy pasting a bunch of parameters that we set by default
2021-11-10 16:37:26 +01:00
Jaime van Kessel
0bb09a4783 Replace all old controls 1 comboboxes with UM.Combobox 2021-11-10 14:57:01 +01:00
Remco Burema
51c5572f0f
Add draw-range behaviour to legacy-mode shaders. 2021-11-08 21:39:12 +01:00
Remco Burema
f486177465
Remove dead (shader) code.
These shader (files) are now only used for compatability mode. The 'modern' code is found in the '...3d.shader' versions of these files.
2021-11-08 21:37:57 +01:00
Remco Burema
4f20dc4c5d
Add documentation. 2021-11-07 22:26:34 +01:00
Remco Burema
a987b9972a
Merge branch 'master' into bremco-graphics_buffer_update 2021-09-16 22:27:52 +02:00
luz paz
9b203c834a Fix source typos 2021-09-07 11:34:22 -04:00
luz paz
d68f375e38 Fix various typos
Found via `codespell -q 3 -S *.po,*.pot -L childs,initialy,lod,ned,te,slicable,sur,tutoriels,wont`
2021-09-07 11:33:54 -04:00
Remco Burema
e119c46944
Fetch count from simple property instead of recalculation.
Polygons don't change when in layer-view. There's already an analogous elementCount property anyway, so a vertexCount property can't do much harm. Just keep in mind that when the polygons are altered, it should be either done via build, or the lineMeshXXXCount methods should be used instead.
2021-08-09 13:15:44 +02:00
Remco Burema
818438a8d6
Merge branch 'graphics_buffer_update' of https://github.com/bremco/Cura into bremco-graphics_buffer_update 2021-08-09 12:09:19 +02:00
Jelle Spijker
2263969d5f
Updated message with message types
Contributes to CURA-8418
2021-07-28 08:45:42 +02:00
Jaime van Kessel
900db57f0f
Update messages to use the message_types
CURA-8418
2021-07-27 11:54:43 +02:00
Remco Burema
458fbd35f1 Merge branch 'master' into graphics_buffer_update 2021-07-25 22:30:39 +02:00
Remco Burema
96ca3b1417 Handle render-range in shader.
Instead of re-uploading the mesh each time the range changes, handle the range in the shaders with the new draw-range parameters. This does however, mean the range has to be in vertices, not in elements. This necessitates some changes to the simulation-view, and some added bits deeper in the base code. Mainly, since each time the type of a line changes, there is an extra vertex, there needs to be a type-change count available to get from 'paths' to range indices.
2021-07-25 22:26:59 +02:00
Jaime van Kessel
d4f249277e
Change icon in simulation view to rectangle
CURA-8379
2021-07-13 15:20:41 +02:00
Ghostkeeper
9046506f2a
Convert icons to UTF-8
As per our architecture design, all of these files should be UTF-8. Luckily it maps well.

Contributes to issue CURA-8342.
2021-06-28 18:28:50 +02:00