Changeset 7041

Timestamp:

May 15, 2009, 8:27:16 AM (15 years ago)

Author:

rwilson

Message:

Fixed bug in 'gridding' operation if no list generated.

Location:

misc/tools/event_selection

Files:

• EventSelection.py (modified) (7 diffs)
• installer/EventSelection.nsi (modified) (1 diff)

misc/tools/event_selection/EventSelection.py

@@ -14 +14 @@
 import tempfile
 try:
-    import cpickle
+    import cpickle as pickle
 except:
     import pickle
@@ -53 +53 @@
 # program name and version
 APP_NAME = 'EventSelection'
-APP_VERSION = '1.0'
+APP_VERSION = '1.1'
 
 # name of the configuration filename
@@ -536 +536 @@
                           size=(CTL_WIDTH, CTL_HEIGHT), style=wx.ALIGN_RIGHT)
             self.txtQuakeID = wx.TextCtrl(p, -1, size=(100, 20),
-                                          pos=(GEN_TEXTXOFFSET, Y_OFFSET))
+                                          pos=(GEN_TEXTXOFFSET, Y_OFFSET),
+                                          style=wx.TE_READONLY)
             Y_OFFSET += GEN_DELTAY 
             x = FORM_WIDTH/2 - BUTTON_WIDTH - DOUBLE_BUTTON_OFFSET
@@ -890 +891 @@
                 filenames.append(filename)
                 
-## No longer generate the python data file
-##            # write data to the file
-##            urs_filename = '%s/%s' % (ResultSubdir, URSDataFilename % quake_ID)
-##            try:
-##                out_fd = open(urs_filename, "w")
-##            except IOError, msg:
-##                self.error("Error opening output file %s': %s" %
-##                           (urs_filename, msg))
-##                return
-##            if last_weight and filenames:
-##                out_fd.write('# Data for region %s,\n'
-##                             '#          hazard %d,\n'
-##                             '#          min height %.2f,\n'
-##                             '#          max height %.2f,\n'
-##                             '#          quake ID %d\n' %
-##                             (Region, GaugeNumber, MinimumHeight,
-##                              MaximumHeight, quake_ID))
-##                out_fd.write('# Generated on %s.\n' % time.asctime(time.localtime()))
-##                out_fd.write('\n')
-##                out_fd.write('import os.path\n')
-##                out_fd.write('\n')
-##                out_fd.write('def getInfo(base_directory):\n')
-##                out_fd.write('    """\n')
-##                out_fd.write('    Return the weight factor and list of URS data filenames\n')
-##                out_fd.write('\n')
-##                out_fd.write('        (weight_factor, [filenames]) <- get_urs_data(base_directory)\n')
-##                out_fd.write('\n')
-##                out_fd.write('    where base_directory is the path to the mux files.\n')
-##                out_fd.write('    """\n')
-##                out_fd.write('\n')
-##                out_fd.write('    weight_factor = %f\n' % last_weight)
-##                out_fd.write('    mux_filenames = [')
-##                if filenames:
-##                    for fn in filenames[:-1]:
-##                        out_fd.write('"%%s" %% os.path.join(base_directory, "%s"),\n                     ' % fn)
-##                    out_fd.write('"%%s" %% os.path.join(base_directory, "%s")\n                    ' % filenames[-1])
-##                out_fd.write(']\n')
-##                out_fd.write('\n')
-##                out_fd.write('    return (weight_factor, mux_filenames)\n')
-##            out_fd.close() 
-            
         ######
         # Call the get_grid function.
@@ -938 +898 @@
             quake_ID = self.txtQuakeID.GetValue()
             if len(quake_ID) == 0:
-                self.error('You must enter a quake ID first')
-                return
-            try:
-                quake_ID = int(quake_ID)
-            except:
-                self.error("You must enter a Quake ID")
-                return
+                self.error("You must enter a quake ID by clicking in "
+                           "the 'list' result box")
+                return
+            quake_ID = int(quake_ID)
 
             region_select = self.cbRegion.GetValue()
@@ -962 +919 @@
             multimux_dir = os.path.join(BaseDirectory, region_dir_name, 'multimux')
             grid_dir = os.path.join(BaseDirectory, region_dir_name, 'static_2m')
+
+            # check that the sub-directory has been created
+            if ResultSubdir == '' or not os.path.isdir(ResultSubdir):
+                self.error("Sorry, you must 'list' earthquakes first.")
+                return
 
             ####################################################################
@@ -1048 +1010 @@
             out_fd.write('WEIGHT_FACTOR=%f\n' % weight_factor)
             out_fd.write('DATA_PATH=%s\n' % grid_dir)
-            for fn in filenames[1:]:
+            #for fn in filenames[1:]:
+            for fn in filenames:
                 owning_dir = filenames[0].split('-')[0]
                 out_fd.write('GRID=%s\n' % (os.path.join(owning_dir, fn)))

misc/tools/event_selection/installer/EventSelection.nsi

@@ -1 +1 @@
 !define PRODUCT_NAME "EventSelection"
-!define PRODUCT_VERSION "1.0"
+!define PRODUCT_VERSION "1.1"
 !define ICON_FILE "tsunami.ico"