From 65781eee847751ac072d0e90b9d1d11f305da5ba Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Wed, 27 May 2015 15:13:36 +0200 Subject: [PATCH 01/11] Set version to 15.05.92 --- cura/CuraApplication.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 1b608dd222..62318fb200 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -48,7 +48,7 @@ class CuraApplication(QtApplication): if not hasattr(sys, "frozen"): Resources.addResourcePath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..")) - super().__init__(name = "cura", version = "15.05.90") + super().__init__(name = "cura", version = "15.05.92") self.setRequiredPlugins([ "CuraEngineBackend", From 68500ed1d0a36f1f2c7f9582f740daeef5d13b08 Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Wed, 27 May 2015 15:37:32 +0200 Subject: [PATCH 02/11] Position the setting tooltip to the left of the settings instead of below This makes the tooltip not cover the settings. Fixes Asana issue 39 --- resources/qml/Sidebar.qml | 4 ++-- resources/qml/SidebarTooltip.qml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml index 0d4d0df599..e803406369 100644 --- a/resources/qml/Sidebar.qml +++ b/resources/qml/Sidebar.qml @@ -16,10 +16,10 @@ UM.AngledCornerRectangle { property alias saveAction: saveButton.saveAction; cornerSize: UM.Theme.sizes.default_margin.width; - + function showTooltip(item, position, text) { tooltip.text = text; - position = item.mapToItem(base, position.x, position.y); + position = item.mapToItem(base, position.x, position.y / 2); tooltip.show(position); } diff --git a/resources/qml/SidebarTooltip.qml b/resources/qml/SidebarTooltip.qml index 9003faf995..6e0ba74404 100644 --- a/resources/qml/SidebarTooltip.qml +++ b/resources/qml/SidebarTooltip.qml @@ -22,10 +22,10 @@ Rectangle { function show(position) { if(position.y + base.height > parent.height) { - x = position.x; + x = position.x - base.width; y = parent.height - base.height; } else { - x = position.x; + x = position.x - base.width; y = position.y; } base.opacity = 1; From 86920f450725968eab31443c0338bec65852f30a Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Wed, 27 May 2015 16:24:13 +0200 Subject: [PATCH 03/11] Start adding some more proper error/warning values to settings Contributes to #7 --- resources/settings/fdmprinter.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/resources/settings/fdmprinter.json b/resources/settings/fdmprinter.json index 657102c5d2..03ee5d8ee3 100644 --- a/resources/settings/fdmprinter.json +++ b/resources/settings/fdmprinter.json @@ -41,8 +41,9 @@ "unit": "mm", "type": "float", "default": 0.1, - "min_value": 0.06, - "max_value": 2.0, + "min_value": 0.00001, + "min_value_warning": 0.04, + "max_value_warning": 2.0, "always_visible": true, "children": { "layer_height_0": { @@ -51,8 +52,9 @@ "unit": "mm", "type": "float", "default": 0.3, - "min_value": 0.06, - "max_value": 2.0, + "min_value": 0.0, + "min_value_warning": 0.04, + "max_value_warning": 2.0, "visible": false } } From 1471a6815fd9a37b57b87542e44fc4abac9788b1 Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Wed, 27 May 2015 16:25:39 +0200 Subject: [PATCH 04/11] Do not slice if there is any setting with an error value Fixes #7 --- plugins/CuraEngineBackend/CuraEngineBackend.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index 7c52a3c6cb..45a2148892 100644 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -110,6 +110,9 @@ class CuraEngineBackend(Backend): if not objects: return #No point in slicing an empty build plate + if kwargs.get("settings", self._settings).hasErrorValue(): + return #No slicing if we have error values since those are by definition illegal values. + self._slicing = True self.slicingStarted.emit() From 0885d1433d62c5f7f46ffdbbede9e5e68a97163f Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Wed, 27 May 2015 16:26:40 +0200 Subject: [PATCH 05/11] Move Sidebar so it is on top of everything else This fixes an issue where the tooltip would be displayed below the layer view slider. Additional fix for Asana issue 39 --- resources/qml/Cura.qml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 7e48765f17..a2eeba59cd 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -144,23 +144,6 @@ UM.MainWindow { } } - Sidebar { - id: sidebar; - - anchors { - top: parent.top; - bottom: parent.bottom; - right: parent.right; - rightMargin: UM.Theme.sizes.window_margin.width; - } - - width: UM.Theme.sizes.panel.width; - - addMachineAction: actions.addMachine; - configureMachinesAction: actions.configureMachines; - saveAction: actions.save; - } - UM.MessageStack { anchors { left: toolbar.right; @@ -265,6 +248,23 @@ UM.MainWindow { bottomMargin: UM.Theme.sizes.window_margin.height; } } + + Sidebar { + id: sidebar; + + anchors { + top: parent.top; + bottom: parent.bottom; + right: parent.right; + rightMargin: UM.Theme.sizes.window_margin.width; + } + + width: UM.Theme.sizes.panel.width; + + addMachineAction: actions.addMachine; + configureMachinesAction: actions.configureMachines; + saveAction: actions.save; + } } } From 830dc45cceec50c1a592360e43f3e3a3528492b6 Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Wed, 27 May 2015 16:30:34 +0200 Subject: [PATCH 06/11] Make cura_app executable Contributes to Ultimaker/Uranium#42 --- cura_app.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 cura_app.py diff --git a/cura_app.py b/cura_app.py old mode 100644 new mode 100755 From 98a527b015e9e98d197fd45af5efef88f4c43394 Mon Sep 17 00:00:00 2001 From: Adam Goldsmith Date: Sun, 31 May 2015 07:35:33 -0400 Subject: [PATCH 07/11] add setting for sidebar background color --- resources/qml/Sidebar.qml | 2 ++ resources/themes/cura/theme.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml index e803406369..3b641a4538 100644 --- a/resources/qml/Sidebar.qml +++ b/resources/qml/Sidebar.qml @@ -17,6 +17,8 @@ UM.AngledCornerRectangle { cornerSize: UM.Theme.sizes.default_margin.width; + color: UM.Theme.colors.sidebar; + function showTooltip(item, position, text) { tooltip.text = text; position = item.mapToItem(base, position.x, position.y / 2); diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json index 2ea7f138f6..f73360d439 100644 --- a/resources/themes/cura/theme.json +++ b/resources/themes/cura/theme.json @@ -44,6 +44,8 @@ }, "colors": { + "sidebar": [255, 255, 255, 255], + "primary": [12, 169, 227, 255], "primary_hover": [34, 150, 190, 255], "primary_text": [255, 255, 255, 255], From cc8f974793f72ba521619e520eae1656135434c7 Mon Sep 17 00:00:00 2001 From: Adam Goldsmith Date: Sun, 31 May 2015 09:18:36 -0400 Subject: [PATCH 08/11] add missing color to tool_button --- resources/themes/cura/styles.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/themes/cura/styles.qml b/resources/themes/cura/styles.qml index d17560d976..bdf332871c 100644 --- a/resources/themes/cura/styles.qml +++ b/resources/themes/cura/styles.qml @@ -73,6 +73,7 @@ QtObject { anchors.horizontalCenter: parent.horizontalCenter; text: control.text; font: UM.Theme.fonts.button_tooltip; + color: UM.Theme.colors.button_text; } } } From 350e3312bdf3cc638ff1490749b7400769ee202d Mon Sep 17 00:00:00 2001 From: Adam Goldsmith Date: Sun, 31 May 2015 09:24:41 -0400 Subject: [PATCH 09/11] add missing width and height to section icon --- resources/themes/cura/styles.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/themes/cura/styles.qml b/resources/themes/cura/styles.qml index bdf332871c..9e9cc11e42 100644 --- a/resources/themes/cura/styles.qml +++ b/resources/themes/cura/styles.qml @@ -122,6 +122,8 @@ QtObject { Image { anchors.verticalCenter: parent.verticalCenter; source: control.iconSource; + width: UM.Theme.sizes.section_icon.width; + height: UM.Theme.sizes.section_icon.height; } Label { From fb6216b99fc6f2369b54f5fb55fd1524f0621eab Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Wed, 3 Jun 2015 15:14:06 +0200 Subject: [PATCH 10/11] Add a changelog file --- CHANGES | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 CHANGES diff --git a/CHANGES b/CHANGES new file mode 100644 index 0000000000..616f906b34 --- /dev/null +++ b/CHANGES @@ -0,0 +1,127 @@ +Cura 15.06 Beta +=============== + +This is the *Beta* version of Cura 15.06. + +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 +extend Cura with additional functionality as well as provide a cleaner UI. + +Changes since 15.05.91 +---------------------- + +* There is now a working MacOSX version. Currently it supports OSX 10.7 and + higher. +* Fixed: Need to deselect before selecting a different object. +* Fixed: Object can be moved on Z axis. +* Fixed: Error values should be considered invalid values and will not trigger a + slice. +* Fixed: Text fields used a locale-aware validator while the underlying code did + not. +* Fixed: Text fields will trigger a slice on text change, not only after focus + change/enter press. +* Fixed: Rotate Tool snaps to incorrect value. + +Changes since 15.05.90 +---------------------- + +* Fixed: Additional UI elements for tools and views not loading. +* Fixed: Double click needed to change setting dialog page. +* Fixed: Context menu entries (reload, center object, etc.) not working. +* Fixed: "Open With" or passing files from command line not working. +* Fixed: "Reload All" would not reload files. + +In addition, a lot of work has gone into getting a usable Mac OSX version. + +New Features +------------ + +* Plugin based system + The Uranium framework provides us with a plugin-based system + that provides additional flexibility when extending Cura. Think + of new views, tools, file formats, etc. This is probably the + biggest new feature. +* Improved UI + The UI has received a complete overhaul. +* Time-Quality Slider + The 4 static quick print profiles have been replaced with + a slider that should make it easier to find the right spot + between print time and print quality. +* More Settings + The Advanced mode is now configurable and can show many + additional settings that were previously not available, while at + the same time not overwhelming new users with too many settings. + Custom set of visible settings can be created by the user. +* Support for high-DPI screens + The refreshed UI has been designed with high-DPI screens in + mind which should improve the experience of Cura on such + devices. +* Improved language support + (Not yet available for the Beta release.) +* Improved support structure generation + The new version of the CuraEngine now features improved + support generation algorithms and additional options for support + structure generation. +* Experimental Feature: Wire Printing + Wire Printing has been added as an experimental new feature. It + will print objects as a structure of lines. It can be enabled by + from Advanced Mode -> Fixes -> Wire Printing. +* Undo/Redo + It is now possible to undo and redo most scene operations, like + moving or rotating objects. + +Features from earlier versions not (yet) in this release +-------------------------------------------------------- + +* The All-at-once/One-at-a-time toggle is not available. + We are working on an improved implementation of this mechanism + but it will not be available for this release. +* No dual extrusion features are available yet. + We are working on a completely new workflow for this but this + needs additional time. +* “Lay Flat” has been removed. + The existing implementation was unfortunately not salvageable. + We will be looking into an improved implementation for this + feature. +* "Split Object Into Parts" has been removed. + Due to the same reason as Lay Flat. +* Support for AMF and DAE file formats has been removed. + Both of these will be implemented as plugins in the future. +* Support for directly loading a GCode file is not yet available. + This will be implemented as a plugin in the future. +* Support for PNG, JPG and other image formats has been removed. + These can be supported by a plugin with an improved UI. +* Support for loading Minecraft levels has been removed. + This can be implemented as a plugin. +* Windows XP support has been dropped. + Microsoft is no longer supporting xp, so they no longer back + port certain features that we require. +* X-Ray view is missing. + Will be implemented as a (you might have guessed it) plugin. +* Infill display in the layer view is missing. + Like several other features, the existing implementation of this + functionality is not salvageable and will need to be reimplemented. + + +Known Issues +------------ + +For an up to date list of all known issues, please see +https://github.com/Ultimaker/Cura/issues and +https://github.com/Ultimaker/Uranium/issues . + +* The application has no application icon yet. +* The Windows version starts a console before starting the + application. This is intentional for the beta and it will be + removed for the final version. +* Opening the machine preferences page will switch to the first + available machine instead of keeping the current machine + selected. +* Some OBJ files are rendered as black objects due to missing + normals. +* The developer documentation for Uranium (available at + http://software.ultimaker.com/uranium/index.html) is not yet + complete. +* Disabling plugins does not work correctly yet. +* Unicorn occasionally still requires feeding. Do not feed it + after midnight. From 3b03cfa9493f1b2bf54ab750508f4bf99db350a6 Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Wed, 3 Jun 2015 15:14:22 +0200 Subject: [PATCH 11/11] Bump version to 15.05.93 --- cura/CuraApplication.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 62318fb200..f6d41a51c8 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -48,7 +48,7 @@ class CuraApplication(QtApplication): if not hasattr(sys, "frozen"): Resources.addResourcePath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..")) - super().__init__(name = "cura", version = "15.05.92") + super().__init__(name = "cura", version = "15.05.93") self.setRequiredPlugins([ "CuraEngineBackend",