[Pyphant-devel] SF.net SVN: pyphant:[699] trunk

[<zk...@us...>]

Revision: 699
          http://pyphant.svn.sourceforge.net/pyphant/?rev=699&view=rev
Author:   zklaus
Date:     2010-09-13 08:56:34 +0000 (Mon, 13 Sep 2010)

Log Message:
-----------
Merge branch 'master' into svn-trunk

* master:
  removed unneeded variable setup
  Changed pyphant/Core/Helper.py to use getpass.
  Bugfix: Logo is loaded from base64 encoded string.
  Added splash screen: This version needs to be started in src/pyphant/pyphant/wxgui2 or doc/logo in order to find the splash screen image.
  pyphantLogo module with docstring.
  Base64 coded pyphant logo.
  Fix: ZStacks: refractive index
  Fix: Restore parameters to DCSource workers
  Cosm: Added line feed to README

Modified Paths:
--------------
    trunk/doc/demo/README
    trunk/src/pyphant/pyphant/core/Helpers.py
    trunk/src/pyphant/pyphant/core/ZStackManager.py
    trunk/src/pyphant/pyphant/tests/TestZStacks.py
    trunk/src/pyphant/pyphant/wxgui2/wxPyphantApplication.py
    trunk/src/workers/tools/tools/DCSource.py
    trunk/src/workers/tools/tools/FCSource.py
    trunk/src/workers/tools/tools/SCSource.py

Added Paths:
-----------
    trunk/doc/logo/
    trunk/doc/logo/mklogo.py
    trunk/doc/logo/pyphant-shade-Information-Analysis-Framework-ARTS-small.png
    trunk/doc/logo/pyphantLogo.py
    trunk/src/pyphant/pyphant/wxgui2/pyphantLogo.py

Modified: trunk/doc/demo/README
===================================================================
--- trunk/doc/demo/README	2010-07-18 18:51:16 UTC (rev 698)
+++ trunk/doc/demo/README	2010-09-13 08:56:34 UTC (rev 699)
@@ -2,4 +2,5 @@
 wxPythant demo.h5
 
 #Start scripting example with
-./simpleScripting.py
\ No newline at end of file
+./simpleScripting.py
+

Added: trunk/doc/logo/mklogo.py
===================================================================
--- trunk/doc/logo/mklogo.py	                        (rev 0)
+++ trunk/doc/logo/mklogo.py	2010-09-13 08:56:34 UTC (rev 699)
@@ -0,0 +1,49 @@
+copyright="""# -*- coding: utf-8 -*-
+
+# Copyright (c) 2010, Andreas W. Liehr (li...@us...)
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# * Neither the name of the Freiburg Materials Research Center,
+#   University of Freiburg nor the names of its contributors may be used to
+#   endorse or promote products derived from this software without specific
+#   prior written permission.
+#
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""
+
+"""Creates pyphantLogo.py, a python modul including a base 64 encoded PNG file of the Pyphant logo."""
+
+import base64
+picname = 'pyphant-shade-Information-Analysis-Framework-ARTS-small.png'
+file = open(picname,'rb')
+logo = file.read()
+file.close()
+pic_b64 = logo.encode('base64')
+
+file = open("pyphantLogo.py",'w')
+file.write(copyright)
+file.write("\"\"\""+
+"""Python modul including a base 64 encoded PNG file of the Pyphant logo based on %s.""" % picname +"\"\"\"\n\n" 
+           )
+file.write("pic_b64 = \"\"\"%s\"\"\"\n" % pic_b64)
+file.close()

Added: trunk/doc/logo/pyphant-shade-Information-Analysis-Framework-ARTS-small.png
===================================================================
--- trunk/doc/logo/pyphant-shade-Information-Analysis-Framework-ARTS-small.png	                        (rev 0)
+++ trunk/doc/logo/pyphant-shade-Information-Analysis-Framework-ARTS-small.png	2010-09-13 08:56:34 UTC (rev 699)
@@ -0,0 +1,978 @@
+\x89PNG
+
+