moving lines version 1.55 with bug fixes and improvements to file saving formats for each different platforms

Author: samuelleblanc

movinglines/MSS.txt

@@ -1,2 +1,3 @@
 MSS_Bocachica,https://bocachica.arc.nasa.gov/wms/?
-MSS_Leipzig,http://tornado.meteo.uni-leipzig.de/
+#MSS_Leipzig,http://tornado.meteo.uni-leipzig.de/
+#mss_cloudagzer2,http://192.168.10.201:8081/?

movinglines/aeronet_locations.txt

@@ -127,6 +127,7 @@ def __init__(self,lon0='14 38.717E',lat0='22 58.783S',speed=130.0,UTC_start=7.0,
         if profile:
             lon0,lat0,UTC_start = profile['Start_lon'],profile['Start_lat'],profile['UTC_start']
             UTC_conversion,alt0,name,campaign = profile['UTC_conversion'],profile['start_alt'],profile['Plane_name'],profile['Campaign']
+            self.profile = profile
         self.__version__ = version
         self.comments = [' ']
         self.wpname = [' ']
@@ -165,6 +166,9 @@ def __init__(self,lon0='14 38.717E',lat0='22 58.783S',speed=130.0,UTC_start=7.0,
         self.campaign = campaign
         self.datestr_verified = datestr_verified
         self.platform, self.p_info,use_file = self.get_platform_info(name,platform_file)
+        for k in profile:
+            if k not in self.p_info:
+                self.p_info[k] = profile[k]
         self.pilot_format = self.p_info.get('pilot_format','DD MM SS')
         if use_file:
             print('Using platform data for: {} from platform file: {}'.format(self.platform,os.path.abspath(platform_file)))
@@ -1220,7 +1224,7 @@ def print_points_kml(self,folder,includepng=False):
                 except:
                     pnt.style.iconstyle.icon.href = get_curdir()+'//map_icons//number_{}.png'.format(self.WP[i])
             else:
-                 pnt.style.iconstyle.icon.href = 'http://maps.google.com/mapfiles/kml/paddle/{}-lv.png'.format(self.WP[i])
+                 pnt.style.iconstyle.icon.href = 'https://www.samueleleblanc.com/img/icons/{}.png'.format(self.WP[i])
             pnt.description = """WP=#%02f\nUTC[H]=%2.2f\nWPname=%s\nLocal[H]=%2.2f\nCumDist[km]=%f\nspeed[m/s]=%4.2f\ndelayT[min]=%f\nSZA[deg]=%3.2f\nAZI[deg]=%3.2f\nBearing[deg]=%3.2f\nClimbT[min]=%f\nComments:%s""" % (self.WP[i],
                                                                    self.utc[i],self.wpname[i],self.local[i],self.cumdist[i],
                                                                    self.speed[i],self.delayt[i],self.sza[i],
@@ -1516,15 +1520,24 @@ def save2xl_for_pilots(filename,ex_arr):
         else:
             sh = wb_pilot.sheets.add(name=a.name,after=wb_pilot.sheets[wb_pilot.sheets.count-1])
             #wb_pilot.sheets(1).add(name=a.name)
+        
         xw.Range('A1').value = '{name} - {daystr} - '.format(name=a.name,daystr=a.datestr)
         xw.Range('A1').font.bold = True
         xw.Range('A1').font.size = 24
-        #for st in ['A','B','C','D','E','F','G']:
-        xw.Range('A1:G1').color = rgb_to_int(to_rgb(a.color)) 
-        #import ipdb; ipdb.set_trace()
-        xw.Range('A2').value = ['WP','WP name','Lat\n[+-90]','Lon\n[+-180]',
+
+        if not a.p_info.get('include_mag_heading',False):
+            xw.Range('A2').value = ['WP','WP name','Lat\n[+-90]','Lon\n[+-180]',
                              'Altitude\n[kft]','UTC\n[hh:mm]','Comments']
-        xw.Range('A2:G2').font.bold = True
+            letter_range = ['A','B','C','D','E','F','G']
+            last_rgs = 'G'
+        else:
+            xw.Range('A2').value = ['WP','WP name','Lat\n[+-90]','Lon\n[+-180]',
+                             'Altitude\n[kft]','UTC\n[hh:mm]','Mag Heading\n[deg]','Comments']
+            letter_range = ['A','B','C','D','E','F','G','H']
+            xw.Range('G3:G%i'% (a.n+2)).number_format = '0.0'
+            last_rgs = 'H'
+        xw.Range('A1:'+last_rgs+'1').color = rgb_to_int(to_rgb(a.color))
+        xw.Range('A2:'+last_rgs+'2').font.bold = True
         #freeze_top_pane(wb_pilot)
         xw.Range('F3:F%i'% (a.n+2)).number_format = 'hh:mm'
         xw.Range('E3:E%i'% (a.n+2)).number_format = '0.00'
@@ -1545,12 +1558,17 @@ def save2xl_for_pilots(filename,ex_arr):
                 comment = 'delay: {:2.1f} min, {}'.format(a.delayt[i],a.comments[i])
             else:
                 comment = a.comments[i]
-            xw.Range('A{:d}'.format(i+3)).value = [a.WP[i],a.wpname[i],lat_f,lon_f,a.alt_kft[i],a.utc[i]/24.0,comment]
+            if not a.p_info.get('include_mag_heading',False):
+                xw.Range('A{:d}'.format(i+3)).value = [a.WP[i],a.wpname[i],lat_f,lon_f,a.alt_kft[i],a.utc[i]/24.0,comment]
+            else:
+                mag_decl = a.p_info.get('mag_declination',13.0)
+                xw.Range('A{:d}'.format(i+3)).value = [a.WP[i],a.wpname[i],lat_f,lon_f,a.alt_kft[i],a.utc[i]/24.0,(360.0+a.bearing[i]-mag_decl)%360,comment]
             if i%2:
-                for st in ['A','B','C','D','E','F','G']:
+                for st in letter_range:
                     xw.Range('{}{:d}'.format(st,i+2)).color = rgb_to_int(make_lighter(to_rgb(a.color)))
         xw.Range('A{:d}'.format(i+5)).value = 'One line waypoints for foreflight:'
         xw.Range('A{:d}'.format(i+6)).value = one_line_points(a)
+        sh.page_setup.print_area = '$A$1:$'+last_rgs+'$%i'% (a.n+2)
     wb_pilot.save(filename)
     try:
         wb_pilot.close()
@@ -1578,26 +1596,27 @@ def save2csv_for_FOREFLIGHT_UFP(filename,ex,foreflight_only=True,verbose=True):
     """
     if filename.endswith('.csv'): 
         filename = filename[:-4]
-    if verbose: print('.. saving FOREFLIGHT csv to {}'.format(filename+'_'+ex.name+'_FOREFLIGHT.csv'))
-    f = open(filename+'_'+ex.name+'_FOREFLIGHT.csv','w+')
-    f.write('Waypoint,Description,LAT,LONG\n')
-    ex.wpname = ex.get_waypoint_names(fmt=ex.p_info.get('waypoint_format','{x.name[0]}{x.datestr.split("-")[2]}{w:02d}'))
-    for i in range(ex.n):
-        if ex.wpname[i] in ex.wpname[0:i]: continue
+    if 'foreflight' in ex.p_info.get('preferred_file_format',['foreflight']):
+        if verbose: print('.. saving FOREFLIGHT csv to {}'.format(filename+'_'+ex.name+'_FOREFLIGHT.csv'))
+        f = open(filename+'_'+ex.name+'_FOREFLIGHT.csv','w+')
+        f.write('Waypoint,Description,LAT,LONG\n')
+        ex.wpname = ex.get_waypoint_names(fmt=ex.p_info.get('waypoint_format','{x.name[0]}{x.datestr.split("-")[2]}{w:02d}'))
+        for i in range(ex.n):
+            if ex.wpname[i] in ex.wpname[0:i]: continue
 
-        comm = ex.comments[i]
-        if ex.comments[i]:
-            comm = ex.comments[i].replace(',', '')
-        f.write("""%s,ALT=%3.2f kft %s ,%+2.12f,%+2.12f\n""" %(
-                ex.wpname[i],ex.alt_kft[i],comm,ex.lat[i],ex.lon[i]))
-    f.close()
+            comm = ex.comments[i]
+            if ex.comments[i]:
+                comm = ex.comments[i].replace(',', '')
+            f.write("""%s,ALT=%3.2f kft %s ,%+2.12f,%+2.12f\n""" %(
+                    ex.wpname[i],ex.alt_kft[i],comm,ex.lat[i],ex.lon[i]))
+        f.close()
 
-    if verbose: print('.. saving FOREFLIGHT one liner to {}'.format(filename+'_'+ex.name+'_FOREFLIGHT_oneline.txt'))
-    fo = open(filename+'_'+ex.name+'_FOREFLIGHT_oneline.txt','w+')
-    fo.write(one_line_points(ex,wpnames=ex.wpname))
-    fo.close()
+        if verbose: print('.. saving FOREFLIGHT one liner to {}'.format(filename+'_'+ex.name+'_FOREFLIGHT_oneline.txt'))
+        fo = open(filename+'_'+ex.name+'_FOREFLIGHT_oneline.txt','w+')
+        fo.write(one_line_points(ex,wpnames=ex.wpname))
+        fo.close()
 
-    if 'er2' in ex.platform: 
+    if 'er2' in ex.p_info.get('preferred_file_format',['foreflight']):
         if verbose: print('.. saving ER2 csv to {}'.format(filename+'_'+ex.name+'.csv'))
         fe = open(filename+'_'+ex.name+'.csv','w+')
         fe.write('ID,Description,LAT,LONG,Altitude [kft],UTC [hh:mm],Comments\n')
@@ -1608,38 +1627,40 @@ def save2csv_for_FOREFLIGHT_UFP(filename,ex,foreflight_only=True,verbose=True):
             w = ex.WP[i]
             x = ex
             wp_str = eval("f'{}'".format(ex.p_info.get('waypoint_format','{x.name[0]}{x.datestr.split("-")[2]}{w:02d}')))
-            desc = ex.wpname[i]
+            desc = '.'+ex.wpname[i]
             if wp_str in ex.wpname[i]:
                 desc = '.'+wp_str[0]+wp_str[3:5]
             fe.write("""%2.0f,%s,%+2.12f,%+2.12f,%3.2f,%2.0f:%02.0f,%s\n""" %(
                     ex.WP[i],desc,ex.lat[i],ex.lon[i],ex.alt_kft[i],np.floor(ex.utc[i]),(ex.utc[i]-np.floor(ex.utc[i]))*60.0,comm))
         fe.close()
         return #no need to print out the rest
 
-    if verbose: print('.. saving UFP csv to {}'.format(filename+'_'+ex.name+'_UFP.csv'))
-    fu = open(filename+'_'+ex.name+'_UFP.csv','w+')
-    fu.write('Waypoint,LAT,LONG,Description\n')
-    for i in range(ex.n):
-        if ex.wpname[i] in ex.wpname[0:i]: continue
-        comm = ex.comments[i]
-        if ex.comments[i]:
-            comm = ex.comments[i].replace(',', '')
-        fu.write("""%s,%+2.12f,%+2.12f,ALT=%3.2f kft %s\n""" %(
-                ex.wpname[i],ex.lat[i],ex.lon[i],ex.alt_kft[i],comm))
-    fu.close()
+    if 'ufp' in ex.p_info.get('preferred_file_format',['foreflight']):
+        if verbose: print('.. saving UFP csv to {}'.format(filename+'_'+ex.name+'_UFP.csv'))
+        fu = open(filename+'_'+ex.name+'_UFP.csv','w+')
+        fu.write('Waypoint,LAT,LONG,Description\n')
+        for i in range(ex.n):
+            if ex.wpname[i] in ex.wpname[0:i]: continue
+            comm = ex.comments[i]
+            if ex.comments[i]:
+                comm = ex.comments[i].replace(',', '')
+            fu.write("""%s,%+2.12f,%+2.12f,ALT=%3.2f kft %s\n""" %(
+                    ex.wpname[i],ex.lat[i],ex.lon[i],ex.alt_kft[i],comm))
+        fu.close()
 
-    if verbose: print('.. saving Honeywell csv to {}'.format(filename+'_'+ex.name+'_Honeywell.csv'))
-    fh = open(filename+'_'+ex.name+'_Honeywell.csv','w+')
-    fh.write('E,WPT,FIX,LAT,LON\n')
-    for i in range(ex.n):
-        if ex.wpname[i] in ex.wpname[0:i]: continue
-        lat_str,lon_str = format_lat_lon(ex.lat[i],ex.lon[i],format='NDDD MM.SS')
-        comm = ex.comments[i]
-        if ex.comments[i]:
-            comm = ex.comments[i].replace(',', '')
-        fh.write("""x,%s,ALT=%3.2f kft %s,%s,%s\n""" %(
-                ex.wpname[i],ex.alt_kft[i],comm,lat_str,lon_str))
-    fh.close()
+    if 'honeywell' in ex.p_info.get('preferred_file_format',['foreflight']):
+        if verbose: print('.. saving Honeywell csv to {}'.format(filename+'_'+ex.name+'_Honeywell.csv'))
+        fh = open(filename+'_'+ex.name+'_Honeywell.csv','w+')
+        fh.write('E,WPT,FIX,LAT,LON\n')
+        for i in range(ex.n):
+            if ex.wpname[i] in ex.wpname[0:i]: continue
+            lat_str,lon_str = format_lat_lon(ex.lat[i],ex.lon[i],format='NDDD MM.SS')
+            comm = ex.comments[i]
+            if ex.comments[i]:
+                comm = ex.comments[i].replace(',', '')
+            fh.write("""x,%s,ALT=%3.2f kft %s,%s,%s\n""" %(
+                    ex.wpname[i],ex.alt_kft[i],comm,lat_str,lon_str))
+        fh.close()
 
 
 

movinglines/aeronet_locations_full.txt

@@ -0,0 +1,3 @@
+% PP, PP_offset, length
+PP+PP_offset, length/2
+PP+PP_offset, length/2

movinglines/excel_interface.py

@@ -2233,6 +2233,7 @@ def __init__(self,default_profiles,title='Enter map defaults',
         self.default_profiles = default_profiles
         self.profile = self.default_profiles[0]
         self.proj_list = proj_list
+        self.oked = False
         parent = tk._default_root
         tkSimpleDialog.Dialog.__init__(self,parent,title)
 
@@ -2328,6 +2329,13 @@ def apply(self):
         self.profile['UTC_conversion'] = float(self.utc_convert.get())
         self.profile['start_alt'] = float(self.start_alt.get())
         self.profile['Campaign'] = self.pname.get()
+        print('..Applying selected profile')
+        self.oked = True
+        return self.profile
+        
+    def cancel(self,event=None):
+        if not self.oked: self.profile = False
+        super().cancel(event=event)
         return self.profile
 
     def check_input(self,s,isletter=False):

movinglines/flt_module/Principal_plane_split.flt

@@ -93,6 +93,8 @@ UCSB_SBC_PACE2,-119.90633,34.250167,+c
 P&B5,-119.92833,34.2035,+c
 P&B6,-119.950167,34.15683,+c
 P&B7,-120.03333,34.08333,+c
+GliderE, -119.84345,34.258133,+m
+GliderW, -119.9388167,34.3021333,+m
 ##############################################
 #Arctic ground stations / radiosondes
 ##############################################
@@ -175,20 +177,46 @@ BUOYR, -73.184456,83.917512,vb
 ##############################################
 #PACE-PAX air traffic navigation waypoints
 ##############################################
-PENNI, -122.106333,36.7125,^y
-EUGEN, -122.444167,37.0935,^y
-PIRAT, -122.863333,37.257667,^y
-RAINS, -123.243333,37.167833,^y
-TPCAT, -122.963833,37.125,^y
-MOVER, -121.889833,36.857167,^y
-SANTY, -122.073075,36.979239,^y
-GARLK, -121.997289,36.757214,^y
-LISSY, -122.1960,36.88706,^y
+PENNI, -122.106333,36.7125,^m
+EUGEN, -122.444167,37.0935,^m
+PIRAT, -122.863333,37.257667,^m
+RAINS, -123.243333,37.167833,^m
+TPCAT, -122.963833,37.125,^m
+MOVER, -121.889833,36.857167,^m 
+SANTY, -122.073075,36.979239,^m
+GARLK, -121.997289,36.757214,^m
+LISSY, -122.1960,36.88706,^m
+ROSIE, -118.2065,34.8525,^m
+MITEL, -118.5840778,36.68442222,^m
+HAMBO, -117.6425,37.2,^m
+SKIZM, -121.2568778,37.13184167,^m
+ZOMAN, -120.833102777778, 36.8837111111111,^m
+DAGGS, -116.95,34.98333333,^m
+HEINY, -116.5425,35.85833333,^m
 ##############################################
 #PACE-PAX sites of interest
 ##############################################
 # Ivanpah playa 
 IVAN1, -115.395,35.548,xg
 # solar panels near Primm
 SOLP1, -115.36, 35.623,xy
-
+GlID1, -119.93881667, 34.3021333,+m
+GLID2, -119.84345, 34.2581833,+m
+HYPR1, -119.55494, 33.70721,xm
+##############################################
+#AirSHARP points
+##############################################
+OFSH1, -122.2408306, 36.93356111,+y
+OFSH2,-122.2065389,36.93358889,+y
+ARTI1,-122.1371417,36.93290833,+y
+WILD1,-122.1039056,36.93127778,+y
+LML11,-122.0687556,36.93000556,+y
+CIRC1,-122.0342444,36.93205833,+y
+WHRF1,-122.00005,36.93482222,+y
+RTI11,-121.9662333,36.93726667,+y
+CEME1,-121.9327,36.94001389,+y
+SEAS1,-121.8981778,36.94194167,+y
+MBAC1,-121.8730472,36.90190556,+y
+HARB1,-122.0078,36.956217,+y
+SCWR1,-122.0183333,36.95941667,+y
+CPWR1,-121.953231,36.969276,+y