Skip to content

Commit e48db2c

Browse files
Added Array Support for CfgManager.Text.
Text.INI with partial support (arrays are still problematic - to use with care.)
1 parent 24014a2 commit e48db2c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+116
-50
lines changed

_unittests/CfgManager Unit Tests.lvproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
<Item Name="CfgManager Test Launcher.vi" Type="VI" URL="../CfgManager Test Launcher.vi"/>
2424
<Item Name="CfgManager.Text Test Launcher.vi" Type="VI" URL="../CfgManager.Text Test Launcher.vi"/>
2525
<Item Name="CfgManager.Text.INI Test Launcher.vi" Type="VI" URL="../CfgManager.Text.INI Test Launcher.vi"/>
26+
<Item Name="CfgManager.Text.INI (Array) Test Launcher.vi" Type="VI" URL="../CfgManager.Text.INI (Array) Test Launcher.vi"/>
27+
<Item Name="CfgManager.Text.INI (NumericArray) Test Launcher.vi" Type="VI" URL="../CfgManager.Text.INI (NumericArray) Test Launcher.vi"/>
2628
<Item Name="CfgManager.Text Partial Found Test Launcher.vi" Type="VI" URL="../CfgManager.Text Partial Found Test Launcher.vi"/>
2729
<Item Name="CfgManager.Collection Test Launcher.vi" Type="VI" URL="../CfgManager.Collection Test Launcher.vi"/>
2830
<Item Name="CfgManager Cache Lifetime Tests.vi" Type="VI" URL="../CfgManager Cache Lifetime Tests.vi"/>
@@ -289,7 +291,7 @@
289291
<Item Name="4822C501820BB5A8313EAE4F8D4B529FType Descriptor Header__ogtk.ctl" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/_Caraya_internal_deps/4822C501820BB5A8313EAE4F8D4B529FType Descriptor Header__ogtk.ctl"/>
290292
<Item Name="4822C501820BB5A8313EAE4F8D4B529FType Descriptor__ogtk.ctl" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/_Caraya_internal_deps/4822C501820BB5A8313EAE4F8D4B529FType Descriptor__ogtk.ctl"/>
291293
<Item Name="4822C501820BB5A8313EAE4F8D4B529FVariant to Header Info__ogtk.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/_Caraya_internal_deps/4822C501820BB5A8313EAE4F8D4B529FVariant to Header Info__ogtk.vi"/>
292-
<Item Name="Add State(s) to Queue__jki_lib_state_machine.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/State Machine/_JKI_lib_State_Machine.llb/Add State(s) to Queue__jki_lib_state_machine.vi"/>
294+
<Item Name="Add State(s) to Queue__jki_lib_state_machine.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/State Machine/_jki_lib_state_machine.llb/Add State(s) to Queue__jki_lib_state_machine.vi"/>
293295
<Item Name="Application Directory.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/file.llb/Application Directory.vi"/>
294296
<Item Name="Application Menu.rtm" Type="Document" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/Caraya/menu/Application Menu.rtm"/>
295297
<Item Name="BuildHelpPath.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/BuildHelpPath.vi"/>
@@ -341,11 +343,12 @@
341343
<Item Name="Open URL in Default Browser.vi" Type="VI" URL="/&lt;vilib&gt;/Platform/browser.llb/Open URL in Default Browser.vi"/>
342344
<Item Name="OpenDescriptor.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Data Manipulation/TypeDescriptor/OpenDescriptor.lvlib"/>
343345
<Item Name="OpenVariant.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Data Manipulation/Variant/OpenVariant.lvlib"/>
344-
<Item Name="Parse State Queue__jki_lib_state_machine.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/State Machine/_JKI_lib_State_Machine.llb/Parse State Queue__jki_lib_state_machine.vi"/>
346+
<Item Name="Parse State Queue__jki_lib_state_machine.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/State Machine/_jki_lib_state_machine.llb/Parse State Queue__jki_lib_state_machine.vi"/>
345347
<Item Name="Path to URL.vi" Type="VI" URL="/&lt;vilib&gt;/printing/PathToURL.llb/Path to URL.vi"/>
346348
<Item Name="property -- cluster.ctl" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/Caraya/classes/Test Report.JUnit/property -- cluster.ctl"/>
347349
<Item Name="Search and Replace Pattern.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Search and Replace Pattern.vi"/>
348350
<Item Name="Serializer.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Serializer/Serializer/Serializer.lvclass"/>
351+
<Item Name="Serializer.PlainText.INI.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Serializer/Serializer.INI/Serializer.PlainText.INI.lvclass"/>
349352
<Item Name="Serializer.PlainText.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Serializer/Serializer.PlainText/Serializer.PlainText.lvclass"/>
350353
<Item Name="Set Bold Text.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Set Bold Text.vi"/>
351354
<Item Name="Set Busy.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/cursorutil.llb/Set Busy.vi"/>
2.26 KB
Binary file not shown.
18.1 KB
Binary file not shown.
16.5 KB
Binary file not shown.
6.78 KB
Binary file not shown.
Lines changed: 7 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,8 @@
1-
[System]
2-
_staticdeps.Logger.sharedresource = true
3-
_staticdeps.Logger.type = "SMOLogger.lvclass"
4-
_staticdeps.Pump.sharedresource = false
5-
_staticdeps.Pump.type = "SMOPump.lvclass"
6-
7-
[System.Logger]
8-
Config.Boolean = false // there are some comments here
9-
Config.Numeric = 2.7818
10-
Config.String = "logger title here..."
11-
rate (Hz) = 2
12-
13-
[System.Pump]
14-
; this line is only a comment
15-
Config.Boolean = false
16-
Config.Numeric = 0.948999913821431 // This is a randomly generated number
17-
Config.String = "new"
18-
; this second line is also a comment
19-
location = "BOP"
20-
# some other kind of comment
21-
221
[System.Valve]
23-
Settings.D = 0.00000000000000
24-
Settings.I = 0.00000000000000
25-
Settings.P = 1.00000000000000
26-
_staticdeps.Sensor.name = "Sensor"
27-
_staticdeps.Sensor.type = "Sensor.lvclass"
28-
_staticdeps.Sensor.sharedresource = false
29-
_staticdeps.Logger.name = "Logger"
30-
_staticdeps.Logger.type = "Logger.lvclass"
31-
_staticdeps.Logger.sharedresource = true
2+
_dyndependencies = _dyndependencies.<size(s)> = "2"
3+
_dyndependencies 0.sharedresource = "TRUE"
4+
_dyndependencies 0.type = "Logger.lvclass"
5+
_dyndependencies 0.name = "Logger"
6+
_dyndependencies 1.sharedresource = "FALSE"
7+
_dyndependencies 1.type = "Sensor.lvclass"
8+
_dyndependencies 1.name = "Sensor"
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
System.Other:ArrayOfClusters = [{true,42,"A"},{false,0,""},{true,-54,"C"}]
12
System.Pump:Config.Boolean = true
2-
System.Pump:Config.Numeric = 0.334867987909570
3+
System.Pump:Config.Numeric = 0.537480273173034
34
System.Pump:Config.String = "modified"
5+
System.Pump:Config.array = [0.5874812513732]
46
System.Valve:Settings.D = 0.00000000000000
57
System.Valve:Settings.I = 0.227441643632954
68
System.Valve:Settings.P = 1.00000000000000

source/Cache/GetElement(Single).vi

108 Bytes
Binary file not shown.

source/CfgManager.lvproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<Item Name="OpenDescriptor.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Data Manipulation/TypeDescriptor/OpenDescriptor.lvlib"/>
2929
<Item Name="OpenVariant.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Data Manipulation/Variant/OpenVariant.lvlib"/>
3030
<Item Name="Serializer.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Serializer/Serializer/Serializer.lvclass"/>
31+
<Item Name="Serializer.PlainText.INI.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Serializer/Serializer.INI/Serializer.PlainText.INI.lvclass"/>
3132
<Item Name="Serializer.PlainText.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Serializer/Serializer.PlainText/Serializer.PlainText.lvclass"/>
3233
<Item Name="Space Constant.vi" Type="VI" URL="/&lt;vilib&gt;/dlg_ctls.llb/Space Constant.vi"/>
3334
<Item Name="TD_Compare Types.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/GetType.llb/TD_Compare Types.vi"/>
-936 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)