Merge branch 'users/DilmiWickramanayake/Analog_Input' of https://github.com/ni/nipanel-python into users/DilmiWickramanayake/Analog_Input

Author: Dilmi Wickramanayake

examples/nidaqmx/nidaqmx_continuous_analog_input.py

@@ -1,27 +1,22 @@
 """Data acquisition script that continuously acquires analog input data."""
 
-import pathlib
+from pathlib import Path
 
 import nidaqmx
 from nidaqmx.constants import AcquisitionType
 
 import nipanel
 
-script_path = pathlib.Path(__file__)
-panel_script_path = str(script_path.with_name("nidaqmx_continuous_analog_input_panel.py"))
-
-panel = nipanel.StreamlitPanel(
-    panel_id="nidaqmx_continuous_analog_input_panel",
-    streamlit_script_path=panel_script_path,
-)
-print(f"Panel URL: {panel.panel_url}")
+panel_script_path = Path(__file__).with_name("nidaqmx_continuous_analog_input_panel.py")
+panel = nipanel.create_panel(panel_script_path)
 
 with nidaqmx.Task() as task:
     task.ai_channels.add_ai_voltage_chan("Dev1/ai0")
     task.ai_channels.add_ai_thrmcpl_chan("Dev1/ai1")
     task.timing.cfg_samp_clk_timing(
         rate=1000.0, sample_mode=AcquisitionType.CONTINUOUS, samps_per_chan=3000
     )
+    panel.set_value("sample_rate", task._timing.samp_clk_rate)
     task.start()
     try:
         print(f"\nPress Ctrl + C to stop")

examples/nidaqmx/nidaqmx_continuous_analog_input_panel.py

@@ -1,11 +1,11 @@
-"""Streamlit visualization script that displays the data acquired by nidaqmx_continuous_analog_input.py"""
+"""Streamlit visualization script that displays the data acquired by nidaqmx_continuous_analog_input.py."""
 
 import streamlit as st
 from streamlit_echarts import st_echarts
 
 import nipanel
 
-panel = nipanel.initialize_panel()
+panel = nipanel.get_panel_accessor()
 
 st.title("Analog Input - Voltage and Thermocouple in a Single Task")
 voltage_tab, thermocouple_tab = st.tabs(["Voltage", "Thermocouple"])
@@ -24,19 +24,25 @@
 thermocouple_data = panel.get_value("thermocouple_data", [0.0])
 voltage_data = panel.get_value("voltage_data", [0.0])
 
+sample_rate = panel.get_value("sample_rate")
 st.header("Voltage & Thermocouple")
 voltage_therm_graph = {
     "tooltip": {"trigger": "axis"},
     "legend": {"data": ["Voltage (V)", "Temperature (C)"]},
     "xAxis": {
         "type": "category",
-        "data": list(range(len(voltage_data))),
+        "data": [x / sample_rate for x in range(len(voltage_data))],
         "name": "Time",
         "nameLocation": "center",
-        "nameGap": 40
+        "nameGap": 40,
+    },
+    "yAxis": {
+        "type": "value",
+        "name": "Measurement",
+        "nameRotate": 90,
+        "nameLocation": "center",
+        "nameGap": 40,
     },
-    "yAxis": {"type": "value", "name": "Measurement", "nameRotate": 90,"nameLocation": "center", "nameGap": 40},
-    
     "series": [
         {
             "name": "voltage_amplitude",