Sun Jan 21 14:10:53 MST 2018

Author: Daniel Buscombe

PyHum/_pyhum_correct.py

@@ -568,7 +568,7 @@ def correct(humfile, sonpath, maxW=1000, doplot=1, dofilt=0, correct_withwater=0
     print("Processing took "+ str(elapsed) + "seconds to analyse")
 
     print("Done!")
-
+    print("===================================================")
 
 # =========================================================
 def water_atten(H,f,c,pH,T,S):

PyHum/_pyhum_map.py

@@ -76,6 +76,7 @@
 import PyHum.utils as humutils
 import pyresample
 #from scipy.ndimage import binary_dilation, binary_erosion, binary_fill_holes
+from skimage.restoration import denoise_tv_chambolle
 
 try:
    from pykdtree.kdtree import KDTree
@@ -261,13 +262,13 @@ def map(humfile, sonpath, cs2cs_args = "epsg:26949", res = 99, mode=3, nn = 64,
 #    dat_star = star_fp[p]
 #    data_R = R_fp[p]
 
-#    e = esi; del esi
-#    n = nsi; del nsi
-#    t = theta; del theta
-#    d = dist_tvg; del dist_tvg
-#    dat_port = port_fp; del port_fp
-#    dat_star = star_fp; del star_fp
-#    data_R = R_fp; del R_fp
+#    e = esi;# del esi
+#    n = nsi; #del nsi
+#    t = theta;# del theta
+#    d = dist_tvg;# del dist_tvg
+#    dat_port = port_fp;# del port_fp
+#    dat_star = star_fp; #del star_fp
+#    data_R = R_fp; #del R_fp
 
     dx = np.arcsin(meta['c']/(1000*meta['t']*meta['f']))
     pix_m = meta['pix_m']*1.1
@@ -296,6 +297,7 @@ def map(humfile, sonpath, cs2cs_args = "epsg:26949", res = 99, mode=3, nn = 64,
     print("Processing took "+str(elapsed)+"seconds to analyse")
 
     print("Done!")
+    print("===================================================")
 
 
 # =========================================================
@@ -327,6 +329,8 @@ def make_map(e, n, t, d, dat_port, dat_star, data_R, pix_m, res, cs2cs_args, son
 
    merge = merge.astype('float32')
 
+   merge = denoise_tv_chambolle(merge.copy(), weight=2, multichannel=False).astype('float32')
+
    R = np.vstack((np.flipud(data_R),data_R))
    del data_R
    R = R[:np.shape(merge)[0],:np.shape(merge)[1]]

PyHum/_pyhum_map_texture.py

@@ -441,6 +441,7 @@ def map_texture(humfile, sonpath, cs2cs_args = "epsg:26949", res = 0.5, mode=3,
     print("Processing took "+str(elapsed)+"seconds to analyse")
 
     print("Done!")
+    print("===================================================")
 
 # =========================================================
 def getclass_asc(sonpath, p):

PyHum/_pyhum_read.py

@@ -847,6 +847,7 @@ def read(humfile, sonpath, cs2cs_args="epsg:26949", c=1450.0, draft=0.3, doplot=
     print("Processing took "+ str(elapsed) + "seconds to analyse")
 
     print("Done!")
+    print("===================================================")
 
 
 # =========================================================

PyHum/_pyhum_rmshadows.py

@@ -549,6 +549,7 @@ def rmshadows(humfile, sonpath, win=31, shadowmask=0, doplot=1, dissim=3, correl
     print("Processing took "+str(elapsed)+ "seconds to analyse")
 
     print("Done!")
+    print("===================================================")
 
 # =========================================================
 def custom_save(figdirec,root):

PyHum/_pyhum_texture.py

@@ -412,7 +412,7 @@ def texture(humfile, sonpath, win=100, shift=10, doplot=1, density=50, numclasse
       print("Processing took "+ str(elapsed)+ "seconds to analyse")
 
       print("Done!")
-    
+      print("===================================================")    
 
 # =========================================================
 def get_srt(Z,ind,maxscale, notes, win): #, density):    

PyHum/_pyhum_texture2.py

@@ -362,6 +362,7 @@ def texture2(humfile, sonpath, win=10, doplot=1,  numclasses=4):
       print("Processing took " +str(elapsed)+ "seconds to analyse")
 
       print("Done!")
+      print("===================================================")
 
 # =========================================================
 def get_kclass(Sk, numclasses):   

PyHum/test.py

@@ -112,13 +112,14 @@ def dotest():
    notes = 4 # Notes per octave (for wavelet analysis)
 
    # for mapping
-   res = 0.1 #99 # grid resolution in metres
+   res = 0.05 #99 # grid resolution in metres
    # if res==99, the program will automatically calc res from the spatial res of the scans
    mode = 1 # gridding mode (simple nearest neighbour)
    #mode = 2 # gridding mode (inverse distance weighted nearest neighbour)
    #mode = 3 # gridding mode (gaussian weighted nearest neighbour)
    use_uncorrected = 0
 
+   scalemax=40
    nn = 64 #number of nearest neighbours for gridding (used if mode > 1)
    ##influence = 1 #Radius of influence used in gridding. Cut off distance in meters 
    numstdevs = 5 #Threshold number of standard deviations in sidescan intensity per grid cell up to which to accept 
@@ -142,7 +143,7 @@ def dotest():
    PyHum.texture2(humfile, sonpath, win, doplot, numclasses)
 
    ## grid and map the scans
-   PyHum.map(humfile, sonpath, cs2cs_args, res, mode, nn, numstdevs, use_uncorrected) #dowrite, 
+   PyHum.map(humfile, sonpath, cs2cs_args, res, mode, nn, numstdevs, use_uncorrected, scalemax) 
 
    ## calculate and map the e1 and e2 acoustic coefficients from the downward-looking sonar
    PyHum.e1e2(humfile, sonpath, cs2cs_args, ph, temp, salinity, beam, transfreq, integ, numclusters, doplot)

PyHum/utils.py

@@ -695,7 +695,7 @@ def make_kml(llcrnrlon, llcrnrlat, urcrnrlon, urcrnrlat,
         ground.draworder = draworder
         ground.visibility = kw.pop('visibility', 1)
         ground.name = kw.pop('name', 'overlay')
-        ground.color = kw.pop('color', '9effffff') ##kw.pop('color', '9effffff')
+        #ground.color = kw.pop('color', '9effffff') ##kw.pop('color', '9effffff')
 
         ground.atomauthor = kw.pop('author', 'PyHum')
         ground.latlonbox.rotation = kw.pop('rotation', 0)