Skip to content

Commit c0b4956

Browse files
author
Tanner Blair
committed
added new json methods, removed old json methods, created test build.
1 parent 373689d commit c0b4956

31 files changed

+143
-54
lines changed

‎LVJSON Build Specification.vipb‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<VI_Package_Builder_Settings Version="2017" Created_Date="2017-08-08 12:01:46" Modified_Date="2018-02-01 18:05:44" Creator="tblair" Comments="" ID="aa89afed0b1a99d2996594660fad5b11">
1+
<VI_Package_Builder_Settings Version="2017" Created_Date="2017-08-08 12:01:46" Modified_Date="2018-05-16 11:42:12" Creator="tblair" Comments="" ID="c450ed914d47d2e10647002b70946fea">
22
<Library_General_Settings>
33
<Package_File_Name>NI_lib_LVJSON</Package_File_Name>
4-
<Library_Version>2.1.0.68</Library_Version>
4+
<Library_Version>3.0.0.69</Library_Version>
55
<Auto_Increment_Version>false</Auto_Increment_Version>
66
<Library_Source_Folder>Source</Library_Source_Folder>
77
<Library_Output_Folder>Builds</Library_Output_Folder>
@@ -33,7 +33,7 @@
3333
<Packager>NI Systems Engineering</Packager>
3434
<URL/>
3535
<Release_Notes>!!!BREAKING CHANGE!!!
36-
Simplified API, made all methods static. Added path VIs</Release_Notes>
36+
Revamped variant support. Untested at this point, upgrading is not recommended.</Release_Notes>
3737
</Description>
3838
<Destinations>
3939
<Toolkit_VIs>
@@ -326,7 +326,7 @@ Simplified API, made all methods static. Added path VIs</Release_Notes>
326326
<Path>Source\JSON Value\Helper Methods</Path>
327327
<VI_Title/>
328328
</Items_Data>
329-
<GUID>FFC68ECDAF9CCFB0BC3FC0815369DE80</GUID>
329+
<GUID>12375B01E650D0FAA5020E294343220E</GUID>
330330
</Functions_Palette_Data>
331331
<Functions_Palette_Data>
332332
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -529,7 +529,7 @@ Simplified API, made all methods static. Added path VIs</Release_Notes>
529529
<Path>Source\JSON Value\Array\Get Array Values.vi</Path>
530530
<VI_Title/>
531531
</Items_Data>
532-
<GUID>D97B0F793B83181F5C2DB9A8256F8459</GUID>
532+
<GUID>E7036F0B42B0AACCBC859A1298B46A44</GUID>
533533
</Functions_Palette_Data>
534534
<Functions_Palette_Data>
535535
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -606,7 +606,7 @@ Simplified API, made all methods static. Added path VIs</Release_Notes>
606606
<Path>Source\JSON Value\Object\Remove Value.vi</Path>
607607
<VI_Title/>
608608
</Items_Data>
609-
<GUID>B55AA9AAA371ED398A82C478BCAC9CFE</GUID>
609+
<GUID>6EF0E54EF88AAF06E522E4CFF7E7F911</GUID>
610610
</Functions_Palette_Data>
611611
<Functions_Palette_Data>
612612
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -644,46 +644,46 @@ Simplified API, made all methods static. Added path VIs</Release_Notes>
644644
<Items_Data>
645645
<Type>Item</Type>
646646
<Sub_Palette_Index>-1</Sub_Palette_Index>
647-
<NameSub_Menu_Name>To Variant.vi</NameSub_Menu_Name>
647+
<NameSub_Menu_Name>To File.vi</NameSub_Menu_Name>
648648
<Short_Name/>
649649
<is_Merge_VI>false</is_Merge_VI>
650650
<Position>
651-
<Row>2</Row>
651+
<Row>1</Row>
652652
<Column>1</Column>
653653
</Position>
654654
<Icon>00000000</Icon>
655-
<Path>Source\JSON Value\Variant Support\To Variant.vi</Path>
655+
<Path>Source\JSON Value\Helper Methods\To File.vi</Path>
656656
<VI_Title/>
657657
</Items_Data>
658658
<Items_Data>
659659
<Type>Item</Type>
660660
<Sub_Palette_Index>-1</Sub_Palette_Index>
661-
<NameSub_Menu_Name>From Variant.vi</NameSub_Menu_Name>
661+
<NameSub_Menu_Name>json to variant.vi</NameSub_Menu_Name>
662662
<Short_Name/>
663663
<is_Merge_VI>false</is_Merge_VI>
664664
<Position>
665665
<Row>2</Row>
666-
<Column>2</Column>
666+
<Column>1</Column>
667667
</Position>
668668
<Icon>00000000</Icon>
669-
<Path>Source\JSON Value\Variant Support\From Variant.vi</Path>
669+
<Path>Source\JSON Variant Support\json to variant.vi</Path>
670670
<VI_Title/>
671671
</Items_Data>
672672
<Items_Data>
673673
<Type>Item</Type>
674674
<Sub_Palette_Index>-1</Sub_Palette_Index>
675-
<NameSub_Menu_Name>To File.vi</NameSub_Menu_Name>
675+
<NameSub_Menu_Name>variant to json.vi</NameSub_Menu_Name>
676676
<Short_Name/>
677677
<is_Merge_VI>false</is_Merge_VI>
678678
<Position>
679-
<Row>1</Row>
680-
<Column>1</Column>
679+
<Row>2</Row>
680+
<Column>2</Column>
681681
</Position>
682682
<Icon>00000000</Icon>
683-
<Path>Source\JSON Value\Helper Methods\To File.vi</Path>
683+
<Path>Source\JSON Variant Support\variant to json.vi</Path>
684684
<VI_Title/>
685685
</Items_Data>
686-
<GUID>E927C0E454C92F1ED4893027BF68CBB9</GUID>
686+
<GUID>092340EC7FDBF3EAAE9FC801CFE33CDA</GUID>
687687
</Functions_Palette_Data>
688688
<Functions_Palette_Data>
689689
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -746,7 +746,7 @@ Simplified API, made all methods static. Added path VIs</Release_Notes>
746746
<Path>Source\JSON Value\By Pointer\Set(path).vi</Path>
747747
<VI_Title/>
748748
</Items_Data>
749-
<GUID>7B5162AD2BFF38AA5C8DE3DACB5999B6</GUID>
749+
<GUID>E1A0DE7CBA1AE502147CAC432DDB3034</GUID>
750750
</Functions_Palette_Data>
751751
</Library_Palette_Definition>
752752
</VI_Package_Builder_Settings>

