fixed string formatting

erdosmiller · Jun 23, 2017 · a046aef · a046aef
1 parent 44f0abe
commit a046aef
Show file tree

Hide file tree

Showing 45 changed files with 30 additions and 13 deletions.
diff --git a/TOML.lvproj b/TOML.lvproj
@@ -33,6 +33,8 @@
 				<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"/>
 				<Item Name="Get Last PString__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Get Last PString__ogtk.vi"/>
 				<Item Name="Get PString__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Get PString__ogtk.vi"/>
+				<Item Name="Get Strings from Enum TD__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Get Strings from Enum TD__ogtk.vi"/>
+				<Item Name="Get Strings from Enum__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Get Strings from Enum__ogtk.vi"/>
 				<Item Name="Get TDEnum from Data__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Get TDEnum from Data__ogtk.vi"/>
 				<Item Name="Get Variant Attributes__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Get Variant Attributes__ogtk.vi"/>
 				<Item Name="MGI Caller&apos;s VI Reference.vi" Type="VI" URL="/&lt;userlib&gt;/_MGI/Application Control/MGI VI Reference/MGI Caller&apos;s VI Reference.vi"/>
@@ -46,6 +48,7 @@
 				<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"/>
 				<Item Name="Set Cluster Element by Name__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Set Cluster Element by Name__ogtk.vi"/>
 				<Item Name="Set Data Name__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Set Data Name__ogtk.vi"/>
+				<Item Name="Set Enum String Value__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Set Enum String Value__ogtk.vi"/>
 				<Item Name="Split Cluster TD__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Split Cluster TD__ogtk.vi"/>
 				<Item Name="Type Descriptor Enumeration__ogtk.ctl" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Type Descriptor Enumeration__ogtk.ctl"/>
 				<Item Name="Type Descriptor Header__ogtk.ctl" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Type Descriptor Header__ogtk.ctl"/>
@@ -107,7 +110,7 @@
 				<Property Name="Bld_localDestDirType" Type="Str">relativeToProject</Property>
 				<Property Name="Bld_modifyLibraryFile" Type="Bool">true</Property>
 				<Property Name="Bld_previewCacheID" Type="Str">{E526DB6C-F4F8-4D2D-A5CE-B82A00E8199B}</Property>
-				<Property Name="Bld_version.build" Type="Int">58</Property>
+				<Property Name="Bld_version.build" Type="Int">60</Property>
 				<Property Name="Bld_version.major" Type="Int">1</Property>
 				<Property Name="Destination[0].destName" Type="Str">decoder.exe</Property>
 				<Property Name="Destination[0].path" Type="Path">../builds/decoder/decoder.exe</Property>
@@ -149,7 +152,7 @@
 				<Property Name="Bld_localDestDirType" Type="Str">relativeToProject</Property>
 				<Property Name="Bld_modifyLibraryFile" Type="Bool">true</Property>
 				<Property Name="Bld_previewCacheID" Type="Str">{56F94607-40CA-437D-B1F9-24B2C2C94B9C}</Property>
-				<Property Name="Bld_version.build" Type="Int">60</Property>
+				<Property Name="Bld_version.build" Type="Int">62</Property>
 				<Property Name="Bld_version.major" Type="Int">1</Property>
 				<Property Name="Destination[0].destName" Type="Str">encoder.exe</Property>
 				<Property Name="Destination[0].path" Type="Path">../builds/encoder/encoder.exe</Property>

