Merge branch 'master' of https://github.com/sharksmhi/ctdvis

sharksmhi · Apr 6, 2023 · 7340da3 · 7340da3
2 parents b2af061 + 5a45079
commit 7340da3
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 25 deletions.
diff --git a/ctdvis/callbacks/cbs.py b/ctdvis/callbacks/cbs.py
@@ -503,9 +503,10 @@ def get_flag_buttons_widget(position_source, data_source, datasets,
 
         // Save changes to ColumnDataSource (only on the plotting side of ColumnDataSource)
         data_source.change.emit();
-        for (var key in figure_objs) {
-            figure_objs[key].reset.emit();
-        }
+        // If we want to reset figure size after flagging.
+        // for (var key in figure_objs) {
+        //     figure_objs[key].reset.emit();
+        // }
         data_source.selected.indices = selected_indices;
         select_button.button_type = select_button_type;
 

diff --git a/ctdvis/etc/vis_setup/smhi_expedition_vis.json b/ctdvis/etc/vis_setup/smhi_expedition_vis.json
@@ -109,24 +109,6 @@
             "plot_color_key": "color_x18",
             "plot_size_key": "size_x18"
         },
-        "DENS_CTD": {
-            "unit": "[kg/m3]",
-            "q_flag": "Q_DENS_CTD",
-            "q0_flag": "Q0_DENS_CTD",
-            "plot_key": "x9",
-            "plot_q0_key": "x9_q0",
-            "plot_color_key": "color_x9",
-            "plot_size_key": "size_x9"
-        },
-        "DENS2_CTD": {
-            "unit": "[kg/m3]",
-            "q_flag": "Q_DENS2_CTD",
-            "q0_flag": "Q0_DENS2_CTD",
-            "plot_key": "x10",
-            "plot_q0_key": "x10_q0",
-            "plot_color_key": "color_x10",
-            "plot_size_key": "size_x10"
-        },
         "PAR_CTD": {
             "unit": "[µE/(cm2 sec)]",
             "q_flag": "Q_PAR_CTD",
@@ -180,6 +162,24 @@
             "plot_q0_key": "x16_q0",
             "plot_color_key": "color_x16",
             "plot_size_key": "size_x16"
-        }
+        },
+        "SVEL_CTD": {
+            "unit": "[m/s]",
+            "q_flag": "Q_SVEL_CTD",
+            "q0_flag": "Q0_SVEL_CTD",
+            "plot_key": "x19",
+            "plot_q0_key": "x19_q0",
+            "plot_color_key": "color_x19",
+            "plot_size_key": "size_x19"
+        },
+        "SVEL2_CTD": {
+            "unit": "[m/s]",
+            "q_flag": "Q_SVEL2_CTD",
+            "q0_flag": "Q0_SVEL2_CTD",
+            "plot_key": "x20",
+            "plot_q0_key": "x20_q0",
+            "plot_color_key": "color_x20",
+            "plot_size_key": "size_x20"
+        }        
     }
 }
diff --git a/ctdvis/tests/app_to_serve.py b/ctdvis/tests/app_to_serve.py
@@ -7,6 +7,8 @@
 """
 from bokeh.plotting import curdoc
 from ctdvis.session import Session
+import warnings
+warnings.filterwarnings('ignore')
 
 
 """
@@ -25,7 +27,7 @@ def bokeh_qc_tool():
 
     Path to CTD-standard-format (including auto-QC-fields).
     """
-    data_dir = r'C:\Utveckling\ctdpy\ctdpy\tests\test_data\bas2019'
+    data_dir = r'C:\Temp\CTD_DV\mh_test'
 
     filters = None
     # filters = dict(
@@ -40,8 +42,8 @@ def bokeh_qc_tool():
 
     s = Session(
         # visualize_setting='slua_vis',
-        # visualize_setting='smhi_expedition_vis',
-        visualize_setting='smhi_vis',
+        visualize_setting='smhi_expedition_vis',
+        # visualize_setting='smhi_vis',
         data_directory=data_dir,
         filters=filters,
     )