Skip to content
Snippets Groups Projects
Commit 024f36a2 authored by Qianqian Fang's avatar Qianqian Fang
Browse files

update changelog and tag 1.0rc1

git-svn-id: http://svn.code.sf.net/p/iso2mesh/code/trunk/jsonlab@440 786e58fb-9377-0410-9ff7-e4ac0ac0635c
parent ec151dcf
No related branches found
No related tags found
No related merge requests found
...@@ -6,6 +6,13 @@ ...@@ -6,6 +6,13 @@
JSONlab ChangeLog (key features marked by *): JSONlab ChangeLog (key features marked by *):
== JSONlab 1.0.0-RC1 (codename: Optimus - RC1), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
2014/09/17 fix several compatibility issues when running on octave versions 3.2-3.8
2014/09/17 support 2D cell and struct arrays in both savejson and saveubjson
2014/08/04 escape special characters in a JSON string
2014/02/16 fix a bug when saving ubjson files
== JSONlab 0.9.9 (codename: Optimus - beta), FangQ <fangq (at) nmr.mgh.harvard.edu> == == JSONlab 0.9.9 (codename: Optimus - beta), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
2014/01/22 use binary read and write in saveubjson and loadubjson 2014/01/22 use binary read and write in saveubjson and loadubjson
......
...@@ -93,7 +93,7 @@ JSON. The detailed help info for the four functions can be found below: ...@@ -93,7 +93,7 @@ JSON. The detailed help info for the four functions can be found below:
http://www.mathworks.com/matlabcentral/fileexchange/20565 http://www.mathworks.com/matlabcentral/fileexchange/20565
date: 2008/07/03 date: 2008/07/03
$Id: loadjson.m 394 2012-12-18 17:58:11Z fangq $ $Id: loadjson.m 437 2014-09-15 18:59:36Z fangq $
input: input:
fname: input file name, if fname contains "{}" or "[]", fname fname: input file name, if fname contains "{}" or "[]", fname
...@@ -121,7 +121,7 @@ JSON. The detailed help info for the four functions can be found below: ...@@ -121,7 +121,7 @@ JSON. The detailed help info for the four functions can be found below:
author: Qianqian Fang (fangq<at> nmr.mgh.harvard.edu) author: Qianqian Fang (fangq<at> nmr.mgh.harvard.edu)
created on 2011/09/09 created on 2011/09/09
$Id: savejson.m 394 2012-12-18 17:58:11Z fangq $ $Id: savejson.m 439 2014-09-17 05:31:08Z fangq $
input: input:
rootname: name of the root-object, if set to '', will use variable name rootname: name of the root-object, if set to '', will use variable name
...@@ -169,6 +169,7 @@ JSON. The detailed help info for the four functions can be found below: ...@@ -169,6 +169,7 @@ JSON. The detailed help info for the four functions can be found below:
wrapped inside a function call as 'foo(...);' wrapped inside a function call as 'foo(...);'
opt.UnpackHex [1|0]: conver the 0x[hex code] output by loadjson opt.UnpackHex [1|0]: conver the 0x[hex code] output by loadjson
back to the string form back to the string form
opt.SaveBinary [0|1]: 1 - save the JSON file in binary mode; 0 - text mode.
opt can be replaced by a list of ('param',value) pairs. The param opt can be replaced by a list of ('param',value) pairs. The param
string is equivallent to a field in opt. string is equivallent to a field in opt.
output: output:
...@@ -193,7 +194,7 @@ JSON. The detailed help info for the four functions can be found below: ...@@ -193,7 +194,7 @@ JSON. The detailed help info for the four functions can be found below:
authors:Qianqian Fang (fangq<at> nmr.mgh.harvard.edu) authors:Qianqian Fang (fangq<at> nmr.mgh.harvard.edu)
date: 2013/08/01 date: 2013/08/01
$Id: loadubjson.m 410 2013-08-24 03:33:18Z fangq $ $Id: loadubjson.m 436 2014-08-05 20:51:40Z fangq $
input: input:
fname: input file name, if fname contains "{}" or "[]", fname fname: input file name, if fname contains "{}" or "[]", fname
...@@ -221,7 +222,7 @@ JSON. The detailed help info for the four functions can be found below: ...@@ -221,7 +222,7 @@ JSON. The detailed help info for the four functions can be found below:
author: Qianqian Fang (fangq<at> nmr.mgh.harvard.edu) author: Qianqian Fang (fangq<at> nmr.mgh.harvard.edu)
created on 2013/08/17 created on 2013/08/17
$Id: saveubjson.m 410 2013-08-24 03:33:18Z fangq $ $Id: saveubjson.m 439 2014-09-17 05:31:08Z fangq $
input: input:
rootname: name of the root-object, if set to '', will use variable name rootname: name of the root-object, if set to '', will use variable name
...@@ -268,7 +269,7 @@ JSON. The detailed help info for the four functions can be found below: ...@@ -268,7 +269,7 @@ JSON. The detailed help info for the four functions can be found below:
a=struct('node',[1 9 10; 2 1 1.2], 'elem',[9 1;1 2;2 3],... a=struct('node',[1 9 10; 2 1 1.2], 'elem',[9 1;1 2;2 3],...
'face',[9 01 2; 1 2 3; NaN,Inf,-Inf], 'author','FangQ'); 'face',[9 01 2; 1 2 3; NaN,Inf,-Inf], 'author','FangQ');
saveubjson('mesh',a) saveubjson('mesh',a)
saveubjson('',a,'ArrayIndent',0,'FloatFormat','\t%.5g') saveubjson('mesh',a,'meshdata.ubj')
</pre> </pre>
...@@ -294,7 +295,7 @@ and robust. Hopefully in a few future releases, the limitations become less. ...@@ -294,7 +295,7 @@ and robust. Hopefully in a few future releases, the limitations become less.
Here are the known issues: Here are the known issues:
# Any high-dimensional cell-array will be converted to a 1D array; # 3D or higher dimensional cell/struct-arrays will be converted to 2D arrays;
# When processing names containing multi-byte characters, Octave and MATLAB \ # When processing names containing multi-byte characters, Octave and MATLAB \
can give different field-names; you can use feature('DefaultCharacterSet','latin1') \ can give different field-names; you can use feature('DefaultCharacterSet','latin1') \
in MATLAB to get consistant results in MATLAB to get consistant results
......
...@@ -58,7 +58,7 @@ function json=saveubjson(rootname,obj,varargin) ...@@ -58,7 +58,7 @@ function json=saveubjson(rootname,obj,varargin)
% a=struct('node',[1 9 10; 2 1 1.2], 'elem',[9 1;1 2;2 3],... % a=struct('node',[1 9 10; 2 1 1.2], 'elem',[9 1;1 2;2 3],...
% 'face',[9 01 2; 1 2 3; NaN,Inf,-Inf], 'author','FangQ'); % 'face',[9 01 2; 1 2 3; NaN,Inf,-Inf], 'author','FangQ');
% saveubjson('mesh',a) % saveubjson('mesh',a)
% saveubjson('',a,'ArrayIndent',0,'FloatFormat','\t%.5g') % saveubjson('mesh',a,'meshdata.ubj')
% %
% license: % license:
% BSD or GPL version 3, see LICENSE_{BSD,GPLv3}.txt files for details % BSD or GPL version 3, see LICENSE_{BSD,GPLv3}.txt files for details
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment