Merge pull request #126 from CameronBodine/dev

Sonar log filter, coverage, bankline workflow

Author: CameronBodine

default_params.json

@@ -1,7 +1,6 @@
 {   
     "inDir":"",
     "humFile":"",
-    "aoi":"",
     "projDir":"",
     "project_mode":true,
     "tempC":10,
@@ -10,6 +9,11 @@
     "exportUnknown":false,
     "fixNoDat":false,
     "threadCnt":0,
+    "aoi":"",
+    "max_heading_deviation":0,
+    "max_heading_distance":0,
+    "min_speed":0,
+    "max_speed":0,
     "pix_res_son":0.05,
     "pix_res_map":0.25,
     "x_offset":0.0,
@@ -40,5 +44,6 @@
     "mosaic_nchunk":0,
     "mosaic":"False",
     "map_mosaic":"False",
-    "banklines":false
+    "banklines":false,
+    "coverage":false
 }

gui_main.py

@@ -36,8 +36,6 @@
 layout = [
     [sg.Text('Recording to Process')],
     [sg.In(size=(80,1)), sg.FileBrowse(key='humFile', file_types=(("DAT File", "*.DAT"), ), initial_folder=os.path.dirname(default_params['humFile']))],
-    [sg.Text('AOI')],
-    [sg.In(size=(80,1)), sg.FileBrowse(key='aoi', file_types=(("Shapefile", "*.shp"), (".plan File", "*.plan")), initial_folder=os.path.dirname(default_params['aoi']))],
     [sg.Text('Output Folder')],
     [sg.In(size=(80,1)), sg.FolderBrowse(key='proj', initial_folder=os.path.dirname(default_params['projDir']))],
     [sg.Text('Project Name', size=(15,1)), sg.InputText(key='projName', size=(50,1), default_text=os.path.basename(default_params['projDir']))],
@@ -46,13 +44,16 @@
     [sg.Text('General Parameters')],
     [sg.Text('Temperature [C]', size=(20,1)), sg.Input(key='tempC', default_text=default_params['tempC'], size=(10,1))],
     [sg.Text('Chunk Size', size=(20,1)), sg.Input(key='nchunk', default_text=default_params['nchunk'], size=(10,1))],
-    [sg.Text('Crop Range [m]', size=(20,1)), sg.Input(key='cropRange', default_text=default_params['cropRange'], size=(10,1))],
     [sg.Checkbox('Export Unknown Ping Attributes', key='exportUnknown', default=default_params['exportUnknown'])],
     [sg.Checkbox('Locate and flag missing pings', key='fixNoDat', default=default_params['fixNoDat'])],
     [sg.Text('Thread Count [0==All Threads]', size=(30,1)), sg.Input(key='threadCnt', default_text=default_params['threadCnt'], size=(10,1))],
     [sg.HorizontalSeparator()],
-    [sg.Text('GeoTiff Pixel Resolution [0==Default Resolution (~0.02m)]')],
-    [sg.Text('Sonar', size=(10,1)), sg.Input(key='pix_res_son', default_text=default_params['pix_res_son'], size=(10,1)), sg.Text('Substrate', size=(10,1)), sg.Input(key='pix_res_map', default_text=default_params['pix_res_map'], size=(10,1))],
+    [sg.Text('Filter Sonar Log')],
+    [sg.Text('Crop Range [m]', size=(22,1)), sg.Input(key='cropRange', default_text=default_params['cropRange'], size=(10,1))],
+    [sg.Text('Max. Heading Deviation [deg]:', size=(22,1)), sg.Input(key='max_heading_deviation', default_text=default_params['max_heading_deviation'], size=(10,1)), sg.VerticalSeparator(), sg.Text('Distance [m]:', size=(15,1)), sg.Input(key='max_heading_distance', default_text=default_params['max_heading_distance'], size=(10,1))],
+    [sg.Text('Min. Speed [m/s]:', size=(22,1)), sg.Input(key='min_speed', default_text=default_params['min_speed'], size=(10,1)), sg.VerticalSeparator(), sg.Text('Max. Speed [m/s]:', size=(15,1)), sg.Input(key='max_speed', default_text=default_params['max_speed'], size=(10,1))],
+    [sg.Text('AOI')],
+    [sg.In(size=(80,1)), sg.FileBrowse(key='aoi', file_types=(("Shapefile", "*.shp"), (".plan File", "*.plan")), initial_folder=os.path.dirname(default_params['aoi']))],
     [sg.HorizontalSeparator()],
     [sg.Text('Position Corrections')],
     [sg.Text('Transducer Offset [X]:', size=(22,1)), sg.Input(key='x_offset', default_text=default_params['x_offset'], size=(10,1)), sg.VerticalSeparator(), sg.Text('Transducer Offset [Y]:', size=(22,1)), sg.Input(key='y_offset', default_text=default_params['y_offset'], size=(10,1))],
@@ -73,21 +74,23 @@
     [sg.Text('Depth Detection', size=(20,1)), sg.Combo(['Sensor', 'Auto'], key='detectDep', default_value=default_params['detectDep']), sg.VerticalSeparator(), sg.Checkbox('Smooth Depth', key='smthDep', default=default_params['smthDep']), sg.VerticalSeparator(), sg.Text('Adjust Depth [m]'), sg.Input(key='adjDep', default_text=default_params['adjDep'], size=(10,1)), sg.VerticalSeparator(()), sg.Checkbox('Plot Bedpick', key='pltBedPick', default=default_params['pltBedPick'])],
     [sg.HorizontalSeparator()],
     [sg.Text('Sonar Georectification Exports')],
+    [sg.Text('Pixel Resolution [0==Default Resolution (~0.02m)]', size=(38,1)), sg.Input(key='pix_res_son', default_text=default_params['pix_res_son'], size=(10,1)),],
     [sg.Checkbox('WCP', key='rect_wcp', default=default_params['rect_wcp']), sg.Checkbox('WCR', key='rect_wcr', default=default_params['rect_wcr']), sg.Text('Sonar Colormap'), sg.Combo(plt.colormaps(), key='son_colorMap', default_value=default_params['son_colorMap'])],
     [sg.HorizontalSeparator()],
     [sg.Text('Substrate Mapping')],
     # [sg.Checkbox('Predict Substrate', key='pred_sub', default=default_params['pred_sub']), sg.VerticalSeparator(), sg.Checkbox('Export Substrate Plots', key='pltSubClass', default=default_params['pltSubClass'])],
     # [sg.Checkbox('Map Substrate [Raster]', key='map_sub', default=default_params['map_sub']), sg.VerticalSeparator(), sg.Checkbox('Map Substrate [Polygon]', key='export_poly', default=default_params['export_poly']), sg.VerticalSeparator(), sg.Text('Classification Method'), sg.Combo(['max'], key='map_class_method', default_value=default_params['map_class_method'])],
     # [sg.Checkbox('Export Substrate Plots', key='pltSubClass', default=default_params['pltSubClass'])],
     # [sg.Text('Map Predictions', size=(20,1)), sg.Combo(['False', 'Logit', 'Probability'], key='map_predict', default_value=default_params['map_predict'])],
+    [sg.Text('Pixel Resolution [0==Default Resolution (~0.02m)]', size=(38,1)), sg.Input(key='pix_res_map', default_text=default_params['pix_res_map'], size=(10,1))],
     [sg.Checkbox('Map Substrate [Raster]', key='map_sub', default=default_params['map_sub']), sg.VerticalSeparator(), sg.Checkbox('Map Substrate [Polygon]', key='export_poly', default=default_params['export_poly']), sg.VerticalSeparator(), sg.Checkbox('Export Substrate Plots', key='pltSubClass', default=default_params['pltSubClass'])],
     [sg.HorizontalSeparator()],
     [sg.Text('Mosaic Exports')],
     [sg.Text('# Chunks per Mosaic [0==All Chunks]'), sg.Input(key='mosaic_nchunk', default_text=default_params['mosaic_nchunk'], size=(10,1))],
     [sg.Text('Export Sonar Mosaic'), sg.Combo(['False', 'GTiff', 'VRT'], key='mosaic', default_value=default_params['mosaic']), sg.VerticalSeparator(), sg.Text('Export Substrate Mosaic'), sg.Combo(['False', 'GTiff', 'VRT'], key='map_mosaic', default_value=default_params['map_mosaic'])],
     [sg.HorizontalSeparator()],
-    [sg.Text('Miscellaneous Exports')],
-    [sg.Checkbox('Banklines', key='banklines', default=default_params['banklines'])],
+    [sg.Text('Miscellaneous Shapefile Exports')],
+    [sg.Checkbox('Banklines', key='banklines', default=default_params['banklines']), sg.VerticalSeparator(), sg.Checkbox('Coverage', key='coverage', default=default_params['coverage'])],
     [sg.HorizontalSeparator()],
     [sg.Submit(), sg.Quit(), sg.Button('Save Defaults')]
 ]
