!

app.py

@@ -44,11 +44,6 @@ video_names = [f for f in os.listdir(dir_videos) if f.endswith('.mp4') or f.ends
 video_files = [BASE_URL + dir_videos + name for name in video_names]
 
 
-#print(model3D_files)
-#print(images_files)
-#print(video_files)
-
-
 DESCRIPTION = """# PROJET MOULIN SIMON """
 
 css = '''
@@ -91,8 +86,8 @@ head = '''
   
 def read_text_file(path:str)->str :
     with open(path, 'r', encoding='utf-8') as file:
-	    content = file.read()
-    return content
+        content = file.read()
+        return content
 
 def read_PIL_images(filenames):
     images = []
@@ -119,55 +114,36 @@ def build_comparison_slider(before_url , after_url):
     
     return html
 
-#print(head)
-#head = head.replace('BASE_URL_3D' , BASE_URL + dir_models3D )
-#print(head)
-   
 with gr.Blocks(analytics_enabled=False , head=head , css=css, theme="bethecloud/storj_theme" , elem_id='gradio-container') as demo:
-    
-    
-    # Load external javascript file
-    #with open('script.js', 'r') as f:
-    #    js_str = f.read()
-    #demo.load(_js=js_str)    
-    
-       
-    # gr.Markdown(DESCRIPTION)
-    # gr.Image(BASE_DIR + 'assets/images/banner-dugrainaupain.jpg', type='filepath')
     gr.HTML(f'''<div style="width:100%; text-align:left"><img src="{BASE_URL}assets/images/banner-dugrainaupain.jpg" style="display: inline-block;"></div>''')
 
+
     with gr.Tab("LE PROJET....."):
+	 
         with gr.Row():
             with gr.Column(scale=1):
-			    before = BASE_URL + 'assets/images/before-after/moulin-insitu-1-_1610534-BEFORE.jpg'
-			    after = BASE_URL + 'assets/images/before-after/moulin-insitu-1-_1610534-AFTER.jpg'
-                gr.HTML(build_comparison_slider(before , after)
+                before = BASE_URL + 'assets/images/before-after/moulin-insitu-1-_1610534-BEFORE.jpg'
+                after = BASE_URL + 'assets/images/before-after/moulin-insitu-1-_1610534-AFTER.jpg'
+                gr.HTML(build_comparison_slider(before , after))
 				
             with gr.Column(scale=1):
                 gr.HTML(read_text_file("assets/html/intro.txt"))
 
+
     with gr.Tab("Avant/Après"):
-	
-	    with gr.Row():
-	
-	        before_after_1= gr.HTML(f''' 
-				<img-comparison-slider hover="hover" class="slider-with-animated-handle" style="max-width:500px; --divider-width: 4px; --divider-color: #ff0000;">
-					<img slot="first" width="100%" src="{BASE_URL}assets/images/before-after/moulin-insitu-1-_1610534-BEFORE.jpg" />
-					<img slot="second" width="100%" src="{BASE_URL}assets/images/before-after/moulin-insitu-1-_1610534-AFTER.jpg" />
-					<svg slot="handle" class="custom-animated-handle" xmlns="http://www.w3.org/2000/svg" width="100" viewBox="-8 -3 16 6">
-						<path stroke="#fff" d="M -5 -2 L -7 0 L -5 2 M -5 -2 L -5 2 M 5 -2 L 7 0 L 5 2 M 5 -2 L 5 2" stroke-width="1" fill="#fff" vector-effect="non-scaling-stroke"></path>
-					</svg>					
-				</img-comparison-slider>''')
-	   
-	        before_after_2 = gr.HTML(f''' 
-				<img-comparison-slider hover="hover" class="slider-with-animated-handle" style="max-width:500px; --divider-width: 4px; --divider-color: #ff0000;">
-					<img slot="first" width="100%" src="{BASE_URL}assets/images/before-after/moulin-insitu-1-_1610534-BEFORE.jpg" />
-					<img slot="second" width="100%" src="{BASE_URL}assets/images/before-after/moulin-insitu-1-_1610534-AFTER.jpg" />
-				</img-comparison-slider>''')
+        with gr.Row():
+            before = BASE_URL + 'assets/images/before-after/moulin-insitu-1-_1610534-schema-BEFORE.jpg'
+            after = BASE_URL + 'assets/images/before-after/moulin-insitu-1-_1610534-AFTER.jpg'	
+            gr.HTML(build_comparison_slider(before , after))
+            
+            before = BASE_URL + 'assets/images/before-after/moulin-insitu-1-_1610534-BEFORE.jpg'
+            after = BASE_URL + 'assets/images/before-after/moulin-insitu-1-_1610534-AFTER.jpg'	
+            gr.HTML(build_comparison_slider(before , after))
+            
+            print(f'{BASE_URL}assets/images/before-after/moulin-insitu-1-_1610534-schema-BEFORE.jpg')
+            print(f'{BASE_URL}assets/images/before-after/moulin-insitu-1-_1610534-BEFORE.jpg')
+            print(f'{BASE_URL}assets/images/before-after/moulin-insitu-1-_1610534-AFTER.jpg')
 
-	   
-    print(f'{BASE_URL}assets/images/before-after/moulin-insitu-1-_1610534-BEFORE.jpg')
-    print(f'{BASE_URL}assets/images/before-after/moulin-insitu-1-_1610534-AFTER.jpg')
 
     with gr.Tab("Images"):
         image_viewer = gr.Gallery(label="Generated images", 
@@ -178,6 +154,7 @@ with gr.Blocks(analytics_enabled=False , head=head , css=css, theme="bethecloud/
                                   object_fit="cover", 
                                   interactive=False,
                                   value=images_files)
+        
 
     with gr.Tab("Modèles 3D"):
     
@@ -188,7 +165,6 @@ with gr.Blocks(analytics_enabled=False , head=head , css=css, theme="bethecloud/
                 
         viewer_html = viewer_html.replace('DEFAULT_MODEL_URL' , BASE_URL + dir_models3D + model3D_names[0])
         viewer_html = viewer_html.replace('BASE_URL_3D' , BASE_URL + dir_models3D)
-        # print(viewer_html)
         
         google_viewer = gr.HTML(viewer_html)
 
@@ -209,31 +185,7 @@ with gr.Blocks(analytics_enabled=False , head=head , css=css, theme="bethecloud/
                                outputs=None ,  
                                js=f"(name) => document.getElementById('google-3D-viewer').src = '{BASE_URL + dir_models3D}' + name")
 
-    '''
-    with gr.Tab("Modèles 3D"):
-        
-        model_viewer = gr.Model3D(clear_color=[0.0, 0.0, 0.0, 0.0], label="3D Model" , interactive=False , value=model3D_files[0])
-
-        with gr.Row(visible=True):
-        
-            model_selection = gr.Radio(
-                show_label=True,
-                container=True,
-                interactive=True,
-                choices=model3D_names,
-                value=model3D_names[0],
-                label="Selectionner un modèle 3D :",
-            )
 
-        def load_mesh(model_name):
-            model_file = BASE_URL + dir_models3D + model_name
-            print(f'LOADING MODEL: {model_file}')
-            # model_viewer.update(value=model_file)
-            return model_file
-            
-        model_selection.change(fn=load_mesh, inputs=model_selection, outputs=model_viewer)
-    '''
-    
     with gr.Tab("Videos"):
     
         video_viewer = gr.Video(interactive=False, value=video_files[0])
@@ -256,6 +208,6 @@ with gr.Blocks(analytics_enabled=False , head=head , css=css, theme="bethecloud/
             
         video_selection.change(fn=load_video, inputs=video_selection, outputs=video_viewer)
 
-    
+
 if __name__ == "__main__":
-    demo.launch(debug=not IN_SPACE, show_api=False) 
+    demo.launch(debug=not IN_SPACE, show_api=False)