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

Merged LayerView show_adhesion and show_support into show_helpers. CURA-3273

Browse source
This commit is contained in:
Jack Ha 2017-02-20 15:56:29 +01:00
parent e82bb29e1d
commit 24d04558f0
6 changed files with 32 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/LayerView/LayerPass.py
View file

@ -48,8 +48,7 @@ class LayerPass(RenderPass):
self._layer_shader.setUniformValue("u_layer_view_type", self._layer_view.getLayerViewType()) self._layer_shader.setUniformValue("u_layer_view_type", self._layer_view.getLayerViewType())
self._layer_shader.setUniformValue("u_extruder_opacity", self._layer_view.getExtruderOpacities()) self._layer_shader.setUniformValue("u_extruder_opacity", self._layer_view.getExtruderOpacities())
self._layer_shader.setUniformValue("u_show_travel_moves", self._layer_view.getShowTravelMoves()) self._layer_shader.setUniformValue("u_show_travel_moves", self._layer_view.getShowTravelMoves())
self._layer_shader.setUniformValue("u_show_support", self._layer_view.getShowSupport()) self._layer_shader.setUniformValue("u_show_helpers", self._layer_view.getShowHelpers())
self._layer_shader.setUniformValue("u_show_adhesion", self._layer_view.getShowAdhesion())
self._layer_shader.setUniformValue("u_show_skin", self._layer_view.getShowSkin()) self._layer_shader.setUniformValue("u_show_skin", self._layer_view.getShowSkin())
self._layer_shader.setUniformValue("u_show_infill", self._layer_view.getShowInfill()) self._layer_shader.setUniformValue("u_show_infill", self._layer_view.getShowInfill())
else: else:
@ -57,8 +56,7 @@ class LayerPass(RenderPass):
self._layer_shader.setUniformValue("u_layer_view_type", 1) self._layer_shader.setUniformValue("u_layer_view_type", 1)
self._layer_shader.setUniformValue("u_extruder_opacity", [1, 1, 1, 1]) self._layer_shader.setUniformValue("u_extruder_opacity", [1, 1, 1, 1])
self._layer_shader.setUniformValue("u_show_travel_moves", 0) self._layer_shader.setUniformValue("u_show_travel_moves", 0)
self._layer_shader.setUniformValue("u_show_support", 1) self._layer_shader.setUniformValue("u_show_helpers", 1)
self._layer_shader.setUniformValue("u_show_adhesion", 1)
self._layer_shader.setUniformValue("u_show_skin", 1) self._layer_shader.setUniformValue("u_show_skin", 1)
self._layer_shader.setUniformValue("u_show_infill", 1) self._layer_shader.setUniformValue("u_show_infill", 1)

27
plugins/LayerView/LayerView.py
View file