‎Source/JSON Parsing.aliases‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[My Computer]
2-
My Computer = "172.19.85.6"
2+
My Computer = "172.28.64.210"
33

44
[RT PXI Target]
55
RT PXI Target = "0.0.0.0"

‎Source/JSON Parsing.lvlps‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
11
[ProjectWindow_Data]
2-
ProjectExplorer.ClassicPosition[String] = "157,1139,763,1573"
2+
ProjectExplorer.ClassicPosition[String] = "209,979,815,1413"
3+
4+
[AB_Cache_{160B96C6-FD29-4031-AEE5-0D464B27D3F3}]
5+
Cache_Path[Path] Line0001 = "/C/Users/Tanner Blair/AppData/Local/Temp/AB_Cache_"
6+
Cache_Path[Path] Line0002 = "{160B96C6-FD29-4031-AEE5-0D464B27D3F3}.txt"
7+
8+
[AB_Cache_{01328221-D2AE-4C36-9791-776C11B1BB77}]
9+
Cache_Path[Path] Line0001 = "/C/Users/Tanner Blair/AppData/Local/Temp/AB_Cache_"
10+
Cache_Path[Path] Line0002 = "{01328221-D2AE-4C36-9791-776C11B1BB77}.txt"
311

‎Source/JSON Parsing.lvproj‎

