Change preference to only hide the xray message, not the visualization

plugins/SolidView/SolidView.py

@@ -133,55 +133,44 @@ class SolidView(View):
             self._support_mesh_shader.setUniformValue("u_vertical_stripes", True)
             self._support_mesh_shader.setUniformValue("u_width", 5.0)
 
-        if not Application.getInstance().getPreferences().getValue(self._show_xray_warning_preference):
-            self._xray_error_image = None
-            self._xray_shader = None
-            self._xray_composite_shader = None
-            if self._composite_pass and 'xray' in self._composite_pass.getLayerBindings():
-                self._composite_pass.setLayerBindings(self._old_layer_bindings)
-                self._composite_pass.setCompositeShader(self._old_composite_shader)
-                self._old_layer_bindings = None
-                self._old_composite_shader = None
-                self._xray_warning_message.hide()
-        else:
-            if not self._xray_error_image:
-                self._xray_error_image = OpenGL.getInstance().createTexture()
-                texture_file = "xray_error.png"
-                try:
-                    texture_image = QImage(Resources.getPath(Resources.Images, texture_file)).mirrored()
-                    self._xray_error_image.setImage(texture_image)
-                    self._xray_error_image_size = texture_image.size()
-                except FileNotFoundError:
-                    Logger.log("w", "Unable to find xray error texture image [%s]", texture_file)
-
-            if not self._xray_shader:
-                self._xray_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "xray.shader"))
-
-            if not self._xray_composite_shader:
-                self._xray_composite_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "xray_composite.shader"))
-                theme = Application.getInstance().getTheme()
-                self._xray_composite_shader.setUniformValue("u_background_color", Color(*theme.getColor("viewport_background").getRgb()))
-                self._xray_composite_shader.setUniformValue("u_outline_color", Color(*theme.getColor("model_selection_outline").getRgb()))
-                self._xray_composite_shader.setTexture(3, self._xray_error_image)
-
-            renderer = self.getRenderer()
-            if not self._composite_pass or not 'xray' in self._composite_pass.getLayerBindings():
-                # Currently the RenderPass constructor requires a size > 0
-                # This should be fixed in RenderPass's constructor.
-                self._xray_pass = XRayPass.XRayPass(1, 1)
-
-                renderer.addRenderPass(self._xray_pass)
-
-                if not self._composite_pass:
-                    self._composite_pass = self.getRenderer().getRenderPass("composite")
-
-                self._old_layer_bindings = self._composite_pass.getLayerBindings()
-                self._composite_pass.setLayerBindings(["default", "selection", "xray"])
-                self._old_composite_shader = self._composite_pass.getCompositeShader()
-                self._composite_pass.setCompositeShader(self._xray_composite_shader)
-
-            error_image_scale = [renderer.getViewportWidth() / self._xray_error_image_size.width(), renderer.getViewportHeight() / self._xray_error_image_size.height()]
-            self._xray_composite_shader.setUniformValue("u_xray_error_scale", error_image_scale)
+        if not self._xray_error_image:
+            self._xray_error_image = OpenGL.getInstance().createTexture()
+            texture_file = "xray_error.png"
+            try:
+                texture_image = QImage(Resources.getPath(Resources.Images, texture_file)).mirrored()
+                self._xray_error_image.setImage(texture_image)
+                self._xray_error_image_size = texture_image.size()
+            except FileNotFoundError:
+                Logger.log("w", "Unable to find xray error texture image [%s]", texture_file)
+
+        if not self._xray_shader:
+            self._xray_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "xray.shader"))
+
+        if not self._xray_composite_shader:
+            self._xray_composite_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "xray_composite.shader"))
+            theme = Application.getInstance().getTheme()
+            self._xray_composite_shader.setUniformValue("u_background_color", Color(*theme.getColor("viewport_background").getRgb()))
+            self._xray_composite_shader.setUniformValue("u_outline_color", Color(*theme.getColor("model_selection_outline").getRgb()))
+            self._xray_composite_shader.setTexture(3, self._xray_error_image)
+
+        renderer = self.getRenderer()
+        if not self._composite_pass or not 'xray' in self._composite_pass.getLayerBindings():
+            # Currently the RenderPass constructor requires a size > 0
+            # This should be fixed in RenderPass's constructor.
+            self._xray_pass = XRayPass.XRayPass(1, 1)
+
+            renderer.addRenderPass(self._xray_pass)
+
+            if not self._composite_pass:
+                self._composite_pass = self.getRenderer().getRenderPass("composite")
+
+            self._old_layer_bindings = self._composite_pass.getLayerBindings()
+            self._composite_pass.setLayerBindings(["default", "selection", "xray"])
+            self._old_composite_shader = self._composite_pass.getCompositeShader()
+            self._composite_pass.setCompositeShader(self._xray_composite_shader)
+
+        error_image_scale = [renderer.getViewportWidth() / self._xray_error_image_size.width(), renderer.getViewportHeight() / self._xray_error_image_size.height()]
+        self._xray_composite_shader.setUniformValue("u_xray_error_scale", error_image_scale)
 
     def beginRendering(self):
         scene = self.getController().getScene()

resources/qml/Preferences/GeneralPage.qml

@@ -345,7 +345,7 @@ UM.PreferencesPage
                 width: childrenRect.width;
                 height: childrenRect.height;
 
-                text: catalog.i18nc("@info:tooltip", "Highlight missing or extraneous surfaces of the model using warning signs. The toolpaths will often be missing parts of the intended geometry.")
+                text: catalog.i18nc("@info:tooltip", "Show a message if missing or extraneous surfaces are detected. The toolpaths will often be missing parts of the intended geometry.")
 
                 CheckBox
                 {
@@ -354,7 +354,7 @@ UM.PreferencesPage
                     checked: boolCheck(UM.Preferences.getValue("view/show_xray_warning"))
                     onClicked: UM.Preferences.setValue("view/show_xray_warning",  checked)
 
-                    text: catalog.i18nc("@option:check", "Display model errors");
+                    text: catalog.i18nc("@option:check", "Display message if model errors are detected");
                 }
             }