Add different choices for input picture

pages/About.py

@@ -6,13 +6,14 @@ st.write("")
 st.write("")
 st.write("")
 
-st.markdown("#####  This app allows you to compare, from a given image, the results of different solutions:")
+st.markdown("#####  This app allows you to compare, from a given picture, the results of different solutions:")
 st.markdown("##### *EasyOcr, PaddleOCR, MMOCR, Tesseract*")
 st.write("")
 st.write("")
 
 st.markdown(''' The 1st step is to choose the language for the text recognition (not all solutions \
-support the same languages), and then upload the image to consider. It is possible to use a demo file. \
+support the same languages), and then choose the picture to consider. It is possible to upload a file, \
+to take a picture, or to use a demo file. \
 It is then possible to change the default values for the text area detection process, \
 before launching the detection task for each solution.''')
 st.write("")

pages/App.py

@@ -934,19 +934,21 @@ mmocr_lang = list_dict_lang[2][mmocr_key_lang]
 tesserocr_key_lang = lang_col[3].selectbox(reader_type_list[3]+" :", list_dict_lang[3].keys(), 35)
 tesserocr_lang = list_dict_lang[3][tesserocr_key_lang]
 
-img_typ = st.radio("#### Choose image:", ['Upload file', 'Take a picture', 'Use a demo file'], index=0)
+st.markdown("#### Choose picture:")
+cols_pict = st.columns([1, 1, 2, 2])
+img_typ = cols_pict[0].radio("", ['Upload file', 'Take a picture', 'Use a demo file'], index=0)
 
 if img_typ == 'Upload file':
-    image_file = st.file_uploader("Upload a file:", type=["png","jpg","jpeg"])
+    image_file = cols_pict[2].file_uploader("Upload a file:", type=["png","jpg","jpeg"])
 if img_typ == 'Take a picture':
-    image_file = st.camera_input("Take a picture:")
+    image_file = cols_pict[2].camera_input("Take a picture:")
 if img_typ == 'Use a demo file':
-    cols_demo = st.columns([1, 2, 2])
-    demo_used = cols_demo[0].radio('##### Choose a demo file:', ['File 1', 'File 2'], index=0)
-    cols_demo[1].markdown('##### File 1')
-    cols_demo[1].image(img_demo_1, use_column_width=True)
-    cols_demo[2].markdown('##### File 2')
-    cols_demo[2].image(img_demo_2, use_column_width=True)
+    cols_pict[1].markdown('###### Choose a demo file:')
+    demo_used = cols_pict[1].radio('', ['File 1', 'File 2'], index=0)
+    cols_pict[2].markdown('###### File 1')
+    cols_pict[2].image(img_demo_1, use_column_width=True)
+    cols_pict[3].markdown('###### File 2')
+    cols_pict[3].image(img_demo_2, use_column_width=True)
     if demo_used == 'File 1':
         image_file = 'img_demo_1.jpg'
     else: