diff options
| -rw-r--r-- | cura/ApplicationMetadata.py | 1 | ||||
| -rwxr-xr-x | cura/CuraApplication.py | 6 | ||||
| -rw-r--r-- | cura/UI/CuraSplashScreen.py | 6 | ||||
| -rw-r--r-- | cura/UI/TextManager.py | 8 | ||||
| -rwxr-xr-x | cura_app.py | 2 | ||||
| -rw-r--r-- | resources/images/cura-icon-32_wip.png | bin | 0 -> 10175 bytes | |||
| -rw-r--r-- | resources/images/cura-icon_wip.png | bin | 0 -> 16757 bytes | |||
| -rw-r--r-- | resources/images/cura_wip.png | bin | 0 -> 34915 bytes | |||
| -rw-r--r-- | resources/texts/change_log.txt | 81 |
9 files changed, 96 insertions, 8 deletions
diff --git a/cura/ApplicationMetadata.py b/cura/ApplicationMetadata.py index 2e15d60a93..6399e7a757 100644 --- a/cura/ApplicationMetadata.py +++ b/cura/ApplicationMetadata.py @@ -46,6 +46,7 @@ except ImportError: # Various convenience flags indicating what kind of Cura build it is. __ENTERPRISE_VERSION_TYPE = "enterprise" IsEnterpriseVersion = CuraBuildType.lower() == __ENTERPRISE_VERSION_TYPE +IsAlternateVersion = CuraBuildType.lower() not in [DEFAULT_CURA_BUILD_TYPE, __ENTERPRISE_VERSION_TYPE] try: from cura.CuraVersion import CuraAppDisplayName # type: ignore diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 76a54d1de6..8540f5986d 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -150,11 +150,11 @@ class CuraApplication(QtApplication): def __init__(self, *args, **kwargs): super().__init__(name = ApplicationMetadata.CuraAppName, app_display_name = ApplicationMetadata.CuraAppDisplayName, - version = ApplicationMetadata.CuraVersion, + version = ApplicationMetadata.CuraVersion if not ApplicationMetadata.IsAlternateVersion else ApplicationMetadata.CuraBuildType, api_version = ApplicationMetadata.CuraSDKVersion, build_type = ApplicationMetadata.CuraBuildType, is_debug_mode = ApplicationMetadata.CuraDebugMode, - tray_icon_name = "cura-icon-32.png", + tray_icon_name = "cura-icon-32.png" if not ApplicationMetadata.IsAlternateVersion else "cura-icon-32_wip.png", **kwargs) self.default_theme = "cura-light" @@ -475,7 +475,7 @@ class CuraApplication(QtApplication): if not self.getIsHeadLess(): try: - self.setWindowIcon(QIcon(Resources.getPath(Resources.Images, "cura-icon.png"))) + self.setWindowIcon(QIcon(Resources.getPath(Resources.Images, "cura-icon.png" if not ApplicationMetadata.IsAlternateVersion else "cura-icon_wip.png"))) except FileNotFoundError: Logger.log("w", "Unable to find the window icon.") diff --git a/cura/UI/CuraSplashScreen.py b/cura/UI/CuraSplashScreen.py index d9caa207f4..4fa798247d 100644 --- a/cura/UI/CuraSplashScreen.py +++ b/cura/UI/CuraSplashScreen.py @@ -17,7 +17,9 @@ class CuraSplashScreen(QSplashScreen): self._scale = 0.7 self._version_y_offset = 0 # when extra visual elements are in the background image, move version text down - if ApplicationMetadata.IsEnterpriseVersion: + if ApplicationMetadata.IsAlternateVersion: + splash_image = QPixmap(Resources.getPath(Resources.Images, "cura_wip.png")) + elif ApplicationMetadata.IsEnterpriseVersion: splash_image = QPixmap(Resources.getPath(Resources.Images, "cura_enterprise.png")) self._version_y_offset = 26 else: @@ -70,7 +72,7 @@ class CuraSplashScreen(QSplashScreen): font = QFont() # Using system-default font here font.setPixelSize(18) painter.setFont(font) - painter.drawText(60, 70 + self._version_y_offset, round(330 * self._scale), round(230 * self._scale), Qt.AlignLeft | Qt.AlignTop, version[0]) + painter.drawText(60, 70 + self._version_y_offset, round(330 * self._scale), round(230 * self._scale), Qt.AlignLeft | Qt.AlignTop, version[0] if not ApplicationMetadata.IsAlternateVersion else ApplicationMetadata.CuraBuildType) if len(version) > 1: font.setPixelSize(16) painter.setFont(font) diff --git a/cura/UI/TextManager.py b/cura/UI/TextManager.py index dbe7940f26..99c1a55d46 100644 --- a/cura/UI/TextManager.py +++ b/cura/UI/TextManager.py @@ -43,7 +43,9 @@ class TextManager(QObject): line = line.replace("[", "")
line = line.replace("]", "")
open_version = Version(line)
- if open_version > Version([14, 99, 99]): # Bit of a hack: We released the 15.x.x versions before 2.x
+ if open_version < Version([0, 0, 1]): # Something went wrong with parsing, assume non-numerical alternate version that should be on top.
+ open_version = Version([99, 99, 99])
+ if Version([14, 99, 99]) < open_version < Version([16, 0, 0]): # Bit of a hack: We released the 15.x.x versions before 2.x
open_version = Version([0, open_version.getMinor(), open_version.getRevision(), open_version.getPostfixVersion()])
open_header = ""
change_logs_dict[open_version] = collections.OrderedDict()
@@ -61,7 +63,9 @@ class TextManager(QObject): text_version = version
if version < Version([1, 0, 0]): # Bit of a hack: We released the 15.x.x versions before 2.x
text_version = Version([15, version.getMinor(), version.getRevision(), version.getPostfixVersion()])
- content += "<h1>" + str(text_version) + "</h1><br>"
+ if version > Version([99, 0, 0]): # Leave it out altogether if it was originally a non-numbered version.
+ text_version = ""
+ content += ("<h1>" + str(text_version) + "</h1><br>") if text_version else ""
content += ""
for change in change_logs_dict[version]:
if str(change) != "":
diff --git a/cura_app.py b/cura_app.py index cc8a1d575c..a55cc21b67 100755 --- a/cura_app.py +++ b/cura_app.py @@ -56,6 +56,8 @@ if with_sentry_sdk: sentry_env = "development" # Master is always a development version. elif "beta" in ApplicationMetadata.CuraVersion or "BETA" in ApplicationMetadata.CuraVersion: sentry_env = "beta" + elif "alpha" in ApplicationMetadata.CuraVersion or "ALPHA" in ApplicationMetadata.CuraVersion: + sentry_env = "alpha" try: if ApplicationMetadata.CuraVersion.split(".")[2] == "99": sentry_env = "nightly" diff --git a/resources/images/cura-icon-32_wip.png b/resources/images/cura-icon-32_wip.png Binary files differnew file mode 100644 index 0000000000..4c8791d2e1 --- /dev/null +++ b/resources/images/cura-icon-32_wip.png diff --git a/resources/images/cura-icon_wip.png b/resources/images/cura-icon_wip.png Binary files differnew file mode 100644 index 0000000000..a10357ea96 --- /dev/null +++ b/resources/images/cura-icon_wip.png diff --git a/resources/images/cura_wip.png b/resources/images/cura_wip.png Binary files differnew file mode 100644 index 0000000000..e62768f11e --- /dev/null +++ b/resources/images/cura_wip.png diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index 19d539cbde..22812436c8 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -1,3 +1,82 @@ +[Arachne engine alpha] + +<h1>Arachne engine alpha</h1> + +Cura Team, as part of and with help from Ultimaker R&D in a more general sense, have been working on a large project that changes the core of how our slicing engine works. +The goal is to have variable line widths (instead of static) for each extrusion, and better path-planning, in order to better fit the eventual printed part to the specifications. + +If after you've used this alpha you want to give some feedback (please do, it's the main reason we're doing this), please see <a href="https://github.com/Ultimaker/Cura/discussions/8965">the discussion here</a>. + +This effort is still ongoing, but we're at the point where we would very much like to have the feedback and input of the wider community. + +In order to get this done, we've decided to release an 'Alpha' build, or an early preview. + +Not everything has been implemented, and there are even an amount of known bugs (see below), as well as very probably a comparable amount of unknown issues. +On top of that, we added some parameters (and removed a few others). These have hardly been tuned, even for our own printers, let alone 3rd party ones. +In other words, don't expect perfection. In fact, the default settings as they are now are likely to be worse as what's there in a lot of cases. + +Note: This is _not_ otherwise build on a specific version (like '4.8.0' or similar), so there may be issues that have been solved or introduced since then that have little or nothing to do with the Variable Line Width feature-set! + +* New Settings + +Variable Line Strategy: How the walls are spread over the available space. +- Central Deviation: Will print all walls at the nominal line width except the central one(s), causing big variations in the center but very consistent outsides. +- Distributed: Distributes the width variations equally over all walls. +- Inward Distributed: Is a balance between the other two, distributing the changes in width over all walls but keeping the walls on the outside slightly more consistent. +Minimum Variable Line Width: The smallest line width, as a factor of the normal line width, beyond which it will choose to use fewer, but wider lines to fill the available space. Reduce this threshold to use more, thinner lines. Increase to use fewer, wider lines. +Wall Transition Length: When transitioning between different numbers of walls as the part becomes thinner, a certain amount of space is allotted to split or join the wall lines. +Wall Transition Angle: When transitioning between different numbers of walls as the part becomes thinner, two adjacent walls will join together at this angle. This can make the walls come together faster than what the Wall Transition Length indicates, filling the space better. +Wall Transition Filter Distance: If it would be transitioning back and forth between different numbers of walls in quick succession, don't transition at all. Remove transitions if they are closer together than this distance. + +* Removed/Renamed/Altered Settings + +Print Thin Walls: Behaviour altered. + +* To Implement + +Not all initially planned sub-features are in yet, any subsequent non-patch releases will probably contain more. + +* Known Issues + +SkeletalTrapezoidation not robust to unsimplified input. For very intricate and or small models, crashes may occur. Please attach any crashing model to the discussion/feedback link above. + +Different extruders for inner and outer walls. The used extruder alternate each layer but the inner and outer wall are printed with the same extruder (used at that layer) + +Spiralise bugs: +- Bottom layers issue in spiralize mode. +- Stringing when in spiralized mode. +- Last bottom layer missing for some models. + +Support not being correctly generated. It might start mid-air or not providing enough support for some parts of the model. + +Gradual infill support not being correctly generated. Support walls don't seem to be printed well when gradual infill support is enabled. Ultimaker printers enable this by default for PVA. + +Combing in the wrong part when printing dual extrusion Visible, for example, when printing with dual extrusion with two different colors. E.g.: 'Bleeding' of red into white parts. + +Printed travel moves. + +Gaps between inner wall and skin. + +Z-Seam Sharpest Corner broken. The seam is not placed in the sharpest corner + +Small line width and overlap. When using the Center Deviation setting on a thin model some wall lines may overlap or leave a gap. + +Wall positioning is imprecise. On some models, the walls are not centered properly within the outline nor have the correct width. + +Connected and gradual infill results in overextrusion. When gradual infill and connect infill lines is enabled, it'll connect different pieces of infill on top of each other, causing overextrusion. + +Connect Top/Bottom polygon not working currently. The issue occurs when concentric is the infill pattern. + +Small travel line segments in infill/support. This is causing unnecessary traveling and stringing. + +Wrong Infill Layer Thickness. In combination with a higher Extra Infill Line Count, some parts are not generating infill lines. + +Inward/Distributed overextrusion. Seen on models with multiplied infill walls. + +Overlapping skin and alternating wall. The extra wall at each alternating step will overlap with the skin + +Assertion failure in SkeletalTrapezoidation. Can cause the engine to crash on certain models. + [4.8.0] <i>For an overview of the new features in Cura 4.8, please see this video: <a href="https://www.youtube.com/watch?v=BI1n4IDHbuA">Change log overview</a>.</i> @@ -1990,7 +2069,7 @@ Prints the outer walls with a jittering motion to give your object a diffuse fin The object is printed with a mid-air / net-like structure, following the mesh surface. The build plate will move up and down during diagonal segments. Though not visible in layer view, you can view the result in other software, such as Repetier Host or http://chilipeppr.com/tinyg. -[15.06 Beta] +[15.06.0] Cura 15.06 is a new release built from the ground up on a completely new framework called Uranium. This framework has been designed to make it easier to |
