|
109 | 109 | % nix.Filter helper functions
|
110 | 110 | % -----------------------------------------------------------
|
111 | 111 |
|
112 |
| - function err = valid_filter(filter, val) |
113 |
| - err = ''; |
| 112 | + function [] = valid_filter(filter, val) |
114 | 113 | if (~isa(filter, 'nix.Filter'))
|
115 |
| - err = 'Valid nix.Filter required'; |
116 |
| - return |
| 114 | + err.identifier = 'NIXMX:InvalidArgument'; |
| 115 | + err.message = 'Valid nix.Filter required'; |
| 116 | + error(err); |
117 | 117 | end
|
118 | 118 |
|
119 | 119 | % Currently matlab will crash, if anything other than
|
120 | 120 | % a cell array is handed over to a nix.Filter.ids.
|
121 | 121 | if (filter == nix.Filter.ids && ~iscell(val))
|
122 |
| - err = 'nix.Filter.ids requires a cell array'; |
123 |
| - return |
| 122 | + err.identifier = 'NIXMX:InvalidArgument'; |
| 123 | + err.message = 'nix.Filter.ids requires a cell array'; |
| 124 | + error(err) |
124 | 125 | end
|
125 | 126 | end
|
126 | 127 |
|
127 | 128 | function r = filter(obj, mxMethodName, filter, val, objConstructor)
|
128 |
| - valid = nix.Utils.valid_filter(filter, val); |
129 |
| - if (~isempty(valid)) |
130 |
| - error(valid); |
131 |
| - end |
| 129 | + nix.Utils.valid_filter(filter, val); |
132 | 130 |
|
133 | 131 | mxMethod = strcat(obj.alias, '::', mxMethodName);
|
134 | 132 | list = nix_mx(mxMethod, obj.nix_handle, uint8(filter), val);
|
|
141 | 139 |
|
142 | 140 | function r = find(obj, mxMethodName, max_depth, filter, val, objConstructor)
|
143 | 141 | if (~isnumeric(max_depth))
|
144 |
| - error('Provide a valid search depth'); |
| 142 | + err.identifier = 'NIXMX:InvalidArgument'; |
| 143 | + err.message = 'Provide a valid search depth'; |
| 144 | + error(err); |
145 | 145 | end
|
146 | 146 |
|
147 |
| - valid = nix.Utils.valid_filter(filter, val); |
148 |
| - if (~isempty(valid)) |
149 |
| - error(valid); |
150 |
| - end |
| 147 | + nix.Utils.valid_filter(filter, val); |
151 | 148 |
|
152 | 149 | mxMethod = strcat(obj.alias, '::', mxMethodName);
|
153 | 150 | list = nix_mx(mxMethod, obj.nix_handle, max_depth, uint8(filter), val);
|
|
0 commit comments