Merge pull request #46 from nathanielatom/gui/dialogue

Gui/dialogue
tardis-sn · Jun 25, 2013 · 83ee861 · 83ee861
2 parents a73869f + ae1dbe6
commit 83ee861
Show file tree

Hide file tree

Showing 7 changed files with 192 additions and 77 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,17 +12,20 @@ eggs
 fake-eggs
 parts
 dist
+.idea
 .installed.cfg
 .mr.developer.cfg
 .hg
 .bzr
 .svn
+*.orig
+*.so
 *.pyc
 *.pyo
 *.tmp*
 *.komodoproject
-
 #special to the tardis project
+tardis/version.py
 tardis/data/w7*
 tardis/*.c
 tardis/*.html
@@ -31,3 +34,4 @@ tardis/*.html
 # Sphinx
 _build
 _generated
+docs/gui.rst.*
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/other.xml b/.idea/other.xml
diff --git a/docs/gui.rst b/docs/gui.rst
@@ -5,10 +5,10 @@ TARDIS uses the `PyQt4 framework <http://www.riverbankcomputing.com/software/pyq
 interface.
 
 The GUI runs through the `IPython Interpreter <http://ipython.org/install.html>`_ which should be started with the
-command ``ipython-2.7 --pylab``, so that it has acess to pylab.
+command ``ipython-2.7 --pylab=qt``, so that it has acess to pylab.
 
 Creating an instance of the :class:`ModelViewer`-class requires that PyQt4 has already been initialized in
-IPython with the command ``%gui qt``.
+IPython. The above command to start IPython accomplishes this.
 
 GUI Layout and Features
 -----------------------

diff --git a/setup.py b/setup.py
@@ -30,6 +30,7 @@
     import builtins
 else:
     import __builtin__ as builtins
+builtins._ASTROPY_SETUP_ = True
 builtins._PACKAGE_SETUP_ = True
 
 import astropy