improved with parameters input and fixes

pages/00_home.py

@@ -24,6 +24,8 @@ def Page():
                 - https://github.com/saferplaces/dcascade_py.git                       
             by Stefano Bagli (stefano.bagli@gecosistema.com) - Gecosistema srl, Italy  
             and Valerio Luzzi (valerio.luzzi@gecosistema.com) - Gecosistema srl, Italy 
+
+            * The model is currently in development phase, hence some functionalities might not work as intended.
                                                                                                                                  
         
         """

pages/01_dcascade.py

@@ -13,7 +13,7 @@ from dcascade import main as dcascade_main
 zoom = solara.reactive(2)
 center = solara.reactive((20, 0))
 config = {'version': 'v1',
- 'config': {'visState': {'filters': [{'dataId': ['Countries'],
+ 'config': {'visState': {'filters': [{'dataId': ['Discharge'],
      'id': '58woufh3',
      'name': ['ts'],
      'type': 'range',
@@ -25,8 +25,8 @@ config = {'version': 'v1',
      'speed': 1}],
    'layers': [{'id': 'lqz57i8',
      'type': 'geojson',
-     'config': {'dataId': 'Countries',
-      'label': 'Countries',
+     'config': {'dataId': 'Discharge',
+      'label': 'Discharge',
       'color': [18, 147, 154],
       'highlightColor': [252, 242, 26, 255],
       'columns': {'geojson': '_geojson'},
@@ -80,7 +80,7 @@ config = {'version': 'v1',
       'heightScale': 'linear',
       'radiusField': None,
       'radiusScale': 'linear'}}],
-   'interactionConfig': {'tooltip': {'fieldsToShow': {'Countries': [{'name': 'ts',
+   'interactionConfig': {'tooltip': {'fieldsToShow': {'Discharge': [{'name': 'ts',
         'format': None},
        {'name': 'Discharge', 'format': None}]},
      'compareMode': False,
@@ -122,7 +122,7 @@ class Map(leafmap.Map):
         # change_basemap(self)
         # self.add_shp()
     def updateMap(self):
-        self.add_shp("public/deposito.shp", "Countries")
+        self.add_shp("public/deposito.shp", "Discharge")
         self.config = config
         # self.add_basemap("OpenTopoMap")
         # change_basemap(self)
@@ -154,11 +154,19 @@ def Page():
         q_filename, set_q_filename = solara.use_state("")
         error_select_csv, set_error_select_csv = solara.use_state("")
         error_select_shp, set_error_select_shp = solara.use_state("")
+        no_file_selected, set_no_file_selected = solara.use_state("")
         # removed_data, set_removed = solara.use_state("")
         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")
+        continuous_update = solara.reactive(True)
+
         
 
         def on_file(file: FileInfo):
@@ -181,9 +189,12 @@ def Page():
                 if file_path.endswith(".shp"):
                     set_river_filename(file_path)
                     set_error_select_shp(False)
+                    set_no_file_selected(False)
                 else:
                     set_error_select_shp(True)
-                    
+            else:
+                set_error_select_shp(True)
+                
 
         def open_q_file():
             if file_browser:
@@ -193,106 +204,134 @@ def Page():
                     set_error_select_csv(False)
                 else:
                     set_error_select_csv(True)
+            else:
+                set_error_select_csv(True)
 
         def remove_data():
             for file in os.listdir(os.getcwd()+"/public"):
-                # print(file)
                 os.remove(os.getcwd()+"/public/"+file)
 
 
         def run_dcascade():
-            set_map_loaded(False)
-            river = river_filename
-            q = q_filename
-            out = os.getcwd()+"/public/deposito"
-            out_shp = out+".shp"
-            out_prj = out+".prj"
-            shutil.copyfile(river,out_prj)
-            dcascade_main.main(river, q, timescale=20, formula=3, partitioning=4, out=out_shp, version=False, verbose=False, debug=False, credits=False)
-            set_map_loaded(True)
+            
+            if (river_filename == "" or q_filename == ""):
+                set_no_file_selected(True)
+            else:
+                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("'",""))
+                
+                set_map_loaded(False)
+                river = river_filename
+                q = q_filename
+                out = os.getcwd()+"/public/deposito"
+                out_shp = out+".shp"
+                out_prj = out+".prj"
+                shutil.copyfile(river,out_prj)
+                dcascade_main.main(river, q, timescale=sel_timescale, formula=sel_form, partitioning=sel_part, out=out_shp, version=False, verbose=False, debug=False, credits=False)
+                set_map_loaded(True)
 
         with solara.Div() as main:
             
             with solara.Card("Dcascade"):
                 if map_loaded:
                     MapComponent()
-                solara.Markdown("####**Upload files**")
-                solara.Markdown("Required \*.shp, \*.shx, \*.dbf and \*.prj files for **river** file and \*.csv for **q** file. (one at the time)")
-                with solara.ColumnsResponsive(1, large=6):    
-                    solara.FileDrop(
-                    label="Drag and drop a file here ",
-                    on_file=on_file,
-                    lazy=True, 
-                )
-                    solara.Button("Upload file",
-                                    color="primary",
-                                    on_click=upload_file)
-                if content and not uploaded:
-                    solara.Info(f"File {filename} has total length: {size}\n",
-                                text=True,
-                                dense=True,
-                                icon=True,
-                    )
-                    # solara.Preformatted("\n".join(textwrap.wrap(repr(content))))
-                    # solara.Preformatted("\n".join(textwrap.wrap(repr(filename))))
-                elif uploaded:
-                    solara.Success(
-                        f"{filename} uploaded",
-                        text=True,
-                        dense=True,
-                        icon=True,
+                with solara.Card("Upload files"):
+                    solara.Markdown("Required \*.shp, \*.shx, \*.dbf and \*.prj files for **river** file and \*.csv for **q** file. (one at the time)")
+                    with solara.ColumnsResponsive(1, large=6):    
+                        solara.FileDrop(
+                        label="Drag and drop a file here ",
+                        on_file=on_file,
+                        lazy=True, 
                     )
+                        solara.Button("Upload file",
+                                        color="primary",
+                                        on_click=upload_file)
+                    if content and not uploaded:
+                        solara.Info(f"File {filename} has total length: {size}\n",
+                                    text=True,
+                                    dense=True,
+                                    icon=True,
+                        )
+                        # solara.Preformatted("\n".join(textwrap.wrap(repr(content))))
+                        # solara.Preformatted("\n".join(textwrap.wrap(repr(filename))))
+                    elif uploaded:
+                        solara.Success(
+                            f"{filename} uploaded",
+                            text=True,
+                            dense=True,
+                            icon=True,
+                        )
 
-                    
-                solara.Markdown("####**Select files**")
-                solara.Markdown("Select **river** and **q** files from file explorer below, the uploaded files can be found in /public folder. To select files click on the explorer the click on *SELECT RIVER FILE* or *SELECT Q FILE* based on the file selected.")
-                with solara.ColumnsResponsive(3, large=6):    
-                    solara.Markdown(f"**River file**: {river_filename}")
-                    
-                    solara.Button("Select river file",
-                                color="primary",
-                                on_click=open_river_file)
-                with solara.ColumnsResponsive(3, large=6):    
-                    solara.Markdown(f"**Q file**: {q_filename}")
-                    
-                    solara.Button("Select Q file",
-                                color="primary",
-                                on_click=open_q_file)
-                if error_select_csv:
-                    solara.Warning(f"Q file must be csv",
-                                text=True,
-                                dense=True,
-                                icon=True,
-                    )
-                if error_select_shp:
-                    solara.Warning(f"River file must be shp",
-                                text=True,
-                                dense=True,
-                                icon=True,
-                    )
+                
+
+                with solara.Card("Select parameters"):
+                    with solara.ColumnsResponsive(3, large=4): 
 
-                solara.FileBrowser(
-                                can_select=False,
-                                on_file_open=set_file_browser,
-                                directory="./public"
-                                )
-                solara.Markdown("#### Run model") 
-                with solara.ColumnsResponsive(3, large=6): 
-                    solara.Markdown("Click on DCASCADE button to run the model and generate the output map")  
-                    solara.Button("DCASCADE",
-                                color="primary",
-                                on_click=run_dcascade)
-                # solara.Button("REMOVE DATA",
-                #     color="secondary",
-                #     on_click=remove_data)
-                    # solara.Info(f"You are in directory: {directory}")
-                    # solara.Info(f"You selected path: {path}")
-                    # solara.Info(f"You opened file: {file}")
-                # if removed_data:
+                        solara.InputText("Timescale (days)", value=timescale, continuous_update=continuous_update.value)
+  
+                        solara.Select(label="Formula", value=formula, values=formulas)
+                        # solara.Markdown(f"**Selected**: {formula.value}")
+
+                        solara.Select(label="Partitioning ", value=partitioning, values=partitionings)
+                        # solara.Markdown(f"**Selected**: {partitioning.value}")
+
+                with solara.Card("Select files"):
+                    solara.Markdown("Select **river** and **q** files from file explorer below, the uploaded files can be found in /public folder. To select files click on the explorer the click on *SELECT RIVER FILE* or *SELECT Q FILE* based on the file selected.")
+                    with solara.ColumnsResponsive(3, large=6):    
+                        solara.Markdown(f"**River file**: {river_filename}")
+                        
+                        solara.Button("Select river file",
+                                    color="primary",
+                                    on_click=open_river_file)
+                    with solara.ColumnsResponsive(3, large=6):    
+                        solara.Markdown(f"**Q file**: {q_filename}")
+                        
+                        solara.Button("Select Q file",
+                                    color="primary",
+                                    on_click=open_q_file)
+                    if error_select_csv:
+                        solara.Warning(f"Q file must be csv",
+                                    text=True,
+                                    dense=True,
+                                    icon=True,
+                        )
+                    if error_select_shp:
+                        solara.Warning(f"River file must be shp",
+                                    text=True,
+                                    dense=True,
+                                    icon=True,
+                        )
+
+                    solara.FileBrowser(
+                                    can_select=False,
+                                    on_file_open=set_file_browser,
+                                    directory="./public"
+                                    )
+                with solara.Card("Run model"): 
+                    with solara.ColumnsResponsive(3, large=6): 
+                        solara.Markdown("Click on DCASCADE button to run the model and generate the output map")  
+                        solara.Button("DCASCADE",
+                                    color="primary",
+                                    on_click=run_dcascade)
+                        if no_file_selected:
+                            solara.Warning(f"Select both River and Q files",
+                                        text=True,
+                                        dense=True,
+                                        icon=True,
+                            )
+                    # solara.Button("REMOVE DATA",
+                    #     color="secondary",
+                    #     on_click=remove_data)
+                        # solara.Info(f"You are in directory: {directory}")
+                        # solara.Info(f"You selected path: {path}")
+                        # solara.Info(f"You opened file: {file}")
+                    # if removed_data:
 
-                #     solara.Success(
-                #             f"Removed data",
-                #             text=True,
-                #             dense=True,
-                #             icon=True,
-                #         )
+                    #     solara.Success(
+                    #             f"Removed data",
+                    #             text=True,
+                    #             dense=True,
+                    #             icon=True,
+                    #         )