[Avida-cvs] [avida-svn] r906 - branches/developers/avida-edward/source/python/AvidaGui2
gerrishj at myxo.css.msu.edu
gerrishj at myxo.css.msu.edu
Tue Aug 29 11:36:08 PDT 2006
Author: gerrishj
Date: 2006-08-29 14:36:08 -0400 (Tue, 29 Aug 2006)
New Revision: 906
Modified:
branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrg_ScopeCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismScopeCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyTimeline.py
branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
Log:
Fix timeline alignment issues.
Fix populations stats window and button clipping.
Update todo list.
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrg_ScopeCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrg_ScopeCtrl.py 2006-08-29 18:36:01 UTC (rev 905)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrg_ScopeCtrl.py 2006-08-29 18:36:08 UTC (rev 906)
@@ -19,6 +19,7 @@
self.m_timeline.setMaxValue(0)
# Use background color so timeline meter doesn't show up
self.m_timeline.setFillColor(self.m_timeline.colorGroup().background())
+# self.m_timeline.setScalePosition(pyTimeline.None)
self.m_timer = qt.QTimer()
self.m_next = qt.QTimer()
self.m_timer_interval = 100
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsView.ui 2006-08-29 18:36:01 UTC (rev 905)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsView.ui 2006-08-29 18:36:08 UTC (rev 906)
@@ -494,7 +494,7 @@
<cstring>unnamed</cstring>
</property>
<property name="spacing">
- <number>3</number>
+ <number>4</number>
</property>
<widget class="QLayoutWidget">
<property name="name">
@@ -1409,7 +1409,7 @@
<cstring>unnamed</cstring>
</property>
<property name="spacing">
- <number>3</number>
+ <number>2</number>
</property>
<widget class="QLayoutWidget">
<property name="name">
@@ -1471,7 +1471,7 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <pointsize>9</pointsize>
</font>
</property>
<property name="text">
@@ -1518,7 +1518,7 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <pointsize>9</pointsize>
</font>
</property>
<property name="text">
@@ -1560,7 +1560,7 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <pointsize>9</pointsize>
</font>
</property>
<property name="text">
@@ -1602,7 +1602,7 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <pointsize>9</pointsize>
</font>
</property>
<property name="text">
@@ -1644,7 +1644,7 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <pointsize>9</pointsize>
</font>
</property>
<property name="text">
@@ -1686,7 +1686,7 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <pointsize>9</pointsize>
</font>
</property>
<property name="text">
@@ -1728,7 +1728,7 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <pointsize>9</pointsize>
</font>
</property>
<property name="text">
@@ -1770,7 +1770,7 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <pointsize>9</pointsize>
</font>
</property>
<property name="text">
@@ -1812,7 +1812,7 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <pointsize>9</pointsize>
</font>
</property>
<property name="text">
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismScopeCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismScopeCtrl.py 2006-08-29 18:36:01 UTC (rev 905)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismScopeCtrl.py 2006-08-29 18:36:08 UTC (rev 906)
@@ -193,7 +193,10 @@
self.m_timeline.reset()
self.flagEvents()
+# self.m_timeline.addFlag(TimelineFlag("8", 0, "Test beginning"))
+# self.m_timeline.addFlag(TimelineFlag("9", self.m_frames.getSnapshotCount(), "Test end"))
+
progress_callback.clear()
self.m_session_mdl.m_session_mdtr.emit(PYSIGNAL("statusBarClearSig"), ())
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyTimeline.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyTimeline.py 2006-08-29 18:36:01 UTC (rev 905)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyTimeline.py 2006-08-29 18:36:08 UTC (rev 906)
@@ -88,7 +88,7 @@
def get_border_width(self):
"Get full border width"
# default margin size is 10 (QwtThermo docs)
- return self.borderWidth() + 10
+ return self.borderWidth() + 5
def get_flag_pos(self, flag):
"Calculate where in timeline flag should appear"
@@ -98,7 +98,7 @@
borders = self.get_border_width()
a = self.width() - frame - (borders * 2)
mult = a / (self.maxValue() - self.minValue())
- final_pos = (flag.pos * mult) + (frame / 2) + borders - adj
+ final_pos = (flag.pos * mult) + (frame / 2) + borders - adj - 1
return final_pos
def layout_events(self):
Modified: branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/to-do_list 2006-08-29 18:36:01 UTC (rev 905)
+++ branches/developers/avida-edward/source/python/AvidaGui2/to-do_list 2006-08-29 18:36:08 UTC (rev 906)
@@ -131,11 +131,8 @@
12-Jun-06 Add documentation about saving and exporting excel data and images
-01-Apr-06 Get Windows automated builds working on Devolab machine
-
08-Jun-06 Add printing/saving images to organism and population stats view.
-03-Jul-06 Delete extra whitespace at top of analysis-mode
************Other*****************
a. Under the sliders with ranges put a few values in grey that tell you the range min and max (non)
@@ -257,8 +254,9 @@
03-Jul-06 Remove flip arrow on analyze mode -- Finished 04-Jul-06
03-Jul-06 Change title to y-axis vs. x-axis -- Finished 04-Jul-06
03-Jul-06 Remove "Drag a Full Petri Dish..." after first dish is graphed -- Finished 04-Jul-06
+03-Jul-06 Delete extra whitespace at top of analysis-mode -- Finished 17-Aug-06
+01-Apr-06 Get Windows builds working on Devolab machine -- Finished 17-Aug-06
-
*************Jeff********************
June
-Petri dish now outlines the organisms that are about to start that run
More information about the Avida-cvs
mailing list