pyadps 0.2.1b0__py3-none-any.whl → 0.3.0__py3-none-any.whl

pyadps/pages/02_View_Raw_Data.py

@@ -61,11 +61,12 @@ def fillplot_plotly(data, colorscale="balance", title="Data", xaxis="time"):
 
 @st.cache_data
 def lineplot(data, title, xaxis="time"):
+    data1 = np.where(data == -32768, np.nan, data)
     if xaxis == "time":
-        df = pd.DataFrame({"date": st.session_state.date, title: data})
+        df = pd.DataFrame({"date": st.session_state.date, title: data1})
         fig = px.line(df, x="date", y=title)
     else:
-        df = pd.DataFrame({"ensemble": x, title: data})
+        df = pd.DataFrame({"ensemble": x, title: data1})
         fig = px.line(df, x="ensemble", y=title)
 
     st.plotly_chart(fig)
@@ -84,45 +85,100 @@ The ordinate (y-axis) for the heatmap is `bins` as the depth correction is not a
 xbutton = st.radio("Select an x-axis to plot", ["time", "ensemble"], horizontal=True)
 
 
-# Fixed Leader Plots
-st.header("Fixed Leader", divider="blue")
-fbutton = st.radio("Select a dynamic variable to plot:", fdata.keys(), horizontal=True)
-lineplot(fdata[fbutton], fbutton, xaxis=str(xbutton))
-
-# Variable Leader Plots
-st.header("Variable Leader", divider="blue")
-vbutton = st.radio("Select a dynamic variable to plot:", vdata.keys(), horizontal=True)
-lineplot(vdata[vbutton], vbutton, xaxis=str(xbutton))
-
-basic_options = [
-    "Pressure",
-    "Temperature",
-    "Salinity",
-    "Depth of Transducer",
-    "Heading",
-    "Pitch",
-    "Roll",
-]
-
-
-st.header("Velocity, Echo Intensity, Correlation & Percent Good", divider="blue")
-
-
-def call_plot(varname, beam, xaxis="time"):
-    if varname == "Velocity":
-        fillplot_plotly(velocity[beam - 1, :, :], title=varname, xaxis=xaxis)
-    elif varname == "Echo":
-        fillplot_plotly(echo[beam - 1, :, :], title=varname, xaxis=xaxis)
-    elif varname == "Correlation":
-        fillplot_plotly(correlation[beam - 1, :, :], title=varname, xaxis=xaxis)
-    elif varname == "Percent Good":
-        fillplot_plotly(pgood[beam - 1, :, :], title=varname, xaxis=xaxis)
-
-
-var_option = st.selectbox(
-    "Select a data type", ("Velocity", "Echo", "Correlation", "Percent Good")
+tab1, tab2, tab3, tab4 = st.tabs(
+    ["Primary Data", "Variable Leader", "Fixed Leader", "Advanced"]
 )
-beam = st.radio("Select beam", (1, 2, 3, 4), horizontal=True)
-call_plot(var_option, beam, xaxis=str(xbutton))
 
+with tab3:
+    # Fixed Leader Plots
+    st.header("Fixed Leader", divider="blue")
+    fbutton = st.radio(
+        "Select a dynamic variable to plot:", fdata.keys(), horizontal=True
+    )
+    lineplot(fdata[fbutton], fbutton, xaxis=str(xbutton))
+
+with tab2:
+    # Variable Leader Plots
+    st.header("Variable Leader", divider="blue")
+    vbutton = st.radio(
+        "Select a dynamic variable to plot:", vdata.keys(), horizontal=True
+    )
+    lineplot(vdata[vbutton], vbutton, xaxis=str(xbutton))
+
+with tab1:
+    st.header("Velocity, Echo Intensity, Correlation & Percent Good", divider="blue")
+
+    def call_plot(varname, beam, xaxis="time"):
+        if varname == "Velocity":
+            fillplot_plotly(velocity[beam - 1, :, :], title=varname, xaxis=xaxis)
+        elif varname == "Echo":
+            fillplot_plotly(echo[beam - 1, :, :], title=varname, xaxis=xaxis)
+        elif varname == "Correlation":
+            fillplot_plotly(correlation[beam - 1, :, :], title=varname, xaxis=xaxis)
+        elif varname == "Percent Good":
+            fillplot_plotly(pgood[beam - 1, :, :], title=varname, xaxis=xaxis)
+
+    var_option = st.selectbox(
+        "Select a data type", ("Velocity", "Echo", "Correlation", "Percent Good")
+    )
+    beam = st.radio("Select beam", (1, 2, 3, 4), horizontal=True)
+    call_plot(var_option, beam, xaxis=str(xbutton))
+
+
+with tab4:
+    st.header("Advanced Data", divider="blue")
+    adv_option = st.selectbox(
+        "Select a data type",
+        (
+            "Bit Result",
+            "ADC Channel",
+            "Error Status Word 1",
+            "Error Status Word 2",
+            "Error Status Word 3",
+            "Error Status Word 4",
+        ),
+    )
+    if adv_option == "Bit Result":
+        bitdata = st.session_state.ds.variableleader.bitresult()
+        st.subheader("BIT Result", divider="orange")
+        st.write("""
+        This field contains the results of Workhorse ADCPs builtin test functions.
+        A zero indicates a successful BIT result.
+        """)
+        bitbutton = st.radio(
+            "Select a dynamic variable to plot:", bitdata.keys(), horizontal=True
+        )
+        lineplot(bitdata[bitbutton], bitbutton, xaxis=str(xbutton))
 
+    elif adv_option == "ADC Channel":
+        adcdata = st.session_state.vlead.adc_channel()
+        st.subheader("ADC Channel", divider="orange")
+        adcbutton = st.radio(
+            "Select a dynamic variable to plot:", adcdata.keys(), horizontal=True
+        )
+        lineplot(adcdata[adcbutton], adcbutton, xaxis=str(xbutton))
+    elif adv_option == "Error Status Word 1":
+        errordata1 = st.session_state.vlead.error_status_word(esw=1)
+        st.subheader("Error Status Word", divider="orange")
+        errorbutton = st.radio(
+            "Select a dynamic variable to plot:", errordata1.keys(), horizontal=True
+        )
+        lineplot(errordata1[errorbutton], errorbutton, xaxis=str(xbutton))
+    elif adv_option == "Error Status Word 2":
+        errordata2 = st.session_state.vlead.error_status_word(esw=2)
+        errorbutton = st.radio(
+            "Select a dynamic variable to plot:", errordata2.keys(), horizontal=True
+        )
+        lineplot(errordata2[errorbutton], errorbutton, xaxis=str(xbutton))
+    elif adv_option == "Error Status Word 3":
+        errordata3 = st.session_state.vlead.error_status_word(esw=3)
+        errorbutton = st.radio(
+            "Select a dynamic variable to plot:", errordata3.keys(), horizontal=True
+        )
+        lineplot(errordata3[errorbutton], errorbutton, xaxis=str(xbutton))
+    elif adv_option == "Error Status Word 4":
+        errordata4 = st.session_state.vlead.error_status_word(esw=4)
+        errorbutton = st.radio(
+            "Select a dynamic variable to plot:", errordata4.keys(), horizontal=True
+        )
+        lineplot(errordata4[errorbutton], errorbutton, xaxis=str(xbutton))

pyadps/pages/03_Download_Raw_File.py

@@ -18,16 +18,32 @@ if "fname" not in st.session_state:
     st.session_state.fname = "No file selected"
 
 if "rawfilename" not in st.session_state:
-    st.session_state.rawfilename = "rawfile.nc"
+    st.session_state.rawfilename = "RAW_DAT.nc"
+
+if "fleadfilename" not in st.session_state:
+    st.session_state.fleadfilename = "RAW_FIX.nc"
 
 if "vleadfilename" not in st.session_state:
-    st.session_state.vleadfilename = "vlead.nc"
+    st.session_state.vleadfilename = "RAW_VAR.nc"
 
 if "attributes" not in st.session_state:
     st.session_state.attributes = {}
-    
-if "add_attributes" not in st.session_state:
-    st.session_state.add_attributes = "No"  # Default value
+
+if "add_attributes_DRW" not in st.session_state:
+    st.session_state.add_attributes_DRW = "No"  # Default value
+
+if "file_prefix" not in st.session_state:
+    raw_basename = os.path.basename(st.session_state.fname)
+    st.session_state.filename = os.path.splitext(raw_basename)[0]
+    st.session_state.file_prefix = st.session_state.filename
+
+
+if "prefix_saved" not in st.session_state:
+    st.session_state.prefix_saved = False
+
+if "filename" not in st.session_state:
+    st.session_state.filename = ""  # <-- Default file name if not passed
+
 
 ################ Functions #######################
 @st.cache_data()
@@ -38,6 +54,7 @@ def file_access(uploaded_file):
         f.write(uploaded_file.getvalue())
     return path
 
+
 @st.cache_data
 def read_file(filepath):
     ds = rd.ReadFile(st.session_state.fpath)
@@ -45,25 +62,68 @@ def read_file(filepath):
         ds.fixensemble()
     st.session_state.ds = ds
 
+
+@st.cache_data
+def get_prefixed_filename(base_name):
+    """Generates the file name with the optional prefix."""
+    if st.session_state.file_prefix:
+        return f"{st.session_state.file_prefix}_{base_name}"
+    return base_name
+
+
 @st.cache_data
 def file_write(path, axis_option, add_attributes=True):
     tempdirname = tempfile.TemporaryDirectory(delete=False)
-    st.session_state.rawfilename = tempdirname.name + "/rawfile.nc"
-    
+    st.session_state.rawfilename = os.path.join(
+        tempdirname.name, get_prefixed_filename("RAW_DAT.nc")
+    )
+
+    if add_attributes:
+        wr.rawnc(
+            path,
+            st.session_state.rawfilename,
+            axis_option=axis_option,
+            attributes=st.session_state.attributes,
+        )
+    else:
+        wr.rawnc(path, st.session_state.rawfilename, axis_option)
+
+
+@st.cache_data
+def file_write_flead(path, axis_option, add_attributes=True):
+    tempvardirname = tempfile.TemporaryDirectory(delete=False)
+    st.session_state.fleadfilename = os.path.join(
+        tempvardirname.name, get_prefixed_filename("RAW_FIX.nc")
+    )
+
     if add_attributes:
-        wr.rawnc(path, st.session_state.rawfilename, st.session_state.date1, axis_option, attributes=st.session_state.attributes)
+        wr.flead_nc(
+            path,
+            st.session_state.fleadfilename,
+            axis_option=axis_option,
+            attributes=st.session_state.attributes,
+        )
     else:
-        wr.rawnc(path, st.session_state.rawfilename, st.session_state.date1,axis_option)
+        wr.flead_nc(path, st.session_state.fleadfilename, axis_option)
+
 
 @st.cache_data
 def file_write_vlead(path, axis_option, add_attributes=True):
     tempvardirname = tempfile.TemporaryDirectory(delete=False)
-    st.session_state.vleadfilename = tempvardirname.name + "/vlead.nc"
-    
+    st.session_state.vleadfilename = os.path.join(
+        tempvardirname.name, get_prefixed_filename("RAW_VAR.nc")
+    )
+
     if add_attributes:
-        wr.vlead_nc(path, st.session_state.vleadfilename, st.session_state.date2, axis_option, attributes=st.session_state.attributes)
+        wr.vlead_nc(
+            path,
+            st.session_state.vleadfilename,
+            axis_option=axis_option,
+            attributes=st.session_state.attributes,
+        )
     else:
-        wr.vlead_nc(path, st.session_state.vleadfilename, st.session_state.date2, axis_option)
+        wr.vlead_nc(path, st.session_state.vleadfilename, axis_option)
+
 
 if "axis_option" not in st.session_state:
     st.session_state.axis_option = "ensemble"  # Default value
@@ -72,69 +132,130 @@ if "axis_option" not in st.session_state:
 st.header("NetCDF File", divider="blue")
 
 # Option to add attributes
-add_attributes = st.radio("Do you want to add attributes to the NetCDF file?", ["No", "Yes"], horizontal=True)
+st.session_state.add_attributes_DRW = st.radio(
+    "Do you want to add attributes to the NetCDF file?", ["No", "Yes"], horizontal=True
+)
 
-if add_attributes == "Yes":
+if st.session_state.add_attributes_DRW == "Yes":
     st.write("### Please fill in the attributes:")
-    
+
     # Two-column layout
     col1, col2 = st.columns(2)
-    
-    with col1:
-        st.session_state.attributes['Cruise_No.'] = st.text_input("Cruise No.")
-        st.session_state.attributes['Ship_Name'] = st.text_input("Ship Name")
-        st.session_state.attributes['Project_No.'] = st.text_input("Project No.")
-        st.session_state.attributes['Water_Depth_m'] = st.text_input("Water Depth (m)")
-        st.session_state.attributes['Deployment_Depth_m'] = st.text_input("Deployment Depth (m)")
-        st.session_state.attributes['Deployment_Date'] = st.date_input("Deployment Date")
-        st.session_state.attributes['Recovery_Date'] = st.date_input("Recovery Date")
 
+    with col1:
+        st.session_state.attributes["Cruise_No."] = st.text_input("Cruise No.")
+        st.session_state.attributes["Ship_Name"] = st.text_input("Ship Name")
+        st.session_state.attributes["Project_No."] = st.text_input("Project No.")
+        st.session_state.attributes["Water_Depth_m"] = st.text_input("Water Depth (m)")
+        st.session_state.attributes["Deployment_Depth_m"] = st.text_input(
+            "Deployment Depth (m)"
+        )
+        st.session_state.attributes["Deployment_Date"] = st.date_input(
+            "Deployment Date"
+        )
+        st.session_state.attributes["Recovery_Date"] = st.date_input("Recovery Date")
 
     with col2:
-        st.session_state.attributes['Latitude'] = st.text_input("Latitude")
-        st.session_state.attributes['Longitude'] = st.text_input("Longitude")
-        st.session_state.attributes['Platform_Type'] = st.text_input("Platform Type")
-        st.session_state.attributes['Participants'] = st.text_area("Participants")
-        st.session_state.attributes['File_created_by'] = st.text_input("File created by")
-        st.session_state.attributes['Contact'] = st.text_input("Contact")
-        st.session_state.attributes['Comments'] = st.text_area("Comments")
+        st.session_state.attributes["Latitude"] = st.text_input("Latitude")
+        st.session_state.attributes["Longitude"] = st.text_input("Longitude")
+        st.session_state.attributes["Platform_Type"] = st.text_input("Platform Type")
+        st.session_state.attributes["Participants"] = st.text_area("Participants")
+        st.session_state.attributes["File_created_by"] = st.text_input(
+            "File created by"
+        )
+        st.session_state.attributes["Contact"] = st.text_input("Contact")
+        st.session_state.attributes["Comments"] = st.text_area("Comments")
 
     st.write("Attributes will be added to the NetCDF file once you submit.")
 
+
+st.info(f"Current file name: **{st.session_state.filename}**")
+
+# Prefix editing option
+st.session_state.use_custom_filename = st.radio(
+    "Do you want to edit Output Filename?",
+    ["No", "Yes"],
+    horizontal=True,
+)
+
+if st.session_state.use_custom_filename == "Yes" and not st.session_state.prefix_saved:
+    st.session_state.file_prefix = st.text_input(
+        "Enter file name (e.g., GD10A000)",
+        value=st.session_state.file_prefix,
+    )
+
+    if st.button("Save Filename"):
+        if st.session_state.file_prefix.strip():
+            st.session_state.prefix_saved = True
+            st.rerun()
+        else:
+            st.warning("Please enter a valid filename before saving.")
+
+if st.session_state.prefix_saved:
+    st.success(f"Filename saved as: **{st.session_state.file_prefix}**")
+
 # Dropdown for axis_option
-axis_option = st.selectbox(
+st.session_state.axis_option_DRW = st.selectbox(
     "Select x-axis option:",
-    options=["ensemble", "time"],
-    index=0  # Default to "ensemble"
+    options=["time", "ensemble"],
+    index=0,  # Default to "time"
 )
 
 # Ensure it is passed correctly
-st.session_state.axis_option = axis_option
+# st.session_state.axis_option = axis_option
 
 # Buttons to generate files
-download_button = st.button("Generate Raw NetCDF File")
-download_var_button = st.button("Generate Raw Variable Leader NetCDF File")
+st.session_state.rawnc_download_DRW = st.button("Generate Raw NetCDF File")
+st.session_state.fleadnc_download_DRW = st.button(
+    "Generate Raw Fixed Leader NetCDF File"
+)
+st.session_state.vleadnc_download_DRW = st.button(
+    "Generate Raw Variable Leader NetCDF File"
+)
 
-if download_button:
-    file_write(st.session_state.fpath,   st.session_state.axis_option , add_attributes == "Yes")
+if st.session_state.rawnc_download_DRW:
+    file_write(
+        st.session_state.fpath,
+        st.session_state.axis_option_DRW,
+        st.session_state.add_attributes_DRW == "Yes",
+    )
     st.write(st.session_state.rawfilename)
     with open(st.session_state.rawfilename, "rb") as file:
         st.download_button(
             label="Download Raw File",
             data=file,
-            file_name="rawfile.nc",
+            file_name=get_prefixed_filename("RAW_DAT.nc"),
         )
 
-if download_var_button:
-    file_write_vlead(st.session_state.fpath,  st.session_state.axis_option, add_attributes == "Yes")
+if st.session_state.fleadnc_download_DRW:
+    file_write_flead(
+        st.session_state.fpath,
+        st.session_state.axis_option,
+        st.session_state.add_attributes_DRW == "Yes",
+    )
+    st.write(st.session_state.fleadfilename)
+    with open(st.session_state.fleadfilename, "rb") as file:
+        st.download_button(
+            label="Download Fixed Leader",
+            data=file,
+            file_name=get_prefixed_filename("RAW_FIX.nc"),
+        )
+
+if st.session_state.vleadnc_download_DRW:
+    file_write_vlead(
+        st.session_state.fpath,
+        st.session_state.axis_option,
+        st.session_state.add_attributes_DRW == "Yes",
+    )
     st.write(st.session_state.vleadfilename)
     with open(st.session_state.vleadfilename, "rb") as file:
         st.download_button(
             label="Download Variable Leader",
             data=file,
-            file_name="vlead.nc",
+            file_name=get_prefixed_filename("RAW_VAR.nc"),
         )
 
+
 def download_csv_with_ensemble(data, filename):
     # Create ensemble numbers from 1 to the number of rows in the data
     ensembles = np.arange(1, len(next(iter(data.values()))) + 1)
@@ -144,60 +265,62 @@ def download_csv_with_ensemble(data, filename):
     df.insert(0, "RDI_Ensemble", ensembles)  # Add ensemble numbers as the first column
 
     # Export the DataFrame as a CSV
-    csv = df.to_csv(index=False).encode('utf-8')
+    csv = df.to_csv(index=False).encode("utf-8")
     return st.download_button(
         label=f"Download {filename} as CSV",
         data=csv,
         file_name=f"{filename}.csv",
-        mime='text/csv',
+        mime="text/csv",
     )
-    
+
+
 def download_csv(data, filename):
     # Convert data to DataFrame if it's not already one
     if isinstance(data, dict):
         df = pd.DataFrame.from_dict(data, orient="index").T
     else:
         df = pd.DataFrame(data)
-    
+
     # Export the DataFrame as a CSV
-    csv = df.to_csv(index=False).encode('utf-8')
+    csv = df.to_csv(index=False).encode("utf-8")
     return st.download_button(
         label=f"Download {filename} as CSV",
         data=csv,
         file_name=f"{filename}.csv",
-        mime='text/csv',
+        mime="text/csv",
     )
-    
-    
+
+
 def download_csv1(data, filename):
     # Convert data to DataFrame if it's not already one
     if isinstance(data, dict):
         df = pd.DataFrame.from_dict(data, orient="index").T
     else:
         df = pd.DataFrame(data)
-    
+
     # Create ensemble and depth arrays
     ensembles = np.arange(1, df.shape[0] + 1)
     depths = np.arange(1, df.shape[1] + 1)
-    
+
     # Add ensemble numbers as the first column
-    df.insert(0, 'Ensemble', ensembles)
-    
+    df.insert(0, "Ensemble", ensembles)
+
     # Transpose the DataFrame to switch rows and columns
     df = df.T
-    
+
     # Add depth values as the first row
-    df.insert(0, 'Depth', [''] + list(depths))
-    
+    df.insert(0, "Depth", [""] + list(depths))
+
     # Export the DataFrame as a CSV
-    csv = df.to_csv(index=False, header=False).encode('utf-8')
+    csv = df.to_csv(index=False, header=False).encode("utf-8")
     return st.download_button(
         label=f"Download {filename} as CSV",
         data=csv,
         file_name=f"{filename}.csv",
-        mime='text/csv',
+        mime="text/csv",
     )
 
+
 # Load data
 fdata = st.session_state.flead.fleader
 vdata = st.session_state.vlead.vleader
@@ -215,25 +338,36 @@ X, Y = np.meshgrid(x, y)
 st.header("Download Raw Data CSV File", divider="blue")
 
 # Selection for the data category
-data_type = st.selectbox(
+st.session_state.rawcsv_option_DRW = st.selectbox(
     "Select data type to download:",
-    ["Fixed Leader", "Variable Leader", "Velocity", "Echo Intensity", "Correlation", "Percent Good"]
+    [
+        "Velocity",
+        "Echo Intensity",
+        "Correlation",
+        "Percent Good",
+        "Variable Leader",
+        "Fixed Leader",
+    ],
 )
 
 # Show corresponding variable options based on selection
-if data_type == "Fixed Leader":
+if st.session_state.rawcsv_option_DRW == "Fixed Leader":
     # Combine all variables of Fixed Leader into one DataFrame
     f_combined_data = {var: fdata[var] for var in fdata.keys()}
     download_csv_with_ensemble(f_combined_data, "Fixed_Leader_All_Variables")
 
-elif data_type == "Variable Leader":
+elif st.session_state.rawcsv_option_DRW == "Variable Leader":
     # Combine all variables of Variable Leader into one DataFrame
     v_combined_data = {var: vdata[var] for var in vdata.keys()}
     download_csv(v_combined_data, "Variable_Leader_All_Variables")
 
 else:
-    beam_download = st.radio("Select beam to download", (1, 2, 3, 4), horizontal=True)
+    st.session_state.rawcsv_beam_DRW = st.radio(
+        "Select beam to download", (1, 2, 3, 4), horizontal=True
+    )
 
+    data_type = st.session_state.rawcsv_option_DRW
+    beam_download = st.session_state.rawcsv_beam_DRW
     if data_type == "Velocity":
         download_data = velocity[beam_download - 1, :, :]
     elif data_type == "Echo Intensity":
@@ -244,4 +378,3 @@ else:
         download_data = pgood[beam_download - 1, :, :]
 
     download_csv1(download_data, f"{data_type}_Beam_{beam_download}")
-