From 19a718205dbb30dacc6ecfe40be5526c8bc1c671 Mon Sep 17 00:00:00 2001 From: Thomas Karl Pietrowski Date: Fri, 1 Jul 2016 21:27:36 +0200 Subject: [PATCH 1/5] =?UTF-8?q?BQ=20Hephestos2=20-=20Preheating=20temperat?= =?UTF-8?q?ure=20fix=20When=20starting=20a=20print=20with=20the=20"custom"?= =?UTF-8?q?=20GCode=20by=20BQ,=20the=20printer=20resets=20the=20nozzle=20t?= =?UTF-8?q?emperature=20to=20210=C2=B0C=20when=20printing=20via=20SD=20car?= =?UTF-8?q?d=20(no=20matter=20what=20you=20set=20on=20Cura)=20and=20only?= =?UTF-8?q?=20preheats=20the=20nozzle=20to=20180=C2=B0C=20when=20printing?= =?UTF-8?q?=20via=20USB.=20So=20currently=20the=20printer=20begins=20to=20?= =?UTF-8?q?print=20via=20USB=20at=20180=C2=B0C=20and=20reaches=20the=20cor?= =?UTF-8?q?rect=20temperature=20eg.g=20while=20printing=20the=20brim.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/definitions/bq_hephestos_2.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/bq_hephestos_2.def.json b/resources/definitions/bq_hephestos_2.def.json index e4e58cb6c2..db6a2971e6 100644 --- a/resources/definitions/bq_hephestos_2.def.json +++ b/resources/definitions/bq_hephestos_2.def.json @@ -14,7 +14,7 @@ }, "overrides": { - "machine_start_gcode": { "default_value": "; -- START GCODE --\nM800 ; Custom GCODE to fire start print procedure\n; -- end of START GCODE --" }, + "machine_start_gcode": { "default_value": "; -- START GCODE --\nM800 ; Custom GCODE to fire start print procedure\nM109 S{print_temperature} ;Makes sure the temperature is correct before printing\n; -- end of START GCODE --" }, "machine_end_gcode": { "default_value": "; -- END GCODE --\nM801 ; Custom GCODE to fire end print procedure\n; -- end of END GCODE --" }, "machine_width": { "default_value": 210 }, "machine_depth": { "default_value": 297 }, From ec41fce7bdd5d828c6834966aef75aefac7679cc Mon Sep 17 00:00:00 2001 From: Thomas Karl Pietrowski Date: Sun, 3 Jul 2016 13:26:51 +0200 Subject: [PATCH 2/5] USBPrinting: Let's "Print via USB" Already made that correction in the past. When print monitor was merged it appeared again. --- plugins/USBPrinting/USBPrinterOutputDevice.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/USBPrinting/USBPrinterOutputDevice.py b/plugins/USBPrinting/USBPrinterOutputDevice.py index 0b545314aa..2938604eed 100644 --- a/plugins/USBPrinting/USBPrinterOutputDevice.py +++ b/plugins/USBPrinting/USBPrinterOutputDevice.py @@ -26,8 +26,8 @@ class USBPrinterOutputDevice(PrinterOutputDevice): def __init__(self, serial_port): super().__init__(serial_port) self.setName(catalog.i18nc("@item:inmenu", "USB printing")) - self.setShortDescription(catalog.i18nc("@action:button", "Print with USB")) - self.setDescription(catalog.i18nc("@info:tooltip", "Print with USB")) + self.setShortDescription(catalog.i18nc("@action:button", "Print via USB")) + self.setDescription(catalog.i18nc("@info:tooltip", "Print via USB")) self.setIconName("print") self._serial = None From a38606da4a159389824fabdc7cebf07b9df5557a Mon Sep 17 00:00:00 2001 From: Thomas Karl Pietrowski Date: Sun, 3 Jul 2016 15:00:26 +0200 Subject: [PATCH 3/5] SplashScreen: Using system-default fontfamily Contributes to CURA-1676 --- cura/CuraSplashScreen.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cura/CuraSplashScreen.py b/cura/CuraSplashScreen.py index f2810d359b..3f24502bcd 100644 --- a/cura/CuraSplashScreen.py +++ b/cura/CuraSplashScreen.py @@ -25,10 +25,14 @@ class CuraSplashScreen(QSplashScreen): if buildtype: version[0] += " (%s)" %(buildtype) - painter.setFont(QFont("Proxima Nova Rg", 20 )) + used_font = QFont() # Using system-default font here + used_font.setPointSize(20) + painter.setFont(used_font) painter.drawText(0, 0, 330 * self._scale, 230 * self._scale, Qt.AlignHCenter | Qt.AlignBottom, version[0]) if len(version) > 1: - painter.setFont(QFont("Proxima Nova Rg", 12 )) + used_font = QFont() # Using system-default font here + used_font.setPointSize(12) + painter.setFont(used_font) painter.drawText(0, 0, 330 * self._scale, 255 * self._scale, Qt.AlignHCenter | Qt.AlignBottom, version[1]) painter.restore() From cd14a150403b7fed88a0dd052389819b27be2f34 Mon Sep 17 00:00:00 2001 From: Thomas Karl Pietrowski Date: Sun, 3 Jul 2016 15:17:40 +0200 Subject: [PATCH 4/5] Using the correct placeholder Thanks to Ruben! --- resources/definitions/bq_hephestos_2.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/bq_hephestos_2.def.json b/resources/definitions/bq_hephestos_2.def.json index db6a2971e6..374e41f93c 100644 --- a/resources/definitions/bq_hephestos_2.def.json +++ b/resources/definitions/bq_hephestos_2.def.json @@ -14,7 +14,7 @@ }, "overrides": { - "machine_start_gcode": { "default_value": "; -- START GCODE --\nM800 ; Custom GCODE to fire start print procedure\nM109 S{print_temperature} ;Makes sure the temperature is correct before printing\n; -- end of START GCODE --" }, + "machine_start_gcode": { "default_value": "; -- START GCODE --\nM800 ; Custom GCODE to fire start print procedure\nM109 S{material_print_temperature} ;Makes sure the temperature is correct before printing\n; -- end of START GCODE --" }, "machine_end_gcode": { "default_value": "; -- END GCODE --\nM801 ; Custom GCODE to fire end print procedure\n; -- end of END GCODE --" }, "machine_width": { "default_value": 210 }, "machine_depth": { "default_value": 297 }, From 0c23c26ac91b7bcdccfa7525686e8317bcaa14f9 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Sun, 3 Jul 2016 16:01:57 +0200 Subject: [PATCH 5/5] Code style CURA-1676 --- cura/CuraSplashScreen.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/cura/CuraSplashScreen.py b/cura/CuraSplashScreen.py index 3f24502bcd..1df2c39da7 100644 --- a/cura/CuraSplashScreen.py +++ b/cura/CuraSplashScreen.py @@ -25,14 +25,13 @@ class CuraSplashScreen(QSplashScreen): if buildtype: version[0] += " (%s)" %(buildtype) - used_font = QFont() # Using system-default font here - used_font.setPointSize(20) - painter.setFont(used_font) + font = QFont() # Using system-default font here + font.setPointSize(20) + painter.setFont(font) painter.drawText(0, 0, 330 * self._scale, 230 * self._scale, Qt.AlignHCenter | Qt.AlignBottom, version[0]) if len(version) > 1: - used_font = QFont() # Using system-default font here - used_font.setPointSize(12) - painter.setFont(used_font) + font.setPointSize(12) + painter.setFont(font) painter.drawText(0, 0, 330 * self._scale, 255 * self._scale, Qt.AlignHCenter | Qt.AlignBottom, version[1]) painter.restore()