diff --git a/CMakeLists.txt b/CMakeLists.txt index 035191ebf7..39628b8fa8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,24 +30,16 @@ configure_file(${CMAKE_SOURCE_DIR}/cura.desktop.in ${CMAKE_BINARY_DIR}/cura.desk configure_file(cura/CuraVersion.py.in CuraVersion.py @ONLY) -# FIXME: Remove the code for CMake <3.12 once we have switched over completely. -# FindPython3 is a new module since CMake 3.12. It deprecates FindPythonInterp and FindPythonLibs. The FindPython3 -# module is copied from the CMake repository here so in CMake <3.12 we can still use it. -if(${CMAKE_VERSION} VERSION_LESS 3.12) - # Use FindPythonInterp and FindPythonLibs for CMake <3.12 - find_package(PythonInterp 3 REQUIRED) +# FIXME: The new FindPython3 finds the system's Python3.6 reather than the Python3.5 that we built for Cura's environment. +# So we're using the old method here, with FindPythonInterp for now. +find_package(PythonInterp 3 REQUIRED) - set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE}) - - set(Python3_VERSION ${PYTHON_VERSION_STRING}) - set(Python3_VERSION_MAJOR ${PYTHON_VERSION_MAJOR}) - set(Python3_VERSION_MINOR ${PYTHON_VERSION_MINOR}) - set(Python3_VERSION_PATCH ${PYTHON_VERSION_PATCH}) -else() - # Use FindPython3 for CMake >=3.12 - find_package(Python3 REQUIRED COMPONENTS Interpreter Development) -endif() +set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE}) +set(Python3_VERSION ${PYTHON_VERSION_STRING}) +set(Python3_VERSION_MAJOR ${PYTHON_VERSION_MAJOR}) +set(Python3_VERSION_MINOR ${PYTHON_VERSION_MINOR}) +set(Python3_VERSION_PATCH ${PYTHON_VERSION_PATCH}) if(NOT ${URANIUM_DIR} STREQUAL "") set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${URANIUM_DIR}/cmake") diff --git a/cmake/CuraTests.cmake b/cmake/CuraTests.cmake index 251bec5781..0e62b84efa 100644 --- a/cmake/CuraTests.cmake +++ b/cmake/CuraTests.cmake @@ -4,18 +4,11 @@ include(CTest) include(CMakeParseArguments) -# FIXME: Remove the code for CMake <3.12 once we have switched over completely. -# FindPython3 is a new module since CMake 3.12. It deprecates FindPythonInterp and FindPythonLibs. The FindPython3 -# module is copied from the CMake repository here so in CMake <3.12 we can still use it. -if(${CMAKE_VERSION} VERSION_LESS 3.12) - # Use FindPythonInterp and FindPythonLibs for CMake <3.12 - find_package(PythonInterp 3 REQUIRED) +# FIXME: The new FindPython3 finds the system's Python3.6 reather than the Python3.5 that we built for Cura's environment. +# So we're using the old method here, with FindPythonInterp for now. +find_package(PythonInterp 3 REQUIRED) - set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE}) -else() - # Use FindPython3 for CMake >=3.12 - find_package(Python3 REQUIRED COMPONENTS Interpreter Development) -endif() +set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE}) add_custom_target(test-verbose COMMAND ${CMAKE_CTEST_COMMAND} --verbose) diff --git a/cura/PreviewPass.py b/cura/PreviewPass.py index ba139bb2b3..47e8c367dc 100644 --- a/cura/PreviewPass.py +++ b/cura/PreviewPass.py @@ -76,8 +76,8 @@ class PreviewPass(RenderPass): Logger.error("Unable to compile shader program: overhang.shader") if not self._non_printing_shader: + self._non_printing_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "transparent_object.shader")) if self._non_printing_shader: - self._non_printing_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "transparent_object.shader")) self._non_printing_shader.setUniformValue("u_diffuseColor", [0.5, 0.5, 0.5, 0.5]) self._non_printing_shader.setUniformValue("u_opacity", 0.6) diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index 09a6bb5bb6..80a0d64474 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -122,6 +122,8 @@ class ContainerManager(QObject): root_material.setMetaDataEntry(entry_name, entry_value) if sub_item_changed: #If it was only a sub-item that has changed then the setMetaDataEntry won't correctly notice that something changed, and we must manually signal that the metadata changed. root_material.metaDataChanged.emit(root_material) + + cura.CuraApplication.CuraApplication.getInstance().getMachineManager().updateUponMaterialMetadataChange() return True @pyqtSlot(str, result = str) diff --git a/cura/Settings/CuraContainerStack.py b/cura/Settings/CuraContainerStack.py index 4595bf3996..f594ad3d0c 100755 --- a/cura/Settings/CuraContainerStack.py +++ b/cura/Settings/CuraContainerStack.py @@ -1,7 +1,7 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import Any, cast, List, Optional +from typing import Any, cast, List, Optional, Dict from PyQt5.QtCore import pyqtProperty, pyqtSignal, QObject from UM.Application import Application @@ -60,6 +60,8 @@ class CuraContainerStack(ContainerStack): import cura.CuraApplication #Here to prevent circular imports. self.setMetaDataEntry("setting_version", cura.CuraApplication.CuraApplication.SettingVersion) + self._settable_per_extruder_cache = {} # type: Dict[str, Any] + self.setDirty(False) # This is emitted whenever the containersChanged signal from the ContainerStack base class is emitted. @@ -387,6 +389,18 @@ class CuraContainerStack(ContainerStack): value = int(Application.getInstance().getMachineManager().defaultExtruderPosition) return value + def getProperty(self, key: str, property_name: str, context = None) -> Any: + if property_name == "settable_per_extruder": + # Setable per extruder isn't a value that can ever change. So once we requested it once, we can just keep + # that in memory. + try: + return self._settable_per_extruder_cache[key] + except KeyError: + self._settable_per_extruder_cache[key] = super().getProperty(key, property_name, context) + return self._settable_per_extruder_cache[key] + + return super().getProperty(key, property_name, context) + class _ContainerIndexes: """Private helper class to keep track of container positions and their types.""" diff --git a/cura/Settings/CuraStackBuilder.py b/cura/Settings/CuraStackBuilder.py index aadfd15f1a..efc447b2cf 100644 --- a/cura/Settings/CuraStackBuilder.py +++ b/cura/Settings/CuraStackBuilder.py @@ -16,13 +16,13 @@ from .ExtruderStack import ExtruderStack class CuraStackBuilder: """Contains helper functions to create new machines.""" - @classmethod - def createMachine(cls, name: str, definition_id: str) -> Optional[GlobalStack]: + def createMachine(cls, name: str, definition_id: str, machine_extruder_count: Optional[int] = None) -> Optional[GlobalStack]: """Create a new instance of a machine. :param name: The name of the new machine. :param definition_id: The ID of the machine definition to use. + :param machine_extruder_count: The number of extruders in the machine. :return: The new global stack or None if an error occurred. """ @@ -66,7 +66,14 @@ class CuraStackBuilder: Logger.logException("e", "Failed to create an extruder stack for position {pos}: {err}".format(pos = position, err = str(e))) return None - for new_extruder in new_global_stack.extruderList: # Only register the extruders if we're sure that all of them are correct. + # If given, set the machine_extruder_count when creating the machine, or else the extruderList used bellow will + # not return the correct extruder list (since by default, the machine_extruder_count is 1) in machines with + # settable number of extruders. + if machine_extruder_count and 0 <= machine_extruder_count <= len(extruder_dict): + new_global_stack.setProperty("machine_extruder_count", "value", machine_extruder_count) + + # Only register the extruders if we're sure that all of them are correct. + for new_extruder in new_global_stack.extruderList: registry.addContainer(new_extruder) # Register the global stack after the extruder stacks are created. This prevents the registry from adding another diff --git a/cura/Settings/ExtruderStack.py b/cura/Settings/ExtruderStack.py index bb35b336c7..2a9838c671 100644 --- a/cura/Settings/ExtruderStack.py +++ b/cura/Settings/ExtruderStack.py @@ -131,13 +131,13 @@ class ExtruderStack(CuraContainerStack): if not self._next_stack: raise Exceptions.NoGlobalStackError("Extruder {id} is missing the next stack!".format(id = self.id)) - if context is None: - context = PropertyEvaluationContext() - context.pushContainer(self) + if context: + context.pushContainer(self) if not super().getProperty(key, "settable_per_extruder", context): result = self.getNextStack().getProperty(key, property_name, context) - context.popContainer() + if context: + context.popContainer() return result limit_to_extruder = super().getProperty(key, "limit_to_extruder", context) @@ -150,13 +150,15 @@ class ExtruderStack(CuraContainerStack): try: result = self.getNextStack().extruderList[int(limit_to_extruder)].getProperty(key, property_name, context) if result is not None: - context.popContainer() + if context: + context.popContainer() return result except IndexError: pass result = super().getProperty(key, property_name, context) - context.popContainer() + if context: + context.popContainer() return result @override(CuraContainerStack) diff --git a/cura/Settings/GlobalStack.py b/cura/Settings/GlobalStack.py index a9164d0fb9..2c7cbf5e25 100755 --- a/cura/Settings/GlobalStack.py +++ b/cura/Settings/GlobalStack.py @@ -211,9 +211,8 @@ class GlobalStack(CuraContainerStack): if not self.definition.findDefinitions(key = key): return None - if context is None: - context = PropertyEvaluationContext() - context.pushContainer(self) + if context: + context.pushContainer(self) # Handle the "resolve" property. #TODO: Why the hell does this involve threading? @@ -238,13 +237,15 @@ class GlobalStack(CuraContainerStack): if super().getProperty(key, "settable_per_extruder", context): result = self._extruders[str(limit_to_extruder)].getProperty(key, property_name, context) if result is not None: - context.popContainer() + if context: + context.popContainer() return result else: Logger.log("e", "Setting {setting} has limit_to_extruder but is not settable per extruder!", setting = key) result = super().getProperty(key, property_name, context) - context.popContainer() + if context: + context.popContainer() return result @override(ContainerStack) @@ -256,8 +257,6 @@ class GlobalStack(CuraContainerStack): raise Exceptions.InvalidOperationError("Global stack cannot have a next stack!") - # protected: - # Determine whether or not we should try to get the "resolve" property instead of the # requested property. def _shouldResolve(self, key: str, property_name: str, context: Optional[PropertyEvaluationContext] = None) -> bool: @@ -265,6 +264,10 @@ class GlobalStack(CuraContainerStack): # Do not try to resolve anything but the "value" property return False + if not self.definition.getProperty(key, "resolve"): + # If there isn't a resolve set for this setting, there isn't anything to do here. + return False + current_thread = threading.current_thread() if key in self._resolving_settings[current_thread.name]: # To prevent infinite recursion, if getProperty is called with the same key as @@ -273,10 +276,8 @@ class GlobalStack(CuraContainerStack): # track all settings that are being resolved. return False - setting_state = super().getProperty(key, "state", context = context) - if setting_state is not None and setting_state != InstanceState.Default: - # When the user has explicitly set a value, we should ignore any resolve and - # just return that value. + if self.hasUserValue(key): + # When the user has explicitly set a value, we should ignore any resolve and just return that value. return False return True diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 1934befd66..c7c3fcee18 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1212,9 +1212,8 @@ class MachineManager(QObject): return if not available_quality_types: - if global_stack.qualityChanges == empty_quality_changes_container: - Logger.log("i", "No available quality types found, setting all qualities to empty (Not Supported).") - self._setEmptyQuality() + Logger.log("i", "No available quality types found, setting all qualities to empty (Not Supported).") + self._setEmptyQuality() return if current_quality_type in available_quality_types: @@ -1704,7 +1703,7 @@ class MachineManager(QObject): return False return global_stack.qualityChanges != empty_quality_changes_container - def _updateUponMaterialMetadataChange(self) -> None: + def updateUponMaterialMetadataChange(self) -> None: if self._global_container_stack is None: return with postponeSignals(*self._getContainerChangedSignals(), compress = CompressTechnique.CompressPerParameterValue): diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index 89b4209b56..3ed005f131 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -506,6 +506,9 @@ class ThreeMFWorkspaceReader(WorkspaceReader): # Now we know which material is in which extruder. Let's use that to sort the material_labels according to # their extruder position material_labels = [material_name for pos, material_name in sorted(materials_in_extruders_dict.items())] + machine_extruder_count = self._getMachineExtruderCount() + if machine_extruder_count: + material_labels = material_labels[:machine_extruder_count] num_visible_settings = 0 try: @@ -665,7 +668,12 @@ class ThreeMFWorkspaceReader(WorkspaceReader): # We need to create a new machine machine_name = self._container_registry.uniqueName(self._machine_info.name) - global_stack = CuraStackBuilder.createMachine(machine_name, self._machine_info.definition_id) + # Printers with modifiable number of extruders (such as CFFF) will specify a machine_extruder_count in their + # quality_changes file. If that's the case, take the extruder count into account when creating the machine + # or else the extruderList will return only the first extruder, leading to missing non-global settings in + # the other extruders. + machine_extruder_count = self._getMachineExtruderCount() # type: Optional[int] + global_stack = CuraStackBuilder.createMachine(machine_name, self._machine_info.definition_id, machine_extruder_count) if global_stack: # Only switch if creating the machine was successful. extruder_stack_dict = {str(position): extruder for position, extruder in enumerate(global_stack.extruderList)} @@ -922,6 +930,29 @@ class ThreeMFWorkspaceReader(WorkspaceReader): self._machine_info.quality_changes_info.name = quality_changes_name + def _getMachineExtruderCount(self) -> Optional[int]: + """ + Extracts the machine extruder count from the definition_changes file of the printer. If it is not specified in + the file, None is returned instead. + + :return: The count of the machine's extruders + """ + machine_extruder_count = None + if self._machine_info \ + and self._machine_info.definition_changes_info \ + and "values" in self._machine_info.definition_changes_info.parser \ + and "machine_extruder_count" in self._machine_info.definition_changes_info.parser["values"]: + try: + # Theoretically, if the machine_extruder_count is a setting formula (e.g. "=3"), this will produce a + # value error and the project file loading will load the settings in the first extruder only. + # This is not expected to happen though, since all machine definitions define the machine_extruder_count + # as an integer. + machine_extruder_count = int(self._machine_info.definition_changes_info.parser["values"]["machine_extruder_count"]) + except ValueError: + Logger.log("w", "'machine_extruder_count' in file '{file_name}' is not a number." + .format(file_name = self._machine_info.definition_changes_info.file_name)) + return machine_extruder_count + def _createNewQualityChanges(self, quality_type: str, intent_category: Optional[str], name: str, global_stack: GlobalStack, extruder_stack: Optional[ExtruderStack]) -> InstanceContainer: """Helper class to create a new quality changes profile. diff --git a/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py b/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py index 7865e7b6ae..78e0e71626 100644 --- a/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py +++ b/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py @@ -51,7 +51,7 @@ # M207 S F - set the retract length or feed rate # M117 - output the current changes -from typing import List, Optional, Dict +from typing import List, Dict from ..Script import Script import re @@ -336,7 +336,7 @@ class ChangeAtZ(Script): caz_instance = ChangeAtZProcessor() - caz_instance.TargetValues = {} + caz_instance.targetValues = {} # copy over our settings to our change z class self.setIntSettingIfEnabled(caz_instance, "e1_Change_speed", "speed", "e2_speed") @@ -352,23 +352,23 @@ class ChangeAtZ(Script): self.setFloatSettingIfEnabled(caz_instance, "caz_change_retractlength", "retractlength", "caz_retractlength") # is this mod enabled? - caz_instance.IsEnabled = self.getSettingValueByKey("caz_enabled") + caz_instance.enabled = self.getSettingValueByKey("caz_enabled") # are we emitting data to the LCD? - caz_instance.IsDisplayingChangesToLcd = self.getSettingValueByKey("caz_output_to_display") + caz_instance.displayChangesToLcd = self.getSettingValueByKey("caz_output_to_display") # are we doing linear move retractions? - caz_instance.IsLinearRetraction = self.getSettingValueByKey("caz_retractstyle") == "linear" + caz_instance.linearRetraction = self.getSettingValueByKey("caz_retractstyle") == "linear" # see if we're applying to a single layer or to all layers hence forth - caz_instance.IsApplyToSingleLayer = self.getSettingValueByKey("c_behavior") == "single_layer" + caz_instance.applyToSingleLayer = self.getSettingValueByKey("c_behavior") == "single_layer" # used for easy reference of layer or height targeting - caz_instance.IsTargetByLayer = self.getSettingValueByKey("a_trigger") == "layer_no" + caz_instance.targetByLayer = self.getSettingValueByKey("a_trigger") == "layer_no" # change our target based on what we're targeting - caz_instance.TargetLayer = self.getIntSettingByKey("b_targetL", None) - caz_instance.TargetZ = self.getFloatSettingByKey("b_targetZ", None) + caz_instance.targetLayer = self.getIntSettingByKey("b_targetL", None) + caz_instance.targetZ = self.getFloatSettingByKey("b_targetZ", None) # run our script return caz_instance.execute(data) @@ -388,7 +388,7 @@ class ChangeAtZ(Script): return # set our value in the target settings - caz_instance.TargetValues[target] = value + caz_instance.targetValues[target] = value # Sets the given TargetValue in the ChangeAtZ instance if the trigger is specified def setFloatSettingIfEnabled(self, caz_instance, trigger, target, setting): @@ -405,7 +405,7 @@ class ChangeAtZ(Script): return # set our value in the target settings - caz_instance.TargetValues[target] = value + caz_instance.targetValues[target] = value # Returns the given settings value as an integer or the default if it cannot parse it def getIntSettingByKey(self, key, default): @@ -430,13 +430,13 @@ class ChangeAtZ(Script): class GCodeCommand: # The GCode command itself (ex: G10) - Command = None, + command = None, # Contains any arguments passed to the command. The key is the argument name, the value is the value of the argument. - Arguments = {} + arguments = {} # Contains the components of the command broken into pieces - Components = [] + components = [] # Constructor. Sets up defaults def __init__(self): @@ -468,10 +468,10 @@ class GCodeCommand: return None # stores all the components of the command within the class for later - command.Components = command_pieces + command.components = command_pieces # set the actual command - command.Command = command_pieces[0] + command.command = command_pieces[0] # stop here if we don't have any parameters if len(command_pieces) == 1: @@ -488,15 +488,15 @@ class GCodeCommand: linear_command = GCodeCommand.getFromLine(line) # if it's not a linear move, we don't care - if linear_command is None or (linear_command.Command != "G0" and linear_command.Command != "G1"): + if linear_command is None or (linear_command.command != "G0" and linear_command.command != "G1"): return None # convert our values to floats (or defaults) - linear_command.Arguments["F"] = linear_command.getArgumentAsFloat("F", None) - linear_command.Arguments["X"] = linear_command.getArgumentAsFloat("X", None) - linear_command.Arguments["Y"] = linear_command.getArgumentAsFloat("Y", None) - linear_command.Arguments["Z"] = linear_command.getArgumentAsFloat("Z", None) - linear_command.Arguments["E"] = linear_command.getArgumentAsFloat("E", None) + linear_command.arguments["F"] = linear_command.getArgumentAsFloat("F", None) + linear_command.arguments["X"] = linear_command.getArgumentAsFloat("X", None) + linear_command.arguments["Y"] = linear_command.getArgumentAsFloat("Y", None) + linear_command.arguments["Z"] = linear_command.getArgumentAsFloat("Z", None) + linear_command.arguments["E"] = linear_command.getArgumentAsFloat("E", None) # return our new command return linear_command @@ -508,11 +508,11 @@ class GCodeCommand: self.parseArguments() # if we don't have the parameter, return the default - if name not in self.Arguments: + if name not in self.arguments: return default # otherwise return the value - return self.Arguments[name] + return self.arguments[name] # Gets the value of a parameter as a float or returns the default def getArgumentAsFloat(self, name: str, default: float = None) -> float: @@ -593,14 +593,14 @@ class GCodeCommand: def parseArguments(self): # stop here if we don't have any remaining components - if len(self.Components) <= 1: + if len(self.components) <= 1: return None # iterate and index all of our parameters, skip the first component as it's the command - for i in range(1, len(self.Components)): + for i in range(1, len(self.components)): # get our component - component = self.Components[i] + component = self.components[i] # get the first character of the parameter, which is the name component_name = component[0] @@ -613,10 +613,10 @@ class GCodeCommand: component_value = component[1:] # index the argument - self.Arguments[component_name] = component_value + self.arguments[component_name] = component_value # clear the components to we don't process again - self.Components = [] + self.components = [] # Easy function for replacing any GCODE parameter variable in a given GCODE command @staticmethod @@ -625,8 +625,8 @@ class GCodeCommand: # Resets the model back to defaults def reset(self): - self.Command = None - self.Arguments = {} + self.command = None + self.arguments = {} # The primary ChangeAtZ class that does all the gcode editing. This was broken out into an @@ -634,55 +634,55 @@ class GCodeCommand: class ChangeAtZProcessor: # Holds our current height - CurrentZ = None + currentZ = None # Holds our current layer number - CurrentLayer = None + currentLayer = None # Indicates if we're only supposed to apply our settings to a single layer or multiple layers - IsApplyToSingleLayer = False + applyToSingleLayer = False # Indicates if this should emit the changes as they happen to the LCD - IsDisplayingChangesToLcd = False + displayChangesToLcd = False # Indicates that this mod is still enabled (or not) - IsEnabled = True + enabled = True # Indicates if we're processing inside the target layer or not - IsInsideTargetLayer = False + insideTargetLayer = False # Indicates if we have restored the previous values from before we started our pass - IsLastValuesRestored = False + lastValuesRestored = False # Indicates if the user has opted for linear move retractions or firmware retractions - IsLinearRetraction = True + linearRetraction = True # Indicates if we're targetting by layer or height value - IsTargetByLayer = True + targetByLayer = True # Indicates if we have injected our changed values for the given layer yet - IsTargetValuesInjected = False + targetValuesInjected = False # Holds the last extrusion value, used with detecting when a retraction is made - LastE = None + lastE = None # An index of our gcodes which we're monitoring - LastValues = {} + lastValues = {} # The detected layer height from the gcode - LayerHeight = None + layerHeight = None # The target layer - TargetLayer = None + targetLayer = None # Holds the values the user has requested to change - TargetValues = {} + targetValues = {} # The target height in mm - TargetZ = None + targetZ = None # Used to track if we've been inside our target layer yet - WasInsideTargetLayer = False + wasInsideTargetLayer = False # boots up the class with defaults def __init__(self): @@ -692,7 +692,7 @@ class ChangeAtZProcessor: def execute(self, data): # short cut the whole thing if we're not enabled - if not self.IsEnabled: + if not self.enabled: return data # our layer cursor @@ -750,14 +750,14 @@ class ChangeAtZProcessor: # for each of our target values, get the value to restore # no point in restoring values we haven't changed - for key in self.TargetValues: + for key in self.targetValues: # skip target values we can't restore - if key not in self.LastValues: + if key not in self.lastValues: continue # save into our changed - changed[key] = self.LastValues[key] + changed[key] = self.lastValues[key] # return our collection of changed values return changed @@ -766,7 +766,7 @@ class ChangeAtZProcessor: def getDisplayChangesFromValues(self, values: Dict[str, any]) -> str: # stop here if we're not outputting data - if not self.IsDisplayingChangesToLcd: + if not self.displayChangesToLcd: return "" # will hold all the default settings for the target layer @@ -833,7 +833,7 @@ class ChangeAtZProcessor: def getTargetDisplayValues(self) -> str: # convert our target values to something we can output - return self.getDisplayChangesFromValues(self.TargetValues) + return self.getDisplayChangesFromValues(self.targetValues) # Builds the the relevant GCODE lines from the given collection of values def getCodeFromValues(self, values: Dict[str, any]) -> str: @@ -898,7 +898,7 @@ class ChangeAtZProcessor: # set retract rate if "retractfeedrate" in values: - if self.IsLinearRetraction: + if self.linearRetraction: codes.append(";RETRACTFEEDRATE " + str(values["retractfeedrate"] * 60) + "") else: codes.append("M207 F" + str(values["retractfeedrate"] * 60) + "") @@ -906,7 +906,7 @@ class ChangeAtZProcessor: # set retract length if "retractlength" in values: - if self.IsLinearRetraction: + if self.linearRetraction: codes.append(";RETRACTLENGTH " + str(values["retractlength"]) + "") else: codes.append("M207 S" + str(values["retractlength"]) + "") @@ -923,19 +923,19 @@ class ChangeAtZProcessor: def getInjectCode(self) -> str: # if we're now outside of our target layer and haven't restored our last values, do so now - if not self.IsInsideTargetLayer and self.WasInsideTargetLayer and not self.IsLastValuesRestored: + if not self.insideTargetLayer and self.wasInsideTargetLayer and not self.lastValuesRestored: # mark that we've injected the last values - self.IsLastValuesRestored = True + self.lastValuesRestored = True # inject the defaults return self.getLastValues() + "\n" + self.getLastDisplayValues() # if we're inside our target layer but haven't added our values yet, do so now - if self.IsInsideTargetLayer and not self.IsTargetValuesInjected: + if self.insideTargetLayer and not self.targetValuesInjected: # mark that we've injected the target values - self.IsTargetValuesInjected = True + self.targetValuesInjected = True # inject the defaults return self.getTargetValues() + "\n" + self.getTargetDisplayValues() @@ -960,35 +960,35 @@ class ChangeAtZProcessor: def getTargetValues(self) -> str: # build the gcode to change our current values - return self.getCodeFromValues(self.TargetValues) + return self.getCodeFromValues(self.targetValues) # Determines if the current line is at or below the target required to start modifying def isTargetLayerOrHeight(self) -> bool: # target selected by layer no. - if self.IsTargetByLayer: + if self.targetByLayer: # if we don't have a current layer, we're not there yet - if self.CurrentLayer is None: + if self.currentLayer is None: return False # if we're applying to a single layer, stop if our layer is not identical - if self.IsApplyToSingleLayer: - return self.CurrentLayer == self.TargetLayer + if self.applyToSingleLayer: + return self.currentLayer == self.targetLayer else: - return self.CurrentLayer >= self.TargetLayer + return self.currentLayer >= self.targetLayer else: # if we don't have a current Z, we're not there yet - if self.CurrentZ is None: + if self.currentZ is None: return False # if we're applying to a single layer, stop if our Z is not identical - if self.IsApplyToSingleLayer: - return self.CurrentZ == self.TargetZ + if self.applyToSingleLayer: + return self.currentZ == self.targetZ else: - return self.CurrentZ >= self.TargetZ + return self.currentZ >= self.targetZ # Marks any current ChangeZ layer defaults in the layer for deletion @staticmethod @@ -999,7 +999,7 @@ class ChangeAtZProcessor: def processLayerHeight(self, line: str): # stop here if we haven't entered a layer yet - if self.CurrentLayer is None: + if self.currentLayer is None: return # get our gcode command @@ -1010,7 +1010,7 @@ class ChangeAtZProcessor: return # stop here if this isn't a linear move command - if command.Command != "G0" and command.Command != "G1": + if command.command != "G0" and command.command != "G1": return # get our value from the command @@ -1021,15 +1021,15 @@ class ChangeAtZProcessor: return # stop if there's no change - if current_z == self.CurrentZ: + if current_z == self.currentZ: return # set our current Z value - self.CurrentZ = current_z + self.currentZ = current_z # if we don't have a layer height yet, set it based on the current Z value - if self.LayerHeight is None: - self.LayerHeight = self.CurrentZ + if self.layerHeight is None: + self.layerHeight = self.currentZ # Grabs the current layer number def processLayerNumber(self, line: str): @@ -1042,11 +1042,11 @@ class ChangeAtZProcessor: current_layer = GCodeCommand.getDirectArgumentAsInt(line, ";LAYER:", None) # this should never happen, but if our layer number hasn't changed, stop here - if current_layer == self.CurrentLayer: + if current_layer == self.currentLayer: return # update our current layer - self.CurrentLayer = current_layer + self.currentLayer = current_layer # Makes any linear move changes and also injects either target or restored values depending on the plugin state def processLine(self, line: str) -> str: @@ -1059,10 +1059,10 @@ class ChangeAtZProcessor: # if we're not inside the target layer, simply read the any # settings we can and revert any ChangeAtZ deletions - if not self.IsInsideTargetLayer: + if not self.insideTargetLayer: # read any settings if we haven't hit our target layer yet - if not self.WasInsideTargetLayer: + if not self.wasInsideTargetLayer: self.processSetting(line) # if we haven't hit our target yet, leave the defaults as is (unmark them for deletion) @@ -1074,7 +1074,7 @@ class ChangeAtZProcessor: modified_gcode += self.getInjectCode() # modify our command if we're still inside our target layer, otherwise pass unmodified - if self.IsInsideTargetLayer: + if self.insideTargetLayer: modified_gcode += self.processLinearMove(line) + "\n" else: modified_gcode += line + "\n" @@ -1104,11 +1104,11 @@ class ChangeAtZProcessor: return line # get our linear move parameters - feed_rate = linear_command.Arguments["F"] - x_coord = linear_command.Arguments["X"] - y_coord = linear_command.Arguments["Y"] - z_coord = linear_command.Arguments["Z"] - extrude_length = linear_command.Arguments["E"] + feed_rate = linear_command.arguments["F"] + x_coord = linear_command.arguments["X"] + y_coord = linear_command.arguments["Y"] + z_coord = linear_command.arguments["Z"] + extrude_length = linear_command.arguments["E"] # set our new line to our old line new_line = line @@ -1124,7 +1124,7 @@ class ChangeAtZProcessor: new_line = self.processPrintSpeed(feed_rate, new_line) # set our current extrude position - self.LastE = extrude_length if extrude_length is not None else self.LastE + self.lastE = extrude_length if extrude_length is not None else self.lastE # if no changes have been made, stop here if new_line == line: @@ -1137,11 +1137,11 @@ class ChangeAtZProcessor: def processPrintSpeed(self, feed_rate: float, new_line: str) -> str: # if we're not setting print speed or we don't have a feed rate, stop here - if "printspeed" not in self.TargetValues or feed_rate is None: + if "printspeed" not in self.targetValues or feed_rate is None: return new_line # get our requested print speed - print_speed = int(self.TargetValues["printspeed"]) + print_speed = int(self.targetValues["printspeed"]) # if they requested no change to print speed (ie: 100%), stop here if print_speed == 100: @@ -1157,11 +1157,11 @@ class ChangeAtZProcessor: def processRetractLength(self, extrude_length: float, feed_rate: float, new_line: str, x_coord: float, y_coord: float, z_coord: float) -> str: # if we don't have a retract length in the file we can't add one - if "retractlength" not in self.LastValues or self.LastValues["retractlength"] == 0: + if "retractlength" not in self.lastValues or self.lastValues["retractlength"] == 0: return new_line # if we're not changing retraction length, stop here - if "retractlength" not in self.TargetValues: + if "retractlength" not in self.targetValues: return new_line # retractions are only F (feed rate) and E (extrude), at least in cura @@ -1173,22 +1173,22 @@ class ChangeAtZProcessor: return new_line # stop here if we don't know our last extrude value - if self.LastE is None: + if self.lastE is None: return new_line # if there's no change in extrude we have nothing to change - if self.LastE == extrude_length: + if self.lastE == extrude_length: return new_line # if our last extrude was lower than our current, we're restoring, so skip - if self.LastE < extrude_length: + if self.lastE < extrude_length: return new_line # get our desired retract length - retract_length = float(self.TargetValues["retractlength"]) + retract_length = float(self.targetValues["retractlength"]) # subtract the difference between the default and the desired - extrude_length -= (retract_length - self.LastValues["retractlength"]) + extrude_length -= (retract_length - self.lastValues["retractlength"]) # replace our extrude amount return GCodeCommand.replaceDirectArgument(new_line, "E", extrude_length) @@ -1197,7 +1197,7 @@ class ChangeAtZProcessor: def processRetractLengthSetting(self, line: str): # skip if we're not doing linear retractions - if not self.IsLinearRetraction: + if not self.linearRetraction: return # get our command from the line @@ -1208,11 +1208,11 @@ class ChangeAtZProcessor: return # get our linear move parameters - feed_rate = linear_command.Arguments["F"] - x_coord = linear_command.Arguments["X"] - y_coord = linear_command.Arguments["Y"] - z_coord = linear_command.Arguments["Z"] - extrude_length = linear_command.Arguments["E"] + feed_rate = linear_command.arguments["F"] + x_coord = linear_command.arguments["X"] + y_coord = linear_command.arguments["Y"] + z_coord = linear_command.arguments["Z"] + extrude_length = linear_command.arguments["E"] # the command we're looking for only has extrude and feed rate if x_coord is not None or y_coord is not None or z_coord is not None: @@ -1230,17 +1230,17 @@ class ChangeAtZProcessor: return # what ever the last negative retract length is it wins - self.LastValues["retractlength"] = extrude_length + self.lastValues["retractlength"] = extrude_length # Handles any changes to retraction feed rate for the given linear motion command def processRetractFeedRate(self, extrude_length: float, feed_rate: float, new_line: str, x_coord: float, y_coord: float, z_coord: float) -> str: # skip if we're not doing linear retractions - if not self.IsLinearRetraction: + if not self.linearRetraction: return new_line # if we're not changing retraction length, stop here - if "retractfeedrate" not in self.TargetValues: + if "retractfeedrate" not in self.targetValues: return new_line # retractions are only F (feed rate) and E (extrude), at least in cura @@ -1252,7 +1252,7 @@ class ChangeAtZProcessor: return new_line # get our desired retract feed rate - retract_feed_rate = float(self.TargetValues["retractfeedrate"]) + retract_feed_rate = float(self.targetValues["retractfeedrate"]) # convert to units/min retract_feed_rate *= 60 @@ -1264,7 +1264,7 @@ class ChangeAtZProcessor: def processSetting(self, line: str): # if we're in layers already we're out of settings - if self.CurrentLayer is not None: + if self.currentLayer is not None: return # check our retract length @@ -1277,16 +1277,16 @@ class ChangeAtZProcessor: if not self.isTargetLayerOrHeight(): # flag that we're outside our target layer - self.IsInsideTargetLayer = False + self.insideTargetLayer = False # skip to the next line return # flip if we hit our target layer - self.WasInsideTargetLayer = True + self.wasInsideTargetLayer = True # flag that we're inside our target layer - self.IsInsideTargetLayer = True + self.insideTargetLayer = True # Removes all the ChangeZ layer defaults from the given layer @staticmethod @@ -1296,22 +1296,22 @@ class ChangeAtZProcessor: # Resets the class contents to defaults def reset(self): - self.TargetValues = {} - self.IsApplyToSingleLayer = False - self.LastE = None - self.CurrentZ = None - self.CurrentLayer = None - self.IsTargetByLayer = True - self.TargetLayer = None - self.TargetZ = None - self.LayerHeight = None - self.LastValues = {} - self.IsLinearRetraction = True - self.IsInsideTargetLayer = False - self.IsTargetValuesInjected = False - self.IsLastValuesRestored = False - self.WasInsideTargetLayer = False - self.IsEnabled = True + self.targetValues = {} + self.applyToSingleLayer = False + self.lastE = None + self.currentZ = None + self.currentLayer = None + self.targetByLayer = True + self.targetLayer = None + self.targetZ = None + self.layerHeight = None + self.lastValues = {} + self.linearRetraction = True + self.insideTargetLayer = False + self.targetValuesInjected = False + self.lastValuesRestored = False + self.wasInsideTargetLayer = False + self.enabled = True # Sets the original GCODE line in a given GCODE command @staticmethod @@ -1341,31 +1341,31 @@ class ChangeAtZProcessor: return # handle retract length changes - if command.Command == "M207": + if command.command == "M207": # get our retract length if provided - if "S" in command.Arguments: - self.LastValues["retractlength"] = command.getArgumentAsFloat("S") + if "S" in command.arguments: + self.lastValues["retractlength"] = command.getArgumentAsFloat("S") # get our retract feedrate if provided, convert from mm/m to mm/s - if "F" in command.Arguments: - self.LastValues["retractfeedrate"] = command.getArgumentAsFloat("F") / 60.0 + if "F" in command.arguments: + self.lastValues["retractfeedrate"] = command.getArgumentAsFloat("F") / 60.0 # move to the next command return # handle bed temp changes - if command.Command == "M140" or command.Command == "M190": + if command.command == "M140" or command.command == "M190": # get our bed temp if provided - if "S" in command.Arguments: - self.LastValues["bedTemp"] = command.getArgumentAsFloat("S") + if "S" in command.arguments: + self.lastValues["bedTemp"] = command.getArgumentAsFloat("S") # move to the next command return # handle extruder temp changes - if command.Command == "M104" or command.Command == "M109": + if command.command == "M104" or command.command == "M109": # get our tempurature tempurature = command.getArgumentAsFloat("S") @@ -1379,26 +1379,26 @@ class ChangeAtZProcessor: # set our extruder temp based on the extruder if extruder is None or extruder == 0: - self.LastValues["extruderOne"] = tempurature + self.lastValues["extruderOne"] = tempurature if extruder is None or extruder == 1: - self.LastValues["extruderTwo"] = tempurature + self.lastValues["extruderTwo"] = tempurature # move to the next command return # handle fan speed changes - if command.Command == "M106": + if command.command == "M106": # get our bed temp if provided - if "S" in command.Arguments: - self.LastValues["fanSpeed"] = (command.getArgumentAsInt("S") / 255.0) * 100 + if "S" in command.arguments: + self.lastValues["fanSpeed"] = (command.getArgumentAsInt("S") / 255.0) * 100 # move to the next command return # handle flow rate changes - if command.Command == "M221": + if command.command == "M221": # get our flow rate tempurature = command.getArgumentAsFloat("S") @@ -1412,21 +1412,21 @@ class ChangeAtZProcessor: # set our extruder temp based on the extruder if extruder is None: - self.LastValues["flowrate"] = tempurature + self.lastValues["flowrate"] = tempurature elif extruder == 1: - self.LastValues["flowrateOne"] = tempurature + self.lastValues["flowrateOne"] = tempurature elif extruder == 1: - self.LastValues["flowrateTwo"] = tempurature + self.lastValues["flowrateTwo"] = tempurature # move to the next command return # handle print speed changes - if command.Command == "M220": + if command.command == "M220": # get our speed if provided - if "S" in command.Arguments: - self.LastValues["speed"] = command.getArgumentAsInt("S") + if "S" in command.arguments: + self.lastValues["speed"] = command.getArgumentAsInt("S") # move to the next command return diff --git a/plugins/SimulationView/SimulationPass.py b/plugins/SimulationView/SimulationPass.py index b720fc5758..f594fefbe5 100644 --- a/plugins/SimulationView/SimulationPass.py +++ b/plugins/SimulationView/SimulationPass.py @@ -32,6 +32,7 @@ class SimulationPass(RenderPass): self._current_shader = None # This shader will be the shadow or the normal depending if the user wants to see the paths or the layers self._tool_handle_shader = None self._nozzle_shader = None + self._disabled_shader = None self._old_current_layer = 0 self._old_current_path = 0 self._switching_layers = True # It tracks when the user is moving the layers' slider @@ -90,9 +91,17 @@ class SimulationPass(RenderPass): self._nozzle_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "color.shader")) self._nozzle_shader.setUniformValue("u_color", Color(*Application.getInstance().getTheme().getColor("layerview_nozzle").getRgb())) + if not self._disabled_shader: + self._disabled_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "striped.shader")) + self._disabled_shader.setUniformValue("u_diffuseColor1", Color(*Application.getInstance().getTheme().getColor("model_unslicable").getRgb())) + self._disabled_shader.setUniformValue("u_diffuseColor2", Color(*Application.getInstance().getTheme().getColor("model_unslicable_alt").getRgb())) + self._disabled_shader.setUniformValue("u_width", 50.0) + self._disabled_shader.setUniformValue("u_opacity", 0.6) + self.bind() tool_handle_batch = RenderBatch(self._tool_handle_shader, type = RenderBatch.RenderType.Overlay, backface_cull = True) + disabled_batch = RenderBatch(self._disabled_shader) head_position = None # Indicates the current position of the print head nozzle_node = None @@ -105,6 +114,9 @@ class SimulationPass(RenderPass): nozzle_node = node nozzle_node.setVisible(False) + elif getattr(node, "_outside_buildarea", False) and isinstance(node, SceneNode) and node.getMeshData() and node.isVisible(): + disabled_batch.addItem(node.getWorldTransformation(copy=False), node.getMeshData()) + elif isinstance(node, SceneNode) and (node.getMeshData() or node.callDecoration("isBlockSlicing")) and node.isVisible(): layer_data = node.callDecoration("getLayerData") if not layer_data: @@ -183,6 +195,9 @@ class SimulationPass(RenderPass): nozzle_batch.addItem(nozzle_node.getWorldTransformation(), mesh = nozzle_node.getMeshData()) nozzle_batch.render(self._scene.getActiveCamera()) + if len(disabled_batch.items) > 0: + disabled_batch.render(self._scene.getActiveCamera()) + # Render toolhandles on top of the layerview if len(tool_handle_batch.items) > 0: tool_handle_batch.render(self._scene.getActiveCamera()) diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml index da2acc8cf7..6416558fe7 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml @@ -282,12 +282,13 @@ Item enabled: !cameraButton.enabled } + /* //Warning message is commented out because it's factually incorrect. Fix CURA-7637 to allow camera connections via cloud. MonitorInfoBlurb { id: cameraDisabledInfo text: catalog.i18nc("@info", "The webcam is not available because you are monitoring a cloud printer.") target: cameraButton - } + }*/ } // Divider diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py index ec8dfd9ae7..508476095d 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py @@ -1,5 +1,6 @@ -# Copyright (c) 2019 Ultimaker B.V. +# Copyright (c) 2020 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. + import os from typing import Dict, List, Optional, Set @@ -37,7 +38,7 @@ class CloudOutputDeviceManager: SYNC_SERVICE_NAME = "CloudOutputDeviceManager" # The translation catalog for this device. - I18N_CATALOG = i18nCatalog("cura") + i18n_catalog = i18nCatalog("cura") # Signal emitted when the list of discovered devices changed. discoveredDevicesChanged = Signal() @@ -221,7 +222,7 @@ class CloudOutputDeviceManager: ) message = Message( - title = self.I18N_CATALOG.i18ncp( + title = self.i18n_catalog.i18ncp( "info:status", "New printer detected from your Ultimaker account", "New printers detected from your Ultimaker account", @@ -234,11 +235,7 @@ class CloudOutputDeviceManager: message.show() for idx, device in enumerate(new_devices): - message_text = self.I18N_CATALOG.i18nc( - "info:status", "Adding printer {} ({}) from your account", - device.name, - device.printerTypeName - ) + message_text = self.i18n_catalog.i18nc("info:status Filled in with printer name and printer model.", "Adding printer {name} ({model}) from your account").format(name = device.name, model = device.printerTypeName) message.setText(message_text) if len(new_devices) > 1: message.setProgress((idx / len(new_devices)) * 100) @@ -255,16 +252,12 @@ class CloudOutputDeviceManager: if len(new_devices) > max_disp_devices: num_hidden = len(new_devices) - max_disp_devices device_name_list = ["
  • {} ({})
    • ".format(device.name, device.printerTypeName) for device in new_devices[0:max_disp_devices]] - device_name_list.append(self.I18N_CATALOG.i18nc("info:hidden list items", "
  • ... and {} others
    • ", num_hidden)) + device_name_list.append("
  • " + self.i18n_catalog.i18ncp("info:{0} gets replaced by a number of printers", "... and {0} other", "... and {0} others", num_hidden) + "
    • ") device_names = "".join(device_name_list) else: device_names = "".join(["
  • {} ({})
    • ".format(device.name, device.printerTypeName) for device in new_devices]) - message_text = self.I18N_CATALOG.i18nc( - "info:status", - "Printers added from Digital Factory:
      {}
    ", - device_names - ) + message_text = self.i18n_catalog.i18nc("info:status", "Printers added from Digital Factory:") + "
      " + device_names + "
    " message.setText(message_text) def _updateOutdatedMachine(self, outdated_machine: GlobalStack, new_cloud_output_device: CloudOutputDevice) -> None: @@ -318,7 +311,7 @@ class CloudOutputDeviceManager: # Generate message self._removed_printers_message = Message( - title = self.I18N_CATALOG.i18ncp( + title = self.i18n_catalog.i18ncp( "info:status", "A cloud connection is not available for a printer", "A cloud connection is not available for some printers", @@ -326,27 +319,27 @@ class CloudOutputDeviceManager: ) ) device_names = "".join(["
  • {} ({})
    • ".format(self._um_cloud_printers[device].name, self._um_cloud_printers[device].definition.name) for device in self.reported_device_ids]) - message_text = self.I18N_CATALOG.i18ncp( + message_text = self.i18n_catalog.i18ncp( "info:status", "This printer is not linked to the Digital Factory:", "These printers are not linked to the Digital Factory:", len(self.reported_device_ids) ) message_text += "
      {}

    ".format(device_names) - digital_factory_string = self.I18N_CATALOG.i18nc("info:name", "Ultimaker Digital Factory") + digital_factory_string = self.i18n_catalog.i18nc("info:name", "Ultimaker Digital Factory") - message_text += self.I18N_CATALOG.i18nc( + message_text += self.i18n_catalog.i18nc( "info:status", "To establish a connection, please visit the {website_link}".format(website_link = "{}.".format(digital_factory_string)) ) self._removed_printers_message.setText(message_text) self._removed_printers_message.addAction("keep_printer_configurations_action", - name = self.I18N_CATALOG.i18nc("@action:button", "Keep printer configurations"), + name = self.i18n_catalog.i18nc("@action:button", "Keep printer configurations"), icon = "", description = "Keep cloud printers in Ultimaker Cura when not connected to your account.", button_align = Message.ActionButtonAlignment.ALIGN_RIGHT) self._removed_printers_message.addAction("remove_printers_action", - name = self.I18N_CATALOG.i18nc("@action:button", "Remove printers"), + name = self.i18n_catalog.i18nc("@action:button", "Remove printers"), icon = "", description = "Remove cloud printer(s) which aren't linked to your account.", button_style = Message.ActionButtonStyle.SECONDARY, @@ -423,16 +416,11 @@ class CloudOutputDeviceManager: machine.setMetaDataEntry(self.META_HOST_GUID, device.clusterData.host_guid) machine.setMetaDataEntry("group_name", device.name) machine.setMetaDataEntry("group_size", device.clusterSize) - digital_factory_string = self.I18N_CATALOG.i18nc("info:name", "Ultimaker Digital Factory") - digital_factory_link = "{}".format(digital_factory_string) - removal_warning_string = self.I18N_CATALOG.i18nc( - "@label ({printer_name} is replaced with the name of the printer", - "{printer_name} will be removed until the next account sync.
    To remove {printer_name} permanently, " - "visit {digital_factory_link}" - "

    Are you sure you want to remove {printer_name} temporarily?".format(printer_name = device.name, - digital_factory_link = digital_factory_link) - ) - + digital_factory_string = self.i18n_catalog.i18nc("info:name", "Ultimaker Digital Factory") + digital_factory_link = "{digital_factory_string}".format(digital_factory_string = digital_factory_string) + removal_warning_string = self.i18n_catalog.i18nc("@message {printer_name} is replaced with the name of the printer", "{printer_name} will be removed until the next account sync.").format(printer_name = device.name) \ + + "
    " + self.i18n_catalog.i18nc("@message {printer_name} is replaced with the name of the printer", "To remove {printer_name} permanently, visit {digital_factory_link}").format(printer_name = device.name, digital_factory_link = digital_factory_link) \ + + "

    " + self.i18n_catalog.i18nc("@message {printer_name} is replaced with the name of the printer", "Are you sure you want to remove {printer_name} temporarily?").format(printer_name = device.name) machine.setMetaDataEntry("removal_warning", removal_warning_string) machine.addConfiguredConnectionType(device.connectionType.value) @@ -469,10 +457,15 @@ class CloudOutputDeviceManager: remove_printers_ids = {self._um_cloud_printers[i].getId() for i in self.reported_device_ids} all_ids = {m.getId() for m in CuraApplication.getInstance().getContainerRegistry().findContainerStacks(type = "machine")} - question_title = self.I18N_CATALOG.i18nc("@title:window", "Remove printers?") - question_content = self.I18N_CATALOG.i18nc("@label", "You are about to remove {} printer(s) from Cura. This action cannot be undone. \nAre you sure you want to continue?".format(len(remove_printers_ids))) + question_title = self.i18n_catalog.i18nc("@title:window", "Remove printers?") + question_content = self.i18n_catalog.i18ncp( + "@label", + "You are about to remove {num_printers} printer from Cura. This action cannot be undone.\nAre you sure you want to continue?", + "You are about to remove {num_printers} printers from Cura. This action cannot be undone.\nAre you sure you want to continue?", + len(remove_printers_ids) + ).format(num_printers = len(remove_printers_ids)) if remove_printers_ids == all_ids: - question_content = self.I18N_CATALOG.i18nc("@label", "You are about to remove all printers from Cura. This action cannot be undone. \nAre you sure you want to continue?") + question_content = self.i18n_catalog.i18nc("@label", "You are about to remove all printers from Cura. This action cannot be undone.\nAre you sure you want to continue?") result = QMessageBox.question(None, question_title, question_content) if result == QMessageBox.No: return diff --git a/resources/definitions/anet3d.def.json b/resources/definitions/anet3d.def.json index 990be55463..9ffffcb509 100644 --- a/resources/definitions/anet3d.def.json +++ b/resources/definitions/anet3d.def.json @@ -74,7 +74,6 @@ "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_flow": { "value": 100 }, - "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, "z_seam_type": { "value": "'back'" }, "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, diff --git a/resources/definitions/cocoon_create.def.json b/resources/definitions/cocoon_create.def.json new file mode 100644 index 0000000000..a3b47361c7 --- /dev/null +++ b/resources/definitions/cocoon_create.def.json @@ -0,0 +1,79 @@ +{ + "name": "Cocoon Create", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Thushan Fernando", + "manufacturer": "Cocoon Create", + "file_formats": "text/x-gcode", + "preferred_quality_type": "fine", + "has_materials": true, + "platform": "wanhao_200_200_platform.obj", + "platform_texture": "Cocoon-backplate.png", + "machine_extruder_trains": { + "0": "cocoon_create_extruder_0" + }, + "platform_offset": [ + 0, + -28, + 0 + ] + }, + "overrides": { + "machine_name": { + "default_value": "Cocoon Create" + }, + "machine_width": { + "default_value": 200 + }, + "machine_height": { + "default_value": 180 + }, + "machine_depth": { + "default_value": 200 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_start_gcode": { + "default_value": "G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X/Y to min endstops\n G28 Z0 ;move Z to min endstops\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E3 ;extrude 3mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel} \n ;Put printing message on LCD screen\n M117 Printing..." + }, + "machine_end_gcode": { + "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning" + }, + "material_diameter": { + "default_value": 1.75 + }, + "layer_height": { + "default_value": 0.10 + }, + "layer_height_0": { + "default_value": 0.2 + }, + "wall_thickness": { + "value": "0.8" + }, + "top_bottom_thickness": { + "default_value": 0.6 + }, + "speed_print": { + "default_value": 50 + }, + "support_enable": { + "default_value": true + }, + "retraction_enable": { + "default_value": true + }, + "retraction_amount": { + "default_value": 4.5 + }, + "retraction_speed": { + "default_value": 25 + } + } +} \ No newline at end of file diff --git a/resources/definitions/cocoon_create_touch.def.json b/resources/definitions/cocoon_create_touch.def.json new file mode 100644 index 0000000000..da5905c047 --- /dev/null +++ b/resources/definitions/cocoon_create_touch.def.json @@ -0,0 +1,79 @@ +{ + "name": "Cocoon Create Touch", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Thushan Fernando", + "manufacturer": "Cocoon Create", + "file_formats": "text/x-gcode", + "preferred_quality_type": "fine", + "has_materials": true, + "platform": "wanhao_200_200_platform.obj", + "platform_texture": "Cocoon-backplate.png", + "machine_extruder_trains": { + "0": "cocoon_create_touch_extruder_0" + }, + "platform_offset": [ + 0, + -28, + 0 + ] + }, + "overrides": { + "machine_name": { + "default_value": "Cocoon Create Touch" + }, + "machine_width": { + "default_value": 200 + }, + "machine_height": { + "default_value": 180 + }, + "machine_depth": { + "default_value": 200 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_start_gcode": { + "default_value": "G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X/Y to min endstops\n G28 Z0 ;move Z to min endstops\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E3 ;extrude 3mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel} \n ;Put printing message on LCD screen\n M117 Printing..." + }, + "machine_end_gcode": { + "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning" + }, + "material_diameter": { + "default_value": 1.75 + }, + "layer_height": { + "default_value": 0.10 + }, + "layer_height_0": { + "default_value": 0.2 + }, + "wall_thickness": { + "value": "0.8" + }, + "top_bottom_thickness": { + "default_value": 0.6 + }, + "speed_print": { + "default_value": 50 + }, + "support_enable": { + "default_value": true + }, + "retraction_enable": { + "default_value": true + }, + "retraction_amount": { + "default_value": 4.5 + }, + "retraction_speed": { + "default_value": 25 + } + } +} \ No newline at end of file diff --git a/resources/definitions/creality_base.def.json b/resources/definitions/creality_base.def.json index 5b2f799f2a..4574d04f7f 100644 --- a/resources/definitions/creality_base.def.json +++ b/resources/definitions/creality_base.def.json @@ -183,7 +183,6 @@ "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_flow": { "value": 100 }, - "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, "z_seam_type": { "value": "'back'" }, "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, diff --git a/resources/definitions/cubicon_common.def.json b/resources/definitions/cubicon_common.def.json index 61e684a283..45491b943c 100644 --- a/resources/definitions/cubicon_common.def.json +++ b/resources/definitions/cubicon_common.def.json @@ -20,9 +20,6 @@ "machine_heated_bed": { "default_value": true }, - "travel_compensate_overlapping_walls_enabled": { - "default_value": false - }, "layer_height": { "default_value": 0.2 }, diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index e38869da1e..6866af3a81 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1330,38 +1330,6 @@ "limit_to_extruder": "infill_extruder_nr", "settable_per_mesh": true }, - "travel_compensate_overlapping_walls_enabled": - { - "label": "Compensate Wall Overlaps", - "description": "Compensate the flow for parts of a wall being printed where there is already a wall in place.", - "type": "bool", - "default_value": true, - "limit_to_extruder": "wall_x_extruder_nr", - "settable_per_mesh": true, - "children": - { - "travel_compensate_overlapping_walls_0_enabled": - { - "label": "Compensate Outer Wall Overlaps", - "description": "Compensate the flow for parts of an outer wall being printed where there is already a wall in place.", - "type": "bool", - "default_value": true, - "value": "travel_compensate_overlapping_walls_enabled", - "limit_to_extruder": "wall_0_extruder_nr", - "settable_per_mesh": true - }, - "travel_compensate_overlapping_walls_x_enabled": - { - "label": "Compensate Inner Wall Overlaps", - "description": "Compensate the flow for parts of an inner wall being printed where there is already a wall in place.", - "type": "bool", - "default_value": true, - "value": "travel_compensate_overlapping_walls_enabled", - "limit_to_extruder": "wall_x_extruder_nr", - "settable_per_mesh": true - } - } - }, "wall_min_flow": { "label": "Minimum Wall Flow", @@ -1371,7 +1339,6 @@ "maximum_value": "100", "default_value": 0, "type": "float", - "enabled": "travel_compensate_overlapping_walls_0_enabled or travel_compensate_overlapping_walls_x_enabled", "settable_per_mesh": true }, "wall_min_flow_retract": @@ -1380,7 +1347,7 @@ "description": "If enabled, retraction is used rather than combing for travel moves that replace walls whose flow is below the minimum flow threshold.", "type": "bool", "default_value": false, - "enabled": "(travel_compensate_overlapping_walls_0_enabled or travel_compensate_overlapping_walls_x_enabled) and wall_min_flow > 0", + "enabled": "wall_min_flow > 0", "settable_per_mesh": true }, "fill_perimeter_gaps": @@ -4379,7 +4346,7 @@ "type": "bool", "default_value": false, "value": "support_pattern == 'cross' or support_pattern == 'gyroid'", - "enabled": "(support_enable or support_meshes_present) and (support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'cross' or support_pattern == 'gyroid')", + "enabled": "(support_enable or support_meshes_present) and (support_pattern == 'lines' or support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'cross' or support_pattern == 'gyroid')", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true @@ -6199,7 +6166,7 @@ "infill_mesh_order": { "label": "Mesh Processing Rank", - "description": "Determines the priority of this mesh when considering overlapping volumes. Areas where multiple meshes reside will be won by the lower rank mesh. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes.", + "description": "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes.", "default_value": 0, "value": "1 if infill_mesh else 0", "minimum_value_warning": "1", diff --git a/resources/definitions/flyingbear_base.def.json b/resources/definitions/flyingbear_base.def.json index b02060932d..2c8b2a79cc 100644 --- a/resources/definitions/flyingbear_base.def.json +++ b/resources/definitions/flyingbear_base.def.json @@ -48,7 +48,6 @@ "wall_0_wipe_dist": { "value": 0.0 }, "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3 if layer_height > 0.15 else 0.8" }, "optimize_wall_printing_order": { "value": true }, - "travel_compensate_overlapping_walls_0_enabled": { "value": false }, "fill_perimeter_gaps": { "value": "'everywhere'" }, "filter_out_tiny_gaps": { "value": false }, "fill_outline_gaps": { "value": false }, diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index 7d76f24497..b171cb374b 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -91,7 +91,6 @@ "wall_0_inset": {"value": "0" }, "outer_inset_first": {"value": true }, "alternate_extra_perimeter": {"value": false }, - "travel_compensate_overlapping_walls_enabled": {"value": false }, "filter_out_tiny_gaps": {"value": true }, "fill_outline_gaps": {"value": true }, "z_seam_type": {"value": "'shortest'"}, diff --git a/resources/definitions/peopoly_moai.def.json b/resources/definitions/peopoly_moai.def.json index e19fed8b4d..7ca7d67466 100644 --- a/resources/definitions/peopoly_moai.def.json +++ b/resources/definitions/peopoly_moai.def.json @@ -176,15 +176,6 @@ "skin_outline_count": { "value": 0 }, - "travel_compensate_overlapping_walls_enabled": { - "value": "False" - }, - "travel_compensate_overlapping_walls_0_enabled": { - "value": "False" - }, - "travel_compensate_overlapping_walls_x_enabled": { - "value": "False" - }, "wall_0_wipe_dist": { "value": "machine_nozzle_size / 3" }, diff --git a/resources/definitions/skriware_2.def.json b/resources/definitions/skriware_2.def.json index 2554689be4..88f4e3eecf 100644 --- a/resources/definitions/skriware_2.def.json +++ b/resources/definitions/skriware_2.def.json @@ -107,9 +107,6 @@ "switch_extruder_retraction_speed": { "value": "30" }, - "travel_compensate_overlapping_walls_enabled": { - "default_value": false - }, "raft_base_acceleration": { "value": "400" }, @@ -383,9 +380,6 @@ "acceleration_support_infill": { "value": "400" }, - "travel_compensate_overlapping_walls_0_enabled": { - "value": "False" - }, "support_bottom_material_flow": { "value": "99" }, @@ -638,9 +632,6 @@ "skirt_line_count": { "default_value": 2 }, - "travel_compensate_overlapping_walls_x_enabled": { - "value": "False" - }, "jerk_wall_0": { "value": "10" }, diff --git a/resources/definitions/tronxy_x.def.json b/resources/definitions/tronxy_x.def.json index 54a8d50432..089b17e8ab 100644 --- a/resources/definitions/tronxy_x.def.json +++ b/resources/definitions/tronxy_x.def.json @@ -83,7 +83,6 @@ "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_flow": { "value": 100 }, - "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, "z_seam_type": { "value": "'back'" }, "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, diff --git a/resources/extruders/cocoon_create_extruder_0.def.json b/resources/extruders/cocoon_create_extruder_0.def.json new file mode 100644 index 0000000000..edca4b33bb --- /dev/null +++ b/resources/extruders/cocoon_create_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "cocoon_create", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/cocoon_create_touch_extruder_0.def.json b/resources/extruders/cocoon_create_touch_extruder_0.def.json new file mode 100644 index 0000000000..ca7c3e38af --- /dev/null +++ b/resources/extruders/cocoon_create_touch_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "cocoon_create_touch", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/i18n/ko_KR/fdmprinter.def.json.po b/resources/i18n/ko_KR/fdmprinter.def.json.po index 52770fac4c..a423723d2a 100644 --- a/resources/i18n/ko_KR/fdmprinter.def.json.po +++ b/resources/i18n/ko_KR/fdmprinter.def.json.po @@ -1488,12 +1488,12 @@ msgstr "다림질 라인 사이의 거리." #: fdmprinter.def.json msgctxt "ironing_flow label" msgid "Ironing Flow" -msgstr "다림질 과정" +msgstr "다림질 압출량" #: fdmprinter.def.json msgctxt "ironing_flow description" msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface." -msgstr "다림질하는 동안 기본 스킨 라인을 기준으로 한 재료의 양. 노즐을 가득 채우면 윗면의 틈새가 채워서포트만 표면의 과도한 압출과 틈이 너무 많이 생깁니다." +msgstr "다림질하는 동안 기본 스킨 라인을 기준으로 한 재료의 압출량. 노즐을 가득 채우면 윗면의 틈새를 채울 수 있지만 표면에 과도한 압출과 필라멘트 덩어리가 생길 수 있습니다." #: fdmprinter.def.json msgctxt "ironing_inset label" diff --git a/resources/images/Cocoon-backplate.png b/resources/images/Cocoon-backplate.png new file mode 100644 index 0000000000..577edfcf0d Binary files /dev/null and b/resources/images/Cocoon-backplate.png differ diff --git a/resources/qml/PrintMonitor.qml b/resources/qml/PrintMonitor.qml index 9274bf80ad..19c2562874 100644 --- a/resources/qml/PrintMonitor.qml +++ b/resources/qml/PrintMonitor.qml @@ -77,7 +77,7 @@ Item Repeater { id: extrudersRepeater - model: activePrinter != null ? activePrinter.extruderList : null + model: activePrinter != null ? activePrinter.extruders : null ExtruderBox { diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index 3ae180f133..c879ff53fd 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -104,16 +104,6 @@ Popup anchors.left: parent.left anchors.right: parent.right - // We set it by means of a binding, since then we can use the when condition, which we need to - // prevent a binding loop. - Binding - { - target: parent - property: "height" - value: parent.childrenRect.height - when: parent.visibleChildren.length > 0 - } - // Add the qualities that belong to the intent Repeater { @@ -148,11 +138,7 @@ Popup Item { height: childrenRect.height - anchors - { - left: parent.left - right: parent.right - } + width: popup.contentWidth Label { diff --git a/resources/qml/PrintSetupTooltip.qml b/resources/qml/PrintSetupTooltip.qml index 41d68aef37..91f044ceed 100644 --- a/resources/qml/PrintSetupTooltip.qml +++ b/resources/qml/PrintSetupTooltip.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2020 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 @@ -11,7 +11,7 @@ UM.PointingRectangle id: base property real sourceWidth: 0 width: UM.Theme.getSize("tooltip").width - height: label.height + UM.Theme.getSize("tooltip_margins").height * 2 + height: textScroll.height + UM.Theme.getSize("tooltip_margins").height * 2 color: UM.Theme.getColor("tooltip") arrowSize: UM.Theme.getSize("default_arrow").width @@ -59,22 +59,48 @@ UM.PointingRectangle base.opacity = 0; } - Label + MouseArea { - id: label; - anchors + enabled: parent.opacity > 0 + visible: enabled + anchors.fill: parent + acceptedButtons: Qt.NoButton + hoverEnabled: true + onHoveredChanged: { - top: parent.top; - topMargin: UM.Theme.getSize("tooltip_margins").height; - left: parent.left; - leftMargin: UM.Theme.getSize("tooltip_margins").width; - right: parent.right; - rightMargin: UM.Theme.getSize("tooltip_margins").width; + if(containsMouse && base.opacity > 0) + { + base.show(Qt.point(target.x - 1, target.y - UM.Theme.getSize("tooltip_arrow_margins").height / 2)); //Same arrow position as before. + } + else + { + base.hide(); + } + } + + ScrollView + { + id: textScroll + width: parent.width + height: Math.min(label.height, base.parent.height) + + ScrollBar.horizontal: ScrollBar { + active: false //Only allow vertical scrolling. We should grow vertically only, but due to how the label is positioned it allocates space in the ScrollView horizontally. + } + + Label + { + id: label + x: UM.Theme.getSize("tooltip_margins").width + y: UM.Theme.getSize("tooltip_margins").height + width: base.width - UM.Theme.getSize("tooltip_margins").width * 2 + + wrapMode: Text.Wrap; + textFormat: Text.RichText + font: UM.Theme.getFont("default"); + color: UM.Theme.getColor("tooltip_text"); + renderType: Text.NativeRendering + } } - wrapMode: Text.Wrap; - textFormat: Text.RichText - font: UM.Theme.getFont("default"); - color: UM.Theme.getColor("tooltip_text"); - renderType: Text.NativeRendering } } diff --git a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg index 78f78fbd1c..ee818af4f2 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg @@ -21,9 +21,6 @@ wall_0_wipe_dist = 0.2 top_bottom_thickness = 0.8 top_bottom_pattern = lines optimize_wall_printing_order = True -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True z_seam_type = sharpest_corner diff --git a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg index 5e37abb931..dedc528dfd 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg @@ -21,9 +21,6 @@ wall_0_wipe_dist = 0.2 top_bottom_thickness = 0.8 top_bottom_pattern = lines optimize_wall_printing_order = True -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True z_seam_type = sharpest_corner diff --git a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg index 453fcaba7a..6924e3587c 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg @@ -21,9 +21,6 @@ wall_0_wipe_dist = 0.2 top_bottom_thickness = 0.8 top_bottom_pattern = lines optimize_wall_printing_order = True -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True z_seam_type = sharpest_corner diff --git a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg index bf90450fff..f7292ba955 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg @@ -21,9 +21,6 @@ wall_0_wipe_dist = 0.2 top_bottom_thickness = 0.8 top_bottom_pattern = lines optimize_wall_printing_order = True -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True z_seam_type = sharpest_corner diff --git a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg index 3b5a94b1b0..e254ccebff 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg @@ -21,9 +21,6 @@ wall_0_wipe_dist = 0.2 top_bottom_thickness = 0.8 top_bottom_pattern = lines optimize_wall_printing_order = True -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True z_seam_type = sharpest_corner diff --git a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg index 9502684f44..57687b1984 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg @@ -21,9 +21,6 @@ wall_0_wipe_dist = 0.2 top_bottom_thickness = 0.8 top_bottom_pattern = lines optimize_wall_printing_order = True -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True z_seam_type = sharpest_corner diff --git a/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg index 6d1c8dbe20..dc4bc83883 100644 --- a/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg index ce0dae0971..2fb539284c 100644 --- a/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg index 0043dec676..eca311990b 100644 --- a/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg index 2aa4308a99..3a8ff0482c 100644 --- a/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg index 028c7a7036..703bc514d9 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg index b348ec6a9e..70658bad9f 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg index a7d745b9b5..3d83921ac3 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg index 479dfeb0cc..50db49e6bb 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg index 9eb8268cb2..1bbd2d6632 100644 --- a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg +++ b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg index 7a1402c3cd..3191c29469 100644 --- a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg +++ b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg index 4cac7b420e..2b37bf77ce 100644 --- a/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg index 89b6cad2d7..18a4ab1ec9 100644 --- a/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg index 48ed7e7ffe..e65cd8f1a1 100644 --- a/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg index 3c7d41c6f9..1dbf9a5b26 100644 --- a/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg index e358c85814..f48cdbff42 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg index 6b2c99b8ad..3a8076acde 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg index 33522d05af..63ce8d6901 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg index ee44c7237b..cb9334b3e6 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg index 450c8d3e2c..a8d3cb5501 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg index 1687bb4a09..fd4b81ee4e 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg index f6dc41665b..cbfca48757 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg index 8832b3a26c..b182043355 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg index 5cf983bc29..d250d092e4 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg index 784e1df185..4139abdb07 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg index c51c83526b..8e47b3f54c 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg index 2475e48b56..a62635edca 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg index 75f147283d..351447a503 100644 --- a/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg index af2989c43e..d54e912019 100644 --- a/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg index cf9dfd5079..625ae11fa1 100644 --- a/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg index aa03812d16..3c65ec0c41 100644 --- a/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg index 6dcd21c4f3..02a4568e01 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg index a2c7b823d1..228cc45591 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg index 1d00c54968..1f5b3523e8 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg index 4ded0ada0a..621f847f37 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg index 6b27ba11c5..0b375fade8 100644 --- a/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg index aa1e1a13d1..1f436caf05 100644 --- a/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg index cbf67082d7..03f2b2c577 100644 --- a/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg index 7d3e078dd2..a80ed9ebe2 100644 --- a/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg index 8dad25017b..74a3185bb0 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg index f82bbaed2a..c038ec9bde 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg index 361ae4253a..91dd16f010 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 50 infill_pattern = grid diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg index ad8d5f37cf..5683686c6e 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg index 7f91bc6596..74fc97caf2 100644 --- a/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg index 3b48dc775e..29245f2397 100644 --- a/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg index 81410a32ea..bbfe7c82a3 100644 --- a/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg index e32b3acf66..a44d13b96f 100644 --- a/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg index 9ebd20fc0b..a7794b3621 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg index 5f493eb2a0..524e82f5fd 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg index eb1c040901..bd3924c020 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg index a06a846d69..83e6a47349 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg index 819ad6b9d3..c4a3f1ea83 100644 --- a/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg index a081117433..42c569db88 100644 --- a/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg index 4947d9fe28..660567c7e0 100644 --- a/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg index c4abf0eda8..d1f1f9231b 100644 --- a/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg index 054acd964c..bd03160e4d 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg index 9a6c09173d..2e2be1c37c 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg index 3ea322082e..895e4e9a8d 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg index c496980fe6..6e05158cae 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg @@ -18,7 +18,6 @@ wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg index bc45b725b7..6b989ab34e 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg @@ -63,8 +63,6 @@ support_use_towers = False support_xy_distance = 0.8 support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0.2 -travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled -travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled travel_retract_before_outer_wall = True wall_0_wipe_dist = =round(line_width * 1.2,1) bridge_settings_enabled = True diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg index e5daa511b5..004993a759 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg @@ -63,8 +63,6 @@ support_use_towers = False support_xy_distance = 0.8 support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0.2 -travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled -travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled travel_retract_before_outer_wall = True wall_0_wipe_dist = =round(line_width * 1.2,1) bridge_settings_enabled = True diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg index be97c513a2..a7c23d7235 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg @@ -63,8 +63,6 @@ support_use_towers = False support_xy_distance = 0.8 support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0.2 -travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled -travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled travel_retract_before_outer_wall = True wall_0_wipe_dist = =round(line_width * 1.2,1) bridge_settings_enabled = True diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg index cd1774a460..7c28ec29d4 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg @@ -63,8 +63,6 @@ support_use_towers = False support_xy_distance = 0.8 support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0.2 -travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled -travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled travel_retract_before_outer_wall = True wall_0_wipe_dist = =round(line_width * 1.2,1) bridge_settings_enabled = True diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg index 52297ec9f3..db7946d9aa 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg @@ -63,8 +63,6 @@ support_use_towers = False support_xy_distance = 0.8 support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0.2 -travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled -travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled travel_retract_before_outer_wall = True wall_0_wipe_dist = =round(line_width * 1.2,1) bridge_settings_enabled = True diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg index d5628ccb59..b6a6de34ab 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg @@ -63,8 +63,6 @@ support_use_towers = False support_xy_distance = 0.8 support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0.2 -travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled -travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled travel_retract_before_outer_wall = True wall_0_wipe_dist = =round(line_width * 1.2,1) bridge_settings_enabled = True diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg index aa1d8b1a13..380b314a6e 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg @@ -63,8 +63,6 @@ support_use_towers = False support_xy_distance = 0.8 support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0.2 -travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled -travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled travel_retract_before_outer_wall = True wall_0_wipe_dist = =round(line_width * 1.2,1) bridge_settings_enabled = True diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg index e632572a32..bcb6359cc9 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg @@ -63,8 +63,6 @@ support_use_towers = False support_xy_distance = 0.8 support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0.2 -travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled -travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled travel_retract_before_outer_wall = True wall_0_wipe_dist = =round(line_width * 1.2,1) bridge_settings_enabled = True diff --git a/resources/quality/key3d/key3d_tyro_best.inst.cfg b/resources/quality/key3d/key3d_tyro_best.inst.cfg index 82d3e0c35e..d2e47b7759 100644 --- a/resources/quality/key3d/key3d_tyro_best.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_best.inst.cfg @@ -30,9 +30,6 @@ wall_0_inset = 0 optimize_wall_printing_order = False outer_inset_first = False alternate_extra_perimeter = False -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True wall_min_flow = 0 fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True diff --git a/resources/quality/key3d/key3d_tyro_fast.inst.cfg b/resources/quality/key3d/key3d_tyro_fast.inst.cfg index 0d36b5a734..e62b98ed66 100644 --- a/resources/quality/key3d/key3d_tyro_fast.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_fast.inst.cfg @@ -29,9 +29,6 @@ wall_0_inset = 0 optimize_wall_printing_order = False outer_inset_first = False alternate_extra_perimeter = False -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True wall_min_flow = 0 fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True diff --git a/resources/quality/key3d/key3d_tyro_normal.inst.cfg b/resources/quality/key3d/key3d_tyro_normal.inst.cfg index cf31d10c4c..29210204a5 100644 --- a/resources/quality/key3d/key3d_tyro_normal.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_normal.inst.cfg @@ -29,9 +29,6 @@ wall_0_inset = 0 optimize_wall_printing_order = False outer_inset_first = False alternate_extra_perimeter = False -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True wall_min_flow = 0 fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg index 4eb37a08ea..8af201f53c 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg @@ -31,9 +31,6 @@ wall_0_inset = 0 optimize_wall_printing_order = False outer_inset_first = False alternate_extra_perimeter = False -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True wall_min_flow = 0 fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg index 787a05a58a..32bfcd404e 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg @@ -28,9 +28,6 @@ wall_0_inset = 0 optimize_wall_printing_order = False outer_inset_first = False alternate_extra_perimeter = False -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True wall_min_flow = 0 fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg index b1069c720b..5a32f1e93a 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg @@ -31,9 +31,6 @@ wall_0_inset = 0 optimize_wall_printing_order = False outer_inset_first = False alternate_extra_perimeter = False -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True wall_min_flow = 0 fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg index 1f6defeded..b3f52785fb 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg @@ -30,9 +30,6 @@ wall_0_inset = 0 optimize_wall_printing_order = False outer_inset_first = False alternate_extra_perimeter = False -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True wall_min_flow = 0 fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg index ac1ffa5756..68f503139e 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg @@ -29,9 +29,6 @@ wall_0_inset = 0 optimize_wall_printing_order = False outer_inset_first = False alternate_extra_perimeter = False -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True wall_min_flow = 0 fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg index 51d1cc8a7d..9f102a7089 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg @@ -29,9 +29,6 @@ wall_0_inset = 0 optimize_wall_printing_order = False outer_inset_first = False alternate_extra_perimeter = False -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True wall_min_flow = 0 fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg index 41d3da0b5c..83feba0781 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg @@ -29,9 +29,6 @@ wall_0_inset = 0 optimize_wall_printing_order = False outer_inset_first = False alternate_extra_perimeter = False -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True wall_min_flow = 0 fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg index 28964865ba..0c34fe7bdb 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg @@ -46,7 +46,6 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) wall_thickness = 1.6 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg index f93e61cad8..e184ffe541 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg @@ -46,7 +46,6 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) wall_thickness = 1.6 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg index 680ffa024f..a2db9d15d7 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg @@ -46,7 +46,6 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) wall_thickness = 1.6 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg index 7264f8b53c..8501c136b7 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg @@ -56,7 +56,6 @@ switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg index 5343f99df2..425622831f 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -57,7 +57,6 @@ switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg index 59b3536fc7..fce8bcdcff 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg @@ -56,7 +56,6 @@ switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg index 3fa86522b2..128b67140b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg @@ -46,7 +46,6 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) wall_thickness = 1.6 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg index 37abbe7bb1..1378fc3f6c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg @@ -46,7 +46,6 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) wall_thickness = 1.6 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg index 7b6582a71a..610c1bf21f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg @@ -45,7 +45,6 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) wall_thickness = 1.6 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg index 0455ed36b1..96b5270851 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg @@ -54,7 +54,6 @@ switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg index aa8f6ce5f9..bb0f8fa686 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -55,7 +55,6 @@ switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg index 4a602904cd..cc9ba73886 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg @@ -54,7 +54,6 @@ switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg index 6523c1be86..33c6c67f27 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg @@ -46,7 +46,6 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) wall_thickness = 1.6 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg index c98f123b95..532b9b536c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg @@ -46,7 +46,6 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) wall_thickness = 1.6 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg index c441e5a34c..a106902bbe 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg @@ -45,7 +45,6 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) wall_thickness = 1.6 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg index db3ba02928..0460c2ed85 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg @@ -54,7 +54,6 @@ switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg index f4f7472d2c..57904e623d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -55,7 +55,6 @@ switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg index d1fcbee4f6..0f81a22e95 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg @@ -54,7 +54,6 @@ switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index e96c4c342e..7953d911cb 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -43,9 +43,6 @@ wall_0_inset optimize_wall_printing_order outer_inset_first alternate_extra_perimeter -travel_compensate_overlapping_walls_enabled -travel_compensate_overlapping_walls_0_enabled -travel_compensate_overlapping_walls_x_enabled fill_perimeter_gaps filter_out_tiny_gaps fill_outline_gaps diff --git a/resources/shaders/striped.shader b/resources/shaders/striped.shader index 71b1f7b0fa..07ce2bebe6 100644 --- a/resources/shaders/striped.shader +++ b/resources/shaders/striped.shader @@ -29,6 +29,7 @@ fragment = uniform mediump vec4 u_diffuseColor1; uniform mediump vec4 u_diffuseColor2; uniform mediump vec4 u_specularColor; + uniform mediump float u_opacity; uniform highp vec3 u_lightPosition; uniform mediump float u_shininess; uniform highp vec3 u_viewPosition; @@ -65,7 +66,7 @@ fragment = finalColor += pow(NdotR, u_shininess) * u_specularColor; gl_FragColor = finalColor; - gl_FragColor.a = 1.0; + gl_FragColor.a = u_opacity; } vertex41core = @@ -100,6 +101,7 @@ fragment41core = uniform mediump vec4 u_diffuseColor1; uniform mediump vec4 u_diffuseColor2; uniform mediump vec4 u_specularColor; + uniform mediump float u_opacity; uniform highp vec3 u_lightPosition; uniform mediump float u_shininess; uniform highp vec3 u_viewPosition; @@ -138,7 +140,7 @@ fragment41core = finalColor += pow(NdotR, u_shininess) * u_specularColor; frag_color = finalColor; - frag_color.a = 1.0; + frag_color.a = u_opacity; } [defaults] @@ -146,6 +148,7 @@ u_ambientColor = [0.3, 0.3, 0.3, 1.0] u_diffuseColor1 = [1.0, 0.5, 0.5, 1.0] u_diffuseColor2 = [0.5, 0.5, 0.5, 1.0] u_specularColor = [0.4, 0.4, 0.4, 1.0] +u_opacity = 1.0 u_shininess = 20.0 u_width = 5.0 u_vertical_stripes = 0 diff --git a/tests/Settings/TestGlobalStack.py b/tests/Settings/TestGlobalStack.py index ab9c034e24..79d326ddae 100755 --- a/tests/Settings/TestGlobalStack.py +++ b/tests/Settings/TestGlobalStack.py @@ -410,13 +410,13 @@ def test_getPropertyInstancesBeforeResolve(global_stack): value = unittest.mock.MagicMock() #Sets just the value. value.getProperty = unittest.mock.MagicMock(side_effect = getValueProperty) - value.getMetaDataEntry = unittest.mock.MagicMock(return_value = "quality") + value.getMetaDataEntry = unittest.mock.MagicMock(return_value = "quality_changes") resolve = unittest.mock.MagicMock() #Sets just the resolve. resolve.getProperty = unittest.mock.MagicMock(side_effect = getResolveProperty) with unittest.mock.patch("cura.Settings.CuraContainerStack.DefinitionContainer", unittest.mock.MagicMock): #To guard against the type checking. global_stack.definition = resolve - global_stack.quality = value + global_stack.qualityChanges = value assert global_stack.getProperty("material_bed_temperature", "value") == 10