Skip to content

Commit a464d37

Browse files
Merge branch 'release/1.2.0.10'
2 parents b4afea6 + 0b9b500 commit a464d37

Some content is hidden

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

46 files changed

+135
-70
lines changed

Configuration Manager.vipb

+19-20
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<VI_Package_Builder_Settings Version="2018" Created_Date="2018-06-04 19:50:03" Modified_Date="2019-06-04 19:52:49" Creator="Francois Normandin" Comments="" ID="731b4ac5c6beddd4f9e220527b874ebc">
1+
<VI_Package_Builder_Settings Version="2018" Created_Date="2018-06-04 19:50:03" Modified_Date="2019-07-03 19:43:37" Creator="Francois Normandin" Comments="" ID="52de524e7cd6527c46801224d64d50e4">
22
<Library_General_Settings>
33
<Package_File_Name>LabVIEW_Open_Source_lib_Configuration_Manager</Package_File_Name>
4-
<Library_Version>1.1.0.10</Library_Version>
4+
<Library_Version>1.2.0.11</Library_Version>
55
<Auto_Increment_Version>false</Auto_Increment_Version>
66
<Library_Source_Folder>source</Library_Source_Folder>
77
<Library_Output_Folder>_built-packages</Library_Output_Folder>
@@ -17,11 +17,11 @@
1717
</Library_General_Settings>
1818
<Advanced_Settings>
1919
<Package_Dependencies>
20-
<External_Dependencies>labview_open_source_lib_data_manipulation &gt;= 1.1.0.5</External_Dependencies>
21-
<External_Dependencies>labview_open_source_lib_serializer &gt;= 1.0.2.6</External_Dependencies>
20+
<External_Dependencies>labview_open_source_lib_data_manipulation &gt;= 1.2.2.8</External_Dependencies>
21+
<External_Dependencies>labview_open_source_lib_serializer &gt;= 1.0.5.11</External_Dependencies>
2222
<External_Dependencies>labview_open_source_lib_unicity &gt;= 1.0.1.2</External_Dependencies>
23-
<Direct_Dependencies>labview_open_source_lib_data_manipulation-1.1.0.5</Direct_Dependencies>
24-
<Direct_Dependencies>labview_open_source_lib_serializer-1.0.2.6</Direct_Dependencies>
23+
<Direct_Dependencies>labview_open_source_lib_data_manipulation-1.2.2.8</Direct_Dependencies>
24+
<Direct_Dependencies>labview_open_source_lib_serializer-1.0.5.11</Direct_Dependencies>
2525
<Direct_Dependencies>labview_open_source_lib_unicity-1.0.1.2</Direct_Dependencies>
2626
</Package_Dependencies>
2727
<Custom_Action_VIs>
@@ -56,10 +56,9 @@ During "Write" operations, the elements will be written in the first manager of
5656
<Copyright/>
5757
<Packager/>
5858
<URL/>
59-
<Release_Notes>- Updated dependencies to support Enums
60-
- Base class now supports URI
61-
- Support for CfgManager.Text.INI
62-
- Added a method for Read Path in CfgManager.Text</Release_Notes>
59+
<Release_Notes>- Support for Arrays in CfgManager.Text
60+
- Partial support for CfgManager.Text.INI (Arrays are not supported yet)
61+
</Release_Notes>
6362
</Description>
6463
<Destinations>
6564
<Toolkit_VIs>
@@ -391,7 +390,7 @@ During "Write" operations, the elements will be written in the first manager of
391390
<Path>source\INI File</Path>
392391
<VI_Title/>
393392
</Items_Data>
394-
<GUID>AE531B2BAC82CC72C29DEFCC9DE2ABF6</GUID>
393+
<GUID>72F39C1B8629DA7E9BA7F50E2322F2F3</GUID>
395394
</Functions_Palette_Data>
396395
<Functions_Palette_Data>
397396
<Parent_Palette_Index>6</Parent_Palette_Index>
@@ -440,7 +439,7 @@ During "Write" operations, the elements will be written in the first manager of
440439
<Path>source\Encoding\Encode.vi</Path>
441440
<VI_Title/>
442441
</Items_Data>
443-
<GUID>D7FE7F48A9BB4C44DBE492FFD782DF27</GUID>
442+
<GUID>C86F929A80E6BA19D72A23B5481D829F</GUID>
444443
</Functions_Palette_Data>
445444
<Functions_Palette_Data>
446445
<Parent_Palette_Index>6</Parent_Palette_Index>
@@ -489,7 +488,7 @@ During "Write" operations, the elements will be written in the first manager of
489488
<Path>source\Encoding.Base64\Encode.vi</Path>
490489
<VI_Title/>
491490
</Items_Data>
492-
<GUID>D5E29A4FBDA18C1A9E787B64F459FBA7</GUID>
491+
<GUID>623B4E0D8EE580C1173D4ACA423D0CCA</GUID>
493492
</Functions_Palette_Data>
494493
<Functions_Palette_Data>
495494
<Parent_Palette_Index>6</Parent_Palette_Index>
@@ -538,7 +537,7 @@ During "Write" operations, the elements will be written in the first manager of
538537
<Path>source\Encryption\Encrypt.vi</Path>
539538
<VI_Title/>
540539
</Items_Data>
541-
<GUID>F7B732087D8BE1A69D15C4107E3E8A5C</GUID>
540+
<GUID>222E6E13DA0EA912CB9374CCCBAB01FA</GUID>
542541
</Functions_Palette_Data>
543542
<Functions_Palette_Data>
544543
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -671,7 +670,7 @@ During "Write" operations, the elements will be written in the first manager of
671670
<Path>source\Manager\Write URI.vi</Path>
672671
<VI_Title/>
673672
</Items_Data>
674-
<GUID>BB568D793DCE4365D415AF492CFF9AA6</GUID>
673+
<GUID>00549DA479E2620A87539648BDF0EED3</GUID>
675674
</Functions_Palette_Data>
676675
<Functions_Palette_Data>
677676
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -748,7 +747,7 @@ During "Write" operations, the elements will be written in the first manager of
748747
<Path>source\Manager.Text.INI\Create Manager.Text.INI.vi</Path>
749748
<VI_Title/>
750749
</Items_Data>
751-
<GUID>4D0FE4AA498513AEE2AD378E8BD5D46B</GUID>
750+
<GUID>A56333A34317AA713C1F09CEDF5E8AF7</GUID>
752751
</Functions_Palette_Data>
753752
<Functions_Palette_Data>
754753
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -825,7 +824,7 @@ During "Write" operations, the elements will be written in the first manager of
825824
<Path>source\Manager\Decompose KVPs.vi</Path>
826825
<VI_Title/>
827826
</Items_Data>
828-
<GUID>4D891F96D68E6FEBA0B0F446BEE00281</GUID>
827+
<GUID>FE73BCCC5FAABCB64514710673472A95</GUID>
829828
</Functions_Palette_Data>
830829
<Functions_Palette_Data>
831830
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -1126,7 +1125,7 @@ During "Write" operations, the elements will be written in the first manager of
11261125
<Path>source\Manager.Text\Read Path.vi</Path>
11271126
<VI_Title/>
11281127
</Items_Data>
1129-
<GUID>6315C22CAE723FAD2DD70852F35595B9</GUID>
1128+
<GUID>EFE31CDC3A970BC481F3CF1D4FDA04E8</GUID>
11301129
</Functions_Palette_Data>
11311130
<Functions_Palette_Data>
11321131
<Parent_Palette_Index>7</Parent_Palette_Index>
@@ -1343,7 +1342,7 @@ During "Write" operations, the elements will be written in the first manager of
13431342
<Path>source\Manager.Text\EnumerateElements.vi</Path>
13441343
<VI_Title/>
13451344
</Items_Data>
1346-
<GUID>32CF7A4329BD487E2483D9768F1DAF4E</GUID>
1345+
<GUID>7277BEC48FF6CB5F1003654E2E76B7E3</GUID>
13471346
</Functions_Palette_Data>
13481347
<Functions_Palette_Data>
13491348
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -1420,7 +1419,7 @@ During "Write" operations, the elements will be written in the first manager of
14201419
<Path>source\Manager.Text.INI\Default INITextManager Object.vi</Path>
14211420
<VI_Title/>
14221421
</Items_Data>
1423-
<GUID>4F0CC59B0E4155055AA971BDB7DF7579</GUID>
1422+
<GUID>6485E29984772750A88D93379E01C770</GUID>
14241423
</Functions_Palette_Data>
14251424
</Library_Palette_Definition>
14261425
</VI_Package_Builder_Settings>

