From 4b87be7b299030163dcbfc8fdaa58d0864e39be6 Mon Sep 17 00:00:00 2001
From: kliment <kliment.yanev@gmail.com>
Date: Mon, 13 Jun 2011 09:09:29 +0200
Subject: [PATCH] Add installation instructions. Add skeinforge settings option
 to pronterface menu. Fix mini window size on a mac. Make retract option more
 robust.

---
 README         | 18 ++++++++++++++++++
 pronterface.py |  6 +++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/README b/README
index f34fd76..1e63b74 100644
--- a/README
+++ b/README
@@ -5,6 +5,24 @@ Printrun consists of printcore, pronsole and pronterface, and a small collection
 printcore.py is a library that makes writing reprap hosts easy
 pronsole.py is an interactive command-line host software with tabcompletion goodness
 pronterface.py is a graphical host software with the same functionality as pronsole
+INSTALLING DEPENDENCIES
+
+On Windows, download the following:
+http://python.org/ftp/python/2.7.2/python-2.7.2.msi
+http://pypi.python.org/packages/any/p/pyserial/pyserial-2.5.win32.exe
+http://downloads.sourceforge.net/wxpython/wxPython2.8-win32-unicode-2.8.12.0-py27.exe
+http://launchpad.net/pyreadline/trunk/1.7/+download/pyreadline-1.7.win32.exe
+
+On Ubuntu/debian, do:
+apt-get install python-serial python-wxgtk2.8
+
+On Mac OS X, download and install:
+http://downloads.sourceforge.net/wxpython/wxPython2.8-osx-unicode-2.8.12.0-universal-py2.6.dmg
+Grab the source for pyserial from http://pypi.python.org/packages/source/p/pyserial/pyserial-2.5.tar.gz
+Unzip pyserial to a folder. Then, in a terminal, change to the folder you unzipped to, then type in:
+defaults write com.apple.versioner.python Prefer-32-Bit -bool yes
+sudo python setup.py install
+Then repeat the same with http://launchpad.net/pyreadline/trunk/1.7/+download/pyreadline-1.7.zip
 
 USING PRONTERFACE
 
diff --git a/pronterface.py b/pronterface.py
index 84bbbb4..4a75d11 100644
--- a/pronterface.py
+++ b/pronterface.py
@@ -15,6 +15,9 @@ if os.name=="nt":
         import _winreg
     except:
         pass
+if sys.platform=="darwin":
+    winssize=(800,110)        
+
 
 import pronsole
 
@@ -109,7 +112,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
     def do_reverse(self,l=""):
         try:
             if not (l.__class__=="".__class__ or l.__class__==u"".__class__) or (not len(l)):
-                l=str(self.edist.GetValue()*-1)
+                l=str(float(self.edist.GetValue())*-1.0)
             pronsole.pronsole.do_extrude(self,l)
         except:
             pass
@@ -176,6 +179,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
     def popmenu(self):
         self.menustrip = wx.MenuBar()
         m = wx.Menu()
+        self.Bind(wx.EVT_MENU, lambda x:threading.Thread(target=lambda :self.do_skein("set")).start(), m.Append(-1,"Skeinforge settings"," Adjust skeinforge settings"))
         self.Bind(wx.EVT_MENU, self.OnExit, m.Append(wx.ID_EXIT,"Close"," Closes the Window"))
         self.menustrip.Append(m,"&Print")
         self.SetMenuBar(self.menustrip)