[cura] Update to 14.09
Miro Hrončok
churchyard at fedoraproject.org
Sat Oct 25 17:48:46 UTC 2014
commit ef99714a33b17d0897c67bf749fa1cb68d470313
Author: Miro Hrončok <miro at hroncok.cz>
Date: Sat Oct 25 19:48:29 2014 +0200
Update to 14.09
.gitignore | 1 +
cura-czech-newlines.patch | 32 ++++++++++++++++++++++++++++++++
cura-dont-show-nc-stls.patch | 30 ++++++++++++++++++++++++------
cura-hbk-firmware-missing.patch | 13 -------------
cura-missing-firmware.patch | 32 ++++++++++++++++++++++++++++++++
cura.spec | 16 ++++++++++++----
sources | 2 +-
7 files changed, 102 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b55edfd..2291a26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/Cura-13.10-fedora.tar.gz
/Cura-13.11.2-fedora.tar.gz
/Cura-14.06-fedora.tar.gz
+/Cura-14.09-fedora.tar.gz
diff --git a/cura-czech-newlines.patch b/cura-czech-newlines.patch
new file mode 100644
index 0000000..48c2e24
--- /dev/null
+++ b/cura-czech-newlines.patch
@@ -0,0 +1,32 @@
+diff --git a/resources/locale/cs/LC_MESSAGES/Cura.po b/resources/locale/cs/LC_MESSAGES/Cura.po
+index 670e2fd..6b8d78a 100644
+--- a/resources/locale/cs/LC_MESSAGES/Cura.po
++++ b/resources/locale/cs/LC_MESSAGES/Cura.po
+@@ -147,7 +147,7 @@ msgstr "Dvojtryska (experimentální)"
+ msgid "If you have an Ultimaker bought after october 2012 you will have the\n"
+ "Extruder drive upgrade. If you do not have this upgrade,\n"
+ "it is highly recommended to improve reliability."
+-msgstr "Pokud jste zakoupil Ultimaker po říjnu 2012, budete mít upgrade extrudéru. Pokud tento upgrade nevlastníte, doporučujeme jej zakoupit pro zvýšení spolehlivosti.\n"
++msgstr "Pokud jste zakoupil Ultimaker po říjnu 2012, budete mít upgrade extrudéru. Pokud tento upgrade nevlastníte, doporučujeme jej zakoupit pro zvýšení spolehlivosti."
+ ""
+
+ #: Cura/gui/configWizard.py:464
+@@ -368,7 +368,7 @@ msgstr "Nepodařilo se najít tiskárnu pro aktualizaci firmware. Je tiskárna p
+
+ #: Cura/gui/firmwareInstall.py:107
+ msgid "Uploading firmware..."
+-msgstr "Nahrávám firmware\n"
++msgstr "Nahrávám firmware..."
+ ""
+
+ #: Cura/gui/firmwareInstall.py:110
+@@ -379,8 +379,7 @@ msgstr "Hotovo!\n"
+
+ #: Cura/gui/firmwareInstall.py:112
+ msgid "Failed to write firmware.\n"
+-""
+-msgstr "Nepodařilo se zapsat firmware"
++msgstr "Nepodařilo se zapsat firmware.\n"
+
+ #: Cura/gui/mainWindow.py:66
+ msgid "Load model file...\tCTRL+L"
diff --git a/cura-dont-show-nc-stls.patch b/cura-dont-show-nc-stls.patch
index 22c7eaa..a74cef9 100644
--- a/cura-dont-show-nc-stls.patch
+++ b/cura-dont-show-nc-stls.patch
@@ -1,11 +1,12 @@
diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py
-index 2913e4b..e1a2b51 100644
+index c90bf6a..04d7df3 100644
--- a/Cura/gui/sceneView.py
+++ b/Cura/gui/sceneView.py
-@@ -1237,70 +1237,16 @@ class SceneView(openglGui.glGuiPanel):
+@@ -1236,88 +1236,16 @@ class SceneView(openglGui.glGuiPanel):
+
size = [profile.getMachineSettingFloat('machine_width'), profile.getMachineSettingFloat('machine_depth'), profile.getMachineSettingFloat('machine_height')]
- machine = profile.getMachineSetting('machine_type')
+- machine = profile.getMachineSetting('machine_type')
- if machine.startswith('ultimaker'):
- if machine not in self._platformMesh:
- meshes = meshLoader.loadMeshes(resources.getPathForMesh(machine + '_platform.stl'))
@@ -13,7 +14,7 @@ index 2913e4b..e1a2b51 100644
- self._platformMesh[machine] = meshes[0]
- else:
- self._platformMesh[machine] = None
-- if machine == 'ultimaker2':
+- if machine == 'ultimaker2' or machine == 'ultimaker_plus':
- self._platformMesh[machine]._drawOffset = numpy.array([0,-37,145], numpy.float32)
- else:
- self._platformMesh[machine]._drawOffset = numpy.array([0,0,2.5], numpy.float32)
@@ -23,9 +24,12 @@ index 2913e4b..e1a2b51 100644
- self._objectShader.unbind()
-
- #For the Ultimaker 2 render the texture on the back plate to show the Ultimaker2 text.
-- if machine == 'ultimaker2':
+- if machine == 'ultimaker2' or machine == 'ultimaker_plus':
- if not hasattr(self._platformMesh[machine], 'texture'):
-- self._platformMesh[machine].texture = openglHelpers.loadGLTexture('Ultimaker2backplate.png')
+- if machine == 'ultimaker2':
+- self._platformMesh[machine].texture = openglHelpers.loadGLTexture('Ultimaker2backplate.png')
+- else:
+- self._platformMesh[machine].texture = openglHelpers.loadGLTexture('UltimakerPlusbackplate.png')
- glBindTexture(GL_TEXTURE_2D, self._platformMesh[machine].texture)
- glEnable(GL_TEXTURE_2D)
- glPushMatrix()
@@ -59,6 +63,20 @@ index 2913e4b..e1a2b51 100644
- glDisable(GL_TEXTURE_2D)
- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
- glPopMatrix()
+-
+- elif machine.startswith('Witbox'):
+- if machine not in self._platformMesh:
+- meshes = meshLoader.loadMeshes(resources.getPathForMesh(machine + '_platform.stl'))
+- if len(meshes) > 0:
+- self._platformMesh[machine] = meshes[0]
+- else:
+- self._platformMesh[machine] = None
+- if machine == 'Witbox':
+- self._platformMesh[machine]._drawOffset = numpy.array([0,-37,145], numpy.float32)
+- glColor4f(1,1,1,0.5)
+- self._objectShader.bind()
+- self._renderObject(self._platformMesh[machine], False, False)
+- self._objectShader.unbind()
- else:
- glColor4f(0,0,0,1)
- glLineWidth(3)
diff --git a/cura-missing-firmware.patch b/cura-missing-firmware.patch
new file mode 100644
index 0000000..cd554d2
--- /dev/null
+++ b/cura-missing-firmware.patch
@@ -0,0 +1,32 @@
+diff --git a/Cura/gui/firmwareInstall.py b/Cura/gui/firmwareInstall.py
+index 55577c6..d1bc939 100644
+--- a/Cura/gui/firmwareInstall.py
++++ b/Cura/gui/firmwareInstall.py
+@@ -20,18 +20,6 @@ def getDefaultFirmware(machineIndex = None):
+ if profile.getMachineSettingFloat('extruder_amount', machineIndex) > 2:
+ return None
+ if profile.getMachineSetting('has_heated_bed', machineIndex) == 'True':
+- name += '-HBK'
+- if sys.platform.startswith('linux'):
+- name += '-115200'
+- else:
+- name += '-250000'
+- if profile.getMachineSettingFloat('extruder_amount', machineIndex) > 1:
+- name += '-dual'
+- return resources.getPathForFirmware(name + '.hex')
+-
+- if profile.getMachineSetting('machine_type', machineIndex) == 'ultimaker_plus':
+- name = 'MarlinUltimaker-UMOP'
+- if profile.getMachineSettingFloat('extruder_amount', machineIndex) > 2:
+ return None
+ if sys.platform.startswith('linux'):
+ name += '-115200'
+@@ -43,8 +31,6 @@ def getDefaultFirmware(machineIndex = None):
+
+ if profile.getMachineSetting('machine_type', machineIndex) == 'ultimaker2':
+ return resources.getPathForFirmware("MarlinUltimaker2.hex")
+- if profile.getMachineSetting('machine_type', machineIndex) == 'Witbox':
+- return resources.getPathForFirmware("MarlinWitbox.hex")
+ return None
+
+ class InstallFirmware(wx.Dialog):
diff --git a/cura.spec b/cura.spec
index ba498f1..98201a3 100644
--- a/cura.spec
+++ b/cura.spec
@@ -1,6 +1,6 @@
Name: cura
-Version: 14.06
-Release: 2%{?dist}
+Version: 14.09
+Release: 1%{?dist}
Summary: 3D printer control software
# Code is AGPLv3
@@ -28,8 +28,12 @@ Patch1: %{name}-system-paths.patch
# Rework the logic of determining the version (didn't work)
Patch2: %{name}-version.patch
-# Temporarily disable HKB firmware install, as it is not yet packaged for Fedora
-Patch3: %{name}-hbk-firmware-missing.patch
+# Disable installation of firmwares Fedora doesn't ship
+Patch3: %{name}-missing-firmware.patch
+
+# There are errors in Czech .po file
+# https://github.com/daid/Cura/issues/992
+Patch4: %{name}-czech-newlines.patch
BuildArch: noarch
BuildRequires: python2-devel
@@ -61,6 +65,7 @@ settings and send this G-Code to the 3D printer for printing.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
dos2unix resources/example/Attribution.txt
@@ -113,6 +118,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
%{_bindir}/%{name}
%changelog
+* Sat Oct 25 2014 Miro Hrončok <mhroncok at redhat.com> - 14.09-1
+- New version 14.09
+
* Tue Jun 24 2014 Miro Hrončok <mhroncok at redhat.com> - 14.06-2
- Require at least the firmware version originally bundled in git
diff --git a/sources b/sources
index 347250b..d76609d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c8ef0e793659c194a3b3965e45a18dc3 Cura-14.06-fedora.tar.gz
+18e3320f107d055d206169404057e006 Cura-14.09-fedora.tar.gz
More information about the scm-commits
mailing list