@@ -204,7 +207,6 @@
 
 params = {
     'humFile':values['humFile'],
-    'aoi':aoi,
     'projDir':os.path.join(values['proj'], values['projName']),
     'project_mode':int(values['project_mode']),
     'tempC':float(values['tempC']),
@@ -213,6 +215,11 @@
     'exportUnknown':values['exportUnknown'],
     'fixNoDat':values['fixNoDat'],
     'threadCnt':int(values['threadCnt']),
+    'aoi':aoi,
+    'max_heading_deviation':float(values['max_heading_deviation']),
+    'max_heading_distance':float(values['max_heading_distance']),
+    'min_speed':float(values['min_speed']),
+    'max_speed':float(values['max_speed']),
     'pix_res_son':float(values['pix_res_son']),
     'pix_res_map':float(values['pix_res_map']),
     'x_offset':float(values['x_offset']),
@@ -243,7 +250,8 @@
     'mosaic_nchunk':int(values['mosaic_nchunk']),
     'mosaic':mosaic,
     'map_mosaic':map_mosaic,
-    'banklines':values['banklines']
+    'banklines':values['banklines'],
+    'coverage':values['coverage']
 }
 
 globals().update(params)
@@ -315,7 +323,7 @@
     # read_master_func(sonFiles, humFile, projDir, t, nchunk, exportUnknown, wcp, wcr, tileFile, detectDepth, smthDep, adjDep, pltBedPick, threadCnt)
 
     #==================================================
