Skip to content

Commit 95e9e7e

Browse files
douggillespiedouggillespie
committed
Fix annotation reading
Fix reading of annotations from binary files.
1 parent 30794c8 commit 95e9e7e

11 files changed

Lines changed: 41 additions & 17 deletions

File tree

‎pgmatlab/+pgmatlab/+core/+annotations/@BeamFormer/BeamFormer.m‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11

22
classdef BeamFormer < pgmatlab.core.standard.StandardAnnotation
3+
properties
4+
name = "BeamFormer"
5+
end
36
methods
47
function obj = BeamFormer(); end
58
function [data, selState] = read(obj, fid, data, fileInfo, anLength, anVersion);

‎pgmatlab/+pgmatlab/+core/+annotations/@Bearing/Bearing.m‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11

22
classdef Bearing < pgmatlab.core.standard.StandardAnnotation
3+
properties
4+
name = "Bearing"
5+
end
36
methods
47
function obj = Bearing(); end
5-
function [data, selState] = read(obj, fid, data, fileInfo, anLength, anVersion);
8+
function [data, selState] = read(obj, fid, data, fileInfo, anLength, anVersion)
69
[data, selState] = read@pgmatlab.core.standard.StandardAnnotation(obj, fid, data, fileInfo, anLength, anVersion);
710

811
data.algorithmName = pgmatlab.utils.readJavaUTFString(fid);

‎pgmatlab/+pgmatlab/+core/+annotations/@ClickClsFr/ClickClsFr.m‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
classdef ClickClsFr < pgmatlab.core.standard.StandardAnnotation
2+
properties
3+
name = "ClickClsFr"
4+
end
25
methods
36
function obj = ClickClsFr(); end
4-
function [data, selState] = read(obj, fid, data, fileInfo, anLength, anVersion);
7+
function [data, selState] = read(obj, fid, data, fileInfo, anLength, anVersion);
58
[data, selState] = read@pgmatlab.core.standard.StandardAnnotation(obj, fid, data, fileInfo, anLength, anVersion);
6-
79
nclassifications = fread(fid, 1, 'int16');
810
for i = 1:nclassifications
911
data.classify_set(i) = fread(fid, 1, 'int16');

‎pgmatlab/+pgmatlab/+core/+annotations/@DL/DL.m‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@
4949

5050
methods
5151
function obj = DL(); end
52-
function [data, selState] = read(obj, fid, fileInfo, anLength, anVersion);
52+
function [data, selState] = read(obj, fid, data, fileInfo, anLength, anVersion)
53+
5354
nummodels = fread(fid, 1, 'int16'); % short in Java
5455

5556
% disp(['Num models: ' num2str(nummodels)])

‎pgmatlab/+pgmatlab/+core/+annotations/@MatchCls/MatchCls.m‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
classdef MatchCls < pgmatlab.core.standard.StandardAnnotation
2+
properties
3+
name = 'MatchCls';
4+
end
25
methods
36
function obj = MatchCls(); end
4-
function [data, selState] = read(obj, fid, data, fileInfo, anLength, anVersion);
7+
function [data, selState] = read(obj, fid, data, fileInfo, anLength, anVersion)
58
[data, selState] = read@pgmatlab.core.standard.StandardAnnotation(obj, fid, data, fileInfo, anLength, anVersion);
69

710
if (anVersion==1)

‎pgmatlab/+pgmatlab/+core/+annotations/@RWUDP/RWUDP.m‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
classdef RWUDP < pgmatlab.core.standard.StandardAnnotation
2+
properties
3+
name = 'RWUDP';
4+
end
25
methods
36
function obj = RWUDP(); end
4-
function [data, selState] = read(obj, fid, data, fileInfo, anLength, anVersion);
7+
function [data, selState] = read(obj, fid, data, fileInfo, anLength, anVersion)
58
[data, selState] = read@pgmatlab.core.standard.StandardAnnotation(obj, fid, data, fileInfo, anLength, anVersion);
69

710
data.label = pgmatlab.utils.readJavaUTFString(fid);

‎pgmatlab/+pgmatlab/+core/+annotations/@TDBL/TDBL.m‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
classdef TDBL < pgmatlab.core.standard.StandardAnnotation
2+
properties
3+
name = 'TDBL';
4+
end
25
methods
36
function obj = TDBL(); end
4-
function [data, selState] = read(obj, fid, data, fileInfo, anLength, anVersion);
7+
function [data, selState] = read(obj, fid, data, fileInfo, anLength, anVersion)
58
[data, selState] = read@pgmatlab.core.standard.StandardAnnotation(obj, fid, data, fileInfo, anLength, anVersion);
6-
9+
710
nAngles = fread(fid, 1, 'int16');
811
data.angles = fread(fid, nAngles, 'float32');
912
nErrors = fread(fid, 1, 'int16');

‎pgmatlab/+pgmatlab/+core/+annotations/@TM/TM.m‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
classdef TM < pgmatlab.core.standard.StandardAnnotation
2+
properties
3+
name = 'TargetMotion';
4+
end
25
methods
36
function obj = TM(); end
4-
function [data, selState] = read(obj, fid, data, fileInfo, anLength, anVersion);
7+
function [data, selState] = read(obj, fid, data, fileInfo, anLength, anVersion)
58
[data, selState] = read@pgmatlab.core.standard.StandardAnnotation(obj, fid, data, fileInfo, anLength, anVersion);
6-
9+
710
data.model = pgmatlab.utils.readJavaUTFString(fid);
811
data.nLocations = fread(fid, 1, 'int16');
912
data.hydrophones = fread(fid, 1, 'uint32');
1013
for i = 1:data.nLocations
11-
loc.latitude = fread(fid, 1, 'float64');
12-
loc.longitude = fread(fid, 1, 'float64');
14+
loc.latitude = fread(fid, 1, 'float64');
15+
loc.longitude = fread(fid, 1, 'float64');
1316
loc.height = fread(fid, 1, 'float32');
1417
loc.error = pgmatlab.utils.readJavaUTFString(fid);
1518
data.loc(i) = loc;

‎pgmatlab/+pgmatlab/+core/+annotations/@UserForm/UserForm.m‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
classdef UserForm < pgmatlab.core.standard.StandardAnnotation
2+
properties
3+
name = 'USerForm';
4+
end
25
methods
36
function obj = UserForm(); end
4-
function [data, selState] = read(obj, fid, data, fileInfo, anLength, anVersion);
7+
function [data, selState] = read(obj, fid, data, fileInfo, anLength, anVersion)
58
[data, selState] = read@pgmatlab.core.standard.StandardAnnotation(obj, fid, data, fileInfo, anLength, anVersion);
69

710
% this is not quite right...

‎pgmatlab/+pgmatlab/+core/+standard/@StandardAnnotation/StandardAnnotation.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
% StandardAnnotation.m
2-
32
classdef StandardAnnotation < pgmatlab.core.standard.BaseChunk
43
properties (Abstract)
54
name;
65
end
76
methods
87
function obj = StandardAnnotation(); end
9-
function [data, selState] = read(obj, fid, fileInfo, anLength, anVersion);
10-
[data, selState] = read@pgmatlab.core.standard.BaseChunk(obj, fid, fileInfo, anLength, 0);
8+
%function [data, selState] = read(obj, fid, fileInfo, anLength, anVersion)
9+
function [data, selState] = read(obj, fid, data, fileInfo, anLength, anVersion)
10+
[data, selState] = read@pgmatlab.core.standard.BaseChunk(obj, fid, data, fileInfo, anLength, anVersion);
1111
end
1212
end
1313
end

0 commit comments

Comments
 (0)