@ -79,8 +79,7 @@ class LayerView(View):
Preferences.getInstance().addPreference("layerview/extruder3_opacity", 1.0) Preferences.getInstance().addPreference("layerview/extruder3_opacity", 1.0)
Preferences.getInstance().addPreference("layerview/show_travel_moves", False) Preferences.getInstance().addPreference("layerview/show_travel_moves", False)
Preferences.getInstance().addPreference("layerview/show_support", True) Preferences.getInstance().addPreference("layerview/show_helpers", True)
Preferences.getInstance().addPreference("layerview/show_adhesion", True)
Preferences.getInstance().addPreference("layerview/show_skin", True) Preferences.getInstance().addPreference("layerview/show_skin", True)
Preferences.getInstance().addPreference("layerview/show_infill", True) Preferences.getInstance().addPreference("layerview/show_infill", True)
@ -98,8 +97,7 @@ class LayerView(View):
self._extruder_count = 0 self._extruder_count = 0
self._extruder_opacity = [1.0, 1.0, 1.0, 1.0] self._extruder_opacity = [1.0, 1.0, 1.0, 1.0]
self._show_travel_moves = 0 self._show_travel_moves = 0
self._show_support = 1 self._show_helpers = 1
self._show_adhesion = 1
self._show_skin = 1 self._show_skin = 1
self._show_infill = 1 self._show_infill = 1
@ -211,19 +209,12 @@ class LayerView(View):
def getShowTravelMoves(self): def getShowTravelMoves(self):
return self._show_travel_moves return self._show_travel_moves
def setShowSupport(self, show): def setShowHelpers(self, show):
self._show_support = show self._show_helpers = show
self.currentLayerNumChanged.emit() self.currentLayerNumChanged.emit()
def getShowSupport(self): def getShowHelpers(self):
return self._show_support return self._show_helpers
def setShowAdhesion(self, show):
self._show_adhesion = show
self.currentLayerNumChanged.emit()
def getShowAdhesion(self):
return self._show_adhesion
def setShowSkin(self, show): def setShowSkin(self, show):
self._show_skin = show self._show_skin = show
@ -398,8 +389,7 @@ class LayerView(View):
self.setExtruderOpacity(3, float(Preferences.getInstance().getValue("layerview/extruder3_opacity"))) self.setExtruderOpacity(3, float(Preferences.getInstance().getValue("layerview/extruder3_opacity")))
self.setShowTravelMoves(bool(Preferences.getInstance().getValue("layerview/show_travel_moves"))) self.setShowTravelMoves(bool(Preferences.getInstance().getValue("layerview/show_travel_moves")))
self.setShowSupport(bool(Preferences.getInstance().getValue("layerview/show_support"))) self.setShowHelpers(bool(Preferences.getInstance().getValue("layerview/show_helpers")))
self.setShowAdhesion(bool(Preferences.getInstance().getValue("layerview/show_adhesion")))
self.setShowSkin(bool(Preferences.getInstance().getValue("layerview/show_skin"))) self.setShowSkin(bool(Preferences.getInstance().getValue("layerview/show_skin")))
self.setShowInfill(bool(Preferences.getInstance().getValue("layerview/show_infill"))) self.setShowInfill(bool(Preferences.getInstance().getValue("layerview/show_infill")))
@ -417,8 +407,7 @@ class LayerView(View):
"layerview/extruder2_opacity", "layerview/extruder2_opacity",
"layerview/extruder3_opacity", "layerview/extruder3_opacity",
"layerview/show_travel_moves", "layerview/show_travel_moves",
"layerview/show_support", "layerview/show_helpers",
"layerview/show_adhesion",
"layerview/show_skin", "layerview/show_skin",
"layerview/show_infill", "layerview/show_infill",
}: }:

21
plugins/LayerView/LayerView.qml
View file