Lines changed: 54 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,67 @@
1212
<Property Name="server.vi.propertiesEnabled" Type="Bool">true</Property>
1313
<Property Name="specify.custom.address" Type="Bool">false</Property>
1414
<Item Name="JSON Value.lvclass" Type="LVClass" URL="../JSON Value/JSON Value.lvclass"/>
15-
<Item Name="JSFL Variant Support.lvlib" Type="Library" URL="../JSON Value/Variant Support/JSFL Variant Support.lvlib"/>
15+
<Item Name="JSON Variant Support.lvclass" Type="LVClass" URL="../JSON Variant Support/JSON Variant Support.lvclass"/>
1616
<Item Name="Dependencies" Type="Dependencies">
1717
<Item Name="vi.lib" Type="Folder">
1818
<Item Name="Trim Whitespace.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Trim Whitespace.vi"/>
1919
<Item Name="whitespace.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/whitespace.ctl"/>
2020
<Item Name="NI_Data Type.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/Data Type/NI_Data Type.lvlib"/>
21-
<Item Name="LVNumericRepresentation.ctl" Type="VI" URL="/&lt;vilib&gt;/numeric/LVNumericRepresentation.ctl"/>
2221
<Item Name="Error Cluster From Error Code.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Error Cluster From Error Code.vi"/>
22+
<Item Name="LVNumericRepresentation.ctl" Type="VI" URL="/&lt;vilib&gt;/numeric/LVNumericRepresentation.ctl"/>
23+
<Item Name="imagedata.ctl" Type="VI" URL="/&lt;vilib&gt;/picture/picture.llb/imagedata.ctl"/>
24+
<Item Name="Picture to Pixmap.vi" Type="VI" URL="/&lt;vilib&gt;/picture/pictutil.llb/Picture to Pixmap.vi"/>
25+
<Item Name="LVFixedPointRepRangeTypeDef.ctl" Type="VI" URL="/&lt;vilib&gt;/fxp/LVFixedPointRepRangeTypeDef.ctl"/>
26+
<Item Name="LVFixedPointRepBitsTypeDef.ctl" Type="VI" URL="/&lt;vilib&gt;/fxp/LVFixedPointRepBitsTypeDef.ctl"/>
27+
</Item>
28+
<Item Name="user.lib" Type="Folder">
29+
<Item Name="Build Error Cluster__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/error/error.llb/Build Error Cluster__ogtk.vi"/>
30+
<Item Name="Get Last PString__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Get Last PString__ogtk.vi"/>
31+
<Item Name="Get PString__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Get PString__ogtk.vi"/>
32+
<Item Name="Type Descriptor Enumeration__ogtk.ctl" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Type Descriptor Enumeration__ogtk.ctl"/>
33+
<Item Name="Type Descriptor Header__ogtk.ctl" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Type Descriptor Header__ogtk.ctl"/>
34+
<Item Name="Type Descriptor__ogtk.ctl" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Type Descriptor__ogtk.ctl"/>
35+
<Item Name="Get Header from TD__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Get Header from TD__ogtk.vi"/>
36+
<Item Name="Variant to Header Info__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Variant to Header Info__ogtk.vi"/>
37+
<Item Name="Get Variant Attributes__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Get Variant Attributes__ogtk.vi"/>
38+
<Item Name="Set Data Name__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Set Data Name__ogtk.vi"/>
39+
<Item Name="Array of VData to VCluster__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Array of VData to VCluster__ogtk.vi"/>
40+
<Item Name="Get Data Name from TD__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Get Data Name from TD__ogtk.vi"/>
41+
<Item Name="Get Data Name__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Get Data Name__ogtk.vi"/>
42+
<Item Name="Array Size(s)__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Array Size(s)__ogtk.vi"/>
43+
<Item Name="Reshape Array to 1D VArray__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Reshape Array to 1D VArray__ogtk.vi"/>
44+
<Item Name="Array to Array of VData__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Array to Array of VData__ogtk.vi"/>
45+
<Item Name="Array to VCluster__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Array to VCluster__ogtk.vi"/>
46+
</Item>
47+
</Item>
48+
<Item Name="Build Specifications" Type="Build">
49+
<Item Name="JSON Support for LabVIEW" Type="Source Distribution">
50+
<Property Name="Bld_autoIncrement" Type="Bool">true</Property>
51+
<Property Name="Bld_buildCacheID" Type="Str">{160B96C6-FD29-4031-AEE5-0D464B27D3F3}</Property>
52+
<Property Name="Bld_buildSpecName" Type="Str">JSON Support for LabVIEW</Property>
53+
<Property Name="Bld_excludeLibraryItems" Type="Bool">true</Property>
54+
<Property Name="Bld_localDestDir" Type="Path">../builds/Source Distribution/JSON Support for LabVIEW</Property>
55+
<Property Name="Bld_localDestDirType" Type="Str">relativeToCommon</Property>
56+
<Property Name="Bld_previewCacheID" Type="Str">{01328221-D2AE-4C36-9791-776C11B1BB77}</Property>
57+
<Property Name="Bld_version.build" Type="Int">1</Property>
58+
<Property Name="Bld_version.major" Type="Int">1</Property>
59+
<Property Name="Destination[0].destName" Type="Str">Destination Directory</Property>
60+
<Property Name="Destination[0].path" Type="Path">../builds/Source Distribution/JSON Support for LabVIEW</Property>
61+
<Property Name="Destination[1].destName" Type="Str">Support Directory</Property>
62+
<Property Name="Destination[1].path" Type="Path">../builds/Source Distribution/JSON Support for LabVIEW/data</Property>
63+
<Property Name="DestinationCount" Type="Int">2</Property>
64+
<Property Name="Source[0].itemID" Type="Str">{9AEDDE84-ED84-4709-8289-394382C71DEA}</Property>
65+
<Property Name="Source[0].type" Type="Str">Container</Property>
66+
<Property Name="Source[1].destinationIndex" Type="Int">0</Property>
67+
<Property Name="Source[1].itemID" Type="Ref">/My Computer/JSON Value.lvclass</Property>
68+
<Property Name="Source[1].sourceInclusion" Type="Str">Include</Property>
69+
<Property Name="Source[1].type" Type="Str">Library</Property>
70+
<Property Name="Source[2].destinationIndex" Type="Int">0</Property>
71+
<Property Name="Source[2].itemID" Type="Ref">/My Computer/JSON Variant Support.lvclass</Property>
72+
<Property Name="Source[2].sourceInclusion" Type="Str">Include</Property>
73+
<Property Name="Source[2].type" Type="Str">Library</Property>
74+
<Property Name="SourceCount" Type="Int">3</Property>
2375
</Item>
2476
</Item>
25-
<Item Name="Build Specifications" Type="Build"/>
2677
</Item>
2778
</Project>

