Skip to content

Commit

Permalink
Merge branch 'release/1.2.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
francois-normandin committed Apr 15, 2020
2 parents 380fdb9 + be77020 commit 22c1300
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 38 deletions.
1 change: 1 addition & 0 deletions DataManipulation.lvproj
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<Item Name="Type Descriptor I16 Array.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/GetType.llb/Type Descriptor I16 Array.ctl"/>
<Item Name="Type Descriptor I16.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/GetType.llb/Type Descriptor I16.ctl"/>
<Item Name="Type Enum.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/GetType.llb/Type Enum.ctl"/>
<Item Name="VariantType.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/VariantDataType/VariantType.lvlib"/>
</Item>
</Item>
<Item Name="Build Specifications" Type="Build"/>
Expand Down
76 changes: 38 additions & 38 deletions DataManipulation.vipb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<VI_Package_Builder_Settings Version="2018" Created_Date="2018-06-04 19:50:03" Modified_Date="2019-07-03 19:06:01" Creator="Francois Normandin" Comments="" ID="6d75a2675faa0a011ffca3193a3896b6">
<VI_Package_Builder_Settings Version="2018" Created_Date="2018-06-04 19:50:03" Modified_Date="2020-04-14 20:46:24" Creator="Francois Normandin" Comments="" ID="71f7450723bf2b3cfe3346ebeeae2da4">
<Library_General_Settings>
<Package_File_Name>LabVIEW_Open_Source_lib_Data_Manipulation</Package_File_Name>
<Library_Version>1.2.2.9</Library_Version>
<Library_Version>1.2.3.9</Library_Version>
<Auto_Increment_Version>false</Auto_Increment_Version>
<Library_Source_Folder>source</Library_Source_Folder>
<Library_Output_Folder>_built-packages</Library_Output_Folder>
Expand Down Expand Up @@ -32,7 +32,7 @@
<Copyright/>
<Packager>Francois Normandin</Packager>
<URL>https://github.com/LabVIEW-Open-Source</URL>
<Release_Notes>- fix for array casting when no defaults are listed or when array dimension is omitted</Release_Notes>
<Release_Notes>changed license to BSD 0-clause</Release_Notes>
</Description>
<Destinations>
<Toolkit_VIs>
Expand Down Expand Up @@ -196,29 +196,15 @@
<Synchronyze_with_Directory>false</Synchronyze_with_Directory>
<Synchronize_Directory_Path>.</Synchronize_Directory_Path>
</Synchronization_Info>
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
<NameSub_Menu_Name>KVP Parser.vi</NameSub_Menu_Name>
<Short_Name/>
<is_Merge_VI>false</is_Merge_VI>
<Position>
<Row>1</Row>
<Column>1</Column>
</Position>
<Icon>00000000</Icon>
<Path>source\KVP Parser.vi</Path>
<VI_Title/>
</Items_Data>
<Items_Data>
<Type>Sub Palette</Type>
<Sub_Palette_Index>1</Sub_Palette_Index>
<NameSub_Menu_Name>OpenVariant</NameSub_Menu_Name>
<Short_Name>OpenVariant</Short_Name>
<is_Merge_VI>false</is_Merge_VI>
<Position>
<Row>2</Row>
<Column>2</Column>
<Row>1</Row>
<Column>1</Column>
</Position>
<Icon>00000CA0002800000C9A00000400000000000020002000080000000000FFFFFF00FF80000000FFFFFFFFFFFF0000FFFFFFFFCCCC0000FFFFFFFF99990000FFFFFFFF66660000FFFFFFFF33330000FFFFFFFF00000000FFFFCCCCFFFF0000FFFFCCCCCCCC0000FFFFCCCC99990000FFFFCCCC66660000FFFFCCCC33330000FFFFCCCC00000000FFFF9999FFFF0000FFFF9999CCCC0000FFFF999999990000FFFF999966660000FFFF999933330000FFFF999900000000FFFF6666FFFF0000FFFF6666CCCC0000FFFF666699990000FFFF666666660000FFFF666633330000FFFF666600000000FFFF3333FFFF0000FFFF3333CCCC0000FFFF333399990000FFFF333366660000FFFF333333330000FFFF333300000000FFFF0000FFFF0000FFFF0000CCCC0000FFFF000099990000FFFF000066660000FFFF000033330000FFFF000000000000CCCCFFFFFFFF0000CCCCFFFFCCCC0000CCCCFFFF99990000CCCCFFFF66660000CCCCFFFF33330000CCCCFFFF00000000CCCCCCCCFFFF0000CCCCCCCCCCCC0000CCCCCCCC99990000CCCCCCCC66660000CCCCCCCC33330000CCCCCCCC00000000CCCC9999FFFF0000CCCC9999CCCC0000CCCC999999990000CCCC999966660000CCCC999933330000CCCC999900000000CCCC6666FFFF0000CCCC6666CCCC0000CCCC666699990000CCCC666666660000CCCC666633330000CCCC666600000000CCCC3333FFFF0000CCCC3333CCCC0000CCCC333399990000CCCC333366660000CCCC333333330000CCCC333300000000CCCC0000FFFF0000CCCC0000CCCC0000CCCC000099990000CCCC000066660000CCCC000033330000CCCC0000000000009999FFFFFFFF00009999FFFFCCCC00009999FFFF999900009999FFFF666600009999FFFF333300009999FFFF000000009999CCCCFFFF00009999CCCCCCCC00009999CCCC999900009999CCCC666600009999CCCC333300009999CCCC0000000099999999FFFF000099999999CCCC0000999999999999000099999999666600009999999933330000999999990000000099996666FFFF000099996666CCCC0000999966669999000099996666666600009999666633330000999966660000000099993333FFFF000099993333CCCC0000999933339999000099993333666600009999333333330000999933330000000099990000FFFF000099990000CCCC000099990000999900009999000066660000999900003333000099990000000000006666FFFFFFFF00006666FFFFCCCC00006666FFFF999900006666FFFF666600006666FFFF333300006666FFFF000000006666CCCCFFFF00006666CCCCCCCC00006666CCCC999900006666CCCC666600006666CCCC333300006666CCCC0000000066669999FFFF000066669999CCCC0000666699999999000066669999666600006666999933330000666699990000000066666666FFFF000066666666CCCC0000666666669999000066666666666600006666666633330000666666660000000066663333FFFF000066663333CCCC0000666633339999000066663333666600006666333333330000666633330000000066660000FFFF000066660000CCCC000066660000999900006666000066660000666600003333000066660000000000003333FFFFFFFF00003333FFFFCCCC00003333FFFF999900003333FFFF666600003333FFFF333300003333FFFF000000003333CCCCFFFF00003333CCCCCCCC00003333CCCC999900003333CCCC666600003333CCCC333300003333CCCC0000000033339999FFFF000033339999CCCC0000333399999999000033339999666600003333999933330000333399990000000033336666FFFF000033336666CCCC0000333366669999000033336666666600003333666633330000333366660000000033333333FFFF000033333333CCCC0000333333339999000033333333666600003333333333330000333333330000000033330000FFFF000033330000CCCC000033330000999900003333000066660000333300003333000033330000000000000000FFFFFFFF00000000FFFFCCCC00000000FFFF999900000000FFFF666600000000FFFF333300000000FFFF000000000000CCCCFFFF00000000CCCCCCCC00000000CCCC999900000000CCCC666600000000CCCC333300000000CCCC0000000000009999FFFF000000009999CCCC0000000099999999000000009999666600000000999933330000000099990000000000006666FFFF000000006666CCCC0000000066669999000000006666666600000000666633330000000066660000000000003333FFFF000000003333CCCC0000000033339999000000003333666600000000333333330000000033330000000000000000FFFF000000000000CCCC0000000000009999000000000000666600000000000033330000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000000000000000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000000000000000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000EEEEEEEEEEEE0000DDDDDDDDDDDD0000BBBBBBBBBBBB0000AAAAAAAAAAAA000088888888888800007777777777770000555555555555000044444444444400002222222222220000111111111111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000000FFFF010101010101010101010101FFFF0000000000000000000000FFFFFFFFFFFFFF010101010101010101010101FFFFFFFFFFFFFF000000000000FFFFFFFFFFFFFF010101010101010101010101FFFFFFFFFFFFFF000000000000FFFF010101FFFF010101010101010101010101FFFF010101FFFF000000000000FFFF010101FFFF010101010101010101010101FFFF010101FFFF000000000000FFFF010101FFFF010101010101010101010101FFFF010101FFFF000000000000FFFF010101FFFF010101010101010101010101FFFF010101FFFF000000000000FFFF010101FFFF010101010101010101010101FFFF010101FFFF000000000000FFFFFFFFFFFFFF010101010101010101010101FFFFFFFFFFFFFF000000000000FFFFFFFFFFFFFF010101010101010101010101FFFFFFFFFFFFFF0000000000000000000000FFFF010101010101010101010101FFFF00000000000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FF00FF0000FFFF0000FFFFFF0000000000000000000000000000000000000000FF00FF0000FFFF0000FF0000FF00000000000000000000000000000000000000FF00FF00FF0000FF00FFFFFF000000000000000000000000000000000000000000FF0000FFFFFFFF00FF0000FF0000000000000000000000000000000000000000FF0000FF0000FF00FF0000FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001FFFE0001FFFE0001FFFE003FFFFFF03FFFFFF03FFFFFF03FFFFFF03FFFFFF03FFFFFF03FFFFFF03FFFFFF03FFFFFF001FFFE0001FFFE0001FFFE0000000000000000000000000000A6700000A6780000AF7000004F480000494800000000000000000000000000</Icon>
<Path>source\Variant</Path>
Expand All @@ -231,14 +217,28 @@
<Short_Name>OpenDescriptor</Short_Name>
<is_Merge_VI>false</is_Merge_VI>
<Position>
<Row>2</Row>
<Column>3</Column>
<Row>1</Row>
<Column>2</Column>
</Position>
<Icon>00000CA0002800000C9A00000400000000000020002000080000000000FFFFFF00FF80000000FFFFFFFFFFFF0000FFFFFFFFCCCC0000FFFFFFFF99990000FFFFFFFF66660000FFFFFFFF33330000FFFFFFFF00000000FFFFCCCCFFFF0000FFFFCCCCCCCC0000FFFFCCCC99990000FFFFCCCC66660000FFFFCCCC33330000FFFFCCCC00000000FFFF9999FFFF0000FFFF9999CCCC0000FFFF999999990000FFFF999966660000FFFF999933330000FFFF999900000000FFFF6666FFFF0000FFFF6666CCCC0000FFFF666699990000FFFF666666660000FFFF666633330000FFFF666600000000FFFF3333FFFF0000FFFF3333CCCC0000FFFF333399990000FFFF333366660000FFFF333333330000FFFF333300000000FFFF0000FFFF0000FFFF0000CCCC0000FFFF000099990000FFFF000066660000FFFF000033330000FFFF000000000000CCCCFFFFFFFF0000CCCCFFFFCCCC0000CCCCFFFF99990000CCCCFFFF66660000CCCCFFFF33330000CCCCFFFF00000000CCCCCCCCFFFF0000CCCCCCCCCCCC0000CCCCCCCC99990000CCCCCCCC66660000CCCCCCCC33330000CCCCCCCC00000000CCCC9999FFFF0000CCCC9999CCCC0000CCCC999999990000CCCC999966660000CCCC999933330000CCCC999900000000CCCC6666FFFF0000CCCC6666CCCC0000CCCC666699990000CCCC666666660000CCCC666633330000CCCC666600000000CCCC3333FFFF0000CCCC3333CCCC0000CCCC333399990000CCCC333366660000CCCC333333330000CCCC333300000000CCCC0000FFFF0000CCCC0000CCCC0000CCCC000099990000CCCC000066660000CCCC000033330000CCCC0000000000009999FFFFFFFF00009999FFFFCCCC00009999FFFF999900009999FFFF666600009999FFFF333300009999FFFF000000009999CCCCFFFF00009999CCCCCCCC00009999CCCC999900009999CCCC666600009999CCCC333300009999CCCC0000000099999999FFFF000099999999CCCC0000999999999999000099999999666600009999999933330000999999990000000099996666FFFF000099996666CCCC0000999966669999000099996666666600009999666633330000999966660000000099993333FFFF000099993333CCCC0000999933339999000099993333666600009999333333330000999933330000000099990000FFFF000099990000CCCC000099990000999900009999000066660000999900003333000099990000000000006666FFFFFFFF00006666FFFFCCCC00006666FFFF999900006666FFFF666600006666FFFF333300006666FFFF000000006666CCCCFFFF00006666CCCCCCCC00006666CCCC999900006666CCCC666600006666CCCC333300006666CCCC0000000066669999FFFF000066669999CCCC0000666699999999000066669999666600006666999933330000666699990000000066666666FFFF000066666666CCCC0000666666669999000066666666666600006666666633330000666666660000000066663333FFFF000066663333CCCC0000666633339999000066663333666600006666333333330000666633330000000066660000FFFF000066660000CCCC000066660000999900006666000066660000666600003333000066660000000000003333FFFFFFFF00003333FFFFCCCC00003333FFFF999900003333FFFF666600003333FFFF333300003333FFFF000000003333CCCCFFFF00003333CCCCCCCC00003333CCCC999900003333CCCC666600003333CCCC333300003333CCCC0000000033339999FFFF000033339999CCCC0000333399999999000033339999666600003333999933330000333399990000000033336666FFFF000033336666CCCC0000333366669999000033336666666600003333666633330000333366660000000033333333FFFF000033333333CCCC0000333333339999000033333333666600003333333333330000333333330000000033330000FFFF000033330000CCCC000033330000999900003333000066660000333300003333000033330000000000000000FFFFFFFF00000000FFFFCCCC00000000FFFF999900000000FFFF666600000000FFFF333300000000FFFF000000000000CCCCFFFF00000000CCCCCCCC00000000CCCC999900000000CCCC666600000000CCCC333300000000CCCC0000000000009999FFFF000000009999CCCC0000000099999999000000009999666600000000999933330000000099990000000000006666FFFF000000006666CCCC0000000066669999000000006666666600000000666633330000000066660000000000003333FFFF000000003333CCCC0000000033339999000000003333666600000000333333330000000033330000000000000000FFFF000000000000CCCC0000000000009999000000000000666600000000000033330000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000000000000000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000000000000000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000EEEEEEEEEEEE0000DDDDDDDDDDDD0000BBBBBBBBBBBB0000AAAAAAAAAAAA000088888888888800007777777777770000555555555555000044444444444400002222222222220000111111111111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFFFFFFFFFF000000000000000000000000000000000000000000000000FF0505050505FF000000000000000000000000000000000000000000000000FF0505050505FF000000000000000000000000000000000000000000000000FF0505050505FF000000000000000000000000000000000000FFFFFFFFFFFFFF595959595959FFFFFFFFFFFF000000000000000000000000FF0505050505590505050505590505050505FF000000000000000000000000FF0505050505590505050505590505050505FF000000000000000000000000FF0505050505590505050505590505050505FF000000000000000000000000FFFFFFFFFFFFFF5959595959FFFFFFFFFFFFFF000000000000000000000000000000000000FF0505050505FF000000000000000000000000000000000000000000000000FF0505050505FF000000000000000000000000000000000000000000000000FF0505050505FF000000000000000000000000000000000000000000000000FFFFFFFFFFFFFF0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFF00FF00FF00FFFFFF0000FFFFFF0000000000000000000000000000000000FF0000FF00FF00FF0000FF00FF00000000000000000000000000000000000000FF000000FF0000FFFFFF0000FFFF000000000000000000000000000000000000FF000000FF0000FF00000000FF00000000000000000000000000000000000000FF000000FF0000FF00000000FFFFFF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFF0000FFFFFF0000FFFFFF0000FFFF0000FFFFFF00000000000000000000FF0000FF00FF000000FF00000000FF0000FF00FF0000FF000000000000000000FF0000FF00FFFF000000FFFF0000FF00000000FFFFFF00000000000000000000FF0000FF00FF000000000000FF00FF0000FF00FF0000FF000000000000000000FFFFFF0000FFFFFF00FFFFFF000000FFFF0000FF0000FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001FC000003F8000007F000000FE00007FFFF000FFFFE001FFFFC003FFFF8007FFFF00003F8000007F000000FE000001FC0000000000000000000000000000001D5CE000095E8000089CC000089080000890E000000000000000000000000001CE733801E884BC01EC643801E814A401CEE324000000000</Icon>
<Path>source\TypeDescriptor</Path>
<VI_Title/>
</Items_Data>
<GUID>654F3529DD5A5AD485161FE0A2A6A397</GUID>
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
<NameSub_Menu_Name>KVP Parser.vi</NameSub_Menu_Name>
<Short_Name/>
<is_Merge_VI>false</is_Merge_VI>
<Position>
<Row>2</Row>
<Column>4</Column>
</Position>
<Icon>00000000</Icon>
<Path>source\KVP Parser.vi</Path>
<VI_Title/>
</Items_Data>
<GUID>E4D06EFFC9D8A9BE44DE5A9CFD19FC52</GUID>
</Functions_Palette_Data>
<Functions_Palette_Data>
<Parent_Palette_Index>0</Parent_Palette_Index>
Expand Down Expand Up @@ -357,7 +357,7 @@
<Path>source\Variant\Variant_GetArrayElementTypeDescriptor.vi</Path>
<VI_Title/>
</Items_Data>
<GUID>B1871D3DA3BB589C938B5B1CD23D76DC</GUID>
<GUID>C5736587671B88616F0B62DCEC59B834</GUID>
</Functions_Palette_Data>
<Functions_Palette_Data>
<Parent_Palette_Index>0</Parent_Palette_Index>
Expand Down Expand Up @@ -392,20 +392,6 @@
<Path>source\TypeDescriptor\TypeDescriptor_GetDefault.vi</Path>
<VI_Title/>
</Items_Data>
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
<NameSub_Menu_Name>TypeDescriptor_GetName.vi</NameSub_Menu_Name>
<Short_Name/>
<is_Merge_VI>false</is_Merge_VI>
<Position>
<Row>1</Row>
<Column>1</Column>
</Position>
<Icon>00000000</Icon>
<Path>source\TypeDescriptor\TypeDescriptor_GetName.vi</Path>
<VI_Title/>
</Items_Data>
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
Expand Down Expand Up @@ -462,7 +448,21 @@
<Path>source\TypeDescriptor\TypeDescriptor_GetPString.vi</Path>
<VI_Title/>
</Items_Data>
<GUID>6EC47B68182162B83C93F62DF7E05068</GUID>
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
<NameSub_Menu_Name>TypeDescriptor_GetName.vi</NameSub_Menu_Name>
<Short_Name/>
<is_Merge_VI>false</is_Merge_VI>
<Position>
<Row>1</Row>
<Column>1</Column>
</Position>
<Icon>00000000</Icon>
<Path>source\TypeDescriptor\TypeDescriptor_GetName.vi</Path>
<VI_Title/>
</Items_Data>
<GUID>6B95E39913C6CA52C260089D58F9EE2B</GUID>
</Functions_Palette_Data>
</Library_Palette_Definition>
</VI_Package_Builder_Settings>
Binary file modified source/TypeDescriptor/TypeDescriptor_GetRefClassName.vi
Binary file not shown.
Binary file modified source/Variant/Variant_BuildArrayFromElementArray.vi
Binary file not shown.
Binary file modified source/Variant/Variant_BuildClusterFromElementArray.vi
Binary file not shown.
Binary file modified source/Variant/Variant_ExtractClusterElements.vi
Binary file not shown.

0 comments on commit 22c1300

Please sign in to comment.