Skip to content

Commit 1150a6a

Browse files
author
Francois Normandin
committed
- Changed the re-entrancy settings for the overridable protected methods to allow for recursive calls on subsystems during creation and destruction of objects.
- Get PublicEvents is now a public method for conviviality (even if it exposes event refs to developer). Prior to this change, the developer needed to get the Event Registration Reference (Mailbox) and register to all events of a subsystem.
1 parent a0304fa commit 1150a6a

Some content is hidden

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

54 files changed

+91
-95
lines changed

src/Example--SMO.Example.vi

-4 Bytes
Binary file not shown.

src/JKI SMO Example.lvproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
<Item Name="SMO.lvclass" Type="LVClass" URL="../SMO/SMO.lvclass"/>
2626
<Item Name="SMO.UI.lvclass" Type="LVClass" URL="../SMO.UI/SMO.UI.lvclass"/>
2727
</Item>
28-
<Item Name="Template Classes" Type="Folder">
29-
<Item Name="SMO.Template.lvclass" Type="LVClass" URL="../SMO.Template/SMO.Template.lvclass"/>
30-
<Item Name="SMO.UI.Template.lvclass" Type="LVClass" URL="../SMO.UI.Template/SMO.UI.Template.lvclass"/>
31-
</Item>
3228
<Item Name="JKI SMO.vipc" Type="Document" URL="../JKI SMO.vipc"/>
3329
<Item Name="Example--SMO.Example.vi" Type="VI" URL="../Example--SMO.Example.vi"/>
3430
<Item Name="SMO.Example.lvclass" Type="LVClass" URL="../SMO.Example/SMO.Example.lvclass"/>