diff --git a/src/examples/TOML Example.vi b/src/examples/TOML Example.vi
diff --git a/src/examples/TOML Files Example.vi b/src/examples/TOML Files Example.vi
diff --git a/src/examples/subvis/TOML to Tree.vi b/src/examples/subvis/TOML to Tree.vi
diff --git a/src/lib/Array Context.ctl b/src/lib/Array Context.ctl
diff --git a/src/lib/Code Point to UTF-8.vi b/src/lib/Code Point to UTF-8.vi
diff --git a/src/lib/Compose Data.ctl b/src/lib/Compose Data.ctl
diff --git a/src/lib/Compose TOML String.vi b/src/lib/Compose TOML String.vi
diff --git a/src/lib/Context.ctl b/src/lib/Context.ctl
diff --git a/src/lib/Format Basic String.vi b/src/lib/Format Basic String.vi
diff --git a/src/lib/Format Key.vi b/src/lib/Format Key.vi
diff --git a/src/lib/Key-Value Pair.ctl b/src/lib/Key-Value Pair.ctl
diff --git a/src/lib/LabVIEW to TOML.vi b/src/lib/LabVIEW to TOML.vi
diff --git a/src/lib/Match Regex.vi b/src/lib/Match Regex.vi
diff --git a/src/lib/Parse Basic String.vi b/src/lib/Parse Basic String.vi
diff --git a/src/lib/Parse Multiline Basic String.vi b/src/lib/Parse Multiline Basic String.vi
diff --git a/src/lib/Parse TOML String.vi b/src/lib/Parse TOML String.vi
diff --git a/src/lib/Parse Table Names.vi b/src/lib/Parse Table Names.vi
diff --git a/src/lib/Read TOML File (LV).vi b/src/lib/Read TOML File (LV).vi
diff --git a/src/lib/Read TOML File (TOML).vi b/src/lib/Read TOML File (TOML).vi
diff --git a/src/lib/Read TOML File.vi b/src/lib/Read TOML File.vi
diff --git a/src/lib/Set Key.vi b/src/lib/Set Key.vi
diff --git a/src/lib/Set Table Context.vi b/src/lib/Set Table Context.vi
diff --git a/src/lib/Set Value.vi b/src/lib/Set Value.vi
diff --git a/src/lib/State.ctl b/src/lib/State.ctl
diff --git a/src/lib/TOML Key-Value Pair.ctl b/src/lib/TOML Key-Value Pair.ctl
diff --git a/src/lib/TOML Value.ctl b/src/lib/TOML Value.ctl
diff --git a/src/lib/TOML to LabVIEW.vi b/src/lib/TOML to LabVIEW.vi
diff --git a/src/lib/TOML.lvlib b/src/lib/TOML.lvlib
@@ -43,9 +43,9 @@
 	<Item Name="Read TOML File (TOML).vi" Type="VI" URL="../Read TOML File (TOML).vi"/>
 	<Item Name="Read TOML File.vi" Type="VI" URL="../Read TOML File.vi"/>
 	<Item Name="TOML to LabVIEW.vi" Type="VI" URL="../TOML to LabVIEW.vi"/>
-	<Item Name="Write Table Value.vi" Type="VI" URL="../Write Table Value.vi"/>
-	<Item Name="Write Table.vi" Type="VI" URL="../Write Table.vi"/>
 	<Item Name="Write TOML File (LV).vi" Type="VI" URL="../Write TOML File (LV).vi"/>
 	<Item Name="Write TOML File (TOML).vi" Type="VI" URL="../Write TOML File (TOML).vi"/>
 	<Item Name="Write TOML File.vi" Type="VI" URL="../Write TOML File.vi"/>
+	<Item Name="Write Top Level Value.vi" Type="VI" URL="../Write Top Level Value.vi"/>
+	<Item Name="Write Top Level Values.vi" Type="VI" URL="../Write Top Level Values.vi"/>
 </Library>
diff --git a/src/lib/Table Array Context.ctl b/src/lib/Table Array Context.ctl
diff --git a/src/lib/Table Context.ctl b/src/lib/Table Context.ctl
diff --git a/src/lib/Value Type.ctl b/src/lib/Value Type.ctl
diff --git a/src/lib/Value.ctl b/src/lib/Value.ctl
diff --git a/src/lib/Write TOML File (LV).vi b/src/lib/Write TOML File (LV).vi
diff --git a/src/lib/Write TOML File (TOML).vi b/src/lib/Write TOML File (TOML).vi
diff --git a/src/lib/Write TOML File.vi b/src/lib/Write TOML File.vi
diff --git a/src/lib/Write Table Value.vi b/src/lib/Write Table Value.vi
diff --git a/src/lib/Write Table.vi → src/lib/Write Top Level Value.vi b/src/lib/Write Table.vi → src/lib/Write Top Level Value.vi
diff --git a/src/lib/Write Top Level Values.vi b/src/lib/Write Top Level Values.vi
diff --git a/tests/decoder.vi b/tests/decoder.vi
diff --git a/tests/encoder.vi b/tests/encoder.vi
diff --git a/tests/subvis/Format JSON String.vi b/tests/subvis/Format JSON String.vi
diff --git a/tests/subvis/JSON to TOML.vi b/tests/subvis/JSON to TOML.vi
diff --git a/tests/subvis/TOML to JSON.vi b/tests/subvis/TOML to JSON.vi
diff --git a/vipb/LV-TOML.vipb b/vipb/LV-TOML.vipb
@@ -1,7 +1,7 @@
-<VI_Package_Builder_Settings Version="2017" Created_Date="2016-09-02 15:51:35" Modified_Date="2017-06-13 10:44:09" Creator="David Taylor" Comments="" ID="19f76e64d15f0aabaccb0fc1198785b6">
+<VI_Package_Builder_Settings Version="2017" Created_Date="2016-09-02 15:51:35" Modified_Date="2017-06-21 13:12:51" Creator="David Taylor" Comments="" ID="9f076cc8f564eb5049ac65789b49eb1b">
   <Library_General_Settings>
     <Package_File_Name>LV_TOML</Package_File_Name>
