diff --git a/Source/Example Measurements/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement UI/Keysight 34401A DMM Measurement UI.lvlib b/Source/Example Measurements/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement UI/Keysight 34401A DMM Measurement UI.lvlib new file mode 100644 index 000000000..34d2b653b --- /dev/null +++ b/Source/Example Measurements/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement UI/Keysight 34401A DMM Measurement UI.lvlib @@ -0,0 +1,8 @@ + + + )!#!!!!!!!)!"1!&!!!-!%!!!@````]!!!!"!!%!!!(]!!!*Q(C=\>8"=>MQ%!8143;(8.6"2CVM#WJ",7Q,SN&(N<!NK!7VM#WI"<8A0$%94UZ2$P%E"Y.?G@I%A7=11U>M\7P%FXB^VL\`NHV=@X<^39O0^N(_<8NZOEH@@=^_CM?,3)VK63LD->8LS%=_]J'0@/1N<XH,7^\SFJ?]Z#5P?=F,HP+5JTTF+5`Z>MB$(P+1)YX*RU2DU$(![)Q3YW.YBG>YBM@8'*\B':\B'2Z>9HC':XC':XD=&M-T0--T0-.DK%USWS(H'2\$2`-U4`-U4`/9-JKH!>JE<?!W#%;UC_WE?:KH?:R']T20]T20]\A=T>-]T>-]T?/7<66[UTQ//9^BIHC+JXC+JXA-(=640-640-6DOCC?YCG)-G%:(#(+4;6$_6)]R?.8&%`R&%`R&)^,WR/K<75?GM=BZUG?Z%G?Z%E?1U4S*%`S*%`S'$;3*XG3*XG3RV320-G40!G3*D6^J-(3D;F4#J,(T\:<=HN+P5FS/S,7ZIWV+7.NNFC<+.<GC0819TX-7!]JVO,(7N29CR6L%7,^=<(1M4#R*IFV][.DX(X?V&6>V&G>V&%>V&\N(L@_Z9\X_TVONVN=L^?Y8#ZR0J`D>$L&]8C-Q_%1_`U_>LP>WWPAG_0NB@$TP@4C`%`KH@[8`A@PRPA=PYZLD8Y!#/7SO!!!!!! + 536903680 + 1.0.0.0 + false + + diff --git a/Source/Example Measurements/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement/Measurement UI.vi b/Source/Example Measurements/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement UI/Measurement UI.vi similarity index 55% rename from Source/Example Measurements/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement/Measurement UI.vi rename to Source/Example Measurements/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement UI/Measurement UI.vi index 6bd880283..a9ad3a3c5 100644 Binary files a/Source/Example Measurements/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement/Measurement UI.vi and b/Source/Example Measurements/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement UI/Measurement UI.vi differ diff --git a/Source/Example Measurements/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement.lvproj b/Source/Example Measurements/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement.lvproj index 5d9da4c2a..c3e0ca095 100644 --- a/Source/Example Measurements/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement.lvproj +++ b/Source/Example Measurements/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement.lvproj @@ -10,6 +10,7 @@ true true false + @@ -106,7 +107,7 @@ Support Directory ../builds/NI_AB_PROJECTNAME/Keysight 34401A DMM Measurement/data 2 - {E3E180ED-2C27-4B9C-8099-563ACB69EACD} + {8459DDE9-A4F7-498B-9923-04E849755447} Container 0 /My Computer/Keysight 34401A DMM Measurement.lvlib/Get Measurement Details.vi @@ -133,7 +134,7 @@ Include VI 0 - /My Computer/Keysight 34401A DMM Measurement.lvlib/Measurement UI.vi + /My Computer/Keysight 34401A DMM Measurement UI.lvlib/Measurement UI.vi Include VI 0 @@ -155,32 +156,36 @@ Keysight 34401A DMM Measurement UI true true - ../NI_AB_PROJECTNAME + ../NI_AB_PROJECTNAME/BuiltUI relativeToProject true {34E58981-12FC-4B65-80DF-C32EC0A02763} 1 Keysight 34401A DMM Measurement UI.lvlibp - ../NI_AB_PROJECTNAME/Keysight 34401A DMM Measurement UI.lvlibp + ../NI_AB_PROJECTNAME/BuiltUI/Keysight 34401A DMM Measurement UI.lvlibp relativeToProject true App Support Directory - ../NI_AB_PROJECTNAME + ../NI_AB_PROJECTNAME/BuiltUI relativeToProject 2 true - {E3E180ED-2C27-4B9C-8099-563ACB69EACD} + {8459DDE9-A4F7-498B-9923-04E849755447} Container 0 /My Computer/Keysight 34401A DMM Measurement.lvlib true - true - true - true - TopLevel Library - 2 + 0 + /My Computer/Keysight 34401A DMM Measurement UI.lvlib + true + true + true + true + TopLevel + Library + 3 National Instruments Corporation Keysight 34401A DMM Measurement UI Keysight 34401A DMM Measurement UI diff --git a/Source/Example Measurements/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement/Get UI Details.vi b/Source/Example Measurements/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement/Get UI Details.vi index 3581acad3..966b71941 100644 Binary files a/Source/Example Measurements/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement/Get UI Details.vi and b/Source/Example Measurements/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement/Get UI Details.vi differ diff --git a/Source/Example Measurements/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement.lvlib b/Source/Example Measurements/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement.lvlib index a7aeb6573..8fbdf1229 100644 --- a/Source/Example Measurements/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement.lvlib +++ b/Source/Example Measurements/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement/Keysight 34401A DMM Measurement.lvlib @@ -36,6 +36,5 @@ - diff --git a/Source/Example Measurements/Keysight 34401A DMM Measurement/README.md b/Source/Example Measurements/Keysight 34401A DMM Measurement/README.md index b9c25b9be..44b512163 100644 --- a/Source/Example Measurements/Keysight 34401A DMM Measurement/README.md +++ b/Source/Example Measurements/Keysight 34401A DMM Measurement/README.md @@ -41,8 +41,8 @@ or a custom alias). ### Using a LabVIEW UI with External Dependencies This example uses a LabVIEW UI with external dependencies. In order to display the LabVIEW UI in InstrumentStudio, you must first build the `Keysight 34401A DMM Measurement UI` -packed library build specification. The packed library will contain all of the dependencies that -the UI needs to load in InstrumentStudio. +packed library build specification. The packed library and its containing directory will +have all of the dependencies that the UI needs to load in InstrumentStudio. If you make changes to `Measurement UI.vi`, you must rebuild the packed library. diff --git a/Source/Runtime/MeasurementLink Measurement Server/Build Assets/Post-Build Action.vi b/Source/Runtime/MeasurementLink Measurement Server/Build Assets/Post-Build Action.vi index 009527161..8530a7eb6 100644 Binary files a/Source/Runtime/MeasurementLink Measurement Server/Build Assets/Post-Build Action.vi and b/Source/Runtime/MeasurementLink Measurement Server/Build Assets/Post-Build Action.vi differ diff --git a/Source/Runtime/MeasurementLink Measurement Server/Build Assets/UiType.ctl b/Source/Runtime/MeasurementLink Measurement Server/Build Assets/UiType.ctl new file mode 100644 index 000000000..5deec4e6b Binary files /dev/null and b/Source/Runtime/MeasurementLink Measurement Server/Build Assets/UiType.ctl differ diff --git a/Source/Runtime/MeasurementLink Measurement Server/MeasurementLink Measurement Server.lvlib b/Source/Runtime/MeasurementLink Measurement Server/MeasurementLink Measurement Server.lvlib index 2c0f67c69..4d153fa86 100644 --- a/Source/Runtime/MeasurementLink Measurement Server/MeasurementLink Measurement Server.lvlib +++ b/Source/Runtime/MeasurementLink Measurement Server/MeasurementLink Measurement Server.lvlib @@ -6,6 +6,9 @@ true + + 2 + 0 diff --git a/docs/README.md b/docs/README.md index 9fdea76a5..a05a768ed 100644 --- a/docs/README.md +++ b/docs/README.md @@ -74,7 +74,7 @@ The MeasurementLink Support for LabVIEW packages enable measurement developers t 7. Create the user interface in `Measurement UI.vi` under the `.lvlib`. The control and indicator names in the user interface should match the `Measurement Configuration` and `Measurement Results`. If the data type and name match, then the data from the controls will be sent to the `Measurement Logic.vi` and the results will be published to the indicators after the measurement is run. By default, the UI file consists of an 'Array In' control and 'Array Out' indicator.

-If your user interface has dependencies that are not available in the LabVIEW runtime, you will have to build the UI into a packed library. For example, you will have to do this if your UI contains VIs from vi.lib or if your UI depends on user created subVIs or controls. The packed library needs to be located in the same directory as `Measurement Logic.vi`. The [Keysight 34401A DMM Measurement](../Source/Example%20Measurements/Keysight%2034401A%20DMM%20Measurement) example demonstrates how to use a packed library user interface. +If your user interface has dependencies that are not available in the LabVIEW runtime, you will have to build the UI into a packed library. For example, you will have to build a packed library if your UI contains VIs from vi.lib or if your UI depends on user created subVIs or controls. The packed library should be located in a directory at the same level as `Measurement Logic.vi`. The [Keysight 34401A DMM Measurement](../Source/Example%20Measurements/Keysight%2034401A%20DMM%20Measurement) example demonstrates how to use a packed library user interface. ![Measurement UI](images/Measurement%20UI.png)