|
150 | 150 | end
|
151 | 151 |
|
152 | 152 | % save to a file if FileName is set, suggested by Patrick Rapin
|
153 |
| -if(~isempty(jsonopt('FileName','',opt))) |
| 153 | +filename=jsonopt('FileName','',opt); |
| 154 | +if(~isempty(filename)) |
154 | 155 | if(jsonopt('SaveBinary',0,opt)==1)
|
155 |
| - fid = fopen(opt.filename, 'wb'); |
| 156 | + fid = fopen(filename, 'wb'); |
156 | 157 | fwrite(fid,json);
|
157 | 158 | else
|
158 |
| - fid = fopen(opt.filename, 'wt'); |
| 159 | + fid = fopen(filename, 'wt'); |
159 | 160 | fwrite(fid,json,'char');
|
160 | 161 | end
|
161 | 162 | fclose(fid);
|
|
178 | 179 |
|
179 | 180 | %%-------------------------------------------------------------------------
|
180 | 181 | function txt=cell2json(name,item,level,varargin)
|
181 |
| -txt=''; |
| 182 | +txt={}; |
182 | 183 | if(~iscell(item))
|
183 | 184 | error('input is not a cell');
|
184 | 185 | end
|
|
196 | 197 | bracketlevel=~jsonopt('singletcell',1,varargin{:});
|
197 | 198 | if(len>bracketlevel)
|
198 | 199 | if(~isempty(name))
|
199 |
| - txt=sprintf('%s"%s": [%s',padding0, checkname(name,varargin{:}),nl); name=''; |
| 200 | + txt={padding0, '"', checkname(name,varargin{:}),'": [', nl}; name=''; |
200 | 201 | else
|
201 |
| - txt=sprintf('%s[%s',padding0,nl); |
| 202 | + txt={padding0, '[', nl}; |
202 | 203 | end
|
203 | 204 | elseif(len==0)
|
204 | 205 | if(~isempty(name))
|
205 |
| - txt=sprintf('%s"%s": []',padding0, checkname(name,varargin{:})); name=''; |
| 206 | + txt={padding0, '"' checkname(name,varargin{:}) '": []'}; name=''; |
206 | 207 | else
|
207 |
| - txt=sprintf('%s[]',padding0); |
| 208 | + txt={padding0, '[]'}; |
208 | 209 | end
|
209 | 210 | end
|
210 | 211 | for i=1:dim(1)
|
211 | 212 | if(dim(1)>1)
|
212 |
| - txt=sprintf('%s%s[%s',txt,padding2,nl); |
| 213 | + txt(end+1:end+3)={padding2,'[',nl}; |
213 | 214 | end
|
214 | 215 | for j=1:dim(2)
|
215 |
| - txt=sprintf('%s%s',txt,obj2json(name,item{i,j},level+(dim(1)>1)+(len>bracketlevel),varargin{:})); |
| 216 | + txt{end+1}=obj2json(name,item{i,j},level+(dim(1)>1)+(len>bracketlevel),varargin{:}); |
216 | 217 | if(j<dim(2))
|
217 |
| - txt=sprintf('%s%s',txt,sprintf(',%s',nl)); |
| 218 | + txt(end+1:end+2)={',' nl}; |
218 | 219 | end
|
219 | 220 | end
|
220 | 221 | if(dim(1)>1)
|
221 |
| - txt=sprintf('%s%s%s]',txt,nl,padding2); |
| 222 | + txt(end+1:end+3)={nl,padding2,']'}; |
222 | 223 | end
|
223 | 224 | if(i<dim(1))
|
224 |
| - txt=sprintf('%s%s',txt,sprintf(',%s',nl)); |
| 225 | + txt(end+1:end+2)={',' nl}; |
225 | 226 | end
|
226 | 227 | %if(j==dim(2)) txt=sprintf('%s%s',txt,sprintf(',%s',nl)); end
|
227 | 228 | end
|
228 | 229 | if(len>bracketlevel)
|
229 |
| - txt=sprintf('%s%s%s]',txt,nl,padding0); |
| 230 | + txt(end+1:end+3)={nl,padding0,']'}; |
230 | 231 | end
|
| 232 | +txt = sprintf('%s',txt{:}); |
231 | 233 |
|
232 | 234 | %%-------------------------------------------------------------------------
|
233 | 235 | function txt=struct2json(name,item,level,varargin)
|
234 |
| -txt=''; |
| 236 | +txt={}; |
235 | 237 | if(~isstruct(item))
|
236 | 238 | error('input is not a struct');
|
237 | 239 | end
|
|
251 | 253 |
|
252 | 254 | if(isempty(item))
|
253 | 255 | if(~isempty(name))
|
254 |
| - txt=sprintf('%s"%s": []',padding0,checkname(name,varargin{:})); |
| 256 | + txt={padding0, '"', checkname(name,varargin{:}),'": []'}; |
255 | 257 | else
|
256 |
| - txt=sprintf('%s[]',padding0); |
| 258 | + txt={padding0, '[]'}; |
257 | 259 | end
|
258 | 260 | return;
|
259 | 261 | end
|
260 | 262 | if(~isempty(name))
|
261 | 263 | if(forcearray)
|
262 |
| - txt=sprintf('%s"%s": [%s',padding0,checkname(name,varargin{:}),nl); |
| 264 | + txt={padding0, '"', checkname(name,varargin{:}),'": [', nl}; |
263 | 265 | end
|
264 | 266 | else
|
265 | 267 | if(forcearray)
|
266 |
| - txt=sprintf('%s[%s',padding0,nl); |
| 268 | + txt={padding0, '[', nl}; |
267 | 269 | end
|
268 | 270 | end
|
269 | 271 | for j=1:dim(2)
|
270 | 272 | if(dim(1)>1)
|
271 |
| - txt=sprintf('%s%s[%s',txt,padding2,nl); |
| 273 | + txt(end+1:end+3)={padding2,'[',nl}; |
272 | 274 | end
|
273 | 275 | for i=1:dim(1)
|
274 | 276 | names = fieldnames(item(i,j));
|
275 | 277 | if(~isempty(name) && len==1 && ~forcearray)
|
276 |
| - txt=sprintf('%s%s"%s": {%s',txt,padding1, checkname(name,varargin{:}),nl); |
| 278 | + txt(end+1:end+5)={padding1, '"', checkname(name,varargin{:}),'": {', nl}; |
277 | 279 | else
|
278 |
| - txt=sprintf('%s%s{%s',txt,padding1,nl); |
| 280 | + txt(end+1:end+3)={padding1, '{', nl}; |
279 | 281 | end
|
280 | 282 | if(~isempty(names))
|
281 | 283 | for e=1:length(names)
|
282 |
| - txt=sprintf('%s%s',txt,obj2json(names{e},item(i,j).(names{e}),... |
283 |
| - level+(dim(1)>1)+1+forcearray,varargin{:})); |
| 284 | + txt{end+1}=obj2json(names{e},item(i,j).(names{e}),... |
| 285 | + level+(dim(1)>1)+1+forcearray,varargin{:}); |
284 | 286 | if(e<length(names))
|
285 |
| - txt=sprintf('%s%s',txt,','); |
| 287 | + txt{end+1}=','; |
286 | 288 | end
|
287 |
| - txt=sprintf('%s%s',txt,nl); |
| 289 | + txt{end+1}=nl; |
288 | 290 | end
|
289 | 291 | end
|
290 |
| - txt=sprintf('%s%s}',txt,padding1); |
| 292 | + txt(end+1:end+2)={padding1,'}'}; |
291 | 293 | if(i<dim(1))
|
292 |
| - txt=sprintf('%s%s',txt,sprintf(',%s',nl)); |
| 294 | + txt(end+1:end+2)={',' nl}; |
293 | 295 | end
|
294 | 296 | end
|
295 | 297 | if(dim(1)>1)
|
296 |
| - txt=sprintf('%s%s%s]',txt,nl,padding2); |
| 298 | + txt(end+1:end+3)={nl,padding2,']'}; |
297 | 299 | end
|
298 | 300 | if(j<dim(2))
|
299 |
| - txt=sprintf('%s%s',txt,sprintf(',%s',nl)); |
| 301 | + txt(end+1:end+2)={',' nl}; |
300 | 302 | end
|
301 | 303 | end
|
302 | 304 | if(forcearray)
|
303 |
| - txt=sprintf('%s%s%s]',txt,nl,padding0); |
| 305 | + txt(end+1:end+3)={nl,padding0,']'}; |
304 | 306 | end
|
| 307 | +txt = sprintf('%s',txt{:}); |
305 | 308 |
|
306 | 309 | %%-------------------------------------------------------------------------
|
307 | 310 | function txt=str2json(name,item,level,varargin)
|
308 |
| -txt=''; |
| 311 | +txt={}; |
309 | 312 | if(~ischar(item))
|
310 | 313 | error('input is not a string');
|
311 | 314 | end
|
|
320 | 323 |
|
321 | 324 | if(~isempty(name))
|
322 | 325 | if(len>1)
|
323 |
| - txt=sprintf('%s"%s": [%s',padding1,checkname(name,varargin{:}),nl); |
| 326 | + txt={padding1, '"', checkname(name,varargin{:}),'": [', nl}; |
324 | 327 | end
|
325 | 328 | else
|
326 | 329 | if(len>1)
|
327 |
| - txt=sprintf('%s[%s',padding1,nl); |
| 330 | + txt={padding1, '[', nl}; |
328 | 331 | end
|
329 | 332 | end
|
330 | 333 | for e=1:len
|
|
334 | 337 | if(isempty(name))
|
335 | 338 | obj=['"',val,'"'];
|
336 | 339 | end
|
337 |
| - txt=sprintf('%s%s%s%s',txt,padding1,obj); |
| 340 | + txt(end+1:end+2)={padding1, obj}; |
338 | 341 | else
|
339 |
| - txt=sprintf('%s%s%s%s',txt,padding0,['"',val,'"']); |
| 342 | + txt(end+1:end+4)={padding0,'"',val,'"'}; |
340 | 343 | end
|
341 | 344 | if(e==len)
|
342 | 345 | sep='';
|
343 | 346 | end
|
344 |
| - txt=sprintf('%s%s',txt,sep); |
| 347 | + txt{end+1}=sep; |
345 | 348 | end
|
346 | 349 | if(len>1)
|
347 |
| - txt=sprintf('%s%s%s%s',txt,nl,padding1,']'); |
| 350 | + txt(end+1:end+3)={nl,padding1,']'}; |
348 | 351 | end
|
| 352 | +txt = sprintf('%s',txt{:}); |
349 | 353 |
|
350 | 354 | %%-------------------------------------------------------------------------
|
351 | 355 | function txt=mat2json(name,item,level,varargin)
|
|
0 commit comments