Skip to content

Commit 38dc86d

Browse files
committed
some SnS .HD files couldn't be read because of line break formatting. Fixed this issue
1 parent aca0edd commit 38dc86d

3 files changed

Lines changed: 19 additions & 29 deletions

File tree

gprpy/toolbox/gprIO_DT1.py

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -57,56 +57,46 @@ def readdt1Header(filename):
5757
'''
5858

5959
info = {}
60-
with open(filename,"r") as datafile:
61-
datafile.readline()
62-
datafile.readline()
63-
info["system"] = datafile.readline()
64-
datafile.readline()
65-
info["date"] = datafile.readline()
66-
datafile.readline()
67-
string = datafile.readline()
60+
with open(filename,"r",newline='\n') as datafile:
61+
datafile.readline().strip()
62+
info["system"] = datafile.readline().strip()
63+
info["date"] = datafile.readline().strip()
64+
string = datafile.readline().strip()
6865
var = re.match(r'NUMBER OF TRACES = (.*)', string)
6966
info["N_traces"] = int(var.group(1))
70-
datafile.readline()
71-
string = datafile.readline()
67+
string = datafile.readline().strip()
7268
var = re.match(r'NUMBER OF PTS/TRC = (.*)', string)
7369
info["N_pts_per_trace"] = int(var.group(1))
74-
datafile.readline()
75-
string = datafile.readline()
70+
string = datafile.readline().strip()
7671
var = re.match(r'TIMEZERO AT POINT = (.*)', string)
7772
info["TZ_at_pt"] = float(var.group(1))
78-
datafile.readline()
79-
string = datafile.readline()
73+
string = datafile.readline().strip()
8074
var = re.match(r'TOTAL TIME WINDOW = (.*)', string)
8175
info["Total_time_window"] = float(var.group(1))
82-
datafile.readline()
83-
string = datafile.readline()
76+
string = datafile.readline().strip()
8477
var = re.match(r'STARTING POSITION = (.*)', string)
8578
info["Start_pos"] = float(var.group(1))
86-
datafile.readline()
87-
string = datafile.readline()
79+
string = datafile.readline().strip()
8880
var = re.match(r'FINAL POSITION = (.*)', string)
8981
info["Final_pos"] = float(var.group(1))
90-
datafile.readline()
91-
string = datafile.readline()
82+
string = datafile.readline().strip()
9283
var = re.match(r'STEP SIZE USED = (.*)', string)
9384
info["Step_size"] = float(var.group(1))
94-
datafile.readline()
95-
string = datafile.readline()
85+
string = datafile.readline().strip()
9686
var = re.match(r'POSITION UNITS = (.*)', string)
9787
info["Pos_units"] = str(var.group(1))
98-
datafile.readline()
99-
string = datafile.readline()
88+
string = datafile.readline().strip()
10089
var = re.match(r'NOMINAL FREQUENCY = (.*)', string)
10190
info["Freq"] = float(var.group(1))
102-
datafile.readline()
103-
string = datafile.readline()
91+
string = datafile.readline().strip()
10492
var = re.match(r'ANTENNA SEPARATION = (.*)', string)
10593
info["Antenna_sep"] = float(var.group(1))
10694
# If you need more of the header info, you can just continue as above
10795
# Transform feet to meters
108-
if info['Pos_units'] == 'ft ':
96+
if info['Pos_units'] == 'ft':
10997
info["Start_pos"] = info["Start_pos"]*0.3048
11098
info["Final_pos"] = info["Final_pos"]*0.3048
11199
info["Step_size"] = info["Step_size"]*0.3048
100+
info["Antenna_sep"] = info["Antenna_sep"]*0.3048
101+
info['Pos_units'] = 'm'
112102
return info

gprpy/toolbox/splash.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def showSplash(a,dir_path,widfac,highfac,fontfac):
7878
'size': 13.5*fontfac
7979
#'size': 45.6
8080
}
81-
a.text(50,-12000,'Version 1.0.3',fontdict=fontver)
81+
a.text(50,-12000,'Version 1.0.4',fontdict=fontver)
8282

8383
# add UA logo
8484
filename1=os.path.join(dir_path,'toolbox','splashdat',

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
setuptools.setup(
66
name="gprpy",
7-
version="1.0.3",
7+
version="1.0.4",
88
author="Alain Plattner",
99
author_email="plattner@alumni.ethz.ch",
1010
description="GPRPy - open source ground penetrating radar processing and visualization",

0 commit comments

Comments
 (0)