Merge pull request #215 from WesGilster/master

Ready for new version

Former-commit-id: b1450e9

.travis.yml

@@ -1,27 +1,34 @@
-sudo: false
+sudo: true
+dist: trusty
 git:
   depth: 3
 language: java
 jdk:
 - oraclejdk8
 os:
 - linux
-script:
+addons:
+  apt:
+    packages:
+      - librxtx-java
+install:
+  - sudo apt-get install -y librxtx-java
   - chmod a+rx host/gradlew
-  - "(cd host ; ./gradlew clean dist)"
+script:
+  - "(cd host ; gradle clean dist)"
+  - "(cd host/bin ; sudo bash -x ./start.sh)"
 deploy:
   - provider: bintray
     file: ".bintray.yml"
-    user: jmkao
-    key:
-      secure: "wwJPSP5OLn5JISA8cZCgui7DcG15JwvUildF0BckSMZ1b6tLb6z/7gxb+wPQ7sDzauKjhQq3x777ej6h4KUrTNxpPS3fwNxjAPAvim1F96enrAY+8Q7hX4PdZYsdHdx/KZ1Q49B7l2eJ4wwEq0IlIOcSsg3u72hsUxjiMTSsmLGZOFPWj1qf/5Rc7ID8QhWaUNo7T8LWw/aaD0qPffNSTaMZw4xZOlhCmYFwXD9X28+aIUBWxHJtkFLjUNwhfKr5M35CrRdXZnj+zhgvABXHFhGdmmGtwAYaGpGBLz2AEoS18YF89nTg/jXqxpb6grsYF1f+vh73YTR9bbXfiNEhMCBM8B5YtECJGQgNZLCgQAC6YrtSozNNpojPihYwb0AHjzswPN02QdLxqLxC1IYjdmfj/2Exv6NHlbQ/qLi3g51GnlchAK4svQuKgHudlS2ZpAzqzzbMiK8Ih6HeQmrhIAa6X8dQgvnIjL9gLTJh8OqbpnO7CWClblKglaBXC0NpZEj+yTvBbFxjxVdjYdDW32miz+7NHvIOw6SCcXy7lxL48RS5gEXzU3JIf079620KgVJUMpYunP3rE9rBJimVXqmoDEoXoTc6Uog953l/ikbkPLAwYN5111m59SGeouEfVrO0fwjHdR0eMtKOp7CXSnJJpZXPd9yXwBHhxc0jHhY="
+    user: $BINTRAY_USER
+    key: $BINTRAY_API_KEY
+    dry-run: $SKIP_BINTRAY
     on:
       all_branches: true
   - provider: releases
     skip_cleanup: true
-    prerelease: true
-    api_key:
-      secure: "lt+86YtJtOUeUTdY2PDtIe0vzBEktq0YNGg7N/1xAp/QedzHThhGqORg3dCjZ4MH43WzD7Jq1hMiwU8VBWfdikY+Y1rsGzOSK5UFJmNKSH6Bxe5RoHC2NE8hcb6pwEQQr6aQsRRpwMSDPGWg3RfbA9lamXpT+WHTACZPIhGXjpL0mWLWPQsJqa6HaiZ4hJ6mhASHtGznANPbPDP6P2HnNbh0nvHAhVS/p58OJrXN0ICj9hALjOxcXZZQjxh0bY5VAhKBwAdfXDkJRpderw14qW1w+yuyr4qs3J0x9k4KV4FLCFEc4aWr5tsfEIC5AB2ztEzqYHXjXMWh1qpMSmwcdYM0ygUw0K4gTUKyvCJT7rWn6DQS6oYGgYiTufDR6alBKK04rPnSueg5BWILqLLUJLw9XFyjyi7M+u1nJF8YReVLE9kYeGzvy7iKRQZE58EyBC5mpo8LPqdqAPbjn20I5wUPOWA6zDUfrCCkNTXTAGKbdKqoKKSt1WYu5mT+ND2/i22XqJrSmvrGt1QYS+/JnAEPvNlEiLxMHJ0L0l8F5yUYqMJ5upul0Nlacds/oIRjNWbjsuFZ/adnTiNxOY+JQCWZfZdSwFMNs75seYS5DXYVbNDrtyTnD2aK9xg5EDPwgtvpYB0c9g1isAKRkfOzuUKZncrcVtDLstgwrDl68dg="
+    prerelease: false
+    api_key: $GITHUB_ACCESS_TOKEN
     file_glob: true
     file: "host/*.zip"
     on:

