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

Author: Dilmi Wickramanayake

.github/workflows/check_docs.yml

@@ -12,10 +12,10 @@ jobs:
       - name: Check out repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Set up Python
-        uses: ni/python-actions/setup-python@a3bfe1baa6062fd6157683651d653d527967d4d4 # v0.3.1
+        uses: ni/python-actions/setup-python@5286c12d65d90b2ea738bd57d452dc4366497581 # v0.4.1
         id: setup-python
       - name: Set up Poetry
-        uses: ni/python-actions/setup-poetry@a3bfe1baa6062fd6157683651d653d527967d4d4 # v0.3.1
+        uses: ni/python-actions/setup-poetry@5286c12d65d90b2ea738bd57d452dc4366497581 # v0.4.1
       - name: Check for lock changes
         run: poetry check --lock
       - name: Cache virtualenv (with docs)

.github/workflows/check_nipanel.yml

@@ -12,10 +12,10 @@ jobs:
       - name: Check out repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Set up Python
-        uses: ni/python-actions/setup-python@a3bfe1baa6062fd6157683651d653d527967d4d4 # v0.3.1
+        uses: ni/python-actions/setup-python@5286c12d65d90b2ea738bd57d452dc4366497581 # v0.4.1
         id: setup-python
       - name: Set up Poetry
-        uses: ni/python-actions/setup-poetry@a3bfe1baa6062fd6157683651d653d527967d4d4 # v0.3.1
+        uses: ni/python-actions/setup-poetry@5286c12d65d90b2ea738bd57d452dc4366497581 # v0.4.1
       - name: Check for lock changes
         run: poetry check --lock
       - name: Cache virtualenv

.github/workflows/run_unit_tests.yml

@@ -19,12 +19,12 @@ jobs:
       - name: Check out repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Set up Python
-        uses: ni/python-actions/setup-python@a3bfe1baa6062fd6157683651d653d527967d4d4 # v0.3.1
+        uses: ni/python-actions/setup-python@5286c12d65d90b2ea738bd57d452dc4366497581 # v0.4.1
         id: setup-python
         with:
           python-version: ${{ matrix.python-version }}
       - name: Set up Poetry
-        uses: ni/python-actions/setup-poetry@a3bfe1baa6062fd6157683651d653d527967d4d4 # v0.3.1
+        uses: ni/python-actions/setup-poetry@5286c12d65d90b2ea738bd57d452dc4366497581 # v0.4.1
       - name: Cache virtualenv
         uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:

CONTRIBUTING.md

@@ -56,15 +56,14 @@ start docs\_build\index.html
 
 ## Running examples
 
-1. First, run the PythonPanelService (not part of this repo, provided seperately)
-2. Run the command `poetry run python examples/hello/hello.py`
-3. Open http://localhost:42001/panel-service/panels/hello_panel/ in your browser
-4. If there is an error about missing imports (especially nipanel), execute this
-   command (from the nipanel-python directory) to install the dependencies into the venv: 
-   `%localappdata%\Temp\python_panel_service_venv\Scripts\python.exe -m pip install .\[examples,dev]`,
-    then restart the PythonPanelService and re-run hello.py.
-
-You can see all running panels (and stop them) at: http://localhost:42001/panel-service/
+1. Run the **PythonPanelService** (not part of this repo, provided seperately)
+2. `poetry install --with examples` to get the dependencies needed for the examples
+3. Run the examples with these command(s):
+    - `poetry run python examples/hello/hello.py`
+    - `poetry run python examples/all_types/all_types.py`
+    - `poetry run python examples/simple_graph/simple_graph.py`
+    - `poetry run python examples/nidaqmx/nidaqmx_continuous_analog_input.py` (requires real or simulated devices)
+4. Open http://localhost:42001/panel-service/ in your browser, which will show all running panels
 
 # Debugging on the streamlit side
 

examples/all_types/all_types_panel.py

@@ -5,11 +5,11 @@
 
 import nipanel
 
-panel = nipanel.get_panel_accessor()
 
 st.set_page_config(page_title="All Types Example", page_icon="📊", layout="wide")
 st.title("All Types Example")
 
+panel = nipanel.get_panel_accessor()
 for name in all_types_with_values.keys():
     col1, col2 = st.columns([0.4, 0.6])
 

examples/hello/hello_panel.py

@@ -4,8 +4,9 @@
 
 import nipanel
 
-panel = nipanel.get_panel_accessor()
 
 st.set_page_config(page_title="Hello World Example", page_icon="📊", layout="wide")
 st.title("Hello World Example")
+
+panel = nipanel.get_panel_accessor()
 st.write(panel.get_value("hello_string", ""))

examples/nidaqmx/nidaqmx_continuous_analog_input.py

@@ -10,6 +10,7 @@
 panel_script_path = Path(__file__).with_name("nidaqmx_continuous_analog_input_panel.py")
 panel = nipanel.create_panel(panel_script_path)
 
+# How to use nidaqmx: https://nidaqmx-python.readthedocs.io/en/stable/
 with nidaqmx.Task() as task:
     task.ai_channels.add_ai_voltage_chan("Mod1/ai0")
     task.ai_channels.add_ai_thrmcpl_chan("Mod1/ai1")
@@ -18,10 +19,13 @@
     )
     panel.set_value("sample_rate", task._timing.samp_clk_rate)
     task.start()
+    print(f"Panel URL: {panel.panel_url}")
     try:
-        print(f"\nPress Ctrl + C to stop")
+        print(f"Press Ctrl + C to stop")
         while True:
-            data = task.read(number_of_samples_per_channel=1000)
+            data = task.read(
+                number_of_samples_per_channel=1000  # pyright: ignore[reportArgumentType]
+            )
             panel.set_value("voltage_data", data[0])
             panel.set_value("thermocouple_data", data[1])
     except KeyboardInterrupt:

examples/nidaqmx/nidaqmx_continuous_analog_input_panel.py

@@ -5,8 +5,8 @@
 
 import nipanel
 
-panel = nipanel.get_panel_accessor()
 
+st.set_page_config(page_title="NI-DAQmx Example", page_icon="📈", layout="wide")
 st.title("Analog Input - Voltage and Thermocouple in a Single Task")
 voltage_tab, thermocouple_tab = st.tabs(["Voltage", "Thermocouple"])
 
@@ -21,6 +21,7 @@
     unsafe_allow_html=True,
 )
 
+panel = nipanel.get_panel_accessor()
 thermocouple_data = panel.get_value("thermocouple_data", [0.0])
 voltage_data = panel.get_value("voltage_data", [0.0])
 
@@ -65,7 +66,7 @@
         },
     ],
 }
-st_echarts(options=voltage_therm_graph, height="400px", key="graph")
+st_echarts(options=voltage_therm_graph, height="400px", key="voltage_therm_graph")
 
 voltage_tab.header("Voltage")
 with voltage_tab:

examples/nidaqmx_analog_input_filtering/nidaqmx_analog_input_filtering.py

@@ -26,30 +26,30 @@
     task.timing.samp_clk_dig_fltr_enable = True
     chan_voltage.ai_filter_response
     filter = panel.get_value("filter", "No Filtering")
