[Avida-cvs] [Avida2-svn] r320 - trunk/source/python/AvidaGui2

[jclune@myxo.css.msu.edu]

Author: jclune
Date: 2005-09-17 15:50:20 -0400 (Sat, 17 Sep 2005)
New Revision: 320

Modified:
   trunk/source/python/AvidaGui2/pyOneAna_PetriDishView.ui
   trunk/source/python/AvidaGui2/pyPetriDishCtrl.py
Log:
Hopefully this gets centering to work, as well as drag and drop. 


Modified: trunk/source/python/AvidaGui2/pyOneAna_PetriDishView.ui
===================================================================
--- trunk/source/python/AvidaGui2/pyOneAna_PetriDishView.ui	2005-09-16 22:27:39 UTC (rev 319)
+++ trunk/source/python/AvidaGui2/pyOneAna_PetriDishView.ui	2005-09-17 19:50:20 UTC (rev 320)
@@ -12,8 +12,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>260</width>
-            <height>191</height>
+            <width>392</width>
+            <height>318</height>
         </rect>
     </property>
     <property name="caption">
@@ -139,15 +139,15 @@
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>layout95</cstring>
+                <cstring>layout13</cstring>
             </property>
-            <hbox>
+            <vbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
                 <widget class="pyPetriDishCtrl">
                     <property name="name">
-                        <cstring>pyPetriDishCtrl1</cstring>
+                        <cstring>m_ana_petri_dish_ctrl</cstring>
                     </property>
                     <property name="sizePolicy">
                         <sizepolicy>
@@ -160,12 +160,12 @@
                 </widget>
                 <widget class="pyGradientScaleCtrl">
                     <property name="name">
-                        <cstring>pyGradientScaleCtrl1</cstring>
+                        <cstring>m_ana_gradient_scale_ctrl</cstring>
                     </property>
                     <property name="sizePolicy">
                         <sizepolicy>
-                            <hsizetype>0</hsizetype>
-                            <vsizetype>1</vsizetype>
+                            <hsizetype>5</hsizetype>
+                            <vsizetype>5</vsizetype>
                             <horstretch>1</horstretch>
                             <verstretch>0</verstretch>
                         </sizepolicy>
@@ -177,7 +177,7 @@
                         </size>
                     </property>
                 </widget>
-            </hbox>
+            </vbox>
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
@@ -300,7 +300,7 @@
                 </spacer>
                 <widget class="pyAnalyzeControlsCtrl">
                     <property name="name">
-                        <cstring>pyAnalyzeControlsCtrl11</cstring>
+                        <cstring>m_ana_live_controls_ctrl</cstring>
                     </property>
                     <property name="sizePolicy">
                         <sizepolicy>
@@ -373,6 +373,24 @@
         <property type="0">-1</property>
         <property type="1">pyPetriDishCtrl</property>
         <property type="0">-1</property>
+        <property type="1">pyPetriDishCtrl</property>
+        <property type="0">-1</property>
+        <property type="1">pyPetriDishCtrl</property>
+        <property type="0">-1</property>
+        <property type="1">pyPetriDishCtrl</property>
+        <property type="0">-1</property>
+        <property type="1">pyPetriDishCtrl</property>
+        <property type="0">-1</property>
+        <property type="1">pyPetriDishCtrl</property>
+        <property type="0">-1</property>
+        <property type="1">pyPetriDishCtrl</property>
+        <property type="0">-1</property>
+        <property type="1">pyPetriDishCtrl</property>
+        <property type="0">-1</property>
+        <property type="1">pyPetriDishCtrl</property>
+        <property type="0">-1</property>
+        <property type="1">pyPetriDishCtrl</property>
+        <property type="0">-1</property>
         <property type="pyPetriDishCtrl"></property>
         <property type="-1">1</property>
     </customwidget>
@@ -410,6 +428,24 @@
         <property type="0">-1</property>
         <property type="1">pyGradientScaleCtrl</property>
         <property type="0">-1</property>
+        <property type="1">pyGradientScaleCtrl</property>
+        <property type="0">-1</property>
+        <property type="1">pyGradientScaleCtrl</property>
+        <property type="0">-1</property>
+        <property type="1">pyGradientScaleCtrl</property>
+        <property type="0">-1</property>
+        <property type="1">pyGradientScaleCtrl</property>
+        <property type="0">-1</property>
+        <property type="1">pyGradientScaleCtrl</property>
+        <property type="0">-1</property>
+        <property type="1">pyGradientScaleCtrl</property>
+        <property type="0">-1</property>
+        <property type="1">pyGradientScaleCtrl</property>
+        <property type="0">-1</property>
+        <property type="1">pyGradientScaleCtrl</property>
+        <property type="0">-1</property>
+        <property type="1">pyGradientScaleCtrl</property>
+        <property type="0">-1</property>
         <property type="pyGradientScaleCtrl"></property>
         <property type="-1">1</property>
     </customwidget>
@@ -422,13 +458,17 @@
         </sizehint>
         <container>0</container>
         <sizepolicy>
-            <hordata>5</hordata>
-            <verdata>5</verdata>
+            <hordata>0</hordata>
+            <verdata>0</verdata>
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
         </sizepolicy>
         <pixmap>image2</pixmap>
         <property type="0">3</property>
+        <property type="1">pyAnalyzeControlsCtrl</property>
+        <property type="3">-1</property>
+        <property type="1">pyAnalyzeControlsCtrl</property>
+        <property type="3">-1</property>
         <property type="pyAnalyzeControlsCtrl"></property>
         <property type="-1">1</property>
     </customwidget>

Modified: trunk/source/python/AvidaGui2/pyPetriDishCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyPetriDishCtrl.py	2005-09-16 22:27:39 UTC (rev 319)
+++ trunk/source/python/AvidaGui2/pyPetriDishCtrl.py	2005-09-17 19:50:20 UTC (rev 320)
@@ -240,9 +240,9 @@
     self.m_world_matrix = QWMatrix()
     if self.m_canvas_view:
       self.m_world_matrix.scale(self.m_zoom_factor/self.m_target_dish_scaling, self.m_zoom_factor/self.m_target_dish_scaling)
-      trans_h_preadjust = ((self.m_canvas_view.size().height()) - (self.m_map_cell_width * self.m_world_h)*
+      trans_h_preadjust = ((self.m_canvas_view.size().height()-self.m_scroll_bar_width) - (self.m_map_cell_width * self.m_world_h)*
         (self.m_zoom_factor/self.m_target_dish_scaling))/2
-      trans_w_preadjust = ((self.m_canvas_view.size().width()) - (self.m_map_cell_width * self.m_world_w)*
+      trans_w_preadjust = ((self.m_canvas_view.size().width()-self.m_scroll_bar_width) - (self.m_map_cell_width * self.m_world_w)*
         (self.m_zoom_factor/self.m_target_dish_scaling))/2
 
       trans_h = trans_h_preadjust + self.m_v_scrollbar_offset*(self.m_zoom_factor/self.m_target_dish_scaling)