update version and fix ui

docker2ecr.sh

@@ -1,4 +1,4 @@
 aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin 901702069075.dkr.ecr.us-east-1.amazonaws.com
-docker build -t dcascade-app --build-arg GITHUB_TOKEN=$GITHUB_TOKEN .
+docker build -t dcascade-app --build-arg GITHUB_TOKEN=$GITHUB_TOKEN . --no-cache
 docker tag dcascade-app:latest 901702069075.dkr.ecr.us-east-1.amazonaws.com/dcascade-app:latest
 docker push 901702069075.dkr.ecr.us-east-1.amazonaws.com/dcascade-app:latest

pages/01_dcascade.py

@@ -24,13 +24,22 @@ ds = solara.reactive(None)
 feature_properties = solara.reactive(None)
 geo_data = solara.reactive(None)
 sel_feature = solara.reactive(None)
+timescale = solara.reactive("20")
+sed_range = solara.reactive("-8,5")
+class_size = solara.reactive(2.5)
+deposit = solara.reactive(50.0)
+continuous_update = solara.reactive(True)
+formulas = ["Parker and Klingeman 1982", "Wilkock and Crowe 2003", "Engelund and Hansen 1967", "Yang formula 1989", "Wong and Parker 2006", "Ackers and White formula 1973"]
+formula = solara.reactive("Engelund and Hansen 1967")
+partitionings = ["Direct", "Bed material fraction (BMF)", "Transport capacity function (TCF)", "Shear stress correction approach"]
+partitioning = solara.reactive("Shear stress correction approach")
+
 chart_options = solara.reactive({
         "line": {
             "title": {"text": "Variable"},
             "tooltip": {},
             "legend": {"data": ["Variable"]},
-            "xAxis": {"data":list(range(1, 21))},  # {"type": "category"},
-            "xAxis": {"name": "Time step","nameLocation": "middle","nameGap": 30, "data":list(range(1, 21))},  # {"type": "category"},
+            "xAxis": {"name": "Time step","nameLocation": "middle","nameGap": 30, "data":list(range(1, int(timescale.value)+1))},  # {"type": "category"},
             "yAxis": {"name": "Variable","nameLocation": "middle","nameGap": 60},
             "series": [{
                 "type": "line",
@@ -71,7 +80,7 @@ def on_variable_change(variable):
                 "title": {"text": sel_var.value+" "+str(feature_properties.value['FromN']-1)},
                 "tooltip": {},
                 "legend": {"data": [sel_var.value+" "+str(feature_properties.value['FromN']-1)]},
-                "xAxis": {"name": "Time step","nameLocation": "middle","nameGap": 30,"data":list(range(1, 21))},  # {"type": "category"},
+                "xAxis": {"name": "Time step","nameLocation": "middle","nameGap": 30,"data":list(range(1, int(timescale.value)+1))},  # {"type": "category"},
                 "yAxis": {"name": sel_var.value+" "+str(feature_properties.value['FromN']-1),"nameLocation": "middle","nameGap": 60},
                 "emphasis": {"itemStyle": {"shadowBlur":10}},
                 "series": [{
@@ -100,7 +109,7 @@ def on_feature_click(feature, **kwargs):
                 "title": {"text": sel_var.value+" "+str(properties['FromN']-1)},
                 "tooltip": {},
                 "legend": {"data": [sel_var.value+" "+str(properties['FromN']-1)]},
-                "xAxis": {"name": "Time step","nameLocation": "middle","nameGap": 30,"data":list(range(1, 21))},  # {"type": "category"},
+                "xAxis": {"name": "Time step","nameLocation": "middle","nameGap": 30,"data":list(range(1, int(timescale.value)+1))},  # {"type": "category"},
                 "yAxis": {"name": sel_var.value+" "+str(properties['FromN']-1),"nameLocation": "middle","nameGap": 60},
                 "emphasis": {"itemStyle": {"shadowBlur":10}},
                 "series": [{
@@ -224,17 +233,6 @@ def Page():
         size, set_size = solara.use_state(0)
         file_browser, set_file_browser = solara.use_state(cast(Optional[Path], None))
         map_loaded, set_map_loaded = solara.use_state(False)
-
-        formulas = ["Parker and Klingeman 1982", "Wilkock and Crowe 2003", "Engelund and Hansen 1967", "Yang formula 1989", "Wong and Parker 2006", "Ackers and White formula 1973"]
-        formula = solara.reactive("Engelund and Hansen 1967")
-        partitionings = ["Direct", "Bed material fraction (BMF)", "Transport capacity function (TCF)", "Shear stress correction approach"]
-        partitioning = solara.reactive("Shear stress correction approach")
-        timescale = solara.reactive("20")
-        sed_range = solara.reactive("-8,5")
-        class_size = solara.reactive(2.5)
-        deposit = solara.reactive(50.0)
-        continuous_update = solara.reactive(True)
-
         
 
         def on_file(file: FileInfo):
@@ -295,8 +293,13 @@ def Page():
                 set_no_file_selected(False)
                 sel_form = formulas.index(str(formula).replace("'",""))+1
                 sel_part = partitionings.index(str(partitioning).replace("'",""))+1
-                sel_timescale = int(str(timescale).replace("'",""))
-                
+                # sel_timescale = int(str(timescale).replace("'",""))
+                sel_timescale = int(timescale.value)
+
+                tmp_options = chart_options.value
+                tmp_options["line"]["xAxis"]["data"] = list(range(1, sel_timescale+1))
+                chart_options.set(tmp_options)
+
                 set_map_loaded(False)
                 global_map_loaded.set(False)
                 river = river_filename
@@ -310,7 +313,7 @@ def Page():
                 file_shp.set(out_shp)
                 # out_prj = out+".prj"
                 # shutil.copyfile(river,out_prj)
-                dcascade_py(river, q, sed_range=sed_range.value, class_size=class_size.value, deposit=deposit.value, timescale=sel_timescale, formula=sel_form, partitioning=sel_part, out=out_nc, version=False, verbose=False, debug=False, credits=False)
+                dcascade_py(river, q, sed_range=sed_range.value, class_size=class_size.value, deposit=deposit.value, timescale=sel_timescale, formula=sel_form, partitioning=sel_part, out=out_nc, version=False, verbose=False, debug=False, credits=False, nc=True)
                 set_map_loaded(True)
                 # filename = os.getcwd()+'/public/deposito.nc'
                 ds.set(xr.open_dataset(out_nc, decode_times=False))