[cig-commits] r4449 - in cs/framework/trunk/cig: addyndum seismo
web web/seismo/events web/seismo/events/templates/events
leif at geodynamics.org
leif at geodynamics.org
Tue Aug 29 15:33:44 PDT 2006
Author: leif
Date: 2006-08-29 15:33:43 -0700 (Tue, 29 Aug 2006)
New Revision: 4449
Modified:
cs/framework/trunk/cig/addyndum/applications.py
cs/framework/trunk/cig/seismo/events.py
cs/framework/trunk/cig/web/forms.py
cs/framework/trunk/cig/web/seismo/events/models.py
cs/framework/trunk/cig/web/seismo/events/templates/events/event_list.html
Log:
Added createFromDBModel(). Also fixed two bugs: The Bogus Beachball Bug,
and a bug in TeeManipulator that truncated a simulation's station list
to a single item.
Modified: cs/framework/trunk/cig/addyndum/applications.py
===================================================================
--- cs/framework/trunk/cig/addyndum/applications.py 2006-08-29 19:09:57 UTC (rev 4448)
+++ cs/framework/trunk/cig/addyndum/applications.py 2006-08-29 22:33:43 UTC (rev 4449)
@@ -294,25 +294,12 @@
def getEggs(self):
- wd = os.getcwd()
- local_packages = os.path.abspath(os.path.join(wd, ".local-packages"))
- #sys.path.insert(0, local_packages)
- #print "@@@", sys.path
- if False:
- PYTHONPATH = (os.environ.get('PYTHONPATH') or '').split(os.pathsep)
- PYTHONPATH.insert(1, local_packages)
- os.environ['PYTHONPATH'] = os.pathsep.join(PYTHONPATH)
-
- savedWd = os.getcwd()
- os.chdir("..")
-
- from setuptools.command.easy_install import main as easy_install
- easy_install(argv=["-zmxd", "somedir", "Specfem3DGlobe"])
-
- os.chdir(savedWd)
-
- sys.exit(1)
-
+ import pkg_resources
+ from __main__ import __requires__
+ requires = pkg_resources.Requirement.parse(__requires__)
+ for distribution in pkg_resources.working_set.resolve([requires]):
+ print distribution.location
+ return
def zipPythonModules(self, context):
Modified: cs/framework/trunk/cig/seismo/events.py
===================================================================
--- cs/framework/trunk/cig/seismo/events.py 2006-08-29 19:09:57 UTC (rev 4448)
+++ cs/framework/trunk/cig/seismo/events.py 2006-08-29 22:33:43 UTC (rev 4449)
@@ -74,6 +74,37 @@
self.Mtp = 0.0
+ def createFromDBModel(cls, model):
+ cmtSolution = CMTSolution()
+ cmtSolution.dataSource = model.dataSource.name
+ cmtSolution.year = model.when.year
+ cmtSolution.month = model.when.month
+ cmtSolution.day = model.when.day
+ cmtSolution.hour = model.when.hour
+ cmtSolution.minute = model.when.minute
+ cmtSolution._second = float(model.when.second) + (float(model.microsecond) / 1000000.0)
+ cmtSolution.sourceLatitude = model.sourceLatitude
+ cmtSolution.sourceLongitude = model.sourceLongitude
+ cmtSolution.sourceDepth = model.sourceDepth
+ cmtSolution.sourceMB = model.sourceMB
+ cmtSolution.sourceMs = model.sourceMs
+ cmtSolution.regionName = model.region.name
+ cmtSolution.eventName = model.eventName
+ cmtSolution.timeShift = model.timeShift
+ cmtSolution.halfDuration = model.halfDuration
+ cmtSolution.latitude = model.latitude
+ cmtSolution.longitude = model.longitude
+ cmtSolution.depth = model.depth
+ cmtSolution.Mrr = model.Mrr
+ cmtSolution.Mtt = model.Mtt
+ cmtSolution.Mpp = model.Mpp
+ cmtSolution.Mrt = model.Mrt
+ cmtSolution.Mrp = model.Mrp
+ cmtSolution.Mtp = model.Mtp
+ return cmtSolution
+ createFromDBModel = classmethod(createFromDBModel)
+
+
def parse(cls, data):
cmtList = []
cmtSolution = None
Modified: cs/framework/trunk/cig/web/forms.py
===================================================================
--- cs/framework/trunk/cig/web/forms.py 2006-08-29 19:09:57 UTC (rev 4448)
+++ cs/framework/trunk/cig/web/forms.py 2006-08-29 22:33:43 UTC (rev 4449)
@@ -87,7 +87,7 @@
for field in manip.fields:
oldName = field.field_name[keyLen:]
if new_data.has_key(field.field_name):
- new_data[oldName] = new_data[field.field_name]
+ new_data.setlist(oldName, new_data.getlist(field.field_name))
field.field_name = oldName
return
Modified: cs/framework/trunk/cig/web/seismo/events/models.py
===================================================================
--- cs/framework/trunk/cig/web/seismo/events/models.py 2006-08-29 19:09:57 UTC (rev 4448)
+++ cs/framework/trunk/cig/web/seismo/events/models.py 2006-08-29 22:33:43 UTC (rev 4449)
@@ -93,5 +93,19 @@
objects = models.Manager()
user_objects = CurrentUserManager()
+ def _getMrrStr2f(self): return "%.2f" % (self.Mrr * 1.0e-26)
+ def _getMttStr2f(self): return "%.2f" % (self.Mtt * 1.0e-26)
+ def _getMppStr2f(self): return "%.2f" % (self.Mpp * 1.0e-26)
+ def _getMrtStr2f(self): return "%.2f" % (self.Mrt * 1.0e-26)
+ def _getMrpStr2f(self): return "%.2f" % (self.Mrp * 1.0e-26)
+ def _getMtpStr2f(self): return "%.2f" % (self.Mtp * 1.0e-26)
+ mrr = property(_getMrrStr2f)
+ mtt = property(_getMttStr2f)
+ mpp = property(_getMppStr2f)
+ mrt = property(_getMrtStr2f)
+ mrp = property(_getMrpStr2f)
+ mtp = property(_getMtpStr2f)
+
+
# end of file
Modified: cs/framework/trunk/cig/web/seismo/events/templates/events/event_list.html
===================================================================
--- cs/framework/trunk/cig/web/seismo/events/templates/events/event_list.html 2006-08-29 19:09:57 UTC (rev 4448)
+++ cs/framework/trunk/cig/web/seismo/events/templates/events/event_list.html 2006-08-29 22:33:43 UTC (rev 4449)
@@ -22,7 +22,7 @@
{% for object in object_list %}
<tr>
<td valign="top"><a href="{{ object.id }}/">Edit</a> <a href="{{ object.id }}/delete/">Delete</a></td>
- <td valign="top"><img width=49 height=49 src="http://www.seismology.harvard.edu/cgi-bin/webCMTgif/form?mrr={{object.Mrr}}&mtt={{object.Mtt}}&mpp={{object.Mpp}}&mrt={{object.Mrt}}&mrp={{object.Mrp}}&mtp={{object.Mtp}}"></td>
+ <td valign="top"><img width=49 height=49 src="http://www.seismology.harvard.edu/cgi-bin/webCMTgif/form?mrr={{object.mrr}}&mtt={{object.mtt}}&mpp={{object.mpp}}&mrt={{object.mrt}}&mrp={{object.mrp}}&mtp={{object.mtp}}"></td>
<td valign="top">{{ object.dataSource.name }}</td>
<td valign="top">{{ object.when }}</td>
<td valign="top">{{ object.region.name }}</td>
More information about the cig-commits
mailing list