Modify layout

Use VisDrone config

README.md

@@ -1,8 +1,8 @@
 ---
 title: NRTK-Gradio
-emoji: 🕵️‍♂️
-colorFrom: purple
-colorTo: blue
+emoji: 📷
+colorFrom: blue
+colorTo: green
 sdk: gradio
 sdk_version: 4.13.0
 app_file: app.py

app.py

@@ -10,38 +10,42 @@ from nrtk.impls.perturb_image.pybsm.perturber import PybsmPerturber
 
 import gradio as gr  # type: ignore
 
+
+asset_dir = Path("./assets")
+
+
 # Define default values for fields for initilization and button clicks
 #
-# Note, for this application we'll be focusing on the use case of satellite imagery, so we'll try to pick default
-# values that work with images similar to those in the xView dataset. Perturbing images from other datasets or other
+# Note, for this application we'll be focusing on the use case of UAS imagery, so we'll try to pick default
+# values that work with images similar to those in the VisDrone dataset. Perturbing images from other datasets or other
 # operational tasks may not be successful without modification to these values; defining broad defaults is extremely
 # difficult, if not impossible due to the physics-based nature of these perturbations.
 default_values = {
-    "gsd": 0.3,
+    "gsd": 0.105,
     "scenario": {
-        "aircraftSpeed": 100.,
-        "altitude": 4000.,
+        "aircraftSpeed": 0,
+        "altitude": 75,
         "backgroundReflectance": 0.07,
         "backgroundTemperature": 293.,
-        "cn2at1m": 1.7e-14,
-        "groundRange": 1000,
+        "cn2at1m": 0,
+        "groundRange": 0,
         "haWindspeed": 21.,
-        "ihaze": 1,
+        "ihaze": 2,
         "name": "",
         "targetReflectance": 0.15,
         "targetTemperature": 295.,
     },
     "sensor": {
-        "D": .029,
+        "D": 0.004,
         "bitdepth": 11.9,
         "darkCurrent": 0.,
         "dax": 0.0001,
         "day": 0.0001,
         "eta": 0.4,
-        "f": .27,
+        "f": 0.01429,
         "intTime": 0.03,
         "maxN": 96000,
-        "maxWellFill": 0.6,
+        "maxWellFill": 0.005,
         "name": "",
         "optTransWavelengths": [3.8e-07, 7.0e-07],
         "opticsTransmission": [],
@@ -226,42 +230,43 @@ def submit(data):
     scenario = PybsmScenario(**scenario_config)
     perturber = PybsmPerturber(sensor=sensor, scenario=scenario)
 
+    config = generate_config(data)
+    config_file = str(asset_dir / "generated_config.yml")
+    with open(config_file, "w") as f:
+        yaml.dump(config, f)
+
+    def stretch_contrast_convert_8bit(img, perc=[0.1, 99.9]):
+        img = img.astype(float)
+        img = img - np.percentile(img.ravel(), perc[0])
+        img = img / (np.percentile(img.ravel(), perc[1]) / 255)
+        img = np.clip(img, 0, 255)
+        return np.round(img).astype(np.uint8)
+
+    perturbed_img = perturber(image=data[input_img], additional_params={"img_gsd": gsd})
+    peturbed_img = stretch_contrast_convert_8bit(perturbed_img, [0.1, 90.9])
+
     # Apply the perturbation and display
     return {
-        output_col: gr.Column(visible=True),
-        out_img: perturber(image=data[input_img], additional_params={"img_gsd": gsd})
+        out_img: perturbed_img,
+        out_config: config_file
     }
 
 
-def save(data):
-    """
-    Saves current configuration at given path
-    """
-    if not data[file_path]:
-        raise gr.Error("A filename must be provided to save the configuration!")
-    path = Path(data[file_path])
-    path.parent.mkdir(parents=True, exist_ok=True)
-    config = generate_config(data)
-    with open(path, 'w') as yaml_file:
-        yaml.dump(config, yaml_file)
-    gr.Info(f"Saved config: {data[file_path]}")
-
-
 # Lastly, we define the layout of the application and register the button click listener functions:
-with gr.Blocks() as demo:
+with gr.Blocks() as nrtk_demo:
     gr.Markdown(
         """
         # Apply pyBSM Perturbations with NRTK
 
-        Note: Default configuration options are tailored to satellite imagery (specifically xView).
+        Note: Default configuration options are tailored to UAS imagery (specifically VisDrone).
         Perturbing other datasets or other operational tasks may not be successful without modification
         to some of these configuration options; defining broad defaults is extremely difficult, if not
         impossible due to the physics-based nature of these perturbations.
         """
     )
     with gr.Row():
-        with gr.Column() as input_col:
-            sample_img_path = "./assets/92_1920_2201_2432_2713.jpg"
+        with gr.Column():
+            sample_img_path = str(asset_dir / "0000161_01584_d_0000158.jpg")
             input_img = gr.Image(
                 label="Input Image",
                 value=sample_img_path
@@ -270,13 +275,17 @@ with gr.Blocks() as demo:
             gr.Examples(
                 examples=[
                     sample_img_path,
-                    "./assets/99_384_0_896_512.jpg",
-                    "./assets/125_1152_768_1664_1280.jpg",
-                    "./assets/126_1920_1920_2432_2432.jpg"
+                    str(asset_dir / "0000006_01111_d_0000003.jpg"),
+                    str(asset_dir / "0000006_01659_d_0000004.jpg"),
+                    str(asset_dir / "0000006_04309_d_0000011.jpg")
                 ],
                 inputs=input_img
             )
-
+        with gr.Column() as output_col:
+            out_img = gr.Image(label="Perturbed Image")
+            out_config = gr.File(label="Generated Configuration")
+    with gr.Row():
+        with gr.Column() as input_col:
             with gr.Row():
                 gen_config_btn = gr.Button("Generate New Configuration")
                 with gr.Column():
@@ -420,14 +429,9 @@ with gr.Blocks() as demo:
 
                 submit_btn = gr.Button("Perturb Image")
 
-        with gr.Column(visible=False) as output_col:
-            out_img = gr.Image(label="Perturbed Image")
-            file_path = gr.Textbox(label="Config Filename")
-            save_btn = gr.Button("Save Configuration")
-
     github_btn = gr.Button(
         "Check out NRTK on GitHub!",
-        icon="./assets/github-badge.png",
+        icon=str(asset_dir / "github-badge.png"),
         link="https://github.com/Kitware/nrtk"
     )
 
@@ -461,18 +465,8 @@ with gr.Blocks() as demo:
             D_m, f_m, px_m, optTransWavelengths_str, opticsTransmission_str, eta, int_time_s, dark_current, read_noise,
             max_N, bit_depth, max_well_fill, sx, sy, dax, day, qe_str, qewavelengths_str
         },
-        outputs=[out_img, output_col],
-    )
-    save_btn.click(
-        fn=save,
-        inputs={
-            input_img, img_gsd, scenario_name, ihaze, altitude_m, ground_range_m, aircraft_speed_m_Per_s, target_reflectance,
-            target_temperature_K, bkgd_reflectance, bkgd_temperature_K, ha_windspeed_m_Per_s, cn2at1m, sensor_name,
-            D_m, f_m, px_m, optTransWavelengths_str, opticsTransmission_str, eta, int_time_s, dark_current, read_noise,
-            max_N, bit_depth, max_well_fill, sx, sy, dax, day, qe_str, qewavelengths_str, file_path
-        },
-        outputs=None,
+        outputs=[out_img, out_config],
     )
 
 
-demo.launch(show_error=True, share=True)
+nrtk_demo.launch(show_error=True)