Merge branch 'master' of github.com:kliment/Printrun

README.md

@@ -14,21 +14,16 @@ If you want the newest, shiniest features, you can run Printrun from source usin
 
 A precompiled version is available at http://koti.kapsi.fi/~kliment/printrun/
 
-*Note:* Prontserve is not currently included in the windows binary.
-
 ## Mac OS X
 
 A precompiled version is available at http://koti.kapsi.fi/~kliment/printrun/
 
-*Note:* Prontserve is not currently included in the OSX binary.
-
 ## Linux
 ### Ubuntu/Debian
 
 You can run Printrun directly from source, as there are no packages available yet. Fetch and install the dependencies using
 
 1. `sudo apt-get install python-serial python-wxgtk2.8 python-pyglet python-tornado python-setuptools python-libxml2 python-gobject avahi-daemon libavahi-compat-libdnssd1`
-2. `pip install -r requirements_prontserve.txt`
 
 ### Fedora
 
@@ -48,12 +43,6 @@ You can also run Printrun directly from source, if the packages are too old for
 
 Optional: `sudo yum install skeinforge simarrange`
 
-To enable Prontserve you need to also install something along the following 
-lines. Unforunately this has yet to be tested on a real Fedora system:
-
-1. `sudo yum install avahi avahi-python`
-2. `pip install -r requirements_prontserve.txt`
-
 ### Archlinux
 
 Packages are available in AUR. Just run
@@ -62,8 +51,6 @@ Packages are available in AUR. Just run
 
 and enjoy the `pronterface`, `pronsole`, ... commands directly.
 
-*Note:* Prontserve is not currently included in the arch package.
-
 ## RUNNING FROM SOURCE
 
 Run Printrun for source if you want to test out the latest features.
@@ -157,13 +144,6 @@ If you want to load stl files, you need to install a slicing program such as Sli
 See the Slic3r readme for more details on integration.
 
 
-## USING PRONTSERVE
-
-Prontserve runs a server for remotely monitoring and controlling your 3D printer over your network.
-
-To start the server you can run `./prontserve.py` in the directory you git cloned printrun too. Once the server starts you can verify it's working by going to http://localhost:8888 in your web browser.
-
-
 ## USING PRONSOLE
 
 To use pronsole, you need:

printrun/pronterface.py

@@ -572,7 +572,6 @@ class PronterWindow(MainWindow, pronsole.pronsole):
 
         if self.settings.slic3rintegration:
             m = wx.Menu()
-            self.menustrip.Append(m, _("&Slic3r"))
             print_menu = wx.Menu()
             filament_menu = wx.Menu()
             printer_menu = wx.Menu()
@@ -582,7 +581,12 @@ class PronterWindow(MainWindow, pronsole.pronsole):
             menus = {"print": print_menu,
                      "filament": filament_menu,
                      "printer": printer_menu}
-            self.load_slic3r_configs(menus)
+            try:
+                self.load_slic3r_configs(menus)
+                self.menustrip.Append(m, _("&Slic3r"))
+            except IOError:
+                self.logError(_("Failed to load Slic3r configuration:") +
+                              "\n" + traceback.format_exc())
 
         # Settings menu
         m = wx.Menu()

prontserve.py

-#!/usr/bin/env python
-
-# This file is part of the Printrun suite.
-#
-# Printrun is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Printrun is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Printrun.  If not, see <http://www.gnu.org/licenses/>.
-
-import argparse
-
-from printrun.prontserve import Prontserve
-
-if __name__ == "__main__":
-  # Args
-  # -------------------------------------------------
-
-  parser = argparse.ArgumentParser(
-    description='Runs a 3D printer server using the Construct Protocol'
-  )
-
-  parser.add_argument('--dry-run', default=False, action='store_true',
-    help='Does not connect to the 3D printer'
-  )
-
-  parser.add_argument('--loud', default=False, action='store_true',
-    help='Enables verbose printer output'
-  )
-
-  parser.add_argument('--heaptrace', default=False, action='store_true',
-    help='Enables a heap trace on exit (for developer use)'
-  )
-
-  args = parser.parse_args()
-
-  # Server Start Up
-  # -------------------------------------------------
-
-  prontserve = Prontserve(**vars(args)).start()

requirements_prontserve.txt

-git+https://github.com/D1plo1d/tornado.git
-git+https://github.com/D1plo1d/py-mdns.git
-git+https://github.com/construct-protocol/construct_server.py
-
-inflection>=0.2.0
-mdns>=1.0.0
-objgraph>=1.7.2
-pybonjour>=1.1.1
-pyserial==2.6
-wsgiref==0.1.2