diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 701efcc658..b2c690342a 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -155,12 +155,15 @@ jobs: channel_metadata = f"{no_commits}" else: channel_metadata = f"{channel}_{no_commits}" - # FIXME: for when we create a new release branch - if latest_branch_version.prerelease == "": + if latest_branch_version.prerelease == "": + if is_release_branch: bump_up_patch = int(latest_branch_version.patch) + 1 actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{bump_up_patch}-alpha+{buildmetadata}{channel_metadata}" else: - actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.lower()}+{buildmetadata}{channel_metadata}" + bump_up_minor = int(latest_branch_version.minor) + 1 + actual_version = f"{latest_branch_version.major}.{bump_up_minor}.{latest_branch_version.patch}-alpha+{buildmetadata}{channel_metadata}" + else: + actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.lower()}+{buildmetadata}{channel_metadata}" else: # FIXME: for external PR's actual_version = f"5.2.0-alpha+{buildmetadata}pr_{issue_number}" diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d6e3c709b..61c6d1cf41 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,8 @@ # Copyright (c) 2022 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. +# NOTE: This is only being used for translation scripts. + # For MSVC flags, will be ignored on non-Windows OS's and this project in general. Only needed for cura-build-environment. cmake_policy(SET CMP0091 NEW) project(cura) @@ -13,47 +15,8 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) set(URANIUM_DIR "${CMAKE_SOURCE_DIR}/../Uranium" CACHE PATH "The location of the Uranium repository") set(URANIUM_SCRIPTS_DIR "${URANIUM_DIR}/scripts" CACHE PATH "The location of the scripts directory of the Uranium repository") -option(CURA_DEBUGMODE "Enable debug dialog and other debug features" OFF) -if(CURA_DEBUGMODE) - set(_cura_debugmode "ON") -endif() - option(GENERATE_TRANSLATIONS "Should the translations be generated?" ON) -set(CURA_APP_NAME "cura" CACHE STRING "Short name of Cura, used for configuration folder") -set(CURA_APP_DISPLAY_NAME "Ultimaker Cura" CACHE STRING "Display name of Cura") -set(CURA_VERSION "master" CACHE STRING "Version name of Cura") -set(CURA_BUILDTYPE "" CACHE STRING "Build type of Cura, eg. 'PPA'") -set(CURA_CLOUD_API_ROOT "" CACHE STRING "Alternative Cura cloud API root") -set(CURA_CLOUD_API_VERSION "" CACHE STRING "Alternative Cura cloud API version") -set(CURA_CLOUD_ACCOUNT_API_ROOT "" CACHE STRING "Alternative Cura cloud account API version") -set(CURA_MARKETPLACE_ROOT "" CACHE STRING "Alternative Marketplace location") -set(CURA_DIGITAL_FACTORY_URL "" CACHE STRING "Alternative Digital Factory location") - -configure_file(${CMAKE_SOURCE_DIR}/com.ultimaker.cura.desktop.in ${CMAKE_BINARY_DIR}/com.ultimaker.cura.desktop @ONLY) - -configure_file(cura/CuraVersion.py.in CuraVersion.py @ONLY) - -if(NOT DEFINED Python_VERSION) - set(Python_VERSION - 3.10 - CACHE STRING "Python Version" FORCE) - message(STATUS "Setting Python version to ${Python_VERSION}. Set Python_VERSION if you want to compile against an other version.") -endif() -if(APPLE) - set(Python_FIND_FRAMEWORK NEVER) -endif() -find_package(Python ${Python_VERSION} EXACT REQUIRED COMPONENTS Interpreter) -message(STATUS "Linking and building ${project_name} against Python ${Python_VERSION}") -if(NOT DEFINED Python_SITELIB_LOCAL) - set(Python_SITELIB_LOCAL - "${Python_SITELIB}" - CACHE PATH "Local alternative site-package location to install Cura" FORCE) -endif() - -# Tests -include(CuraTests) - if(NOT ${URANIUM_DIR} STREQUAL "") set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${URANIUM_DIR}/cmake") endif() @@ -66,24 +29,4 @@ if(NOT ${URANIUM_SCRIPTS_DIR} STREQUAL "") if(${GENERATE_TRANSLATIONS}) CREATE_TRANSLATION_TARGETS() endif() -endif() - -install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/cura) - -include(CuraPluginInstall) - -install(FILES cura_app.py DESTINATION ${CMAKE_INSTALL_BINDIR} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -install(DIRECTORY cura DESTINATION "${Python_SITELIB_LOCAL}") -install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py DESTINATION "${Python_SITELIB_LOCAL}/cura/") -if(NOT APPLE AND NOT WIN32) - install(FILES ${CMAKE_BINARY_DIR}/com.ultimaker.cura.desktop - DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) - install(FILES ${CMAKE_SOURCE_DIR}/resources/images/cura-icon.png - DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps/) - install(FILES com.ultimaker.cura.appdata.xml - DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo) - install(FILES cura.sharedmimeinfo - DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages/ - RENAME cura.xml ) -endif() +endif() \ No newline at end of file diff --git a/GitVersion.yml b/GitVersion.yml deleted file mode 100644 index 6f94c14540..0000000000 --- a/GitVersion.yml +++ /dev/null @@ -1,55 +0,0 @@ -mode: ContinuousDelivery -next-version: 5.1 -branches: - main: - regex: ^main$ - mode: ContinuousDelivery - tag: alpha - increment: None - prevent-increment-of-merged-branch-version: true - track-merge-target: false - source-branches: [ ] - tracks-release-branches: false - is-release-branch: false - is-mainline: true - pre-release-weight: 55000 - develop: - regex: ^CURA-.*$ - mode: ContinuousDelivery - tag: alpha - increment: None - prevent-increment-of-merged-branch-version: false - track-merge-target: true - source-branches: [ 'main' ] - tracks-release-branches: true - is-release-branch: false - is-mainline: false - pre-release-weight: 0 - release: - regex: ^[\d]+\.[\d]+$ - mode: ContinuousDelivery - tag: beta - increment: None - prevent-increment-of-merged-branch-version: true - track-merge-target: false - source-branches: [ 'main' ] - tracks-release-branches: false - is-release-branch: true - is-mainline: false - pre-release-weight: 30000 - pull-request-main: - regex: ^(pull|pull\-requests|pr)[/-] - mode: ContinuousDelivery - tag: alpha+ - increment: Inherit - prevent-increment-of-merged-branch-version: true - tag-number-pattern: '[/-](?\d+)[-/]' - track-merge-target: true - source-branches: [ 'main' ] - tracks-release-branches: false - is-release-branch: false - is-mainline: false - pre-release-weight: 30000 -ignore: - sha: [ ] -merge-message-formats: { } diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index a345ebbd05..0000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,74 +0,0 @@ -parallel_nodes(['linux && cura', 'windows && cura']) -{ - timeout(time: 2, unit: "HOURS") - { - - // Prepare building - stage('Prepare') - { - // Ensure we start with a clean build directory. - step([$class: 'WsCleanup']) - - // Checkout whatever sources are linked to this pipeline. - checkout scm - } - - // If any error occurs during building, we want to catch it and continue with the "finale" stage. - catchError - { - // Building and testing should happen in a subdirectory. - dir('build') - { - // Perform the "build". Since Uranium is Python code, this basically only ensures CMake is setup. - stage('Build') - { - def branch = env.BRANCH_NAME - if(!fileExists("${env.CURA_ENVIRONMENT_PATH}/${branch}")) - { - branch = "master" - } - - // Ensure CMake is setup. Note that since this is Python code we do not really "build" it. - def uranium_dir = get_workspace_dir("Ultimaker/Uranium/${branch}") - cmake("..", "-DCMAKE_PREFIX_PATH=\"${env.CURA_ENVIRONMENT_PATH}/${branch}\" -DCMAKE_BUILD_TYPE=Release -DURANIUM_DIR=\"${uranium_dir}\"") - } - - // Try and run the unit tests. If this stage fails, we consider the build to be "unstable". - stage('Unit Test') - { - if (isUnix()) - { - // For Linux - try { - sh 'make CTEST_OUTPUT_ON_FAILURE=TRUE test' - } catch(e) - { - currentBuild.result = "UNSTABLE" - } - } - else - { - // For Windows - try - { - // This also does code style checks. - bat 'ctest -V' - } catch(e) - { - currentBuild.result = "UNSTABLE" - } - } - } - } - } - - // Perform any post-build actions like notification and publishing of unit tests. - stage('Finalize') - { - // Publish the test results to Jenkins. - junit allowEmptyResults: true, testResults: 'build/junit*.xml' - - notify_build_result(env.CURA_EMAIL_RECIPIENTS, '#cura-dev', ['master', '2.']) - } - } -} diff --git a/cmake/CuraPluginInstall.cmake b/cmake/CuraPluginInstall.cmake deleted file mode 100644 index 79b86ebdc6..0000000000 --- a/cmake/CuraPluginInstall.cmake +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright (c) 2022 Ultimaker B.V. -# CuraPluginInstall.cmake is released under the terms of the LGPLv3 or higher. - -# -# This module detects all plugins that need to be installed and adds them using the CMake install() command. -# It detects all plugin folder in the path "plugins/*" where there's a "plugin.json" in it. -# -# Plugins can be configured to NOT BE INSTALLED via the variable "CURA_NO_INSTALL_PLUGINS" as a list of string in the -# form of "a;b;c" or "a,b,c". By default all plugins will be installed. -# - -option(PRINT_PLUGIN_LIST "Should the list of plugins that are installed be printed?" ON) - -# Options or configuration variables -set(CURA_NO_INSTALL_PLUGINS "" CACHE STRING "A list of plugins that should not be installed, separated with ';' or ','.") - -file(GLOB_RECURSE _plugin_json_list ${CMAKE_SOURCE_DIR}/plugins/*/plugin.json) -list(LENGTH _plugin_json_list _plugin_json_list_len) - -# Sort the lists alphabetically so we can handle cases like this: -# - plugins/my_plugin/plugin.json -# - plugins/my_plugin/my_module/plugin.json -# In this case, only "plugins/my_plugin" should be added via install(). -set(_no_install_plugin_list ${CURA_NO_INSTALL_PLUGINS}) -# Sanitize the string so the comparison will be case-insensitive. -string(STRIP "${_no_install_plugin_list}" _no_install_plugin_list) -string(TOLOWER "${_no_install_plugin_list}" _no_install_plugin_list) - -# WORKAROUND counterpart of what's in cura-build. -string(REPLACE "," ";" _no_install_plugin_list "${_no_install_plugin_list}") - -list(LENGTH _no_install_plugin_list _no_install_plugin_list_len) - -if(_no_install_plugin_list_len GREATER 0) - list(SORT _no_install_plugin_list) -endif() -if(_plugin_json_list_len GREATER 0) - list(SORT _plugin_json_list) -endif() - -# Check all plugin directories and add them via install() if needed. -set(_install_plugin_list "") -foreach(_plugin_json_path ${_plugin_json_list}) - get_filename_component(_plugin_dir ${_plugin_json_path} DIRECTORY) - file(RELATIVE_PATH _rel_plugin_dir ${CMAKE_CURRENT_SOURCE_DIR} ${_plugin_dir}) - get_filename_component(_plugin_dir_name ${_plugin_dir} NAME) - - # Make plugin name comparison case-insensitive - string(TOLOWER "${_plugin_dir_name}" _plugin_dir_name_lowercase) - - # Check if this plugin needs to be skipped for installation - set(_add_plugin ON) # Indicates if this plugin should be added to the build or not. - set(_is_no_install_plugin OFF) # If this plugin will not be added, this indicates if it's because the plugin is - # specified in the NO_INSTALL_PLUGINS list. - if(_no_install_plugin_list) - if("${_plugin_dir_name_lowercase}" IN_LIST _no_install_plugin_list) - set(_add_plugin OFF) - set(_is_no_install_plugin ON) - endif() - endif() - - # Make sure this is not a subdirectory in a plugin that's already in the install list - if(_add_plugin) - foreach(_known_install_plugin_dir ${_install_plugin_list}) - if(_plugin_dir MATCHES "${_known_install_plugin_dir}.+") - set(_add_plugin OFF) - break() - endif() - endforeach() - endif() - - if(_add_plugin) - if(${PRINT_PLUGIN_LIST}) - message(STATUS "[+] PLUGIN TO INSTALL: ${_rel_plugin_dir}") - endif() - get_filename_component(_rel_plugin_parent_dir ${_rel_plugin_dir} DIRECTORY) - install(DIRECTORY ${_rel_plugin_dir} - DESTINATION lib${LIB_SUFFIX}/cura/${_rel_plugin_parent_dir} - PATTERN "__pycache__" EXCLUDE - PATTERN "*.qmlc" EXCLUDE - ) - list(APPEND _install_plugin_list ${_plugin_dir}) - elseif(_is_no_install_plugin) - if(${PRINT_PLUGIN_LIST}) - message(STATUS "[-] PLUGIN TO REMOVE : ${_rel_plugin_dir}") - endif() - execute_process(COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/mod_bundled_packages_json.py - -d ${CMAKE_CURRENT_SOURCE_DIR}/resources/bundled_packages - ${_plugin_dir_name} - RESULT_VARIABLE _mod_json_result) - endif() -endforeach() diff --git a/cmake/CuraTests.cmake b/cmake/CuraTests.cmake deleted file mode 100644 index 09e8dadbab..0000000000 --- a/cmake/CuraTests.cmake +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright (c) 2022 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. - -include(CTest) -include(CMakeParseArguments) - -add_custom_target(test-verbose COMMAND ${CMAKE_CTEST_COMMAND} --verbose) - -function(cura_add_test) - set(_single_args NAME DIRECTORY PYTHONPATH) - cmake_parse_arguments("" "" "${_single_args}" "" ${ARGN}) - - if(NOT _NAME) - message(FATAL_ERROR "cura_add_test requires a test name argument") - endif() - - if(NOT _DIRECTORY) - message(FATAL_ERROR "cura_add_test requires a directory to test") - endif() - - if(NOT _PYTHONPATH) - set(_PYTHONPATH ${_DIRECTORY}) - endif() - - if(WIN32) - string(REPLACE "|" "\\;" _PYTHONPATH ${_PYTHONPATH}) - set(_PYTHONPATH "${_PYTHONPATH}\\;$ENV{PYTHONPATH}") - else() - string(REPLACE "|" ":" _PYTHONPATH ${_PYTHONPATH}) - set(_PYTHONPATH "${_PYTHONPATH}:$ENV{PYTHONPATH}") - endif() - - get_test_property(${_NAME} ENVIRONMENT test_exists) #Find out if the test exists by getting a property from it that always exists (such as ENVIRONMENT because we set that ourselves). - if (NOT ${test_exists}) - add_test( - NAME ${_NAME} - COMMAND ${Python_EXECUTABLE} -m pytest --junitxml=${CMAKE_BINARY_DIR}/junit-${_NAME}.xml ${_DIRECTORY} - ) - set_tests_properties(${_NAME} PROPERTIES ENVIRONMENT LANG=C) - set_tests_properties(${_NAME} PROPERTIES ENVIRONMENT "PYTHONPATH=${_PYTHONPATH}") - else() - message(WARNING "Duplicate test ${_NAME}!") - endif() -endfunction() - - -#Add code style test. -add_test( - NAME "code-style" - COMMAND ${Python_EXECUTABLE} run_mypy.py - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} -) - -#Add test for import statements which are not compatible with all builds -add_test( - NAME "invalid-imports" - COMMAND ${Python_EXECUTABLE} scripts/check_invalid_imports.py - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} -) - -cura_add_test(NAME pytest-main DIRECTORY ${CMAKE_SOURCE_DIR}/tests PYTHONPATH "${CMAKE_SOURCE_DIR}|${URANIUM_DIR}") - -file(GLOB_RECURSE _plugins plugins/*/__init__.py) -foreach(_plugin ${_plugins}) - get_filename_component(_plugin_directory ${_plugin} DIRECTORY) - if(EXISTS ${_plugin_directory}/tests) - get_filename_component(_plugin_name ${_plugin_directory} NAME) - cura_add_test(NAME pytest-${_plugin_name} DIRECTORY ${_plugin_directory} PYTHONPATH "${_plugin_directory}|${CMAKE_SOURCE_DIR}|${URANIUM_DIR}") - endif() -endforeach() - -#Add test for whether the shortcut alt-keys are unique in every translation. -add_test( - NAME "shortcut-keys" - COMMAND ${Python_EXECUTABLE} scripts/check_shortcut_keys.py - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} -) diff --git a/cmake/mod_bundled_packages_json.py b/cmake/mod_bundled_packages_json.py deleted file mode 100755 index e03261b479..0000000000 --- a/cmake/mod_bundled_packages_json.py +++ /dev/null @@ -1,73 +0,0 @@ -#!/usr/bin/env python3 -# -# This script removes the given package entries in the bundled_packages JSON files. This is used by the PluginInstall -# CMake module. -# - -import argparse -import collections -import json -import os -import sys - - -def find_json_files(work_dir: str) -> list: - """Finds all JSON files in the given directory recursively and returns a list of those files in absolute paths. - - :param work_dir: The directory to look for JSON files recursively. - :return: A list of JSON files in absolute paths that are found in the given directory. - """ - - json_file_list = [] - for root, dir_names, file_names in os.walk(work_dir): - for file_name in file_names: - abs_path = os.path.abspath(os.path.join(root, file_name)) - json_file_list.append(abs_path) - return json_file_list - - -def remove_entries_from_json_file(file_path: str, entries: list) -> None: - """Removes the given entries from the given JSON file. The file will modified in-place. - - :param file_path: The JSON file to modify. - :param entries: A list of strings as entries to remove. - :return: None - """ - - try: - with open(file_path, "r", encoding = "utf-8") as f: - package_dict = json.load(f, object_hook = collections.OrderedDict) - except Exception as e: - msg = "Failed to load '{file_path}' as a JSON file. This file will be ignored Exception: {e}"\ - .format(file_path = file_path, e = e) - sys.stderr.write(msg + os.linesep) - return - - for entry in entries: - if entry in package_dict: - del package_dict[entry] - print("[INFO] Remove entry [{entry}] from [{file_path}]".format(file_path = file_path, entry = entry)) - - try: - with open(file_path, "w", encoding = "utf-8", newline = "\n") as f: - json.dump(package_dict, f, indent = 4) - except Exception as e: - msg = "Failed to write '{file_path}' as a JSON file. Exception: {e}".format(file_path = file_path, e = e) - raise IOError(msg) - - -def main() -> None: - parser = argparse.ArgumentParser("mod_bundled_packages_json") - parser.add_argument("-d", "--dir", dest = "work_dir", - help = "The directory to look for bundled packages JSON files, recursively.") - parser.add_argument("entries", metavar = "ENTRIES", type = str, nargs = "+") - - args = parser.parse_args() - - json_file_list = find_json_files(args.work_dir) - for json_file_path in json_file_list: - remove_entries_from_json_file(json_file_path, args.entries) - - -if __name__ == "__main__": - main() diff --git a/com.ultimaker.cura.appdata.xml b/com.ultimaker.cura.appdata.xml deleted file mode 100644 index 3af0e9c352..0000000000 --- a/com.ultimaker.cura.appdata.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - com.ultimaker.cura.desktop - CC0-1.0 - LGPL-3.0 and CC-BY-SA-4.0 - Cura - The world's most advanced 3d printer software - -