README.md

@@ -1,42 +1,36 @@
-Creation-Workshop-Host
+![Photonic3D](https://raw.githubusercontent.com/jmkao/Creation-Workshop-Host/master/host/resourcesnew/cwh/img/photonic3d-icon-sign-black.png)
 ======================
 
-What does CWH look like?
--------------------------------------------------------------------------------  
-Old Version Looks like [this](https://github.com/area515/Creation-Workshop-Host/blob/master/host/images/cwh.png).  
-The New Version Looks like [this](https://github.com/area515/Creation-Workshop-Host/blob/master/host/images/cwhNew.png).  
-Another GUI looks like [this](https://github.com/area515/Creation-Workshop-Host/blob/master/host/images/anotherGui.png).  
-And yet another GUI is in the works if you don't like the above three.  
+Photonic3D is a control server for DLP resin 3D printers with a web-based user interface. It has been designed to run well on a Raspberry Pi, but is cross-platform and the install distribution will also run on Linux, Windows, and MacOS.
 
-Where are the instructions for installing on the Raspberry Pi?  
--------------------------------------------------------------------------------  
-[Here](https://github.com/area515/Creation-Workshop-Host/wiki/Raspberry-Pi-Manual-Setup-Instructions).
+The server is capable of printing a variety of formats, including:
+ - `.cws` files created by Creation Workshop
+ - STL files, which Photonic3D will slice incrementally
+ - Zip of PNG images, which Photonic3D will scan recursively and print based on alphanumeric ordering (meaning both zero-padded and non-padded numbered PNG files will work correctly)
+ - Single GIF, JPEG, or PNG image, which Photonic3D will extrude and print a 3D relief
+ - Block of text, which Photonic3D will extrude using a system or user uploaded font
 
-Where is a video of how to use CWH with CWS and Zip files?  
+
+Raspberry Pi Usage
 -------------------------------------------------------------------------------  
-[Here](https://www.youtube.com/watch?v=J3HTCkxlKcw).
+If you have a brand new dedicated Raspberry Pi, there is a flashable Jessie Lite based image that you can use to quickly get started. Take a look at the [area515/OctoPi repo on Github](https://github.com/area515/OctoPi) for the download link and installation instructions.
+
+If you have an existing running Raspberry Pi with Raspbian, you can add Photonic3D to it with an easy bootstrap script that will download and install everything you need. This path is [documented in our wiki](https://github.com/area515/Creation-Workshop-Host/wiki/Raspberry-Pi-Manual-Setup-Instructions), and there is a [YouTube video that demonstrates it](https://www.youtube.com/watch?v=ng1Sj2ktWhU).
 
-Where is a video of how to setup CWH from scratch on the Raspberry Pi?
+
+User Interface Examples
 -------------------------------------------------------------------------------  
-[Here](https://www.youtube.com/watch?v=ng1Sj2ktWhU).
+![image](https://cloud.githubusercontent.com/assets/2078819/14433486/58291f82-ffc3-11e5-8bc3-f7b8313dbc18.png)
+![image](https://cloud.githubusercontent.com/assets/2078819/14433580/a984246c-ffc3-11e5-94ff-7214f6bd0635.png)
+
 
-How do I use this new version of the GUI you've started?  
+Use with Creation Workshop
 -------------------------------------------------------------------------------  
-Change the following line:  
-```
-hostGUI=resources
-```  
-in this file:  
-```
-[LocationWhereCWHIsInstalled]/config.properties
-```  
-to this:  
-```
-hostGUI=resourcesnew
-```  
-Once the new GUI has all of the functionality of the current version, we'll use this version automatically.
+Photonic3D can run `.cws` scene files saved from Creation Workshop which contain PNG files. When printed, these files will obey the GCode and imaging commands inside of the files instead of the slicing profiles configured within Photonic3D. This process is 
+[depicted in this YouTube video](https://www.youtube.com/watch?v=J3HTCkxlKcw).
+
 
-What features does CWH have?
+Feature List
 -------------------------------------------------------------------------------  
 1. Print STL files without performing pre-slice stage.
 2. Load STL files directly from thingiverse or the internet.
@@ -66,43 +60,41 @@ What features does CWH have?
 26. Supports Windows, OSX and Linux OSs. (Service support on Linux)
 27. Supports dynamic direct slice-on-the-fly 3d printing of (.mazecube, .stl, .jpg/.png/.gif, .cws/.zip) files.
 
-Do you want to install the latest stable build?
+Linux Installation Quickstart
 -------------------------------------------------------------------------------
+If you are experienced with Linux, you can quickly install Photonic3D with the following commands:
+
+Latest stable:
 ```
 sudo wget https://github.com/area515/Creation-Workshop-Host/raw/master/host/bin/start.sh
 sudo chmod 777 start.sh
 sudo ./start.sh
 ```
 
-Do you want to install the latest unstable daily development build?
--------------------------------------------------------------------------------
+Latest development:
 ```
-sudo wget https://github.com/WesGilster/Creation-Workshop-Host/raw/master/host/bin/start.sh
-sudo chmod 777 start.sh
-sudo ./start.sh WesGilster/Creation-Workshop-Host
+sudo wget https://github.com/WesGilster/Creation-Workshop-Host/raw/master/host/bin/newstart.sh
+sudo chmod 777 newstart.sh
+sudo ./newstart.sh WesGilster
 ```
 
-Do you want to install under Windows?
+Photonic3D will be installed into `/opt/cwh` and an init script will be added to `/etc/init.d` to launch the server on boot.
+
+Windows Installation Quickstart
 ------------------------------------------
-* Download the latest version from: 
-* [https://github.com/area515/Creation-Workshop-Host/blob/master/host/cwh-X.XX.zip](https://github.com/area515/Creation-Workshop-Host/blob/master/host/)  
- or
-* [https://github.com/WesGilster/Creation-Workshop-Host/blob/master/host/cwh-X.XX.zip](https://github.com/area515/Creation-Workshop-Host/blob/master/host/)  
+* Download the latest stable or development version: 
+ * [Stable repo Github Releases](https://github.com/area515/Creation-Workshop-Host/releases) or [Development repo Github Releases](https://github.com/WesGilster/Creation-Workshop-Host/releases)  
 * Unzip the zip file into the directory of your choice.
-* Double click on start.bat.
+* Double click on `start.bat`.
 
-Do you want to use your web browser to automatically navigate to the running printer host without knowing anything about how your network is setup?
+Client Tools
 ----------------------------------------------------------------------
-* Download the latest version from:
-* [https://github.com/area515/Creation-Workshop-Host/blob/master/host/cwhClient-X.XX.zip](https://github.com/area515/Creation-Workshop-Host/blob/master/host/)  
- or
-* [https://github.com/WesGilster/Creation-Workshop-Host/blob/master/host/cwhClient-X.XX.zip](https://github.com/area515/Creation-Workshop-Host/blob/master/host/)  
+There are also a number of tools designed to run on your client desktop that are bundled with the installation.
+
+* Download the latest stable or development version: 
+ * [Stable repo Github Releases](https://github.com/area515/Creation-Workshop-Host/releases) or [Development repo Github Releases](https://github.com/WesGilster/Creation-Workshop-Host/releases)  
 * Unzip the zip file into the directory of your choice.
-* If you are in Linux run this:
-````````
-	sudo browseprinter.sh
-````````
-If you are in windows double click this:
-````````
-	browseprinter.bat
-````````
+
+The *browseprinter* tool will help you find the Photonic3D server on your network, in case you have it installed a machine with a dynamic IP address and you don't know what what is.
+* Linux: Run `sudo browseprinter.sh` at the command line
+* Windows: Run `browseprinter.bat`

host/.gitignore

@@ -1,3 +1,8 @@
 /srcbin/
 /testbin/
 /.gradle/
+.settings/
+.classpath
+.project
+build/
+.idea/