Configuration Manager.vipc

192 KB
Binary file not shown.

_unittests/CfgManager Unit Tests.lvproj

+5-2
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.
Binary file not shown.
Binary file not shown.
6.78 KB
Binary file not shown.
+7-30
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"
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

+1
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.
-968 Bytes
Binary file not shown.
4 Bytes
Binary file not shown.

source/Manager.Text.INI/ConfigManager.Text.INI.lvclass

+66-10
Large diffs are not rendered by default.
Binary file not shown.
22.9 KB
Binary file not shown.
30.2 KB
Binary file not shown.
0 Bytes
Binary file not shown.
Binary file not shown.
22.5 KB
Binary file not shown.
Binary file not shown.

source/Manager.Text.INI/onKeyRead.vi

22.4 KB
Binary file not shown.

source/Manager.Text.INI/onKeyWrite.vi

19.3 KB
Binary file not shown.

source/Manager.Text.INI/regexINI.vi

-12.7 KB
Binary file not shown.
336 Bytes
Binary file not shown.

source/Manager.Text/Build String.vi

-8 Bytes
Binary file not shown.

source/Manager.Text/ConfigManager.Text.lvclass

+34-7
Large diffs are not rendered by default.
44 Bytes
Binary file not shown.
-8 Bytes
Binary file not shown.

source/Manager.Text/EscapeString.vi

14.9 KB
Binary file not shown.
236 Bytes
Binary file not shown.
272 Bytes
Binary file not shown.

source/Manager.Text/Launch Process.vi

4 Bytes
Binary file not shown.

source/Manager.Text/Parse String.vi

0 Bytes
Binary file not shown.

source/Manager.Text/Process.vi

3.18 KB
Binary file not shown.

source/Manager.Text/Save.vi

32 Bytes
Binary file not shown.
4 Bytes
Binary file not shown.

source/Manager.Text/onKeyRead.vi

16 KB
Binary file not shown.

source/Manager.Text/onKeyWrite.vi

17.5 KB
Binary file not shown.

source/Manager/GetElement(Single).vi

80 Bytes
Binary file not shown.
-296 Bytes
Binary file not shown.

source/Manager/Read Serializer.vi

28 Bytes
Binary file not shown.

source/Manager/Read(Variant).vi

16 Bytes
Binary file not shown.

source/Manager/Read.vi

3.38 KB
Binary file not shown.

source/Manager/Write(Variant).vi

16 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)