-    if rect_wcp or rect_wcr or banklines:
+    if rect_wcp or rect_wcr or banklines or coverage:
         print('\n===========================================')
         print('===========================================')
         print('***** RECTIFYING *****')

gui_main_batchDirectory.py

@@ -34,8 +34,6 @@
 layout = [
     [sg.Text('Parent Folder of Recordings to Process')],
     [sg.In(key='inDir', size=(80,1)), sg.FolderBrowse(initial_folder=(default_params['inDir']))],
-    [sg.Text('AOI')],
-    [sg.In(size=(80,1)), sg.FileBrowse(key='aoi', file_types=(("Shapefile", "*.shp"), (".plan File", "*.plan")), initial_folder=os.path.dirname(default_params['aoi']))],
     [sg.Text('Output Folder')],
     [sg.In(size=(80,1)), sg.FolderBrowse(key='proj', initial_folder=os.path.dirname(default_params['projDir']))],
     [sg.Text('Project Name Prefix:', size=(20,1)), sg.Input(key='prefix', size=(10,1)), sg.VerticalSeparator(), sg.Text('Project Name Suffix:', size=(20,1)), sg.Input(key='suffix', size=(10,1))],
@@ -45,13 +43,16 @@
     [sg.Text('General Parameters')],
     [sg.Text('Temperature [C]', size=(20,1)), sg.Input(key='tempC', default_text=default_params['tempC'], size=(10,1))],
     [sg.Text('Chunk Size', size=(20,1)), sg.Input(key='nchunk', default_text=default_params['nchunk'], size=(10,1))],
-    [sg.Text('Crop Range [m]', size=(20,1)), sg.Input(key='cropRange', default_text=default_params['cropRange'], size=(10,1))],
     [sg.Checkbox('Export Unknown Ping Attributes', key='exportUnknown', default=default_params['exportUnknown'])],
     [sg.Checkbox('Locate and flag missing pings', key='fixNoDat', default=default_params['fixNoDat'])],
     [sg.Text('Thread Count [0==All Threads]', size=(30,1)), sg.Input(key='threadCnt', default_text=default_params['threadCnt'], size=(10,1))],
     [sg.HorizontalSeparator()],
-    [sg.Text('GeoTiff Pixel Resolution [0==Default Resolution (~0.02m)]')],
-    [sg.Text('Sonar', size=(10,1)), sg.Input(key='pix_res_son', default_text=default_params['pix_res_son'], size=(10,1)), sg.Text('Substrate', size=(10,1)), sg.Input(key='pix_res_map', default_text=default_params['pix_res_map'], size=(10,1))],
+    [sg.Text('Filter Sonar Log')],
+    [sg.Text('Crop Range [m]', size=(22,1)), sg.Input(key='cropRange', default_text=default_params['cropRange'], size=(10,1))],
+    [sg.Text('Max. Heading Deviation [deg]:', size=(22,1)), sg.Input(key='max_heading_deviation', default_text=default_params['max_heading_deviation'], size=(10,1)), sg.VerticalSeparator(), sg.Text('Distance [m]:', size=(15,1)), sg.Input(key='max_heading_distance', default_text=default_params['max_heading_distance'], size=(10,1))],
+    [sg.Text('Min. Speed [m/s]:', size=(22,1)), sg.Input(key='min_speed', default_text=default_params['min_speed'], size=(10,1)), sg.VerticalSeparator(), sg.Text('Max. Speed [m/s]:', size=(15,1)), sg.Input(key='max_speed', default_text=default_params['max_speed'], size=(10,1))],
+    [sg.Text('AOI')],
+    [sg.In(size=(80,1)), sg.FileBrowse(key='aoi', file_types=(("Shapefile", "*.shp"), (".plan File", "*.plan")), initial_folder=os.path.dirname(default_params['aoi']))],
     [sg.HorizontalSeparator()],
     [sg.Text('Position Corrections')],
     [sg.Text('Transducer Offset [X]:', size=(22,1)), sg.Input(key='x_offset', default_text=default_params['x_offset'], size=(10,1)), sg.VerticalSeparator(), sg.Text('Transducer Offset [Y]:', size=(22,1)), sg.Input(key='y_offset', default_text=default_params['y_offset'], size=(10,1))],
@@ -72,21 +73,23 @@
     [sg.Text('Depth Detection', size=(20,1)), sg.Combo(['Sensor', 'Auto'], key='detectDep', default_value=default_params['detectDep']), sg.VerticalSeparator(), sg.Checkbox('Smooth Depth', key='smthDep', default=default_params['smthDep']), sg.VerticalSeparator(), sg.Text('Adjust Depth [m]'), sg.Input(key='adjDep', default_text=default_params['adjDep'], size=(10,1)), sg.VerticalSeparator(()), sg.Checkbox('Plot Bedpick', key='pltBedPick', default=default_params['pltBedPick'])],
     [sg.HorizontalSeparator()],
     [sg.Text('Sonar Georectification Exports')],
+    [sg.Text('Pixel Resolution [0==Default Resolution (~0.02m)]', size=(38,1)), sg.Input(key='pix_res_son', default_text=default_params['pix_res_son'], size=(10,1)),],
     [sg.Checkbox('WCP', key='rect_wcp', default=default_params['rect_wcp']), sg.Checkbox('WCR', key='rect_wcr', default=default_params['rect_wcr']), sg.Text('Sonar Colormap'), sg.Combo(plt.colormaps(), key='son_colorMap', default_value=default_params['son_colorMap'])],
     [sg.HorizontalSeparator()],
     [sg.Text('Substrate Mapping')],
     # [sg.Checkbox('Predict Substrate', key='pred_sub', default=default_params['pred_sub']), sg.VerticalSeparator(), sg.Checkbox('Export Substrate Plots', key='pltSubClass', default=default_params['pltSubClass'])],
     # [sg.Checkbox('Map Substrate [Raster]', key='map_sub', default=default_params['map_sub']), sg.VerticalSeparator(), sg.Checkbox('Map Substrate [Polygon]', key='export_poly', default=default_params['export_poly']), sg.VerticalSeparator(), sg.Text('Classification Method'), sg.Combo(['max'], key='map_class_method', default_value=default_params['map_class_method'])],
     # [sg.Checkbox('Export Substrate Plots', key='pltSubClass', default=default_params['pltSubClass'])],
     # [sg.Text('Map Predictions', size=(20,1)), sg.Combo(['False', 'Logit', 'Probability'], key='map_predict', default_value=default_params['map_predict'])],
+    [sg.Text('Pixel Resolution [0==Default Resolution (~0.02m)]', size=(38,1)), sg.Input(key='pix_res_map', default_text=default_params['pix_res_map'], size=(10,1))],
     [sg.Checkbox('Map Substrate [Raster]', key='map_sub', default=default_params['map_sub']), sg.VerticalSeparator(), sg.Checkbox('Map Substrate [Polygon]', key='export_poly', default=default_params['export_poly']), sg.VerticalSeparator(), sg.Checkbox('Export Substrate Plots', key='pltSubClass', default=default_params['pltSubClass'])],
     [sg.HorizontalSeparator()],
     [sg.Text('Mosaic Exports')],
     [sg.Text('# Chunks per Mosaic [0==All Chunks]'), sg.Input(key='mosaic_nchunk', default_text=default_params['mosaic_nchunk'], size=(10,1))],
     [sg.Text('Export Sonar Mosaic'), sg.Combo(['False', 'GTiff', 'VRT'], key='mosaic', default_value=default_params['mosaic']), sg.VerticalSeparator(), sg.Text('Export Substrate Mosaic'), sg.Combo(['False', 'GTiff', 'VRT'], key='map_mosaic', default_value=default_params['map_mosaic'])],
     [sg.HorizontalSeparator()],
-    [sg.Text('Miscellaneous Exports')],
-    [sg.Checkbox('Banklines', key='banklines', default=default_params['banklines'])],
+    [sg.Text('Miscellaneous Shapefile Exports')],
+    [sg.Checkbox('Banklines', key='banklines', default=default_params['banklines']), sg.VerticalSeparator(), sg.Checkbox('Coverage', key='coverage', default=default_params['coverage'])],
     [sg.HorizontalSeparator()],
     [sg.Submit(), sg.Quit(), sg.Button('Save Defaults')]
 ]
@@ -213,14 +216,18 @@
 params = {
     # 'humFile':values[0],
     # 'projDir':os.path.join(values[1], values[2]),
-    'aoi':aoi,
     'project_mode':int(values['project_mode']),
     'tempC':float(values['tempC']),
     'nchunk':int(values['nchunk']),
     'cropRange':float(values['cropRange']),
     'exportUnknown':values['exportUnknown'],
     'fixNoDat':values['fixNoDat'],
     'threadCnt':int(values['threadCnt']),
+    'aoi':aoi,
+    'max_heading_deviation':float(values['max_heading_deviation']),
+    'max_heading_distance':float(values['max_heading_distance']),
+    'min_speed':float(values['min_speed']),
+    'max_speed':float(values['max_speed']),
     'pix_res_son':float(values['pix_res_son']),
     'pix_res_map':float(values['pix_res_map']),
     'x_offset':float(values['x_offset']),
@@ -251,7 +258,8 @@
     'mosaic_nchunk':int(values['mosaic_nchunk']),
     'mosaic':mosaic,
     'map_mosaic':map_mosaic,
-    'banklines':values['banklines']
+    'banklines':values['banklines'],
+    'coverage':values['coverage']
 }
 
 globals().update(params)