src/JKI State Machine Objects.vipb

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
<VI_Package_Builder_Settings Version="0.6" Created_Date="2015-12-04 15:52:35" Modified_Date="2016-02-08 21:52:19" Creator="Francois Normandin" Comments="" ID="5a671ef70eb131d7bc1d5779354cdd60">
1+
<VI_Package_Builder_Settings Version="0.6" Created_Date="2015-12-04 15:52:35" Modified_Date="2016-02-10 09:41:19" Creator="Francois Normandin" Comments="" ID="bdf4fb6eee61434aa1319e1b30913ffe">
22
<Library_General_Settings>
33
<Package_File_Name>JKI_StateMachineObjects</Package_File_Name>
4-
<Library_Version>1.0.0.9</Library_Version>
4+
<Library_Version>1.0.0.11</Library_Version>
55
<Auto_Increment_Version>false</Auto_Increment_Version>
66
<Library_Source_Folder>.</Library_Source_Folder>
77
<Library_Output_Folder>..\..\..</Library_Output_Folder>
88
<Company_Name>JKI</Company_Name>
99
<Library_Summary/>
1010
<Library_License>BSD</Library_License>
1111
<Package_LabVIEW_Version>13.0</Package_LabVIEW_Version>
12-
<Community_Edition>true</Community_Edition>
12+
<Community_Edition>false</Community_Edition>
1313
<Package_Icon>00000D7E002800000C9A00000400000200020022002200080000000000FFFFFF00FF80000000FFFFFFFFFFFF0000FFFFFFFFCCCC0000FFFFFFFF99990000FFFFFFFF66660000FFFFFFFF33330000FFFFFFFF00000000FFFFCCCCFFFF0000FFFFCCCCCCCC0000FFFFCCCC99990000FFFFCCCC66660000FFFFCCCC33330000FFFFCCCC00000000FFFF9999FFFF0000FFFF9999CCCC0000FFFF999999990000FFFF999966660000FFFF999933330000FFFF999900000000FFFF6666FFFF0000FFFF6666CCCC0000FFFF666699990000FFFF666666660000FFFF666633330000FFFF666600000000FFFF3333FFFF0000FFFF3333CCCC0000FFFF333399990000FFFF333366660000FFFF333333330000FFFF333300000000FFFF0000FFFF0000FFFF0000CCCC0000FFFF000099990000FFFF000066660000FFFF000033330000FFFF000000000000CCCCFFFFFFFF0000CCCCFFFFCCCC0000CCCCFFFF99990000CCCCFFFF66660000CCCCFFFF33330000CCCCFFFF00000000CCCCCCCCFFFF0000CCCCCCCCCCCC0000CCCCCCCC99990000CCCCCCCC66660000CCCCCCCC33330000CCCCCCCC00000000CCCC9999FFFF0000CCCC9999CCCC0000CCCC999999990000CCCC999966660000CCCC999933330000CCCC999900000000CCCC6666FFFF0000CCCC6666CCCC0000CCCC666699990000CCCC666666660000CCCC666633330000CCCC666600000000CCCC3333FFFF0000CCCC3333CCCC0000CCCC333399990000CCCC333366660000CCCC333333330000CCCC333300000000CCCC0000FFFF0000CCCC0000CCCC0000CCCC000099990000CCCC000066660000CCCC000033330000CCCC0000000000009999FFFFFFFF00009999FFFFCCCC00009999FFFF999900009999FFFF666600009999FFFF333300009999FFFF000000009999CCCCFFFF00009999CCCCCCCC00009999CCCC999900009999CCCC666600009999CCCC333300009999CCCC0000000099999999FFFF000099999999CCCC0000999999999999000099999999666600009999999933330000999999990000000099996666FFFF000099996666CCCC0000999966669999000099996666666600009999666633330000999966660000000099993333FFFF000099993333CCCC0000999933339999000099993333666600009999333333330000999933330000000099990000FFFF000099990000CCCC000099990000999900009999000066660000999900003333000099990000000000006666FFFFFFFF00006666FFFFCCCC00006666FFFF999900006666FFFF666600006666FFFF333300006666FFFF000000006666CCCCFFFF00006666CCCCCCCC00006666CCCC999900006666CCCC666600006666CCCC333300006666CCCC0000000066669999FFFF000066669999CCCC0000666699999999000066669999666600006666999933330000666699990000000066666666FFFF000066666666CCCC0000666666669999000066666666666600006666666633330000666666660000000066663333FFFF000066663333CCCC0000666633339999000066663333666600006666333333330000666633330000000066660000FFFF000066660000CCCC000066660000999900006666000066660000666600003333000066660000000000003333FFFFFFFF00003333FFFFCCCC00003333FFFF999900003333FFFF666600003333FFFF333300003333FFFF000000003333CCCCFFFF00003333CCCCCCCC00003333CCCC999900003333CCCC666600003333CCCC333300003333CCCC0000000033339999FFFF000033339999CCCC0000333399999999000033339999666600003333999933330000333399990000000033336666FFFF000033336666CCCC0000333366669999000033336666666600003333666633330000333366660000000033333333FFFF000033333333CCCC0000333333339999000033333333666600003333333333330000333333330000000033330000FFFF000033330000CCCC000033330000999900003333000066660000333300003333000033330000000000000000FFFFFFFF00000000FFFFCCCC00000000FFFF999900000000FFFF666600000000FFFF333300000000FFFF000000000000CCCCFFFF00000000CCCCCCCC00000000CCCC999900000000CCCC666600000000CCCC333300000000CCCC0000000000009999FFFF000000009999CCCC0000000099999999000000009999666600000000999933330000000099990000000000006666FFFF000000006666CCCC0000000066669999000000006666666600000000666633330000000066660000000000003333FFFF000000003333CCCC0000000033339999000000003333666600000000333333330000000033330000000000000000FFFF000000000000CCCC0000000000009999000000000000666600000000000033330000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000000000000000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000000000000000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000EEEEEEEEEEEE0000DDDDDDDDDDDD0000BBBBBBBBBBBB0000AAAAAAAAAAAA0000888888888888000077777777777700005555555555550000444444444444000022222222222200001111111111110000000000000000007B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B007B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B000000000000000000000000000000000000000000000000000000007B7B7B7B000000005200000000000000000000000000000000000000000000007B7B7B7B000000005200520052000000000000000000000000000000000000007B7B7B7B000052005251000052000000000000000000000000000000000000007B7B7B7B00005200522C2C0052000000000000000000000000000000000000007B7B7B7B000052000000000000000000000000000000000000000000000000007B7B7B7B005252000000000000000000000000000000000000000000000000007B7B7B7B000000000000000000000000000000000000000000000000000000007B7B7B7B000000000000000000000000000000000000000000000000000000007B7B7B7B000000000000000000000000000000000000000000000000000000007B7B7B7B000000000000000000000000000000000000000000000000000000007B7B7B7B00000000002B56F8565656F8F60000000000000000000000000000007B7B7B7B000000002B56323208080808572B00000000000000000000000000007B7B7B7B0000000057562A550808080808332BF6F6F6F6F6F6F6F600000000007B7B7B7B000000003256002A320808080808335757575757575757F8000000007B7B7B7B000000003232795508080808080808080808080808080809F80000007B7B7B7B0000000056085508333333332C08083231323333330F0F0F560000007B7B7B7B000000005632A332FA56FA56570808552A795680320E0716F80000007B7B7B7B0000000056083208562B562B570808550055F8562B070016F80000007B7B7B7B00000000560808085D5D5DFA33080855555C5D815D150F0F560000007B7B7B7B00000000560F0F0F0808080F0F0808080808080808080808560000007B7B7B7B000000005616070E0F0E0E0F230808333333333333333332F60000007B7B7B7B00000000560F00070F0F0F0E080FF82B2B2B2B2B2B2BF8F6000000007B7B7B7B00000000F80F0F0F0808080833F800000000000000000000000000007B7B7B7B0000000000F85757575757562B0000000000000000000000000000007B7B7B7B000000000000F6F6F6F6F600000000000000000000000000000000007B7B7B7B000000000000000000000000000000000000000000000000000000007B7B7B7B000000000000000000000000000000000000000000000000000000007B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B007B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B7B007FFFFFFEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFE002900000012000000020000000D01000000000100000000000A000000080000000000240024002900000012000000020000000D00B2B2B900010000000000100000001000000002002300000000000000000023002900000012000000020000000D00FCFCFD00010000000000100000001000000002002200010001000100010022002900000012000000020000000D00B2B2B900010000000000100000001000000002000000240024002400240000002900000012000000020000000D0080808A00010000000000100000001000000002000100230023002300230001</Package_Icon>
1414
<Product_Name>JKI State Machine Objects (SMO)</Product_Name>
1515
<Was_Built>true</Was_Built>
@@ -41,7 +41,8 @@ The JKI SMO NI Community Group (https://decibel.ni.com/content/groups/jki-state-
4141
<Copyright/>
4242
<Packager>JKI</Packager>
4343
<URL>https://github.com/JKISoftware/JKI-State-Machine-Objects</URL>
44-
<Release_Notes> - Reentrancy settings for SMO API</Release_Notes>
44+
<Release_Notes>- Adjusted reentrancy settings for SMO overridable methods
45+
- Get PublicEvents is now a public method (this exposes the references to developer, which should not generate events outside of the process, but is convenient to avoid event structure linkage issues on renaming and rewiring)</Release_Notes>
4546
</Description>
4647
<Destinations>
4748
<Toolkit_VIs>
@@ -242,7 +243,7 @@ The JKI SMO NI Community Group (https://decibel.ni.com/content/groups/jki-state-
242243
<Path>Example--SMO.Example.vi</Path>
243244
<VI_Title/>
244245
</Items_Data>
245-
<GUID>09FE978B2379F36DD3822E14DB2C8F8A</GUID>
246+
<GUID>F5EC2DA60A020985F67ED3C6AC4BF415</GUID>
246247
</Functions_Palette_Data>
247248
<Functions_Palette_Data>
248249
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -375,7 +376,7 @@ The JKI SMO NI Community Group (https://decibel.ni.com/content/groups/jki-state-
375376
<Path>SMO\GetPublicEvents.vi</Path>
376377
<VI_Title/>
377378
</Items_Data>
378-
<GUID>66D3CA00966C11C652B8FB932C5CA7B9</GUID>
379+
<GUID>D8C8DF8DE263946C9EB39C7430E96C76</GUID>
379380
</Functions_Palette_Data>
380381
<Functions_Palette_Data>
381382
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -494,7 +495,7 @@ The JKI SMO NI Community Group (https://decibel.ni.com/content/groups/jki-state-
494495
<Path>Protected</Path>
495496
<VI_Title/>
496497
</Items_Data>
497-
<GUID>33036A8D0E82643AD3037FE13E07AC29</GUID>
498+
<GUID>C6C625A625142617F47B1266E24B9704</GUID>
498499
</Functions_Palette_Data>
499500
<Functions_Palette_Data>
500501
<Parent_Palette_Index>1</Parent_Palette_Index>
@@ -613,7 +614,7 @@ The JKI SMO NI Community Group (https://decibel.ni.com/content/groups/jki-state-
613614
<Path>SMO\Protected\isProcessAllowedRun.vi</Path>
614615
<VI_Title/>
615616
</Items_Data>
616-
<GUID>97D5009F94733E41E34F46766ADBFEBA</GUID>
617+
<GUID>2C12F32D0D6D66DFCC620F901E4876DE</GUID>
617618
</Functions_Palette_Data>
618619
<Functions_Palette_Data>
619620
<Parent_Palette_Index>2</Parent_Palette_Index>
@@ -648,7 +649,7 @@ The JKI SMO NI Community Group (https://decibel.ni.com/content/groups/jki-state-
648649
<Path>SMO.UI\Show User Interface.vi</Path>
649650
<VI_Title/>
650651
</Items_Data>
651-
<GUID>BE9CBA0AF2E6A3074F599ADA15DBA5B9</GUID>
652+
<GUID>35D26CE83B0DC8EB20BE98286199DA41</GUID>
652653
</Functions_Palette_Data>
653654
</Library_Palette_Definition>
654655
</VI_Package_Builder_Settings>
0 Bytes
Binary file not shown.
4 Bytes
Binary file not shown.
4 Bytes
Binary file not shown.
4 Bytes
Binary file not shown.
4 Bytes
Binary file not shown.
4 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)