@ -219,8 +219,7 @@ Item
view_settings.extruder2_checked = UM.Preferences.getValue("layerview/extruder2_opacity") > 0.5; view_settings.extruder2_checked = UM.Preferences.getValue("layerview/extruder2_opacity") > 0.5;
view_settings.extruder3_checked = UM.Preferences.getValue("layerview/extruder3_opacity") > 0.5; view_settings.extruder3_checked = UM.Preferences.getValue("layerview/extruder3_opacity") > 0.5;
view_settings.show_travel_moves = UM.Preferences.getValue("layerview/show_travel_moves"); view_settings.show_travel_moves = UM.Preferences.getValue("layerview/show_travel_moves");
view_settings.show_support = UM.Preferences.getValue("layerview/show_support"); view_settings.show_helpers = UM.Preferences.getValue("layerview/show_helpers");
view_settings.show_adhesion = UM.Preferences.getValue("layerview/show_adhesion");
view_settings.show_skin = UM.Preferences.getValue("layerview/show_skin"); view_settings.show_skin = UM.Preferences.getValue("layerview/show_skin");
view_settings.show_infill = UM.Preferences.getValue("layerview/show_infill"); view_settings.show_infill = UM.Preferences.getValue("layerview/show_infill");
} }
@ -234,8 +233,7 @@ Item
property bool extruder2_checked: UM.Preferences.getValue("layerview/extruder2_opacity") > 0.5 property bool extruder2_checked: UM.Preferences.getValue("layerview/extruder2_opacity") > 0.5
property bool extruder3_checked: UM.Preferences.getValue("layerview/extruder3_opacity") > 0.5 property bool extruder3_checked: UM.Preferences.getValue("layerview/extruder3_opacity") > 0.5
property bool show_travel_moves: UM.Preferences.getValue("layerview/show_travel_moves") property bool show_travel_moves: UM.Preferences.getValue("layerview/show_travel_moves")
property bool show_support: UM.Preferences.getValue("layerview/show_support") property bool show_helpers: UM.Preferences.getValue("layerview/show_helpers")
property bool show_adhesion: UM.Preferences.getValue("layerview/show_adhesion")
property bool show_skin: UM.Preferences.getValue("layerview/show_skin") property bool show_skin: UM.Preferences.getValue("layerview/show_skin")
property bool show_infill: UM.Preferences.getValue("layerview/show_infill") property bool show_infill: UM.Preferences.getValue("layerview/show_infill")
@ -288,25 +286,18 @@ Item
text: catalog.i18nc("@label", "Show Travel Moves") text: catalog.i18nc("@label", "Show Travel Moves")
} }
CheckBox { CheckBox {
checked: view_settings.show_support checked: view_settings.show_helpers
onClicked: { onClicked: {
UM.Preferences.setValue("layerview/show_support", checked); UM.Preferences.setValue("layerview/show_helpers", checked);
} }
text: catalog.i18nc("@label", "Show Support") text: catalog.i18nc("@label", "Show Helpers")
}
CheckBox {
checked: view_settings.show_adhesion
onClicked: {
UM.Preferences.setValue("layerview/show_adhesion", checked);
}
text: catalog.i18nc("@label", "Show Adhesion")
} }
CheckBox { CheckBox {
checked: view_settings.show_skin checked: view_settings.show_skin
onClicked: { onClicked: {
UM.Preferences.setValue("layerview/show_skin", checked); UM.Preferences.setValue("layerview/show_skin", checked);
} }
text: catalog.i18nc("@label", "Show Skin") text: catalog.i18nc("@label", "Show Shell")
} }
CheckBox { CheckBox {
checked: view_settings.show_infill checked: view_settings.show_infill

10
plugins/LayerView/LayerViewProxy.py
View file

@ -100,16 +100,10 @@ class LayerViewProxy(QObject):
active_view.setShowTravelMoves(show) active_view.setShowTravelMoves(show)
@pyqtSlot(int) @pyqtSlot(int)
def setShowSupport(self, show): def setShowHelpers(self, show):
active_view = self._controller.getActiveView() active_view = self._controller.getActiveView()
if type(active_view) == LayerView.LayerView.LayerView: if type(active_view) == LayerView.LayerView.LayerView:
active_view.setShowSupport(show) active_view.setShowHelpers(show)
@pyqtSlot(int)
def setShowAdhesion(self, show):
active_view = self._controller.getActiveView()
if type(active_view) == LayerView.LayerView.LayerView:
active_view.setShowAdhesion(show)
@pyqtSlot(int) @pyqtSlot(int)
def setShowSkin(self, show): def setShowSkin(self, show):

33
plugins/LayerView/layers.shader
View file

@ -32,8 +32,7 @@ fragment =
varying float v_line_type; varying float v_line_type;
uniform int u_show_travel_moves; uniform int u_show_travel_moves;
uniform int u_show_support; uniform int u_show_helpers;
uniform int u_show_adhesion;
uniform int u_show_skin; uniform int u_show_skin;
uniform int u_show_infill; uniform int u_show_infill;
@ -43,11 +42,12 @@ fragment =
// discard movements // discard movements
discard; discard;
} }
// support: 4, 7, 10 // support: 4, 5, 7, 10
if ((u_show_support == 0) && ( if ((u_show_helpers == 0) && (
((v_line_type >= 3.5) && (v_line_type <= 4.5)) || ((v_line_type >= 3.5) && (v_line_type <= 4.5)) ||
((v_line_type >= 6.5) && (v_line_type <= 7.5)) || ((v_line_type >= 6.5) && (v_line_type <= 7.5)) ||
((v_line_type >= 9.5) && (v_line_type <= 10.5)) ((v_line_type >= 9.5) && (v_line_type <= 10.5)) ||
((v_line_type >= 4.5) && (v_line_type <= 5.5))
)) { )) {
discard; discard;
} }
@ -57,11 +57,6 @@ fragment =
)) { )) {
discard; discard;
} }
// adhesion:
if ((u_show_adhesion == 0) && (v_line_type >= 4.5) && (v_line_type <= 5.5)) {
// discard movements
discard;
}
// infill: // infill:
if ((u_show_infill == 0) && (v_line_type >= 5.5) && (v_line_type <= 6.5)) { if ((u_show_infill == 0) && (v_line_type >= 5.5) && (v_line_type <= 6.5)) {
// discard movements // discard movements
@ -105,8 +100,7 @@ fragment41core =
out vec4 frag_color; out vec4 frag_color;
uniform int u_show_travel_moves; uniform int u_show_travel_moves;
uniform int u_show_support; uniform int u_show_helpers;
uniform int u_show_adhesion;
uniform int u_show_skin; uniform int u_show_skin;
uniform int u_show_infill; uniform int u_show_infill;
@ -116,11 +110,12 @@ fragment41core =
// discard movements // discard movements
discard; discard;
} }
// support: 4, 7, 10 // helpers: 4, 5, 7, 10
if ((u_show_support == 0) && ( if ((u_show_helpers == 0) && (
((v_line_type >= 3.5) && (v_line_type <= 4.5)) || ((v_line_type >= 3.5) && (v_line_type <= 4.5)) ||
((v_line_type >= 6.5) && (v_line_type <= 7.5)) || ((v_line_type >= 6.5) && (v_line_type <= 7.5)) ||
((v_line_type >= 9.5) && (v_line_type <= 10.5)) ((v_line_type >= 9.5) && (v_line_type <= 10.5)) ||
((v_line_type >= 4.5) && (v_line_type <= 5.5))
)) { )) {
discard; discard;
} }
@ -130,11 +125,6 @@ fragment41core =
)) { )) {
discard; discard;
} }
// adhesion:
if ((u_show_adhesion == 0) && (v_line_type >= 4.5) && (v_line_type <= 5.5)) {
// discard movements
discard;
}
// infill: // infill:
if ((u_show_infill == 0) && (v_line_type >= 5.5) && (v_line_type <= 6.5)) { if ((u_show_infill == 0) && (v_line_type >= 5.5) && (v_line_type <= 6.5)) {
// discard movements // discard movements
@ -151,8 +141,7 @@ u_layer_view_type = 0
u_extruder_opacity = [1.0, 1.0, 1.0, 1.0] u_extruder_opacity = [1.0, 1.0, 1.0, 1.0]
u_show_travel_moves = 0 u_show_travel_moves = 0
u_show_support = 1 u_show_helpers = 1
u_show_adhesion = 1
u_show_skin = 1 u_show_skin = 1
u_show_infill = 1 u_show_infill = 1

11
plugins/LayerView/layers3d.shader
View file

@ -68,8 +68,7 @@ geometry41core =
uniform highp mat4 u_viewProjectionMatrix; uniform highp mat4 u_viewProjectionMatrix;
uniform int u_show_travel_moves; uniform int u_show_travel_moves;
uniform int u_show_support; uniform int u_show_helpers;
uniform int u_show_adhesion;
uniform int u_show_skin; uniform int u_show_skin;
uniform int u_show_infill; uniform int u_show_infill;
@ -117,10 +116,7 @@ geometry41core =
if ((u_show_travel_moves == 0) && ((v_line_type[0] == 8) || (v_line_type[0] == 9))) { if ((u_show_travel_moves == 0) && ((v_line_type[0] == 8) || (v_line_type[0] == 9))) {
return; return;
} }
if ((u_show_support == 0) && ((v_line_type[0] == 4) || (v_line_type[0] == 7) || (v_line_type[0] == 10))) { if ((u_show_helpers == 0) && ((v_line_type[0] == 4) || (v_line_type[0] == 5) || (v_line_type[0] == 7) || (v_line_type[0] == 10))) {
return;
}
if ((u_show_adhesion == 0) && (v_line_type[0] == 5)) {
return; return;
} }
if ((u_show_skin == 0) && ((v_line_type[0] == 1) || (v_line_type[0] == 2) || (v_line_type[0] == 3))) { if ((u_show_skin == 0) && ((v_line_type[0] == 1) || (v_line_type[0] == 2) || (v_line_type[0] == 3))) {
@ -234,8 +230,7 @@ u_diffuseColor = [1.0, 0.79, 0.14, 1.0]
u_shininess = 20.0 u_shininess = 20.0
u_show_travel_moves = 0 u_show_travel_moves = 0
u_show_support = 1 u_show_helpers = 1
u_show_adhesion = 1
u_show_skin = 1 u_show_skin = 1
u_show_infill = 1 u_show_infill = 1