Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Task2402796] Automatically Create Enum Annotations Based on Controls #215

Merged
merged 42 commits into from
Jun 2, 2023
Merged

[Task2402796] Automatically Create Enum Annotations Based on Controls #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
69e4be7
Fixed issue with typing referencing old Type Specialization enum.
WesleyTangNationalInstruments May 25, 2023
ecacd00
Initial changes for autocreate enums annotations based on enum contro…
WesleyTangNationalInstruments May 25, 2023
aebaa10
Minor cleanup
WesleyTangNationalInstruments May 25, 2023
044d474
Added Get Results Metadata that mirrors Get Configuration Metadata an…
WesleyTangNationalInstruments May 25, 2023
4a830db
Added Get Results Metadata.vi to lvlib
WesleyTangNationalInstruments May 25, 2023
32444c7
Fixed issue with parameter name.
WesleyTangNationalInstruments May 25, 2023
9468d98
Created two new subVIs to split logic out
WesleyTangNationalInstruments May 26, 2023
d7abc3f
Refactored Create Enum Type Specialization to work with both Enums an…
WesleyTangNationalInstruments May 26, 2023
bdff72d
Closed reference
WesleyTangNationalInstruments May 26, 2023
a79f920
Updated Get Configuration Metadata.vi and Get Results Metadata.vi to …
WesleyTangNationalInstruments May 26, 2023
3f99b43
Updated callers of Get Results MetaData.vi and Get Configuration Meta…
WesleyTangNationalInstruments May 26, 2023
3ea3c45
Updated lvlib to include new helpers.
WesleyTangNationalInstruments May 26, 2023
d297f90
Cleaned up panels.
WesleyTangNationalInstruments May 26, 2023
4944b55
Added IsArrayControl and IsEnumControl helpers
WesleyTangNationalInstruments May 30, 2023
9fa49c1
Added IsEnumOrEnumArrayControl helper
WesleyTangNationalInstruments May 30, 2023
85e08b5
Updated Filter for Enum Controls to use new helpers.
WesleyTangNationalInstruments May 30, 2023
cd29fea
Made Create Enum Type Specialization private. Update lvlib
WesleyTangNationalInstruments May 30, 2023
98be046
Removed parameter name parameter and moved that logic internal to Cre…
WesleyTangNationalInstruments May 30, 2023
6dfa99d
Fixed up callers for removal of parameter name parameter
WesleyTangNationalInstruments May 30, 2023
46362df
Fixed issue where we create enum.values even if no enums.
WesleyTangNationalInstruments May 30, 2023
b8fb694
Refactored helper to check if is enum array rather than any array
WesleyTangNationalInstruments May 30, 2023
7f55f23
Minor cleanup
WesleyTangNationalInstruments May 30, 2023
c38839e
Removed validationand generic up-casting code and updated to use help…
WesleyTangNationalInstruments May 30, 2023
35fc52e
Added another helper VI to share more code between Get Configuration …
WesleyTangNationalInstruments May 30, 2023
7601dbc
Made another helper to consolidate logic between Get Configuration Me…
WesleyTangNationalInstruments May 31, 2023
d29f837
Fixed icon art
WesleyTangNationalInstruments May 31, 2023
6263a6c
Fixed up lvlib
WesleyTangNationalInstruments May 31, 2023
4521301
Updated IEnumArrayControl to use IsEnumControl.
WesleyTangNationalInstruments May 31, 2023
0aea1ba
Fixed an issue where Get Results Metadata uses Measurement Configurat…
WesleyTangNationalInstruments May 31, 2023
514c34b
Refactored IsEnumControl.vi and IsEnumArrayControl.vi to output caste…
WesleyTangNationalInstruments May 31, 2023
379aee9
Updated LabVIEW datatype to Measurement datatype.vi to convert enum t…
WesleyTangNationalInstruments May 31, 2023
e97a7e4
Fixed an issue where we did not update supported tag.
WesleyTangNationalInstruments May 31, 2023
8759014
Added Get Annotations For Parameter helper
WesleyTangNationalInstruments Jun 1, 2023
0ca9085
Refactored to remove Get Results Metadata and Get Configuration Metad…
WesleyTangNationalInstruments Jun 1, 2023
1d868e6
Fixed up lvlib
WesleyTangNationalInstruments Jun 1, 2023
718f299
Removed unused items in unbundle
WesleyTangNationalInstruments Jun 1, 2023
a2b5b42
Renamed Parameter_AnnotationsEntry.ctl for use in both configuration …
WesleyTangNationalInstruments Jun 1, 2023
c301594
Updated lvlib
WesleyTangNationalInstruments Jun 1, 2023
88c7885
Renamed Output to OutputParameter. Switched to using Parameter_Annota…
WesleyTangNationalInstruments Jun 1, 2023
c002b97
Updated references for Parameter_AnnotationsEntry.ctl.
WesleyTangNationalInstruments Jun 1, 2023
4e54a66
Updated callers of OutputParameter.ctl
WesleyTangNationalInstruments Jun 1, 2023
433645e
I have no idea why LabView autodirties and wants to resave this file …
WesleyTangNationalInstruments Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified ...ementLink Measurement Server/Classes/MeasurementPluginService/Get Type Specializations.vi
View file
Open in desktop
WesleyTangNationalInstruments marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
Binary file modified Source/Runtime/MeasurementLink Measurement Server/Helpers/Create Enum Type Specialization.vi
View file
Open in desktop
Binary file not shown.
Binary file added Source/Runtime/MeasurementLink Measurement Server/Helpers/Filter for Enum Controls.vi
View file
Open in desktop
Binary file not shown.
Binary file added Source/Runtime/MeasurementLink Measurement Server/Helpers/Get Annotations For Parameter.vi
View file
Open in desktop
Binary file not shown.
Binary file removed Source/Runtime/MeasurementLink Measurement Server/Helpers/Get Configuration Metadata.vi
View file
Open in desktop
Binary file not shown.
Binary file added Source/Runtime/MeasurementLink Measurement Server/Helpers/Get Enum Type Specializations.vi
View file
Open in desktop
Binary file not shown.
Binary file added ...time/MeasurementLink Measurement Server/Helpers/Get Measurement Configuration Controls.vi
View file
Open in desktop
Binary file not shown.
Binary file modified ...ce/Runtime/MeasurementLink Measurement Server/Helpers/Get MetaData from Configurations.vi
View file
Open in desktop
Binary file not shown.
Binary file modified Source/Runtime/MeasurementLink Measurement Server/Helpers/Get MetaData from Results.vi
View file
Open in desktop
Binary file not shown.
Binary file added Source/Runtime/MeasurementLink Measurement Server/Helpers/Get Metadata.vi
View file
Open in desktop
Binary file not shown.
Binary file added Source/Runtime/MeasurementLink Measurement Server/Helpers/IsEnumArrayControl.vi
View file
Open in desktop
Binary file not shown.
Binary file added Source/Runtime/MeasurementLink Measurement Server/Helpers/IsEnumControl.vi
View file
Open in desktop
Binary file not shown.
Binary file modified ...me/MeasurementLink Measurement Server/Helpers/LabVIEW datatype to Measurement datatype.vi
View file
Open in desktop
Binary file not shown.
Binary file modified ...ce/Runtime/MeasurementLink Measurement Server/Helpers/TypeDefs/ConfigurationParameter.ctl
View file
Open in desktop
Binary file not shown.
Binary file removed ...ementLink Measurement Server/Helpers/TypeDefs/ConfigurationParameter_AnnotationsEntry.ctl
View file
Open in desktop
Binary file not shown.
Binary file modified Source/Runtime/MeasurementLink Measurement Server/Helpers/TypeDefs/GetMetadataResponse.ctl
View file
Open in desktop
Binary file not shown.
Binary file modified Source/Runtime/MeasurementLink Measurement Server/Helpers/TypeDefs/MeasurementSignature.ctl
View file
Open in desktop
Binary file not shown.
Binary file removed Source/Runtime/MeasurementLink Measurement Server/Helpers/TypeDefs/Output.ctl
View file
Open in desktop
Binary file not shown.
Binary file added Source/Runtime/MeasurementLink Measurement Server/Helpers/TypeDefs/OutputParameter.ctl
View file
Open in desktop
Binary file not shown.
Binary file added ...untime/MeasurementLink Measurement Server/Helpers/TypeDefs/Parameter_AnnotationsEntry.ctl
View file
Open in desktop
Binary file not shown.
14 changes: 10 additions & 4 deletions Source/Runtime/MeasurementLink Measurement Server/MeasurementLink Measurement Server.lvlib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,20 @@
<Item Name="Private Helpers" Type="Folder">
<Property Name="NI.LibItem.Scope" Type="Int">4</Property>
<Property Name="NI.SortType" Type="Int">0</Property>
<Item Name="Create Enum Type Specialization.vi" Type="VI" URL="../Helpers/Create Enum Type Specialization.vi"/>
<Item Name="Create Measurement Services.vi" Type="VI" URL="../Helpers/Create Measurement Services.vi"/>
<Item Name="Error Strings Global.vi" Type="VI" URL="../Helpers/Error Strings Global.vi"/>
<Item Name="Get Configuration Metadata.vi" Type="VI" URL="../Helpers/Get Configuration Metadata.vi"/>
<Item Name="Filter for Enum Controls.vi" Type="VI" URL="../Helpers/Filter for Enum Controls.vi"/>
<Item Name="Get Annotations For Parameter.vi" Type="VI" URL="../Helpers/Get Annotations For Parameter.vi"/>
<Item Name="Get Default for Type.vi" Type="VI" URL="../Helpers/Get Default for Type.vi"/>
<Item Name="Get Discovery Service Key File Path.vi" Type="VI" URL="../Helpers/Get Discovery Service Key File Path.vi"/>
<Item Name="Get Enum Type Specializations.vi" Type="VI" URL="../Helpers/Get Enum Type Specializations.vi"/>
<Item Name="Get Measurement Configuration Controls.vi" Type="VI" URL="../Helpers/Get Measurement Configuration Controls.vi"/>
<Item Name="Get MetaData from Configurations.vi" Type="VI" URL="../Helpers/Get MetaData from Configurations.vi"/>
<Item Name="Get MetaData from Results.vi" Type="VI" URL="../Helpers/Get MetaData from Results.vi"/>
<Item Name="Get Metadata.vi" Type="VI" URL="../Helpers/Get Metadata.vi"/>
<Item Name="IsEnumArrayControl.vi" Type="VI" URL="../Helpers/IsEnumArrayControl.vi"/>
<Item Name="IsEnumControl.vi" Type="VI" URL="../Helpers/IsEnumControl.vi"/>
<Item Name="LabVIEW datatype to Measurement datatype.vi" Type="VI" URL="../Helpers/LabVIEW datatype to Measurement datatype.vi"/>
<Item Name="Read Discovery Service Key File.vi" Type="VI" URL="../Helpers/Read Discovery Service Key File.vi"/>
<Item Name="Register Configuration and Results.vi" Type="VI" URL="../Helpers/Register Configuration and Results.vi"/>
Expand All @@ -26,19 +33,18 @@
<Item Name="Private TypeDefs" Type="Folder">
<Property Name="NI.LibItem.Scope" Type="Int">4</Property>
<Item Name="ConfigurationParameter.ctl" Type="VI" URL="../Helpers/TypeDefs/ConfigurationParameter.ctl"/>
<Item Name="ConfigurationParameter_AnnotationsEntry.ctl" Type="VI" URL="../Helpers/TypeDefs/ConfigurationParameter_AnnotationsEntry.ctl"/>
<Item Name="GetMetadataResponse.ctl" Type="VI" URL="../Helpers/TypeDefs/GetMetadataResponse.ctl"/>
<Item Name="google_protobuf_Field_Kind.ctl" Type="VI" URL="../Helpers/TypeDefs/google_protobuf_Field_Kind.ctl"/>
<Item Name="MeasurementSignature.ctl" Type="VI" URL="../Helpers/TypeDefs/MeasurementSignature.ctl"/>
<Item Name="MeasureRequest.ctl" Type="VI" URL="../Helpers/TypeDefs/MeasureRequest.ctl"/>
<Item Name="MeasureResponse.ctl" Type="VI" URL="../Helpers/TypeDefs/MeasureResponse.ctl"/>
<Item Name="Output.ctl" Type="VI" URL="../Helpers/TypeDefs/Output.ctl"/>
<Item Name="OutputParameter.ctl" Type="VI" URL="../Helpers/TypeDefs/OutputParameter.ctl"/>
<Item Name="Parameter_AnnotationsEntry.ctl" Type="VI" URL="../Helpers/TypeDefs/Parameter_AnnotationsEntry.ctl"/>
<Item Name="PinMapContext.ctl" Type="VI" URL="../Helpers/TypeDefs/PinMapContext.ctl"/>
<Item Name="UserInterfaceDetails.ctl" Type="VI" URL="../Helpers/TypeDefs/UserInterfaceDetails.ctl"/>
</Item>
<Item Name="Public Helpers" Type="Folder">
<Property Name="NI.LibItem.Scope" Type="Int">1</Property>
<Item Name="Create Enum Type Specialization.vi" Type="VI" URL="../Helpers/Create Enum Type Specialization.vi"/>
<Item Name="Get Discovery Service Address.vi" Type="VI" URL="../Helpers/Get Discovery Service Address.vi"/>
</Item>
<Item Name="Public TypeDefs" Type="Folder">
Expand Down