From 6b7532e7236cd6371aceb9f819154bc9af7b5bb4 Mon Sep 17 00:00:00 2001 From: Guillaume Seguin Date: Wed, 5 Sep 2012 13:27:49 +0200 Subject: [PATCH 1/3] re module was missing in pronterface_widgets --- printrun/pronterface_widgets.py | 1 + 1 file changed, 1 insertion(+) diff --git a/printrun/pronterface_widgets.py b/printrun/pronterface_widgets.py index 1c34b03..621842c 100644 --- a/printrun/pronterface_widgets.py +++ b/printrun/pronterface_widgets.py @@ -14,6 +14,7 @@ # along with Printrun. If not, see . import wx +import re class macroed(wx.Dialog): """Really simple editor to edit macro definitions""" From 0487808469e3ebab8bc5911d7940e348ad2182d9 Mon Sep 17 00:00:00 2001 From: Guillaume Seguin Date: Wed, 5 Sep 2012 15:11:11 +0200 Subject: [PATCH 2/3] Improve lookup of files --- printrun/printrun_utils.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/printrun/printrun_utils.py b/printrun/printrun_utils.py index 643add4..725d3cc 100644 --- a/printrun/printrun_utils.py +++ b/printrun/printrun_utils.py @@ -1,4 +1,4 @@ -import os +import os, sys import gettext # Set up Internationalization using gettext @@ -16,18 +16,22 @@ def imagefile(filename): candidate = os.path.join(prefix, filename) if os.path.exists(candidate): return candidate - local_candidate = os.path.join(os.path.dirname(__file__), "images", filename) + local_candidate = os.path.join(os.path.dirname(sys.argv[0]), "images", filename) if os.path.exists(local_candidate): return local_candidate else: - return os.path.join(os.path.split(os.path.split(__file__)[0])[0], "images", filename) + return os.path.join("images", filename) def lookup_file(filename, prefixes): for prefix in prefixes: candidate = os.path.join(prefix, filename) if os.path.exists(candidate): return candidate - return filename + local_candidate = os.path.join(os.path.dirname(sys.argv[0]), filename) + if os.path.exists(local_candidate): + return local_candidate + else: + return filename def pixmapfile(filename): return lookup_file(filename, ['/usr/local/share/pixmaps', '/usr/share/pixmaps']) From 1581ab0b9485c4688fa86984996ba23d9ec14306 Mon Sep 17 00:00:00 2001 From: Kliment Yanev Date: Thu, 6 Sep 2012 07:07:37 +0200 Subject: [PATCH 3/3] Fix exception when no bed present. Closes #283 --- pronterface.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pronterface.py b/pronterface.py index bec500b..eed4bdc 100755 --- a/pronterface.py +++ b/pronterface.py @@ -54,7 +54,10 @@ def dosify(name): return os.path.split(name)[1].split(".")[0][:8]+".g" def parse_temperature_report(report, key): - return float(filter(lambda x: x.startswith(key), report.split())[0].split(":")[1].split("/")[0]) + if key in report: + return float(filter(lambda x: x.startswith(key), report.split())[0].split(":")[1].split("/")[0]) + else: + return -1.0 def format_time(timestamp): return datetime.datetime.fromtimestamp(timestamp).strftime("%H:%M:%S")