Merge pull request #5888 from Ultimaker/rename_minimum_diameter

Rename Minimum Diameter to Maximum Tower-Supported Diameter
This commit is contained in:
pkuiper-ultimaker 2019-06-17 15:39:44 +02:00 committed by GitHub
commit 9236f21d67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
792 changed files with 950 additions and 792 deletions

View File

@ -144,7 +144,7 @@ class CuraApplication(QtApplication):
# SettingVersion represents the set of settings available in the machine/extruder definitions.
# You need to make sure that this version number needs to be increased if there is any non-backwards-compatible
# changes of the settings.
SettingVersion = 7
SettingVersion = 8
Created = False

View File

@ -14,7 +14,7 @@ def getMetaData() -> Dict[str, Any]:
return {
"version_upgrade": {
# From To Upgrade function
("preferences", 6000006): ("preferences", 6000007, upgrade.upgradePreferences),
("preferences", 6000006): ("preferences", 6000007, upgrade.upgradePreferences),
("machine_stack", 4000006): ("machine_stack", 4000007, upgrade.upgradeStack),
("extruder_train", 4000006): ("extruder_train", 4000007, upgrade.upgradeStack),
("definition_changes", 4000006): ("definition_changes", 4000007, upgrade.upgradeInstanceContainer),

View File

@ -0,0 +1,91 @@
# Copyright (c) 2019 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
import configparser
import io
from typing import Dict, List, Tuple
from UM.VersionUpgrade import VersionUpgrade
_renamed_settings = {
"support_minimal_diameter": "support_tower_maximum_supported_diameter"
} #type: Dict[str, str]
## Upgrades configurations from the state they were in at version 4.1 to the
# state they should be in at version 4.2.
class VersionUpgrade41to42(VersionUpgrade):
## Gets the version number from a CFG file in Uranium's 4.1 format.
#
# Since the format may change, this is implemented for the 4.1 format only
# and needs to be included in the version upgrade system rather than
# globally in Uranium.
#
# \param serialised The serialised form of a CFG file.
# \return The version number stored in the CFG file.
# \raises ValueError The format of the version number in the file is
# incorrect.
# \raises KeyError The format of the file is incorrect.
def getCfgVersion(self, serialised: str) -> int:
parser = configparser.ConfigParser(interpolation = None)
parser.read_string(serialised)
format_version = int(parser.get("general", "version")) #Explicitly give an exception when this fails. That means that the file format is not recognised.
setting_version = int(parser.get("metadata", "setting_version", fallback = "0"))
return format_version * 1000000 + setting_version
## Upgrades instance containers to have the new version
# number.
#
# This renames the renamed settings in the containers.
def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
parser = configparser.ConfigParser(interpolation = None)
parser.read_string(serialized)
# Update version number.
parser["metadata"]["setting_version"] = "8"
#Rename settings.
if "values" in parser:
for old_name, new_name in _renamed_settings.items():
if old_name in parser["values"]:
parser["values"][new_name] = parser["values"][old_name]
del parser["values"][old_name]
result = io.StringIO()
parser.write(result)
return [filename], [result.getvalue()]
## Upgrades Preferences to have the new version number.
#
# This renames the renamed settings in the list of visible settings.
def upgradePreferences(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
parser = configparser.ConfigParser(interpolation = None)
parser.read_string(serialized)
#Update version number.
parser["metadata"]["setting_version"] = "8"
#Renamed settings.
if "visible_settings" in parser["general"]:
visible_settings = parser["general"]["visible_settings"]
visible_settings_set = set(visible_settings.split(";"))
for old_name, new_name in _renamed_settings.items():
if old_name in visible_settings_set:
visible_settings_set.remove(old_name)
visible_settings_set.add(new_name)
parser["general"]["visible_settings"] = ";".join(visible_settings_set)
result = io.StringIO()
parser.write(result)
return [filename], [result.getvalue()]
## Upgrades stacks to have the new version number.
def upgradeStack(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
parser = configparser.ConfigParser(interpolation = None)
parser.read_string(serialized)
# Update version number.
parser["metadata"]["setting_version"] = "8"
result = io.StringIO()
parser.write(result)
return [filename], [result.getvalue()]

View File

@ -0,0 +1,59 @@
# Copyright (c) 2019 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
from typing import Any, Dict, TYPE_CHECKING
from . import VersionUpgrade41to42
if TYPE_CHECKING:
from UM.Application import Application
upgrade = VersionUpgrade41to42.VersionUpgrade41to42()
def getMetaData() -> Dict[str, Any]:
return {
"version_upgrade": {
# From To Upgrade function
("preferences", 6000007): ("preferences", 6000008, upgrade.upgradePreferences),
("machine_stack", 4000007): ("machine_stack", 4000008, upgrade.upgradeStack),
("extruder_train", 4000007): ("extruder_train", 4000008, upgrade.upgradeStack),
("definition_changes", 4000007): ("definition_changes", 4000008, upgrade.upgradeInstanceContainer),
("quality_changes", 4000007): ("quality_changes", 4000008, upgrade.upgradeInstanceContainer),
("quality", 4000007): ("quality", 4000008, upgrade.upgradeInstanceContainer),
("user", 4000007): ("user", 4000008, upgrade.upgradeInstanceContainer),
},
"sources": {
"preferences": {
"get_version": upgrade.getCfgVersion,
"location": {"."}
},
"machine_stack": {
"get_version": upgrade.getCfgVersion,
"location": {"./machine_instances"}
},
"extruder_train": {
"get_version": upgrade.getCfgVersion,
"location": {"./extruders"}
},
"definition_changes": {
"get_version": upgrade.getCfgVersion,
"location": {"./definition_changes"}
},
"quality_changes": {
"get_version": upgrade.getCfgVersion,
"location": {"./quality_changes"}
},
"quality": {
"get_version": upgrade.getCfgVersion,
"location": {"./quality"}
},
"user": {
"get_version": upgrade.getCfgVersion,
"location": {"./user"}
}
}
}
def register(app: "Application") -> Dict[str, Any]:
return { "version_upgrade": upgrade }

View File

@ -0,0 +1,8 @@
{
"name": "Version Upgrade 4.1 to 4.2",
"author": "Ultimaker B.V.",
"version": "1.0.0",
"description": "Upgrades configurations from Cura 4.1 to Cura 4.2.",
"api": "6.0",
"i18n-catalog": "cura"
}

View File

@ -6,7 +6,7 @@
"type": "extruder",
"author": "Ultimaker",
"manufacturer": "Unknown",
"setting_version": 7,
"setting_version": 8,
"visible": false,
"position": "0"
},

View File

@ -7,7 +7,7 @@
"author": "Ultimaker",
"category": "Other",
"manufacturer": "Unknown",
"setting_version": 7,
"setting_version": 8,
"file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj;application/x3g",
"visible": false,
"has_materials": true,
@ -4580,10 +4580,10 @@
"enabled": "support_enable and support_use_towers",
"settable_per_mesh": true
},
"support_minimal_diameter":
"support_tower_maximum_supported_diameter":
{
"label": "Minimum Diameter",
"description": "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower.",
"label": "Maximum Tower-Supported Diameter",
"description": "Maximum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower.",
"unit": "mm",
"type": "float",
"default_value": 3.0,

View File

@ -4,7 +4,7 @@ name = Fine
definition = abax_pri3
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = Extra Fine
definition = abax_pri3
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Fine
definition = abax_pri3
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = Fine
definition = abax_pri5
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = Extra Fine
definition = abax_pri5
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Fine
definition = abax_pri5
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = Fine
definition = abax_titan
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = Extra Fine
definition = abax_titan
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Fine
definition = abax_titan
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = Draft
definition = anycubic_4max
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = draft
weight = -2

View File

@ -4,7 +4,7 @@ name = High
definition = anycubic_4max
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = anycubic_4max
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = Draft
definition = anycubic_4max
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = draft
weight = -2

View File

@ -4,7 +4,7 @@ name = High
definition = anycubic_4max
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = anycubic_4max
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = Draft
definition = anycubic_4max
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = draft
weight = -2

View File

@ -4,7 +4,7 @@ name = High
definition = anycubic_4max
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = anycubic_4max
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = Draft
definition = anycubic_4max
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = draft
weight = -2

View File

@ -4,7 +4,7 @@ name = High
definition = anycubic_4max
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = anycubic_4max
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = Draft
definition = anycubic_4max
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = draft
weight = -2

View File

@ -4,7 +4,7 @@ name = High
definition = anycubic_4max
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = anycubic_4max
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = Draft
definition = anycubic_chiron
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = draft
weight = -2

View File

@ -4,7 +4,7 @@ name = High
definition = anycubic_chiron
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = anycubic_chiron
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = Draft
definition = anycubic_i3_mega
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = draft
weight = -2

View File

@ -4,7 +4,7 @@ name = High
definition = anycubic_i3_mega
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = anycubic_i3_mega
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = Coarse
definition = builder_premium_small
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = coarse
weight = -1

View File

@ -4,7 +4,7 @@ name = High Quality
definition = builder_premium_small
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = builder_premium_small
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = Coarse
definition = builder_premium_small
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = coarse
weight = -1

View File

@ -4,7 +4,7 @@ name = High Quality
definition = builder_premium_small
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = builder_premium_small
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = Coarse
definition = builder_premium_small
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = coarse
weight = -1

View File

@ -4,7 +4,7 @@ name = High Quality
definition = builder_premium_small
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = builder_premium_small
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = Coarse
definition = builder_premium_small
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = coarse
weight = -1

View File

@ -4,7 +4,7 @@ name = High Quality
definition = builder_premium_small
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = builder_premium_small
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = Coarse
definition = builder_premium_small
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = coarse
weight = -1

View File

@ -4,7 +4,7 @@ name = High Quality
definition = builder_premium_small
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = builder_premium_small
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = Coarse
definition = builder_premium_small
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = coarse
weight = -1

View File

@ -4,7 +4,7 @@ name = High Quality
definition = builder_premium_small
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = builder_premium_small
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = Coarse
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = coarse
weight = 3

View File

@ -4,7 +4,7 @@ name = Extra Coarse
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = extra coarse
weight = 4

View File

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = Coarse
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = coarse
weight = -3

View File

@ -4,7 +4,7 @@ name = Extra Coarse
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = extra coarse
weight = -4

View File

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = Coarse
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = coarse
weight = 3

View File

@ -4,7 +4,7 @@ name = Extra Coarse
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = extra coarse
weight = 4

View File

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = Coarse
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = coarse
weight = 3

View File

@ -4,7 +4,7 @@ name = Extra Coarse
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = extra coarse
weight = 4

View File

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = Coarse
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = coarse
weight = 3

View File

@ -4,7 +4,7 @@ name = Extra Coarse
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = extra coarse
weight = 4

View File

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

View File

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = normal
weight = 0

View File

@ -4,7 +4,7 @@ name = Coarse
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = coarse
weight = 3

View File

@ -4,7 +4,7 @@ name = Extra Coarse
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = extra coarse
weight = 4

View File

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 7
setting_version = 8
type = quality
quality_type = high
weight = 1

Some files were not shown because too many files have changed in this diff Show More