Skip to content

Commit fd38fa6

Browse files
author
Tanner Blair
committed
fix for variant support
2 parents 6cc545f + c0b4956 commit fd38fa6

21 files changed

+234
-30
lines changed

‎LVJSON Build Specification.vipb‎

Lines changed: 42 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
1+
<<<<<<< HEAD
12
<VI_Package_Builder_Settings Version="2017" Created_Date="2017-08-08 12:01:46" Modified_Date="2018-05-11 10:56:06" Creator="tblair" Comments="" ID="487fa99944d9b8b618f01913d245ee0b">
23
<Library_General_Settings>
34
<Package_File_Name>NI_lib_LVJSON</Package_File_Name>
45
<Library_Version>2.1.3.73</Library_Version>
6+
=======
7+
<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">
8+
<Library_General_Settings>
9+
<Package_File_Name>NI_lib_LVJSON</Package_File_Name>
10+
<Library_Version>3.0.0.69</Library_Version>
11+
>>>>>>> feature/fixing_to_and_from_variant
512
<Auto_Increment_Version>false</Auto_Increment_Version>
613
<Library_Source_Folder>Source</Library_Source_Folder>
714
<Library_Output_Folder>Builds</Library_Output_Folder>
@@ -32,7 +39,12 @@
3239
<Copyright/>
3340
<Packager>NI Systems Engineering</Packager>
3441
<URL/>
42+
<<<<<<< HEAD
3543
<Release_Notes>hotfix for pretty string on empty objects and arrays</Release_Notes>
44+
=======
45+
<Release_Notes>!!!BREAKING CHANGE!!!
46+
Revamped variant support. Untested at this point, upgrading is not recommended.</Release_Notes>
47+
>>>>>>> feature/fixing_to_and_from_variant
3648
</Description>
3749
<Destinations>
3850
<Toolkit_VIs>
@@ -325,7 +337,11 @@
325337
<Path>Source\JSON Value\Helper Methods</Path>
326338
<VI_Title/>
327339
</Items_Data>
340+
<<<<<<< HEAD
328341
<GUID>F8E5C42241236DDBA2E193082DEA2FC7</GUID>
342+
=======
343+
<GUID>12375B01E650D0FAA5020E294343220E</GUID>
344+
>>>>>>> feature/fixing_to_and_from_variant
329345
</Functions_Palette_Data>
330346
<Functions_Palette_Data>
331347
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -528,7 +544,11 @@
528544
<Path>Source\JSON Value\Array\Get Array Values.vi</Path>
529545
<VI_Title/>
530546
</Items_Data>
547+
<<<<<<< HEAD
531548
<GUID>9D9770D801B497060A694FDB970A4872</GUID>
549+
=======
550+
<GUID>E7036F0B42B0AACCBC859A1298B46A44</GUID>
551+
>>>>>>> feature/fixing_to_and_from_variant
532552
</Functions_Palette_Data>
533553
<Functions_Palette_Data>
534554
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -605,7 +625,11 @@
605625
<Path>Source\JSON Value\Object\Remove Value.vi</Path>
606626
<VI_Title/>
607627
</Items_Data>
628+
<<<<<<< HEAD
608629
<GUID>B7035122BB31594664B9AB83D5D2992D</GUID>
630+
=======
631+
<GUID>6EF0E54EF88AAF06E522E4CFF7E7F911</GUID>
632+
>>>>>>> feature/fixing_to_and_from_variant
609633
</Functions_Palette_Data>
610634
<Functions_Palette_Data>
611635
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -643,46 +667,50 @@
643667
<Items_Data>
644668
<Type>Item</Type>
645669
<Sub_Palette_Index>-1</Sub_Palette_Index>
646-
<NameSub_Menu_Name>To Variant.vi</NameSub_Menu_Name>
670+
<NameSub_Menu_Name>To File.vi</NameSub_Menu_Name>
647671
<Short_Name/>
648672
<is_Merge_VI>false</is_Merge_VI>
649673
<Position>
650-
<Row>2</Row>
674+
<Row>1</Row>
651675
<Column>1</Column>
652676
</Position>
653677
<Icon>00000000</Icon>
654-
<Path>Source\JSON Value\Variant Support\To Variant.vi</Path>
678+
<Path>Source\JSON Value\Helper Methods\To File.vi</Path>
655679
<VI_Title/>
656680
</Items_Data>
657681
<Items_Data>
658682
<Type>Item</Type>
659683
<Sub_Palette_Index>-1</Sub_Palette_Index>
660-
<NameSub_Menu_Name>From Variant.vi</NameSub_Menu_Name>
684+
<NameSub_Menu_Name>json to variant.vi</NameSub_Menu_Name>
661685
<Short_Name/>
662686
<is_Merge_VI>false</is_Merge_VI>
663687
<Position>
664688
<Row>2</Row>
665-
<Column>2</Column>
689+
<Column>1</Column>
666690
</Position>
667691
<Icon>00000000</Icon>
668-
<Path>Source\JSON Value\Variant Support\From Variant.vi</Path>
692+
<Path>Source\JSON Variant Support\json to variant.vi</Path>
669693
<VI_Title/>
670694
</Items_Data>
671695
<Items_Data>
672696
<Type>Item</Type>
673697
<Sub_Palette_Index>-1</Sub_Palette_Index>
674-
<NameSub_Menu_Name>To File.vi</NameSub_Menu_Name>
698+
<NameSub_Menu_Name>variant to json.vi</NameSub_Menu_Name>
675699
<Short_Name/>
676700
<is_Merge_VI>false</is_Merge_VI>
677701
<Position>
678-
<Row>1</Row>
679-
<Column>1</Column>
702+
<Row>2</Row>
703+
<Column>2</Column>
680704
</Position>
681705
<Icon>00000000</Icon>
682-
<Path>Source\JSON Value\Helper Methods\To File.vi</Path>
706+
<Path>Source\JSON Variant Support\variant to json.vi</Path>
683707
<VI_Title/>
684708
</Items_Data>
709+
<<<<<<< HEAD
685710
<GUID>50B214AFF4ECCA54569616A6CF06804E</GUID>
711+
=======
712+
<GUID>092340EC7FDBF3EAAE9FC801CFE33CDA</GUID>
713+
>>>>>>> feature/fixing_to_and_from_variant
686714
</Functions_Palette_Data>
687715
<Functions_Palette_Data>
688716
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -745,7 +773,11 @@
745773
<Path>Source\JSON Value\By Pointer\Set(path).vi</Path>
746774
<VI_Title/>
747775
</Items_Data>
776+
<<<<<<< HEAD
748777
<GUID>3A8D9564C52401F4E025E618DAC6CC53</GUID>
778+
=======
779+
<GUID>E1A0DE7CBA1AE502147CAC432DDB3034</GUID>
780+
>>>>>>> feature/fixing_to_and_from_variant
749781
</Functions_Palette_Data>
750782
</Library_Palette_Definition>
751783
</VI_Package_Builder_Settings>