-    if filter == "No Filtering":
-        chan_voltage.ai_filter_freq = 0.0
-        chan_current.ai_filter_freq = 0.0
-        chan_strain_gage.ai_filter_freq = 0.0
-
-        chan_voltage.ai_filter_order = 0
-        chan_current.ai_filter_order = 0
-        chan_strain_gage.ai_filter_order = 0
-
-        chan_voltage.ai_filter_response = panel.get_value("filter_response", "Comb")
-        chan_current.ai_filter_response = panel.get_value("filter_response", "Comb")
-        chan_strain_gage.ai_filter_response = panel.get_value("filter_response", "Comb")
-    else:
-        chan_voltage.ai_filter_freq = panel.get_value("filter_freq", 1000.0)
-        chan_current.ai_filter_freq = panel.get_value("filter_freq", 1000.0)
-        chan_strain_gage.ai_filter_freq = panel.get_value("filter_freq", 1000.0)
-
-        chan_voltage.ai_filter_order = panel.get_value("filter_order", 1)
-        chan_current.ai_filter_order = panel.get_value("filter_order", 1)
-        chan_strain_gage.ai_filter_order = panel.get_value("filter_order", 1)
-
-        chan_voltage.ai_filter_response = panel.get_value("filter_response", "Comb")
-        chan_current.ai_filter_response = panel.get_value("filter_response", "Comb")
-        chan_strain_gage.ai_filter_response = panel.get_value("filter_response", "Comb")
+    # if filter == "No Filtering":
+    #     chan_voltage.ai_filter_freq = 0.0
+    #     chan_current.ai_filter_freq = 0.0
+    #     chan_strain_gage.ai_filter_freq = 0.0
+
+    #     chan_voltage.ai_filter_order = 0
+    #     chan_current.ai_filter_order = 0
+    #     chan_strain_gage.ai_filter_order = 0
+
+    #     chan_voltage.ai_filter_response = panel.get_value("filter_response", "Comb")
+    #     chan_current.ai_filter_response = panel.get_value("filter_response", "Comb")
+    #     chan_strain_gage.ai_filter_response = panel.get_value("filter_response", "Comb")
+    # else:
+    #     chan_voltage.ai_filter_freq = panel.get_value("filter_freq", 1000.0)
+    #     chan_current.ai_filter_freq = panel.get_value("filter_freq", 1000.0)
+    #     chan_strain_gage.ai_filter_freq = panel.get_value("filter_freq", 1000.0)
+
+    #     chan_voltage.ai_filter_order = panel.get_value("filter_order", 1)
+    #     chan_current.ai_filter_order = panel.get_value("filter_order", 1)
+    #     chan_strain_gage.ai_filter_order = panel.get_value("filter_order", 1)
+
+    #     chan_voltage.ai_filter_response = panel.get_value("filter_response", "Comb")
+    #     chan_current.ai_filter_response = panel.get_value("filter_response", "Comb")
+    #     chan_strain_gage.ai_filter_response = panel.get_value("filter_response", "Comb")
 
 
 
@@ -76,11 +76,11 @@
         print(f"Press Ctrl + C to stop")
 
         while True:
-            date = panel.get_value("date", None)
-            time_input = panel.get_value("time", None)
+            # date = panel.get_value("date", None)
+            # time_input = panel.get_value("time", None)
 
             hysteriresis = panel.get_value("hysteriesis", 0.0)
-            task.triggers.start_trigger.cfg_time_start_trig(when = date, timescale=Timescale.USE_HOST)
+            # task.triggers.start_trigger.cfg_time_start_trig(when = date, timescale=Timescale.USE_HOST)
             level = panel.get_value("level", 0.0)
             new_slope = Slopes(panel.get_value("slope",Slopes.FALLING.value))
             if slope != new_slope:

examples/nidaqmx_analog_input_filtering/nidaqmx_analog_input_filtering_panel.py

@@ -138,15 +138,15 @@
                 st.number_input(
                     "Max Value",
                     value=0.001,
-                    step=0.0001,
+                    step=1.0,
                     key="max_value_strain",
                 )
                 panel.set_value("max_value_strain", "max_value_strain")
                 st.title("strain gage information")
                 st.number_input(
                     "Gage Factor",
                     value=2.0,
-                    step=1,
+                    step=1.0,
                     key="gage_factor",
                 )
                 panel.set_value("gage_factor", "gage_factor")