- Cura creates a seamless integration between hardware, software and - materials for the best 3D printing experience around. - Cura supports the 3MF, OBJ and STL file formats and is available on - Windows, Mac and Linux. -

-
    -
  • Novices can start printing right away
    • -
  • Experts are able to customize 300 settings to achieve the best results
    • -
  • Optimized profiles for Ultimaker materials
    • -
  • Supported by a global network of Ultimaker certified service partners
    • -
  • Print multiple objects at once with different settings for each object
    • -
  • Cura supports STL, 3MF and OBJ file formats
    • -
  • Open source and completely free
    • -
- - - - https://raw.githubusercontent.com/Ultimaker/Cura/main/cura-logo.PNG - - - https://ultimaker.com/software/ultimaker-cura?utm_source=cura&utm_medium=software&utm_campaign=cura-update-linux - Cura - - diff --git a/com.ultimaker.cura.desktop.in b/com.ultimaker.cura.desktop.in deleted file mode 100644 index 1e17e30f4e..0000000000 --- a/com.ultimaker.cura.desktop.in +++ /dev/null @@ -1,19 +0,0 @@ -[Desktop Entry] -Name=Ultimaker Cura -Name[de]=Ultimaker Cura -Name[nl]=Ultimaker Cura -GenericName=3D Printing Software -GenericName[de]=3D-Druck-Software -GenericName[nl]=3D-printsoftware -Comment=Cura converts 3D models into paths for a 3D printer. It prepares your print for maximum accuracy, minimum printing time and good reliability with many extra features that make your print come out great. -Comment[de]=Cura wandelt 3D-Modelle in Pfade für einen 3D-Drucker um. Es bereitet Ihren Druck für maximale Genauigkeit, minimale Druckzeit und guter Zuverlässigkeit mit vielen zusätzlichen Funktionen vor, damit Ihr Druck großartig wird. -Comment[nl]=Cura converteert 3D-modellen naar paden voor een 3D printer. Het bereidt je print voor om zeer precies, snel en betrouwbaar te kunnen printen, met veel extra functionaliteit om je print er goed uit te laten komen. -Exec=@CMAKE_INSTALL_FULL_BINDIR@/cura %F -TryExec=@CMAKE_INSTALL_FULL_BINDIR@/cura -Icon=cura-icon -Terminal=false -Type=Application -MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;image/bmp;image/gif;image/jpeg;image/png;text/x-gcode;application/x-amf;application/x-ply;application/x-ctm;model/vnd.collada+xml;model/gltf-binary;model/gltf+json;model/vnd.collada+xml+zip; -Categories=Graphics; -Keywords=3D;Printing;Slicer; -StartupWMClass=cura.real diff --git a/conanfile.py b/conanfile.py index c5f584ed16..17cd0260a6 100644 --- a/conanfile.py +++ b/conanfile.py @@ -149,9 +149,9 @@ class CuraConan(ConanFile): with open(Path(__file__).parent.joinpath("CuraVersion.py.jinja"), "r") as f: cura_version_py = Template(f.read()) - cura_version = self.version + cura_version = self.conf_info.get("user.cura:version", default = self.version, check_type = str) if self.options.internal: - version = Version(self.version) + version = Version(cura_version) cura_version = f"{version.major}.{version.minor}.{version.patch}-{version.prerelease.replace('+', '+internal_')}" with open(Path(location, "CuraVersion.py"), "w") as f: @@ -220,7 +220,8 @@ class CuraConan(ConanFile): with open(Path(__file__).parent.joinpath("Ultimaker-Cura.spec.jinja"), "r") as f: pyinstaller = Template(f.read()) - cura_version = Version(self.version) if self.version else Version("0.0.0") + version = self.conf_info.get("user.cura:version", default = self.version, check_type = str) + cura_version = Version(version) with open(Path(location, "Ultimaker-Cura.spec"), "w") as f: f.write(pyinstaller.render( @@ -239,7 +240,7 @@ class CuraConan(ConanFile): strip = False, # This should be possible on Linux and MacOS but, it can also cause issues on some distributions. Safest is to disable it for now target_arch = "'x86_64'" if self.settings.os == "Macos" else "None", # FIXME: Make this dependent on the settings.arch_target macos = self.settings.os == "Macos", - version = f"'{self.version}'", + version = f"'{version}'", short_version = f"'{cura_version.major}.{cura_version.minor}.{cura_version.patch}'", )) @@ -254,7 +255,8 @@ class CuraConan(ConanFile): self.options["cpython"].shared = True def validate(self): - if self.version and Version(self.version) <= Version("4"): + version = self.conf_info.get("user.cura:version", default = self.version, check_type = str) + if version and Version(version) <= Version("4"): raise ConanInvalidConfiguration("Only versions 5+ are support") def requirements(self): @@ -381,7 +383,8 @@ class CuraConan(ConanFile): self.copy("*.txt", src = self.cpp_info.resdirs[-1], dst = self._base_dir.joinpath("pip_requirements")) # Generate the GitHub Action version info Environment - cura_version = Version(self.version) + version = self.conf_info.get("user.cura:version", default = self.version, check_type = str) + cura_version = Version(version) env_prefix = "Env:" if self.settings.os == "Windows" else "" activate_github_actions_version_env = Template(r"""echo "CURA_VERSION_MAJOR={{ cura_version_major }}" >> ${{ env_prefix }}GITHUB_ENV echo "CURA_VERSION_MINOR={{ cura_version_minor }}" >> ${{ env_prefix }}GITHUB_ENV diff --git a/cura/LayerPolygon.py b/cura/LayerPolygon.py index 5cc576cb21..103703e594 100644 --- a/cura/LayerPolygon.py +++ b/cura/LayerPolygon.py @@ -42,11 +42,11 @@ class LayerPolygon: self._extruder = extruder self._types = line_types - unknown_types = np.where(self_types >= self_number_of_types) - if unknown_types: + unknown_types = numpy.where(self._types >= self.__number_of_types, self._types, None) + if unknown_types.any(): # Got faulty line data from the engine. for idx in unknown_types: - Logger.warn(f"Found an unknown line type at: {idx}") + Logger.warning(f"Found an unknown line type at: {idx}") self._types[idx] = self.NoneType self._data = data self._line_widths = line_widths diff --git a/resources/definitions/eryone_thinker.def.json b/resources/definitions/eryone_thinker.def.json index e48803e368..648de5cd03 100644 --- a/resources/definitions/eryone_thinker.def.json +++ b/resources/definitions/eryone_thinker.def.json @@ -249,9 +249,6 @@ }, "smooth_spiralized_contours": { "value": false - }, - "roofing_monotonic": { - "value": true } } } \ No newline at end of file diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 5b6268a875..e8b2d57b17 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1470,8 +1470,7 @@ "label": "Monotonic Top Surface Order", "description": "Print top surface lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent.", "type": "bool", - "default_value": false, - "value": "skin_monotonic", + "value": true, "enabled": "roofing_layer_count > 0 and top_layers > 0 and roofing_pattern != 'concentric'", "limit_to_extruder": "roofing_extruder_nr", "settable_per_mesh": true diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 57d6904aaf..008042eb73 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -79,7 +79,7 @@ "value": "skin_material_flow" }, "skin_monotonic" : { - "value": true + "value": "roofing_layer_count == 0" }, "speed_equalize_flow_width_factor": { "value": "110.0" diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg index f2095ba055..1a82100882 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg @@ -12,16 +12,12 @@ material = generic_abs variant = AA 0.4 [values] +infill_sparse_density = 15 +jerk_print = 30 speed_infill = =speed_print +speed_layer_0 = 20 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -speed_layer_0 = 20 top_bottom_thickness = 0.8 -infill_sparse_density = 15 - -jerk_print = 30 - - - diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg index ed17a36b8a..468528e62c 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg @@ -12,22 +12,13 @@ material = generic_abs variant = AA 0.4 [values] - jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg index 4ec7a841a5..48dee963d1 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg @@ -12,22 +12,13 @@ material = generic_abs variant = AA 0.4 [values] - jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg index b74cd522ac..5ece30afd9 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg @@ -12,17 +12,13 @@ material = generic_cpe_plus variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 - diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg index 1caacdf72f..4afeb44758 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg @@ -12,17 +12,13 @@ material = generic_cpe_plus variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 - diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg index de109c9810..85a2b0f773 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg @@ -12,23 +12,13 @@ material = generic_cpe variant = AA 0.4 [values] - jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 - diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg index 315b26a3b1..88843e549e 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg @@ -12,17 +12,13 @@ material = generic_cpe variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 - diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg index d4a999d8eb..e0d70d45f2 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg @@ -12,17 +12,13 @@ material = generic_nylon variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 - diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg index aa371be6f3..e60b654426 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg @@ -12,17 +12,13 @@ material = generic_nylon variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 - diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg index abd125f483..944362e745 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg @@ -12,17 +12,13 @@ material = generic_pc variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 - diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg index c8cf2a3bd4..006b3cac4c 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg @@ -12,17 +12,13 @@ material = generic_pc variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 - diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg index b4bbdddff7..2686ff7e34 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg @@ -12,17 +12,13 @@ material = generic_petg variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 - diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg index 19418812af..d0f84a8755 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg @@ -12,17 +12,13 @@ material = generic_petg variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 - diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg index 3186c6be4e..8ca43ef884 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg @@ -12,21 +12,12 @@ material = generic_pla variant = AA 0.4 [values] +infill_sparse_density = 15 +jerk_print = 30 speed_infill = =speed_print +speed_layer_0 = 20 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -speed_layer_0 = 20 top_bottom_thickness = 0.8 -infill_sparse_density = 15 - -jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 - - diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg index 36ea7c975e..565387bed6 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg @@ -12,16 +12,13 @@ material = generic_pla variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg index 88691ef1d6..d84c7c3a1a 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg @@ -12,16 +12,13 @@ material = generic_pla variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg index b59ed875b4..3b6a5b6486 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg @@ -11,22 +11,17 @@ quality_type = verydraft material = generic_pla variant = AA 0.4 is_experimental = True - [values] -infill_sparse_density = 10 - -jerk_print = 30 - acceleration_print = 4000 acceleration_wall = 2000 acceleration_wall_0 = 2000 - -speed_print = 50 +infill_sparse_density = 10 +jerk_print = 30 speed_infill = =speed_print +speed_layer_0 = 20 +speed_print = 50 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -speed_layer_0 = 20 - -top_bottom_thickness = 0.8 \ No newline at end of file +top_bottom_thickness = 0.8 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg index 1ca1775990..b2557b3f5e 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg @@ -12,21 +12,12 @@ material = generic_tough_pla variant = AA 0.4 [values] +infill_sparse_density = 15 +jerk_print = 30 speed_infill = =speed_print +speed_layer_0 = 20 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -speed_layer_0 = 20 top_bottom_thickness = 0.8 -infill_sparse_density = 15 - -jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 - - diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg index 924edf577d..3b43a028b4 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg @@ -12,16 +12,13 @@ material = generic_tough_pla variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg index b92e07a877..c8a0053010 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg @@ -12,16 +12,13 @@ material = generic_tough_pla variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg index 21cd1059f0..48fe33a990 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg @@ -11,28 +11,17 @@ quality_type = verydraft material = generic_tough_pla variant = AA 0.4 is_experimental = True - [values] -infill_sparse_density = 10 - -jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 - acceleration_print = 4000 acceleration_wall = 2000 acceleration_wall_0 = 2000 - -speed_print = 50 +infill_sparse_density = 10 +jerk_print = 30 speed_infill = =speed_print +speed_layer_0 = 20 +speed_print = 50 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -speed_layer_0 = 20 - -top_bottom_thickness = 0.8 \ No newline at end of file +top_bottom_thickness = 0.8 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg index 98ad3af40b..994699e382 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg @@ -12,16 +12,12 @@ material = generic_abs variant = AA 0.4 [values] +infill_sparse_density = 15 +jerk_print = 30 speed_infill = =speed_print +speed_layer_0 = 20 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -speed_layer_0 = 20 top_bottom_thickness = 0.8 -infill_sparse_density = 15 - -jerk_print = 30 - - - diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg index 8939d670b1..592ca35859 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg @@ -12,17 +12,13 @@ material = generic_abs variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg index 44f76d561f..6143b0d78d 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg @@ -12,17 +12,13 @@ material = generic_abs variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg index 7bf1fc834a..6d729bcea9 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg @@ -12,18 +12,13 @@ material = generic_cpe_plus variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset - diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg index a95862c35a..86e7cc0505 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg @@ -12,18 +12,13 @@ material = generic_cpe_plus variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset - diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg index bfdd35017c..12902a388c 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg @@ -12,18 +12,13 @@ material = generic_cpe variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset - diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg index 022fb2b50d..642a8e2b3c 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg @@ -12,18 +12,13 @@ material = generic_cpe variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset - diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg index 3637040c4c..1725da9733 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg @@ -12,18 +12,13 @@ material = generic_nylon variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset - diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg index 6cce98ca60..0bba4ccb0f 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg @@ -12,18 +12,13 @@ material = generic_nylon variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset - diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg index 32e0463447..f3a372c8b2 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg @@ -12,18 +12,13 @@ material = generic_pc variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset - diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg index 0b7ffb4154..cca4d4af10 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg @@ -12,18 +12,13 @@ material = generic_pc variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset - diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg index 186281c17c..6b06cb6164 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg @@ -12,18 +12,13 @@ material = generic_petg variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset - diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg index 545a8b5654..345dc02a8c 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg @@ -12,18 +12,13 @@ material = generic_petg variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset - diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg index 76d9191fc1..2baf1418a4 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg @@ -12,16 +12,12 @@ material = generic_pla variant = AA 0.4 [values] +infill_sparse_density = 15 +jerk_print = 30 speed_infill = =speed_print +speed_layer_0 = 20 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -speed_layer_0 = 20 top_bottom_thickness = 0.8 -infill_sparse_density = 15 - -jerk_print = 30 - - - diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg index ca098b5bfa..aa880fba07 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg @@ -12,17 +12,13 @@ material = generic_pla variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg index 472c0b4359..65b3df86d6 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg @@ -12,17 +12,13 @@ material = generic_pla variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg index 51cfaebe34..97d631d300 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg @@ -11,22 +11,17 @@ quality_type = verydraft material = generic_pla variant = AA 0.4 is_experimental = True - [values] -infill_sparse_density = 10 - -jerk_print = 30 - acceleration_print = 4000 acceleration_wall = 2000 acceleration_wall_0 = 2000 - -speed_print = 50 +infill_sparse_density = 10 +jerk_print = 30 speed_infill = =speed_print +speed_layer_0 = 20 +speed_print = 50 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -speed_layer_0 = 20 - -top_bottom_thickness = 0.8 \ No newline at end of file +top_bottom_thickness = 0.8 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg index 7851ecd793..5c603860e5 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg @@ -12,16 +12,12 @@ material = generic_tough_pla variant = AA 0.4 [values] +infill_sparse_density = 15 +jerk_print = 30 speed_infill = =speed_print +speed_layer_0 = 20 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -speed_layer_0 = 20 top_bottom_thickness = 0.8 -infill_sparse_density = 15 - -jerk_print = 30 - - - diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg index 2b1b769595..69f421288c 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg @@ -12,17 +12,13 @@ material = generic_tough_pla variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg index daa327a2f5..079403efb2 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg @@ -12,17 +12,13 @@ material = generic_tough_pla variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg index ec93cc5599..0b2666bf23 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg @@ -11,22 +11,17 @@ quality_type = verydraft material = generic_tough_pla variant = AA 0.4 is_experimental = True - [values] -infill_sparse_density = 10 - -jerk_print = 30 - acceleration_print = 4000 acceleration_wall = 2000 acceleration_wall_0 = 2000 - -speed_print = 50 +infill_sparse_density = 10 +jerk_print = 30 speed_infill = =speed_print +speed_layer_0 = 20 +speed_print = 50 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -speed_layer_0 = 20 - -top_bottom_thickness = 0.8 \ No newline at end of file +top_bottom_thickness = 0.8 diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index 2934edf508..f285bc0c75 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -73,6 +73,9 @@ UM.PreferencesPage var defaultTheme = UM.Preferences.getValue("general/theme") setDefaultTheme(defaultTheme) + UM.Preferences.resetPreference("general/use_tray_icon") + trayIconCheckbox.checked = boolCheck(UM.Preferences.getValue("cura/use_tray_icon")) + UM.Preferences.resetPreference("cura/single_instance") singleInstanceCheckbox.checked = boolCheck(UM.Preferences.getValue("cura/single_instance")) UM.Preferences.resetPreference("cura/single_instance_clear_before_load") @@ -329,6 +332,23 @@ UM.PreferencesPage } } + UM.TooltipArea + { + width: childrenRect.width; + height: childrenRect.height; + + text: catalog.i18nc("@info:tooltip", "Show an icon and notifications in the system notification area.") + + UM.CheckBox + { + id: trayIconCheckbox + checked: boolCheck(UM.Preferences.getValue("general/use_tray_icon")) + onClicked: UM.Preferences.setValue("general/use_tray_icon", checked) + + text: catalog.i18nc("@option:check", "Add icon to system tray *"); + } + } + UM.Label { id: languageCaption @@ -337,6 +357,7 @@ UM.PreferencesPage text: catalog.i18nc("@label", "*You will need to restart the application for these changes to have effect.") wrapMode: Text.WordWrap font.italic: true + } Item diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg index bd6a63d912..3e9965034b 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg @@ -23,7 +23,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg index 138f2f1e4b..ec31d9bd7f 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg @@ -25,7 +25,6 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature - material_print_temperature = =default_material_print_temperature + 15 prime_tower_enable = True raft_margin = 10 -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg index b69188646b..4afe312ac3 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg @@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) 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 6b0cabd0ea..ed79b9ab61 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 @@ -24,7 +24,6 @@ multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 10 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 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 0baec213e4..ad6ecd7a11 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 @@ -24,7 +24,6 @@ multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 20 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 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 05ea628527..a146ef9313 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 @@ -24,7 +24,6 @@ multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 15 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg index 569a214004..e05d0df6cb 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg @@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 0 prime_tower_enable = False -retract_at_layer_change = False speed_print = 45 support_angle = 70 top_bottom_thickness = =layer_height * 6 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg index 85442a1a0e..c155549106 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg @@ -25,7 +25,6 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature - material_print_temperature = =default_material_print_temperature + 5 prime_tower_enable = False raft_margin = 10 -retract_at_layer_change = False speed_infill = =math.ceil(speed_print * 30 / 30) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg index de029fef56..13166a25f1 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg @@ -25,7 +25,6 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature - material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =material_print_temperature prime_tower_enable = False -retract_at_layer_change = False speed_infill = =math.ceil(speed_print * 30 / 35) speed_topbottom = =math.ceil(speed_print * 20 / 35) speed_wall = =math.ceil(speed_print * 25/ 35) 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 21ebf50a79..3e7242fea2 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 @@ -28,7 +28,6 @@ material_print_temperature_layer_0 = =material_print_temperature + 19 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 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 bc910a1ae6..872c811411 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 @@ -29,7 +29,6 @@ material_print_temperature_layer_0 = =material_print_temperature +15 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 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 3b8a6076de..d0e673c585 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 @@ -28,7 +28,6 @@ material_print_temperature_layer_0 = =material_print_temperature + 17 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg index 2bc16834c5..e314a6080d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg @@ -18,4 +18,3 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -retract_at_layer_change = False diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg index ce0d107138..c983a4558c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg @@ -19,4 +19,3 @@ speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 37 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) speed_infill = =math.ceil(speed_print * 37 / 50) -retract_at_layer_change = False diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg index 1cceef1af6..199e80e9ac 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg @@ -18,4 +18,3 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -retract_at_layer_change = False diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg index 5321690d9c..60244f52af 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg @@ -24,7 +24,6 @@ material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True support_angle = 70 top_bottom_thickness = =layer_height * 4 -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg index a559d0f912..6abb19ad5f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg @@ -25,7 +25,6 @@ prime_tower_enable = True raft_margin = 10 support_angle = 70 top_bottom_thickness = =layer_height * 4 -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg index 21425a4920..a67dc3be1b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg @@ -24,7 +24,6 @@ material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True support_angle = 70 top_bottom_thickness = =layer_height * 4 -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) 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 1a3f1cd850..e2904aa1e7 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 @@ -24,7 +24,6 @@ multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 10 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 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 5ecf58efb9..d4508c05c0 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 @@ -24,7 +24,6 @@ multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 20 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 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 ffaf2ffcbb..b68839785f 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 @@ -23,7 +23,6 @@ multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 15 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg index aaa7981b3d..2c322c0565 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg @@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 0 prime_tower_enable = False -retract_at_layer_change = False speed_print = 45 speed_topbottom = =round(speed_print * 35 / 45) speed_wall = =round(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg index dfec5abf1b..1dc6c7c64b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg @@ -25,7 +25,6 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature - material_print_temperature = =default_material_print_temperature + 5 prime_tower_enable = False raft_margin = 10 -retract_at_layer_change = False speed_infill = =math.ceil(speed_print * 30 / 30) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg index b9a4a05ec3..b024316179 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg @@ -25,7 +25,6 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature - material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =material_print_temperature prime_tower_enable = False -retract_at_layer_change = False speed_infill = =math.ceil(speed_print * 30 / 35) speed_print = 35 speed_topbottom = =math.ceil(speed_print * 20 / 35) 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 f4d65fbe04..f611f7d17e 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 @@ -26,7 +26,6 @@ material_print_temperature_layer_0 = =material_print_temperature + 19 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 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 c71889b1fd..e7d370cb8a 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 @@ -27,7 +27,6 @@ material_print_temperature_layer_0 = =material_print_temperature + 15 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 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 a307bc96c6..f318034971 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 @@ -26,7 +26,6 @@ material_print_temperature_layer_0 = =material_print_temperature + 17 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg index 4cba6c87f4..1a4abc69eb 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg @@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg index 70b93730d3..64640ddc5f 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg @@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg index 08bbc9125e..b80ecb7ed0 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg @@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg index 4cb210bba3..1644b7d2ff 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg @@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg index 83957e6d0f..ee5dff1264 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg @@ -18,4 +18,3 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -retract_at_layer_change = False diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg index 011a962d8d..8de9e328d9 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg @@ -19,4 +19,3 @@ speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 37 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) speed_infill = =math.ceil(speed_print * 37 / 50) -retract_at_layer_change = False diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg index 910592f909..3255684648 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg @@ -18,4 +18,3 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -retract_at_layer_change = False diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg index b465c3d95c..5a75d250ae 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg @@ -24,7 +24,6 @@ material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True support_angle = 70 top_bottom_thickness = =layer_height * 4 -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg index 0f2aa42b8d..5fd1ac1591 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg @@ -25,7 +25,6 @@ prime_tower_enable = True raft_margin = 10 support_angle = 70 top_bottom_thickness = =layer_height * 4 -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg index e6e1a9c718..9da869a34e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg @@ -24,7 +24,6 @@ material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True support_angle = 70 top_bottom_thickness = =layer_height * 4 -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) 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 0714319001..f3deb0b0f9 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 @@ -24,7 +24,6 @@ multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 10 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 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 9b669346eb..859f408ffb 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 @@ -24,7 +24,6 @@ multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 20 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 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 498a099bfb..85ca930444 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 @@ -23,7 +23,6 @@ multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 15 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg index d0bbce15a0..d2d69e4870 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg @@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 0 prime_tower_enable = False -retract_at_layer_change = False speed_print = 45 speed_topbottom = =round(speed_print * 35 / 45) speed_wall = =round(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg index 62a9b616b0..876136d914 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg @@ -25,7 +25,6 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature - material_print_temperature = =default_material_print_temperature + 5 prime_tower_enable = False raft_margin = 10 -retract_at_layer_change = False speed_infill = =math.ceil(speed_print * 30 / 30) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg index 48bbe5b568..1133c1c194 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg @@ -25,7 +25,6 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature - material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =material_print_temperature prime_tower_enable = False -retract_at_layer_change = False speed_infill = =math.ceil(speed_print * 30 / 35) speed_print = 35 speed_topbottom = =math.ceil(speed_print * 20 / 35) 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 a6574f6eec..32351241f7 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 @@ -26,7 +26,6 @@ material_print_temperature_layer_0 = =material_print_temperature + 19 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 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 eda3b32597..6e3732f812 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 @@ -27,7 +27,6 @@ material_print_temperature_layer_0 = =material_print_temperature + 15 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 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 24eb4a0b06..ab43aa6af3 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 @@ -26,7 +26,6 @@ material_print_temperature_layer_0 = =material_print_temperature + 17 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg index a8bcf6d444..16d916f56a 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg @@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg index ecffafed57..80e101c1a6 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg @@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg index 68da56447b..af5bb5b9b2 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg @@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg index 58e377a417..e2dbe4a511 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg @@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg index e46f7f8258..748ed78eb7 100644 --- a/resources/variants/ultimaker3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_aa0.8.inst.cfg @@ -30,7 +30,6 @@ material_initial_print_temperature = =material_print_temperature - 5 multiple_mesh_overlap = 0 prime_tower_enable = False prime_tower_wipe_enabled = True -retract_at_layer_change = =not magic_spiralize retraction_amount = 6.5 retraction_hop = 2 retraction_hop_only_when_collides = True diff --git a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg index 4110cf8679..96a34c059e 100644 --- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg @@ -30,7 +30,6 @@ material_initial_print_temperature = =material_print_temperature - 5 multiple_mesh_overlap = 0 prime_tower_enable = False prime_tower_wipe_enabled = True -retract_at_layer_change = True retraction_amount = 6.5 retraction_hop = 2 retraction_hop_only_when_collides = True diff --git a/resources/variants/ultimaker_s3_aa0.8.inst.cfg b/resources/variants/ultimaker_s3_aa0.8.inst.cfg index c3ff805ba0..3e4f3156af 100644 --- a/resources/variants/ultimaker_s3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_aa0.8.inst.cfg @@ -30,7 +30,6 @@ material_initial_print_temperature = =material_print_temperature - 5 multiple_mesh_overlap = 0 prime_tower_enable = False prime_tower_wipe_enabled = True -retract_at_layer_change = =not magic_spiralize retraction_amount = 6.5 retraction_hop = 2 retraction_hop_only_when_collides = True diff --git a/resources/variants/ultimaker_s5_aa0.8.inst.cfg b/resources/variants/ultimaker_s5_aa0.8.inst.cfg index f2e3421b67..ab16ef3b43 100644 --- a/resources/variants/ultimaker_s5_aa0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_aa0.8.inst.cfg @@ -31,7 +31,6 @@ material_initial_print_temperature = =material_print_temperature - 5 multiple_mesh_overlap = 0 prime_tower_enable = False prime_tower_wipe_enabled = True -retract_at_layer_change = =not magic_spiralize retraction_amount = 6.5 retraction_hop = 2 retraction_hop_only_when_collides = True diff --git a/run_coverage.py b/run_coverage.py deleted file mode 100644 index 2fd60f9342..0000000000 --- a/run_coverage.py +++ /dev/null @@ -1,22 +0,0 @@ -import pytest -from pathlib import Path - -# Small helper script to run the coverage of main code & all plugins - -path = Path("plugins") -args = ["--cov" ,"cura" , "--cov-report", "html"] -all_paths = [] -for p in path.glob('**/*'): - if p.is_dir(): - if p.name in ["__pycache__", "tests"]: - continue - args.append("--cov") - args.append(str(p)) - all_paths.append(str(p)) - -for path in all_paths: - args.append(path) -args.append(".") -args.append("-x") -pytest.main(args) - diff --git a/run_mypy.py b/run_mypy.py deleted file mode 100644 index 4486085064..0000000000 --- a/run_mypy.py +++ /dev/null @@ -1,85 +0,0 @@ -#!/usr/bin/env python -import os -import sys -from multiprocessing.dummy import Pool -from functools import partial -from subprocess import call - -# A quick Python implementation of unix 'where' command. -def where(exe_name: str, search_path: str = os.getenv("PATH")) -> str: - if search_path is None: - search_path = "" - paths = search_path.split(os.pathsep) - result = "" - print(" -> sys.executable location: %s" % sys.executable) - sys_exec_dir = os.path.dirname(sys.executable) - root_dir = os.path.dirname(sys_exec_dir) - paths += [sys_exec_dir, - os.path.join(root_dir, "bin"), - os.path.join(root_dir, "scripts"), - ] - paths = set(paths) - - for path in sorted(paths): - print(" -> Searching %s" % path) - candidate_path = os.path.join(path, exe_name) - if os.path.exists(candidate_path): - result = candidate_path - break - return result - - -def findModules(path): - result = [] - for entry in os.scandir(path): - if entry.is_dir() and os.path.exists(os.path.join(path, entry.name, "__init__.py")): - result.append(entry.name) - return result - - -def main(): - # Find Uranium via the PYTHONPATH var - uraniumUMPath = where("UM", os.getenv("PYTHONPATH")) - if uraniumUMPath is None: - uraniumUMPath = os.path.join("..", "Uranium") - uraniumPath = os.path.dirname(uraniumUMPath) - - mypy_path_parts = [".", os.path.join(".", "plugins"), os.path.join(".", "plugins", "VersionUpgrade"), - uraniumPath, os.path.join(uraniumPath, "stubs")] - if sys.platform == "win32": - os.putenv("MYPYPATH", ";".join(mypy_path_parts)) - else: - os.putenv("MYPYPATH", ":".join(mypy_path_parts)) - - # Mypy really needs to be run via its Python script otherwise it can't find its data files. - mypy_exe_name = "mypy.exe" if sys.platform == "win32" else "mypy" - mypy_exe_dir = where(mypy_exe_name) - mypy_module = os.path.join(os.path.dirname(mypy_exe_dir), mypy_exe_name) - print("Found mypy exe path: %s" % mypy_exe_dir) - print("Found mypy module path: %s" % mypy_module) - - plugins = findModules("plugins") - plugins.sort() - - mods = ["cura"] + plugins + findModules("plugins/VersionUpgrade") - success_code = 0 - - pool = Pool(2) # Run two commands at once - - if sys.platform == "win32": - commands = ["%s -p %s --ignore-missing-imports" % (mypy_module, mod) for mod in mods] - else: - commands = ["%s %s -p %s --ignore-missing-imports" % (sys.executable, mypy_module, mod) for mod in mods] - - for i, returncode in enumerate(pool.imap(partial(call, shell=True), commands)): - if returncode != 0: - print("\nCommand {command} failed checking (code {errcode}). :(".format(command = commands[i], errcode = returncode)) - success_code = 1 - if success_code: - print("MYPY check was completed, but did not pass") - else: - print("MYPY check was completed and passed with flying colors") - return success_code - -if __name__ == "__main__": - sys.exit(main()) \ No newline at end of file