‎Source/JSON Value/JSON Value.lvclass‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1292,6 +1292,15 @@
12921292
<Property Name="NI.ClassItem.Property.LongName" Type="Str">value</Property>
12931293
<Property Name="NI.ClassItem.Property.ShortName" Type="Str">value</Property>
12941294
<Property Name="NI.ClassItem.Property.SortKey" Type="Int">-1</Property>
1295+
<Item Name="read variant value.vi" Type="VI" URL="../subVIs/read variant value.vi">
1296+
<Property Name="NI.ClassItem.ConnectorPane" Type="Bin">&amp;A#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!%O!!!!#A!-1#%'=X2B&gt;(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&amp;!!!Q!!!!%!!AFF=H*P=C"P&gt;81!"!!!!!J!5Q6W97RV:1!O1(!!(A!!&amp;"*+5U^/)&amp;:B&lt;(6F,GRW9WRB=X-!!!Z+5U^/)&amp;:B&lt;(6F)'^V&gt;!!!)%"1!!-!!!!"!!)4:8*S&lt;X)A;7YA+'ZP)'6S=G^S+1!M1(!!(A!!&amp;"*+5U^/)&amp;:B&lt;(6F,GRW9WRB=X-!!!V+5U^/)&amp;:B&lt;(6F)'FO!'%!]!!-!!-!"!!&amp;!!9!"!!%!!1!"!!(!!1!"!!)!A!!?!!!$1A!!!!!!!!*!!!!$1M!!!!!!!!!!!!!!!!!!!!!!!!)!!!!!!!!!!!!!!!1!!!.!!!!$!!!!!!!!!!!!!!"!!E!!!!!</Property>
1297+
<Property Name="NI.ClassItem.ExecutionSystem" Type="Int">-1</Property>
1298+
<Property Name="NI.ClassItem.Flags" Type="Int">33554432</Property>
1299+
<Property Name="NI.ClassItem.IsStaticMethod" Type="Bool">true</Property>
1300+
<Property Name="NI.ClassItem.MethodScope" Type="UInt">1</Property>
1301+
<Property Name="NI.ClassItem.Priority" Type="Int">1</Property>
1302+
<Property Name="NI.ClassItem.State" Type="Int">1342710272</Property>
1303+
</Item>
12951304
<Item Name="Write value.vi" Type="VI" URL="../subVIs/Write value.vi">
12961305
<Property Name="NI.ClassItem.ConnectorPane" Type="Bin">&amp;A#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!%O!!!!#A!-1#%'=X2B&gt;(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&amp;!!!Q!!!!%!!AFF=H*P=C"P&gt;81!"!!!!#Z!=!!?!!!5%EJ44UYA6G&amp;M&gt;75O&lt;(:D&lt;'&amp;T=Q!!$EJ44UYA6G&amp;M&gt;75A&lt;X6U!!!A1&amp;!!!Q!!!!%!!B.F=H*P=C"J&lt;C!I&lt;G]A:8*S&lt;X)J!!J!5Q6W97RV:1!M1(!!(A!!&amp;"*+5U^/)&amp;:B&lt;(6F,GRW9WRB=X-!!!V+5U^/)&amp;:B&lt;(6F)'FO!'%!]!!-!!-!"!!%!!5!"!!%!!1!"!!'!!1!"Q!)!A!!?!!!$1A!!!!!!!!!!!!!$1M!!!!!!!!!!!!!!!!!!!!!!!!)!!!!!!!!!"!!!!!3!!!.!!!!$!!!!!!!!!!!!!!"!!E!!!!!</Property>
12971306
<Property Name="NI.ClassItem.ExecutionSystem" Type="Int">-1</Property>

‎Source/JSON Value/Read Value/Read value (String).vi‎

0 Bytes
Binary file not shown.

‎Source/JSON Value/Variant Support/Cast To Variant/Cast To Variant (Array).vi‎

-20.2 KB
Binary file not shown.

‎Source/JSON Value/Variant Support/Cast To Variant/Cast To Variant (Object).vi‎

-16 KB
Binary file not shown.

‎Source/JSON Value/Variant Support/Create From Variant/Create From Variant (Array).vi‎

-28.3 KB
Binary file not shown.

‎Source/JSON Value/Variant Support/Create From Variant/Create From Variant (Boolean).vi‎

-25 KB
Binary file not shown.

0 commit comments

Comments
 (0)