From b0248934ff15742f2102c090b74529a349895e24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 2 Feb 2013 13:40:28 +0100 Subject: [PATCH 1/6] Added Fedora info --- README.md | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5c5588f..5b4e1b5 100644 --- a/README.md +++ b/README.md @@ -26,9 +26,19 @@ You can run Printrun directly from source, as there are no packages available ye `sudo apt-get install python-serial python-wxgtk2.8 python-pyglet` -### Fedora 15 and newer +### Fedora 17 and newer -You can run Printrun directly from source, as there are no packages available yet. Fetch and install the dependencies using +You can install Printrun from official packages. Install the whole package using + +`sudo yum install printrun` + +Or get only apps you need by + +`sudo yum install pronsole` or `pronterface` or `plater` + +Adding `--enablerepo updates-testing` option to `yum` might give you newer packages (but also not very tested). + +You can also run Printrun directly from source, if the packages are too old for you anyway, or you have Fedora 15 or 16. Fetch and install the dependencies using `sudo yum install pyserial wxpython pyglet` From 8f3e5947c63207ebab4f3388eafa7f0a0b1daf55 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Wed, 24 Apr 2013 17:45:02 +0200 Subject: [PATCH 2/6] More little adjustments to printcore.py output --- printcore.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/printcore.py b/printcore.py index bb6501c..b12a9a3 100755 --- a/printcore.py +++ b/printcore.py @@ -383,12 +383,12 @@ if __name__ == '__main__': try: if statusreport: p.loud = False - sys.stdout.write("Progress: 00.0%") + sys.stdout.write("Progress: 00.0%\r") sys.stdout.flush() while p.printing: time.sleep(1) if statusreport: - sys.stdout.write("%02.1f%%\r" % (100 * float(p.queueindex) / len(p.mainqueue),) ) + sys.stdout.write("Progress: %02.1f%%\r" % (100 * float(p.queueindex) / len(p.mainqueue),) ) sys.stdout.flush() p.disconnect() sys.exit(0) From 83b3bb6b71bf5acadc8a03b48166b39ef7593f22 Mon Sep 17 00:00:00 2001 From: Spencer Bliven Date: Tue, 8 Jan 2013 14:54:01 -0800 Subject: [PATCH 3/6] Widen serial port dropbox to fill available space --- printrun/gui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/printrun/gui.py b/printrun/gui.py index 09f7908..781df4a 100644 --- a/printrun/gui.py +++ b/printrun/gui.py @@ -223,7 +223,7 @@ class MainToolbar(wx.BoxSizer): root.serialport = wx.ComboBox(root.panel, -1, choices = root.scanserial(), - style = wx.CB_DROPDOWN, size = (100, 25)) + style = wx.CB_DROPDOWN, size = (-1, 25)) root.serialport.SetToolTip(wx.ToolTip("Select Port Printer is connected to")) root.rescanports() self.Add(root.serialport) From a1c51e86460b91e675921e3cfc5302e5a0b4500e Mon Sep 17 00:00:00 2001 From: Spencer Bliven Date: Tue, 30 Apr 2013 15:54:22 -0700 Subject: [PATCH 4/6] Ignoring Mac .DS_Store --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e8c9a13..7e15284 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ .pronsolerc *.swp *.bak +.DS_Store From b77ce7a2e773265a72460c692d3cac6711ce7905 Mon Sep 17 00:00:00 2001 From: Spencer Bliven Date: Thu, 2 May 2013 15:00:36 -0700 Subject: [PATCH 5/6] Adding w,h parameters to BufferedCanvas.draw All subclasses of BufferedCanvas require dimensions, so the interface should be consistent. --- printrun/bufferedcanvas.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/printrun/bufferedcanvas.py b/printrun/bufferedcanvas.py index 85ad019..3e7049b 100644 --- a/printrun/bufferedcanvas.py +++ b/printrun/bufferedcanvas.py @@ -77,7 +77,7 @@ class BufferedCanvas(wx.Panel): ## General methods ## - def draw(self, dc): + def draw(self, dc, w, h): """ Stub: called when the canvas needs to be re-drawn. """ From 70ca8ace07f5eb15b05c74a5283d0c3d37ba2070 Mon Sep 17 00:00:00 2001 From: Spencer Bliven Date: Thu, 2 May 2013 15:05:37 -0700 Subject: [PATCH 6/6] Setting BufferedCanvas sizes at creation. This fixes bug #359 --- printrun/graph.py | 7 +++---- printrun/xybuttons.py | 3 +-- printrun/zbuttons.py | 4 +--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/printrun/graph.py b/printrun/graph.py index daff989..4b36a7e 100644 --- a/printrun/graph.py +++ b/printrun/graph.py @@ -23,14 +23,13 @@ class Graph(BufferedCanvas): '''A class to show a Graph with Pronterface.''' def __init__(self, parent, id, pos = wx.DefaultPosition, - size = wx.DefaultSize, style = 0): + size = wx.Size(150, 80), style = 0): # Forcing a no full repaint to stop flickering style = style | wx.NO_FULL_REPAINT_ON_RESIZE #call super function - #super(Graph, self).__init__(parent, id, pos, size, style) - BufferedCanvas.__init__(self, parent, id) + super(Graph, self).__init__(parent, id, pos, size, style) + #BufferedCanvas.__init__(self, parent, id) - self.SetSize(wx.Size(150, 80)) self.extruder0temps = [0] self.extruder0targettemps = [0] diff --git a/printrun/xybuttons.py b/printrun/xybuttons.py index 0f6865e..3be412f 100644 --- a/printrun/xybuttons.py +++ b/printrun/xybuttons.py @@ -60,8 +60,7 @@ class XYButtons(BufferedCanvas): self.bgcolor.SetFromName(bgcolor) self.bgcolormask = wx.Colour(self.bgcolor.Red(), self.bgcolor.Green(), self.bgcolor.Blue(), 128) - BufferedCanvas.__init__(self, parent, ID) - self.SetSize(self.bg_bmp.GetSize()) + BufferedCanvas.__init__(self, parent, ID, size=self.bg_bmp.GetSize()) # Set up mouse and keyboard event capture self.Bind(wx.EVT_LEFT_DOWN, self.OnLeftDown) diff --git a/printrun/zbuttons.py b/printrun/zbuttons.py index 1b79f40..101d1a4 100644 --- a/printrun/zbuttons.py +++ b/printrun/zbuttons.py @@ -46,9 +46,7 @@ class ZButtons(BufferedCanvas): self.bgcolor.SetFromName(bgcolor) self.bgcolormask = wx.Colour(self.bgcolor.Red(), self.bgcolor.Green(), self.bgcolor.Blue(), 128) - BufferedCanvas.__init__(self, parent, ID) - - self.SetSize(wx.Size(59, 244)) + BufferedCanvas.__init__(self, parent, ID, size=wx.Size(59, 244)) # Set up mouse and keyboard event capture self.Bind(wx.EVT_LEFT_DOWN, self.OnLeftDown)