Index: sodar/trunk/plotSodar.py =================================================================== --- sodar/trunk/plotSodar.py (revision 139) +++ sodar/trunk/plotSodar.py (revision 141) @@ -40,7 +40,8 @@ numIntervals = arrayDataObject.numIntervals timeInterval = arrayDataObject.timeInterval - timeInterval = (((float(timeInterval.days) * 24.0) + - (timeInterval.seconds / 3600.0)) * 60.0) + # timeInterval = (((float(timeInterval.days) * 24.0) + + # (timeInterval.seconds / 3600.0)) * 60.0) minAltitude = arrayDataObject.minAltitude + numAltitudes = arrayDataObject.numAltitudes altInterval = arrayDataObject.altInterval @@ -50,11 +51,13 @@ pc = axe.pcolor(vector) - axe.set_xlabel('Time (min)') + axe.set_xlabel('Time (hh:mm UTC)') axe.set_ylabel('Altitude (m)') axe.set_xbound(upper=numIntervals) xticks = axe.get_xticks() - xticklabels = [str(x * timeInterval) + xticklabels = [(int(x) * timeInterval) + beginStamp for x in xticks] + xticklabels = [':'.join(('%02u' % x.hour, '%02u' % x.minute)) + for x in xticklabels] axe.set_xticklabels(xticklabels) @@ -77,6 +80,6 @@ uComponents) makePcolor(maskedUComponents.T, - 'U Component of Wind Veloctiy\nFrom %s To %s' % - (beginStamp, endStamp), + 'U Component of Wind Veloctiy for %s' % + (str(beginStamp)[:10],), 'uComponents.png', 'Speed (cm/sec)') @@ -86,6 +89,6 @@ vComponents) makePcolor(maskedVComponents.T, - 'V Component of Wind Veloctiy\nFrom %s To %s' % - (beginStamp, endStamp), + 'V Component of Wind Veloctiy for %s' % + (str(beginStamp)[:10],), 'vComponents.png', 'Speed (cm/sec)') @@ -95,6 +98,6 @@ wComponents) makePcolor(maskedWComponents.T, - 'W Component of Wind Veloctiy\nFrom %s To %s' % - (beginStamp, endStamp), + 'W Component of Wind Veloctiy for %s' % + (str(beginStamp)[:10],), 'wComponents.png', 'Speed (cm/sec)') @@ -104,31 +107,34 @@ echoStrengths) makePcolor(maskedEchoStrenths.T, - 'Echo Strength\nFrom %s To %s' % - (beginStamp, endStamp), + 'Echo Strength for %s' % + (str(beginStamp)[:10],), 'echoStrengths.png', 'Strength (no units)') - fig = p.figure(1) - axe = fig.add_subplot(1, 1, 1) - qv = axe.quiver(maskedUComponents, - maskedVComponents, - maskedWComponents) - axe.set_xlabel('Time (min)') - axe.set_ylabel('Altitude (m)') - axe.set_xbound(upper=numIntervals) - xticks = axe.get_xticks() - xticklabels = [str(x * timeInterval) - for x in xticks] - axe.set_xticklabels(xticklabels) - yticks = axe.get_yticks() - yticklabels = [str(y * altInterval + minAltitude) - for y in yticks] - axe.set_yticklabels(yticklabels) - axe.set_title('Wind Velocty\nFrom %s To %s' % - (beginStamp, endStamp)) - cb = p.colorbar(qv) - cb.set_label('W Component Speed (cm/sec)') - fig.savefig(os.path.join(pathout, 'quiver.png')) - fig.clear() + # timeComponent = n.array(range(numIntervals)) + # altComponent = n.array(range(numAltitudes)) + # fig = p.figure(1) + # axe = fig.add_subplot(1, 1, 1) + # qv = axe.quiver(altComponent, + # timeComponent, + # maskedUComponents.T, + # maskedVComponents.T) + # axe.set_xlabel('Time (min)') + # axe.set_ylabel('Altitude (m)') + # axe.set_xbound(upper=numIntervals) + # xticks = axe.get_xticks() + # xticklabels = [str(x * timeInterval) + # for x in xticks] + # axe.set_xticklabels(xticklabels) + # yticks = axe.get_yticks() + # yticklabels = [str(y * altInterval + minAltitude) + # for y in yticks] + # axe.set_yticklabels(yticklabels) + # axe.set_title('Wind Velocty for %s' % + # (str(beginStamp)[:10],)) + # cb = p.colorbar(qv) + # cb.set_label('W Component Speed (cm/sec)') + # fig.savefig(os.path.join(pathout, 'quiver.png')) + # fig.clear() return 0 @@ -164,6 +170,10 @@ parser = optparse.OptionParser(usage=_main.__doc__, - version='1.0', + version='%prog 1.0', description=__description__) + parser.set_defaults(forceUpdate=False) + parser.add_option('-f', '--force-update', + action='store_true', + dest='forceUpdate') (values, args) = parser.parse_args() (source, destination) = tuple(args)