3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 23:05:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer

Browse source
This commit is contained in:
Kostas Karmas 2020-04-29 15:37:53 +02:00
commit b008f1e823
9 changed files with 36 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
View file

@ -113,14 +113,14 @@ UM.Dialog
TableViewColumn
{
role: "original_value"
title: catalog.i18nc("@title:column", "Default")
title: Cura.MachineManager.activeQualityDisplayNameMap["main"]
width: (tableView.width * 0.3) | 0
delegate: defaultDelegate
}
TableViewColumn
{
role: "user_value"
title: catalog.i18nc("@title:column", "Customized")
title: catalog.i18nc("@title:column", "Current changes")
width: (tableView.width * 0.3) | 0
}
section.property: "category"
@ -192,7 +192,7 @@ UM.Dialog
Button
{
id: discardButton
text: catalog.i18nc("@action:button", "Discard");
text: catalog.i18nc("@action:button", "Discard changes");
anchors.right: parent.right
onClicked:
{
@ -205,7 +205,7 @@ UM.Dialog
Button
{
id: keepButton
text: catalog.i18nc("@action:button", "Keep");
text: catalog.i18nc("@action:button", "Keep changes");
anchors.right: discardButton.left
anchors.rightMargin: UM.Theme.getSize("default_margin").width
onClicked:

7
resources/shaders/xray_composite.shader
View file

@ -30,6 +30,7 @@ fragment =
uniform vec4 u_outline_color;
uniform vec4 u_background_color;
uniform float u_xray_error_strength;
uniform float u_flat_error_color_mix;
const vec3 x_axis = vec3(1.0, 0.0, 0.0);
const vec3 y_axis = vec3(0.0, 1.0, 0.0);
@ -73,7 +74,7 @@ fragment =
float rest = mod(intersection_count + .01, 2.0);
if (rest > 1.0 && rest < 1.5 && intersection_count < 49.0)
{
result = vec4(shiftHue(layer0.rgb, hue_shift), result.a);
result = mix(vec4(shiftHue(layer0.rgb, hue_shift), result.a), vec4(1.,0.,0.,1.), u_flat_error_color_mix);
}
vec4 sum = vec4(0.0);
@ -122,6 +123,7 @@ fragment41core =
uniform vec4 u_outline_color;
uniform vec4 u_background_color;
uniform float u_xray_error_strength;
uniform float u_flat_error_color_mix;
const vec3 x_axis = vec3(1.0, 0.0, 0.0);
const vec3 y_axis = vec3(0.0, 1.0, 0.0);
@ -166,7 +168,7 @@ fragment41core =
float rest = mod(intersection_count + .01, 2.0);
if (rest > 1.0 && rest < 1.5 && intersection_count < 49)
{
result = vec4(shiftHue(layer0.rgb, hue_shift), result.a);
result = mix(vec4(shiftHue(layer0.rgb, hue_shift), result.a), vec4(1.,0.,0.,1.), u_flat_error_color_mix);
}
vec4 sum = vec4(0.0);
@ -196,6 +198,7 @@ u_layer2 = 2
u_background_color = [0.965, 0.965, 0.965, 1.0]
u_outline_strength = 1.0
u_outline_color = [0.05, 0.66, 0.89, 1.0]
u_flat_error_color_mix = 0.5
[bindings]