‎Source/JSON Parsing.lvlps‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
11
[ProjectWindow_Data]
2+
<<<<<<< HEAD
23
ProjectExplorer.ClassicPosition[String] = "190,1210,795,1644"
4+
=======
5+
ProjectExplorer.ClassicPosition[String] = "209,979,815,1413"
6+
7+
[AB_Cache_{160B96C6-FD29-4031-AEE5-0D464B27D3F3}]
8+
Cache_Path[Path] Line0001 = "/C/Users/Tanner Blair/AppData/Local/Temp/AB_Cache_"
9+
Cache_Path[Path] Line0002 = "{160B96C6-FD29-4031-AEE5-0D464B27D3F3}.txt"
10+
11+
[AB_Cache_{01328221-D2AE-4C36-9791-776C11B1BB77}]
12+
Cache_Path[Path] Line0001 = "/C/Users/Tanner Blair/AppData/Local/Temp/AB_Cache_"
13+
Cache_Path[Path] Line0002 = "{01328221-D2AE-4C36-9791-776C11B1BB77}.txt"
14+
>>>>>>> feature/fixing_to_and_from_variant
315

‎Source/JSON Parsing.lvproj‎

Lines changed: 56 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,72 @@
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"/>
2121
<Item Name="Error Cluster From Error Code.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Error Cluster From Error Code.vi"/>
2222
<Item Name="LVNumericRepresentation.ctl" Type="VI" URL="/&lt;vilib&gt;/numeric/LVNumericRepresentation.ctl"/>
23+
<<<<<<< HEAD
2324
<Item Name="Create From Variant (String).vi" Type="VI" URL="/&lt;vilib&gt;/NI/JSON Support for LabVIEW/JSON Value/Variant Support/Create From Variant/Create From Variant (String).vi"/>
2425
<Item Name="Create From Variant (Numeric).vi" Type="VI" URL="/&lt;vilib&gt;/NI/JSON Support for LabVIEW/JSON Value/Variant Support/Create From Variant/Create From Variant (Numeric).vi"/>
26+
=======
27+
<Item Name="imagedata.ctl" Type="VI" URL="/&lt;vilib&gt;/picture/picture.llb/imagedata.ctl"/>
28+
<Item Name="Picture to Pixmap.vi" Type="VI" URL="/&lt;vilib&gt;/picture/pictutil.llb/Picture to Pixmap.vi"/>
29+
<Item Name="LVFixedPointRepRangeTypeDef.ctl" Type="VI" URL="/&lt;vilib&gt;/fxp/LVFixedPointRepRangeTypeDef.ctl"/>
30+
<Item Name="LVFixedPointRepBitsTypeDef.ctl" Type="VI" URL="/&lt;vilib&gt;/fxp/LVFixedPointRepBitsTypeDef.ctl"/>
31+
</Item>
32+
<Item Name="user.lib" Type="Folder">
33+
<Item Name="Build Error Cluster__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/error/error.llb/Build Error Cluster__ogtk.vi"/>
34+
<Item Name="Get Last PString__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Get Last PString__ogtk.vi"/>
35+
<Item Name="Get PString__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Get PString__ogtk.vi"/>
36+
<Item Name="Type Descriptor Enumeration__ogtk.ctl" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Type Descriptor Enumeration__ogtk.ctl"/>
37+
<Item Name="Type Descriptor Header__ogtk.ctl" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Type Descriptor Header__ogtk.ctl"/>
38+
<Item Name="Type Descriptor__ogtk.ctl" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Type Descriptor__ogtk.ctl"/>
39+
<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"/>
40+
<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"/>
41+
<Item Name="Get Variant Attributes__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Get Variant Attributes__ogtk.vi"/>
42+
<Item Name="Set Data Name__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Set Data Name__ogtk.vi"/>
43+
<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"/>
44+
<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"/>
45+
<Item Name="Get Data Name__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Get Data Name__ogtk.vi"/>
46+
<Item Name="Array Size(s)__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Array Size(s)__ogtk.vi"/>
47+
<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"/>
48+
<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"/>
49+
<Item Name="Array to VCluster__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Array to VCluster__ogtk.vi"/>
50+
</Item>
51+
</Item>
52+
<Item Name="Build Specifications" Type="Build">
53+
<Item Name="JSON Support for LabVIEW" Type="Source Distribution">
54+
<Property Name="Bld_autoIncrement" Type="Bool">true</Property>
55+
<Property Name="Bld_buildCacheID" Type="Str">{160B96C6-FD29-4031-AEE5-0D464B27D3F3}</Property>
56+
<Property Name="Bld_buildSpecName" Type="Str">JSON Support for LabVIEW</Property>
57+
<Property Name="Bld_excludeLibraryItems" Type="Bool">true</Property>
58+
<Property Name="Bld_localDestDir" Type="Path">../builds/Source Distribution/JSON Support for LabVIEW</Property>
59+
<Property Name="Bld_localDestDirType" Type="Str">relativeToCommon</Property>
60+
<Property Name="Bld_previewCacheID" Type="Str">{01328221-D2AE-4C36-9791-776C11B1BB77}</Property>
61+
<Property Name="Bld_version.build" Type="Int">1</Property>
62+
<Property Name="Bld_version.major" Type="Int">1</Property>
63+
<Property Name="Destination[0].destName" Type="Str">Destination Directory</Property>
64+
<Property Name="Destination[0].path" Type="Path">../builds/Source Distribution/JSON Support for LabVIEW</Property>
65+
<Property Name="Destination[1].destName" Type="Str">Support Directory</Property>
66+
<Property Name="Destination[1].path" Type="Path">../builds/Source Distribution/JSON Support for LabVIEW/data</Property>
67+
<Property Name="DestinationCount" Type="Int">2</Property>
68+
<Property Name="Source[0].itemID" Type="Str">{9AEDDE84-ED84-4709-8289-394382C71DEA}</Property>
69+
<Property Name="Source[0].type" Type="Str">Container</Property>
70+
<Property Name="Source[1].destinationIndex" Type="Int">0</Property>
71+
<Property Name="Source[1].itemID" Type="Ref">/My Computer/JSON Value.lvclass</Property>
72+
<Property Name="Source[1].sourceInclusion" Type="Str">Include</Property>
73+
<Property Name="Source[1].type" Type="Str">Library</Property>
74+
<Property Name="Source[2].destinationIndex" Type="Int">0</Property>
75+
<Property Name="Source[2].itemID" Type="Ref">/My Computer/JSON Variant Support.lvclass</Property>
76+
<Property Name="Source[2].sourceInclusion" Type="Str">Include</Property>
77+
<Property Name="Source[2].type" Type="Str">Library</Property>
78+
<Property Name="SourceCount" Type="Int">3</Property>
79+
>>>>>>> feature/fixing_to_and_from_variant
2580
</Item>
2681
</Item>
27-
<Item Name="Build Specifications" Type="Build"/>
2882
</Item>
2983
</Project>

‎Source/JSON Value/Helper Methods/To String.vi‎

24 Bytes
Binary file not shown.

‎Source/JSON Value/Helper Methods/To String/To String Helper.vi‎

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)