Skip to content

Commit

Permalink
Merge pull request #109 from ni/nxg5
Browse files Browse the repository at this point in the history
LabVIEW NXG 5.0 changes
  • Loading branch information
rajsite authored May 22, 2020
2 parents 5fbaeb9 + 9b1dc50 commit 22f37a8
Show file tree
Hide file tree
Showing 307 changed files with 248,262 additions and 23,468 deletions.
1 change: 1 addition & 0 deletions .spelling
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ apis
enum
enums
CSV
DCO
YML
timestamp
timestamps
Expand Down
12 changes: 7 additions & 5 deletions CONTRIBUTING.MD
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,17 @@ branch with your changes to your project, and then submit a pull request.

See [GitHub's official documentation](https://help.github.com/articles/using-pull-requests/) for more details.

# Getting Started
<!--
## Getting Started
- TODO: include build steps here.
# Testing
## Testing
- TODO: include testing steps here.
-->

# Developer Certificate of Origin (DCO)
## Developer Certificate of Origin (DCO)

Developer's Certificate of Origin 1.1

Expand Down Expand Up @@ -47,7 +49,7 @@ See [GitHub's official documentation](https://help.github.com/articles/using-pul
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.

(taken from [developercertificate.org](https://developercertificate.org/))
(taken from https://developercertificate.org/)

See [LICENSE](https://github.com/ni/webvi-examples/blob/master/LICENSE)
for details about how webvi-examples is licensed.
for details about how webvi-examples is licensed.
13 changes: 8 additions & 5 deletions Call3rdPartyWebService/Builds/WebApp_Web Server/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@

<link href="ni-webvi-resource-v0/favicon.ico" type="image/x-icon" rel="icon">
<link href="ni-webvi-resource-v0/Web/dist/Styles/niBase.DeployedRun.Absolute.min.css" type="text/css" rel="stylesheet">
<script src="ni-webvi-resource-v0/BrowserDetection.js" type="text/javascript" nomodule=""></script>
<script src="ni-webvi-resource-v0/DeployedRun.min.js" type="module"></script>
<script src="ni-webvi-resource-v0/VireoImport.min.js" type="module"></script>
<script src="ni-webvi-resource-v0/ResourceLoadDetection.js" defer=""></script>
<style ni-autogenerated-style-id="">
/* Read only section. Source panel edits to the content of this style tag will not be persisted */
[ni-control-id='2'] { --ni-background: rgba(255,255,255,1); --ni-border-width: 0px 0px 0px 0px; height: 1300px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 30px 30px 30px 30px; width: 1000px; --ni-max-width: none; }
Expand Down Expand Up @@ -41,7 +44,7 @@
</head>

<body><ni-web-application location="BROWSER" engine="VIREO" vireo-source="index.via.txt" wasm-url="ni-webvi-resource-v0/node_modules/vireo/dist/wasm32-unknown-emscripten/release/vireo.core.wasm"><ni-virtual-instrument vi-name="WebApp::index.gviweb"></ni-virtual-instrument></ni-web-application>
<div id="ni-outdated-browser-message" style="display:none">This browser is reporting compatibility with older browser technologies that may perform poorly if it all.</div>
<div id="ni-outdated-browser-message" style="display:none">This browser is missing features needed to run this web application. Open this web application in a supported browser.</div>
<div id="ni-failed-to-load-vireo-source" style="display:none">Unable to load required dependencies. Please verify all WebVI files are available and served using an http server or use a browser that can load files directly from the filesystem.</div>

<div class="ni-front-panel-wrapper" vi-ref="" ni-control-id="FrontPanelWrapper">
Expand Down Expand Up @@ -79,7 +82,7 @@


<ni-label class='ni-hidden' control-resize-mode='fixed' label-alignment='top-left' ni-control-id='3' text='banner'></ni-label>
<ni-url-image alternate='' binding-info='{"accessMode": "writeOnly", "dataItem": "dataItem_Banner", "dco": 5, "isLatched": false, "prop": "source", "sync": false, "unplacedOrDisabled": true}' control-resize-mode='fixed' follower-ids='["3"]' label-alignment='top-left' label-id='3' ni-control-id='4' read-only='true' source='data:image/svg+xml,%3C?xml%20version=%221.0%22%20encoding=%22UTF-8%22?%3E%3Csvg%20version=%221.1%22%20xmlns=%22http://www.w3.org/2000/svg%22%3E%3Crect%20width=%22100%25%22%20height=%22100%25%22%20fill=%22%2300ADEF%22/%3E%3C/svg%3E' stretch='uniform'></ni-url-image>
<ni-url-image alternate='' binding-info='{"accessMode": "writeOnly", "dataItem": "dataItem_Banner", "dco": 5, "isLatched": false, "prop": "source", "sync": false, "unplacedOrDisabled": true}' control-resize-mode='fixed' follower-ids='["3"]' href='' label-alignment='top-left' label-id='3' ni-control-id='4' read-only='true' source='data:image/svg+xml,%3C?xml%20version=%221.0%22%20encoding=%22UTF-8%22?%3E%3Csvg%20version=%221.1%22%20xmlns=%22http://www.w3.org/2000/svg%22%3E%3Crect%20width=%22100%25%22%20height=%22100%25%22%20fill=%22%2300ADEF%22/%3E%3C/svg%3E' stretch='uniform' target='_self'></ni-url-image>
<ni-text class='header-text-bg-blue' control-resize-mode='fixed' ni-control-id='5' text='Earthquakes this Month'></ni-text>
<ni-data-grid class='grid-header-size' alt-row-colors='true' binding-info='{"accessMode": "writeOnly", "dataItem": "dataItem_Earthquakes", "dco": 0, "isLatched": false, "prop": "value", "sync": false, "unplacedOrDisabled": false}' column-header-visible='true' control-resize-mode='fixed' follower-ids='["13"]' label-alignment='top-left' label-id='13' ni-control-id='6' ni-type='{"name": "Array", "rank": 1, "subtype": {"fields": ["Location", "Magnitude", "Latitude", "Longitude", "Depth"], "name": "Cluster", "subtype": ["String", "Double", "Double", "Double", "Double"]}}' read-only='true' row-height='46' value='[]'>
<ni-data-grid-column field-name='Magnitude' header='Magnitude' index='1' ni-control-id='8' width='125px'>
Expand All @@ -99,9 +102,9 @@
</ni-data-grid-column>
</ni-data-grid>
<ni-label class='ni-hidden' control-resize-mode='fixed' label-alignment='top-left' ni-control-id='13' text='Earthquakes'></ni-label>
<ni-url-image alternate='USGS' binding-info='{"accessMode": "writeOnly", "dataItem": "dataItem_Logo", "dco": 1, "isLatched": false, "prop": "source", "sync": false, "unplacedOrDisabled": true}' control-resize-mode='fixed' follower-ids='["20"]' label-alignment='top-left' label-id='20' ni-control-id='12' read-only='true' source='https://earthquake.usgs.gov/theme/images/usgs-logo.svg' stretch='uniform'></ni-url-image>
<ni-url-image alternate='USGS' binding-info='{"accessMode": "writeOnly", "dataItem": "dataItem_Logo", "dco": 1, "isLatched": false, "prop": "source", "sync": false, "unplacedOrDisabled": true}' control-resize-mode='fixed' follower-ids='["20"]' href='' label-alignment='top-left' label-id='20' ni-control-id='12' read-only='true' source='https://earthquake.usgs.gov/theme/images/usgs-logo.svg' stretch='uniform' target='_self'></ni-url-image>
<ni-label class='ni-hidden' control-resize-mode='fixed' label-alignment='top-left' ni-control-id='20' text='logo'></ni-label>
<ni-url-image alternate='' binding-info='{"accessMode": "writeOnly", "dataItem": "dataItem_MapUrlImage", "dco": 3, "isLatched": false, "prop": "source", "sync": false, "unplacedOrDisabled": false}' control-resize-mode='fixed' follower-ids='["22"]' label-alignment='top-left' label-id='22' ni-control-id='19' read-only='true' source='' stretch='uniform'></ni-url-image>
<ni-url-image alternate='' binding-info='{"accessMode": "writeOnly", "dataItem": "dataItem_MapUrlImage", "dco": 3, "isLatched": false, "prop": "source", "sync": false, "unplacedOrDisabled": false}' control-resize-mode='fixed' follower-ids='["22"]' href='' label-alignment='top-left' label-id='22' ni-control-id='19' read-only='true' source='' stretch='uniform' target='_self'></ni-url-image>
<ni-label class='ni-hidden' control-resize-mode='fixed' label-alignment='top-left' ni-control-id='22' text='map url image'></ni-label>
<jqx-numeric-text-box binding-info='{"accessMode": "readOnly", "dataItem": "dataItem_Map", "dco": 2, "isLatched": false, "prop": "value", "sync": false, "unplacedOrDisabled": false}' control-resize-mode='fixed' enable-mouse-wheel-action='true' follower-ids='["24"]' integer-width='int32' label-alignment='top-left' label-id='24' max='2147483647' min='-2147483648' ni-control-id='21' ni-type='Int32' radix='decimal' significant-digits='6' spin-buttons='true' spin-buttons-initial-delay='500' spin-buttons-position='right' spin-buttons-step='1' validation='interaction' value='0'></jqx-numeric-text-box>
<ni-label class='ni-hidden' control-resize-mode='fixed' label-alignment='top-left' ni-control-id='24' text='Map'></ni-label>
Expand All @@ -111,7 +114,7 @@
On the diagram, this WebVI uses HTTP GET to query the Earthquake API for earthquakes from the last 30 days. The WebVI also uses Unflatten from JSON to convert the results from JSON to LabVIEW data.
On the panel, this WebVI displays a summary of the results in a data grid and a map of the selected earthquake region in a URL Image indicator.'></ni-text>
<ni-hyperlink binding-info='{"accessMode": "readOnly", "dataItem": "dataItem_HyperlinkControl", "dco": 4, "isLatched": false, "prop": "href", "sync": false, "unplacedOrDisabled": true}' content='Learn more about this example at github.com/ni/webvi-examples' control-resize-mode='fixed' follower-ids='["27"]' href='https://github.com/ni/webvi-examples/tree/master/Call3rdPartyWebService' label-alignment='top-left' label-id='27' ni-control-id='26'></ni-hyperlink>
<ni-hyperlink binding-info='{"accessMode": "readOnly", "dataItem": "dataItem_HyperlinkControl", "dco": 4, "isLatched": false, "prop": "href", "sync": false, "unplacedOrDisabled": true}' content='Learn more about this example at github.com/ni/webvi-examples' control-resize-mode='fixed' follower-ids='["27"]' href='https://github.com/ni/webvi-examples/tree/master/Call3rdPartyWebService' label-alignment='top-left' label-id='27' ni-control-id='26' target='_self'></ni-hyperlink>
<ni-label class='ni-hidden' control-resize-mode='fixed' label-alignment='top-left' ni-control-id='27' text='Hyperlink Control'></ni-label>
</ni-front-panel>
</div>
Expand Down
32 changes: 16 additions & 16 deletions Call3rdPartyWebService/Builds/WebApp_Web Server/index.via.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Autogenerated Vireo assembly file
// Generated on 12/03/2019 09:07:55
// Generated on 05/22/2020 17:15:20
//---------------------------------------------------
//VI Definition: ::Web Server::Interactive::WebApp::index.gviweb
define (WebApp%3A%3Aindex%2Egviweb dv(.VirtualInstrument (
Expand All @@ -15,7 +15,7 @@ define (WebApp%3A%3Aindex%2Egviweb dv(.VirtualInstrument (
)
Locals: c( // Data Space
e(dv(.String 'WebApp::index.gviweb')local5)
e(dv(.Int32 0)dataItem_Map)
de(dv(.Int32 0)dataItem_Map)
e(.Int32 local7)
e(a(c(
e(.String map%20url)
Expand Down Expand Up @@ -92,7 +92,7 @@ define (WebApp%3A%3Aindex%2Egviweb dv(.VirtualInstrument (
e(.Double Longitude)
e(.Double Depth)
) *) local74)
e(a(c(
de(a(c(
e(.String Location)
e(.Double Magnitude)
e(.Double Latitude)
Expand All @@ -110,7 +110,7 @@ define (WebApp%3A%3Aindex%2Egviweb dv(.VirtualInstrument (
e(.Int32 local88)
e(.Int32 local89)
e(.String local90)
e(dv(.String '')dataItem_MapUrlImage)
de(dv(.String '')dataItem_MapUrlImage)
e(.String local92)
ce(dv(.Boolean false)c93)
e(c(
Expand Down Expand Up @@ -272,7 +272,7 @@ define (WebApp%3A%3Aindex%2Egviweb dv(.VirtualInstrument (
/* Clump Ended. */ )
)))
// Autogenerated Vireo assembly file
// Generated on 12/03/2019 09:07:54
// Generated on 05/22/2020 17:15:19
//---------------------------------------------------
//VI Definition: ::Web Server::Interactive::NI::HTTP::Smart Path To String.gvi
define (NI%3A%3AHTTP%3A%3ASmart%20Path%20To%20String%2Egvi dv(.VirtualInstrument (
Expand Down Expand Up @@ -306,7 +306,7 @@ define (NI%3A%3AHTTP%3A%3ASmart%20Path%20To%20String%2Egvi dv(.VirtualInstrument
/* Clump Ended. */ )
)))
// Autogenerated Vireo assembly file
// Generated on 12/03/2019 09:07:54
// Generated on 05/22/2020 17:15:19
//---------------------------------------------------
//VI Definition: ::Web Server::Interactive::NI::HTTP::httpWebServerClient.sli::httpWebServer_Get
define (NI%3A%3AHTTP%3A%3AhttpWebServerClient%2Esli%3A%3AhttpWebServer_Get dv(.ReentrantVirtualInstrument (
Expand Down Expand Up @@ -384,7 +384,7 @@ define (NI%3A%3AHTTP%3A%3AhttpWebServerClient%2Esli%3A%3AhttpWebServer_Get dv(.R
/* Clump Ended. */ )
)))
// Autogenerated Vireo assembly file
// Generated on 12/03/2019 09:07:55
// Generated on 05/22/2020 17:15:20
//---------------------------------------------------
//VI Definition: ::Web Server::Interactive::NI::HTTP::GET.gvi
define (NI%3A%3AHTTP%3A%3AGET%2Egvi dv(.ReentrantVirtualInstrument (
Expand Down Expand Up @@ -474,7 +474,7 @@ define (NI%3A%3AHTTP%3A%3AGET%2Egvi dv(.ReentrantVirtualInstrument (
/* Clump Ended. */ )
)))
// Autogenerated Vireo assembly file
// Generated on 12/03/2019 09:07:55
// Generated on 05/22/2020 17:15:20
//---------------------------------------------------
//VI Definition: ::Web Server::Interactive::WebApp::support::Get Map URL.gviweb
define (WebApp%3A%3Asupport%3A%3AGet%20Map%20URL%2Egviweb dv(.VirtualInstrument (
Expand All @@ -499,7 +499,7 @@ define (WebApp%3A%3Asupport%3A%3AGet%20Map%20URL%2Egviweb dv(.VirtualInstrument
e(dv(.String '')local15)
e(.ErrorCluster local16)
e(.ErrorCluster local17)
e(dv(.String '')dataItem_Body)
de(dv(.String '')dataItem_Body)
e(.String local19)
e(.String local20)
e(.String local21)
Expand All @@ -520,7 +520,7 @@ define (WebApp%3A%3Asupport%3A%3AGet%20Map%20URL%2Egviweb dv(.VirtualInstrument
/* Clump Ended. */ )
)))
// Autogenerated Vireo assembly file
// Generated on 12/03/2019 09:07:53
// Generated on 05/22/2020 17:15:19
//---------------------------------------------------
//VI Definition: ::Web Server::Interactive::WebApp::support::Get Earthquake Location.gviweb
define (WebApp%3A%3Asupport%3A%3AGet%20Earthquake%20Location%2Egviweb dv(.VirtualInstrument (
Expand Down Expand Up @@ -592,7 +592,7 @@ define (WebApp%3A%3Asupport%3A%3AGet%20Earthquake%20Location%2Egviweb dv(.Virtua
/* Clump Ended. */ )
)))
// Autogenerated Vireo assembly file
// Generated on 12/03/2019 09:07:53
// Generated on 05/22/2020 17:15:19
//---------------------------------------------------
//VI Definition: ::Web Server::Interactive::WebApp::support::Get Earthquake Info.gviweb
define (WebApp%3A%3Asupport%3A%3AGet%20Earthquake%20Info%2Egviweb dv(.VirtualInstrument (
Expand Down Expand Up @@ -692,7 +692,7 @@ define (WebApp%3A%3Asupport%3A%3AGet%20Earthquake%20Info%2Egviweb dv(.VirtualIns
e(.Double local84)
e(.String local85)
e(.String local86)
e(dv(.Double 0)dataItem_Time)
de(dv(.Double 0)dataItem_Time)
e(.Double local88)
e(.String local89)
e(.String local90)
Expand All @@ -702,7 +702,7 @@ define (WebApp%3A%3Asupport%3A%3AGet%20Earthquake%20Info%2Egviweb dv(.VirtualIns
e(.Int32 local94)
e(.String local95)
e(.String local96)
e(dv(.String '')dataItem_URL)
de(dv(.String '')dataItem_URL)
e(.String local98)
e(.Double local99)
e(dv(.Boolean true)local100)
Expand Down Expand Up @@ -737,7 +737,7 @@ define (WebApp%3A%3Asupport%3A%3AGet%20Earthquake%20Info%2Egviweb dv(.VirtualIns
/* Clump Ended. */ )
)))
// Autogenerated Vireo assembly file
// Generated on 12/03/2019 09:07:53
// Generated on 05/22/2020 17:15:19
//---------------------------------------------------
//VI Definition: ::Web Server::Interactive::WebApp::support::Get Earthquake Count.gviweb
define (WebApp%3A%3Asupport%3A%3AGet%20Earthquake%20Count%2Egviweb dv(.VirtualInstrument (
Expand Down Expand Up @@ -796,7 +796,7 @@ define (WebApp%3A%3Asupport%3A%3AGet%20Earthquake%20Count%2Egviweb dv(.VirtualIn
/* Clump Ended. */ )
)))
// Autogenerated Vireo assembly file
// Generated on 12/03/2019 09:07:55
// Generated on 05/22/2020 17:15:20
//---------------------------------------------------
//VI Definition: ::Web Server::Interactive::WebApp::support::Get Recent Earthquakes.gviweb
define (WebApp%3A%3Asupport%3A%3AGet%20Recent%20Earthquakes%2Egviweb dv(.VirtualInstrument (
Expand All @@ -821,7 +821,7 @@ define (WebApp%3A%3Asupport%3A%3AGet%20Recent%20Earthquakes%2Egviweb dv(.Virtual
e(.String local14)
e(.String local15)
e(.ErrorCluster local16)
e(dv(.String '')dataItem_JSON)
de(dv(.String '')dataItem_JSON)
e(.String local18)
e(.Double local19)
e(.ErrorCluster local20)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
//**********************************************************
// Detect some outdated browsers and display a message to the user
// National Instruments Copyright 2020
//**********************************************************
// This file relies on <script nomodule> to avoid running on modern browsers
// Note: Lack of modules means the browser is unsupported by WebVIs however modules support does not mean WebVIs are fully supported
// Note: strict mode, let/const, and strict equality operators avoided to support older browsers
(function () {
// eslint-disable-next-line no-var
var windowLoaded = function (callback) {
if (window.addEventListener) {
window.addEventListener('load', callback);
} else if (window.attachEvent) {
// Note: the on- prefix intended for legacy attachEvent api
window.attachEvent('onload', callback);
} else {
// Generally avoid overwriting onload, but exception made for very old browsers to show banner
window.onload = callback;
}
};
windowLoaded(function () {
// eslint-disable-next-line no-var
var outdatedBrowserMessage = document.getElementById('ni-outdated-browser-message');
if (outdatedBrowserMessage != null) {
outdatedBrowserMessage.style.display = 'block';
}
});
}());

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//**********************************************************
// Detect if the main bundle failed to load
// National Instruments Copyright 2020
//**********************************************************
(function () {
'use strict';
if (window.NationalInstrumentsMainModuleLoaded !== true) {
const resourceLoadBanner = document.getElementById('ni-failed-to-load-vireo-source');
if (resourceLoadBanner !== null) {
resourceLoadBanner.style.display = 'block';
}
}
}());
Loading

0 comments on commit 22f37a8

Please sign in to comment.