[Avida-cvs] [avida-svn] r704 - in branches/developers/avida-edward: documentation/xdocs/admin source/python/AvidaGui2

[gerrishj@myxo.css.msu.edu]

Author: gerrishj
Date: 2006-05-24 11:59:17 -0400 (Wed, 24 May 2006)
New Revision: 704

Modified:
   branches/developers/avida-edward/documentation/xdocs/admin/third-party-win32.xml
   branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py
   branches/developers/avida-edward/source/python/AvidaGui2/pyPetriDishCtrl.py
Log:
Petri dish print only prints petri dish and scale now.
Removed unnecessary slot from pyPetriDishCtrl.py
Updated documentation for Boost 1.33.1


Modified: branches/developers/avida-edward/documentation/xdocs/admin/third-party-win32.xml
===================================================================
--- branches/developers/avida-edward/documentation/xdocs/admin/third-party-win32.xml	2006-05-23 21:29:08 UTC (rev 703)
+++ branches/developers/avida-edward/documentation/xdocs/admin/third-party-win32.xml	2006-05-24 15:59:17 UTC (rev 704)
@@ -613,8 +613,8 @@
         <title>Boost.Python</title>
         <p>
           Download and unpack the Boost source archive
-	  <a href="http://easynews.dl.sourceforge.net/sourceforge/boost/boost_1_33_0.tar.gz">
-            http://easynews.dl.sourceforge.net/sourceforge/boost/boost_1_33_0.tar.gz
+	  <a href="http://easynews.dl.sourceforge.net/sourceforge/boost/boost_1_33_1.tar.gz">
+            http://easynews.dl.sourceforge.net/sourceforge/boost/boost_1_33_1.tar.gz
           </a>
           into the directory of your choice using cygwin; for example:
         </p>
@@ -622,17 +622,17 @@
           <code>$ cd ~/src</code>
           <br/>
           <code>
-            $ wget http://easynews.dl.sourceforge.net/sourceforge/boost/boost_1_33_0.tar.gz
+            $ wget http://easynews.dl.sourceforge.net/sourceforge/boost/boost_1_33_1.tar.gz
           </code>
           <br/>
-          <code>$ tar xvfz boost_1_33_0.tar.gz</code>
+          <code>$ tar xvfz boost_1_33_1.tar.gz</code>
         </p>
         <p>
           Build Boost.Jam, the Boost Build system.  Use the Windows
           command shell to build it.
         </p>
         <p>
-          <code>$ cd boost_1_33_0</code>
+          <code>$ cd boost_1_33_1</code>
           <br/>
           <code>$ cd tools\build\jam_src</code>
           <br/>
@@ -742,7 +742,7 @@
 	  <code>   -DCMAKE_BUILD_TYPE:STRING=Debug \</code>
 	  <code>   -DAVD_GUI_NCURSES:BOOL=ON \</code>
 	  <code>   -DAVD_PY_BINDINGS:BOOL=ON \</code>
-	  <code>   -DBOOST_INCLUDE_PATH:PATH=/usr/local/include/boost-1_33 \</code>
+	  <code>   -DBOOST_INCLUDE_PATH:PATH=/usr/local/include/boost-1_33_1 \</code>
 	  <code>   -DBOOST_LIBRARY:FILEPATH=/usr/local/lib/libboost_python-gcc.lib \</code>
 	  <code>   -DPYTHON_INCLUDE_PATH:PATH=/c/Python24/include \</code>
 	  <code>   -DPYTHON_LIBRARY:FILEPATH=/c/Python24/libs/python24.lib \</code>

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py	2006-05-23 21:29:08 UTC (rev 703)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py	2006-05-24 15:59:17 UTC (rev 704)
@@ -256,9 +256,19 @@
   def printPetriDishSlot(self):
     printer = QPrinter()
     if printer.setup():
-      widget = QPixmap.grabWidget(self, 0, 0,
-                                  self.width(),
-                                  self.height())
+      dish_height = self.m_petri_dish_ctrl.m_canvas_view.height()
+      # Hide the scrollbars so they aren't printed
+      self.m_petri_dish_ctrl.m_petri_dish_ctrl_h_scrollBar.hide()
+      self.m_petri_dish_ctrl.m_petri_dish_ctrl_v_scrollBar.hide()
+      dish_pix = QPixmap.grabWidget(self.m_petri_dish_ctrl.m_canvas_view, 0, 0,
+                                    self.m_petri_dish_ctrl.m_canvas_view.width(),
+                                    dish_height)
+      self.m_petri_dish_ctrl.m_petri_dish_ctrl_h_scrollBar.show()
+      self.m_petri_dish_ctrl.m_petri_dish_ctrl_v_scrollBar.show()
+      scale_pix = QPixmap.grabWidget(self.m_gradient_scale_ctrl, 0, 0,
+                                     self.m_gradient_scale_ctrl.width(),
+                                     self.m_gradient_scale_ctrl.height())
       painter = QPainter(printer)
-      painter.drawPixmap(0, 0, widget)
+      painter.drawPixmap(0, 0, dish_pix)
+      painter.drawPixmap(0, dish_height + 1, scale_pix)
       painter.end()

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyPetriDishCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyPetriDishCtrl.py	2006-05-23 21:29:08 UTC (rev 703)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyPetriDishCtrl.py	2006-05-24 15:59:17 UTC (rev 704)
@@ -101,14 +101,6 @@
     self.m_org_clicked_on_item = None
     self.m_occupied_cells_ids = []
 
-  def printPetriDishSlot(self):
-    printer = QPrinter()
-    if printer.setup():
-      painter = QPainter(printer)
-      self.m_canvas.drawArea(QRect(0, 0, self.m_canvas.width(),
-                                   self.m_canvas.height()), painter, False)
-      painter.end()
-
   def setColorLookupFunctor(self, color_lookup_functor):
     self.m_color_lookup_functor = color_lookup_functor