-    <Library_Version>1.0.0.5</Library_Version>
+    <Library_Version>1.2.1.2</Library_Version>
     <Auto_Increment_Version>false</Auto_Increment_Version>
     <Library_Source_Folder>..\src</Library_Source_Folder>
     <Library_Output_Folder>..\builds</Library_Output_Folder>
@@ -193,7 +193,7 @@
   <Library_Palette_Definition>
     <Functions_Palette_Data>
       <Parent_Palette_Index>-1</Parent_Palette_Index>
-      <Name>TOML</Name>
+      <Name/>
       <View_Format>Icons</View_Format>
       <Size>
         <Height_Row>3</Height_Row>
@@ -294,6 +294,20 @@
         <Path>..\src\Types</Path>
         <VI_Title/>
       </Items_Data>
+      <Items_Data>
+        <Type>Item</Type>
+        <Sub_Palette_Index>-1</Sub_Palette_Index>
+        <NameSub_Menu_Name>Write Top Level Value.vi</NameSub_Menu_Name>
+        <Short_Name/>
+        <is_Merge_VI>false</is_Merge_VI>
+        <Position>
+          <Row>1</Row>
+          <Column>2</Column>
+        </Position>
+        <Icon>00000000</Icon>
+        <Path>..\src\lib\Write Top Level Value.vi</Path>
+        <VI_Title/>
+      </Items_Data>
       <Items_Data>
         <Type>Item</Type>
         <Sub_Palette_Index>-1</Sub_Palette_Index>
@@ -302,7 +316,7 @@
         <is_Merge_VI>false</is_Merge_VI>
         <Position>
           <Row>1</Row>
-          <Column>3</Column>
+          <Column>4</Column>
         </Position>
         <Icon>00000000</Icon>
         <Path>..\src\lib\Write TOML File.vi</Path>
@@ -311,18 +325,18 @@
       <Items_Data>
         <Type>Item</Type>
         <Sub_Palette_Index>-1</Sub_Palette_Index>
-        <NameSub_Menu_Name>Write Table.vi</NameSub_Menu_Name>
+        <NameSub_Menu_Name>Write Top Level Values.vi</NameSub_Menu_Name>
         <Short_Name/>
         <is_Merge_VI>false</is_Merge_VI>
         <Position>
           <Row>1</Row>
-          <Column>2</Column>
+          <Column>3</Column>
         </Position>
         <Icon>00000000</Icon>
-        <Path>..\src\lib\Write Table.vi</Path>
+        <Path>..\src\lib\Write Top Level Values.vi</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>F4A8A0E317E620487A1DD7B7BFE565C2</GUID>
+      <GUID>7081383607810F8CBEABFEA72D0009A0</GUID>
     </Functions_Palette_Data>
     <Functions_Palette_Data>
       <Parent_Palette_Index>0</Parent_Palette_Index>
@@ -371,7 +385,7 @@
         <Path>..\src\lib\TOML Key-Value Pair.ctl</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>DCAA87A1E06918F01AF14C3C8C05242A</GUID>
+      <GUID>0F445EFEBD6A1C90461BB638E6275CCB</GUID>
     </Functions_Palette_Data>
   </Library_Palette_Definition>
 </VI_Package_Builder_Settings>