Analysis selection improvements.

app.py

@@ -39,6 +39,8 @@ import ecg_plot
 import getopt
 import gradio
 import io
+import matplotlib
+matplotlib.use('Agg')
 import matplotlib.pyplot as plt
 import matplotlib.ticker
 import neurokit2
@@ -196,16 +198,6 @@ def predict(numberOfECGs:         int = 1,
    return plotList
 
 
-# ###### Select ECG in the gallery ##########################################
-def select(event:   gradio.SelectData,
-           request: gradio.Request):
-   # Get selection index from Gallery select() event:
-   # https://github.com/gradio-app/gradio/issues/1976#issuecomment-1726018500
-
-   Sessions[request.session_hash].Selected = event.index
-   log(f'Session "{request.session_hash}": Selected ECG #{Sessions[request.session_hash].Selected + 1}')
-
-
 # ###### Download CSV #######################################################
 def downloadCSV(request: gradio.Request) -> pathlib.Path:
 
@@ -239,9 +231,21 @@ def downloadPDF(request: gradio.Request) -> pathlib.Path:
    return fileName
 
 
+# # ###### Select ECG in the gallery ##########################################
+# def select(event:   gradio.SelectData,
+#            request: gradio.Request):
+#    # Get selection index from Gallery select() event:
+#    # https://github.com/gradio-app/gradio/issues/1976#issuecomment-1726018500
+#
+#    Sessions[request.session_hash].Selected = event.index
+#    log(f'Session "{request.session_hash}": Selected ECG #{Sessions[request.session_hash].Selected + 1}')
+
+
 # ###### Analyze the selected ECG ###########################################
-def analyze(request: gradio.Request) -> matplotlib.figure.Figure:
+def analyze(event:   gradio.SelectData,
+            request: gradio.Request) -> matplotlib.figure.Figure:
 
+   Sessions[request.session_hash].Selected = event.index
    log(f'Session "{request.session_hash}": Analyze ECG #{Sessions[request.session_hash].Selected + 1}!')
 
    data = Sessions[request.session_hash].Results[Sessions[request.session_hash].Selected]
@@ -285,9 +289,9 @@ div {
 
 /* ###### General Settings ##############################################  */
 html, body {
-   /* height:           100%; */
-   padding:          0;
+   height:           100%;
    margin:           0;
+   padding:          0;
    font-family:      sans-serif;
    font-size:        small;
    background-color: #E3E3E3;   /* Simula background colour: #E3E3E3 */
@@ -373,7 +377,7 @@ if len(args) > 0:
 
 # ====== Create GUI =========================================================
 with gradio.Blocks(css = css, theme = gradio.themes.Glass(secondary_hue=gradio.themes.colors.blue),
-                   fill_height = False, fill_width = True) as gui:
+                   fill_height = True, fill_width = True) as gui:
 
    # ====== Session handling ================================================
    # Session initialization, to be called when page is loaded
@@ -395,43 +399,38 @@ with gradio.Blocks(css = css, theme = gradio.themes.Glass(secondary_hue=gradio.t
 </div>
 """)
 
-   gradio.Markdown('## Settings')
-   with gradio.Row(height = '10vh', min_height = '10vh', max_height = '10vh'):
+   # gradio.Markdown('## Settings')
+
+   with gradio.Row(height = '12vh', min_height = '12vh', max_height = '12vh'):
       sliderNumberOfECGs     = gradio.Slider(1, 100, label="Number of ECGs", step = 1, value = 4, interactive = True)
       # sliderLengthInSeconds = gradio.Slider(5, 60, label="Length (s)", step = 5, value = 10, interactive = True)
       dropdownType           = gradio.Dropdown( [ 'ECG-12', 'ECG-8' ], label = 'ECG Type', interactive = True)
       dropdownGeneratorModel = gradio.Dropdown( [ 'Default' ], label = 'Generator Model', interactive = True)
       with gradio.Column():
          buttonGenerate = gradio.Button("Generate ECGs!")
-         buttonAnalyze  = gradio.Button("Analyze this ECG!")
+         # buttonAnalyze  = gradio.Button("Analyze this ECG!")
          with gradio.Row():
             buttonCSV = gradio.DownloadButton("Download CSV")
             buttonCSV_hidden = gradio.DownloadButton(visible=False, elem_id="download_csv_hidden")
             buttonPDF = gradio.DownloadButton("Download PDF")
             buttonPDF_hidden = gradio.DownloadButton(visible=False, elem_id="download_pdf_hidden")
 
-   gradio.Markdown('## Output')
+   # gradio.Markdown('## Output')
 
-   # with gradio.Row():
+   with gradio.Row(): # height = '24vh', min_height = '24vh', max_height = '24vh'):
+      analysisOutput = gradio.Plot(label = 'Analysis')
 
-      # with gradio.Row():
-
-   with gradio.Row(height = '32vh', min_height = '32vh', max_height = '32vh'):
-      analysisOutput = gradio.Plot()
-
-   with gradio.Row(height = '24vh', min_height = '24vh', max_height = '24vh'):
-      outputGallery = gradio.Gallery(label         = 'output',
-                                    columns       = 8,
-                                    rows          = 1,
-                                    height        = 'auto',
-                                    object_fit    = 'contain',
-                                    show_label    = True,
-                                    allow_preview = True,
-                                    preview       = False
+   with gradio.Row(): # height = '24vh', min_height = '24vh', max_height = '24vh'):
+      outputGallery = gradio.Gallery(label         = 'ECG',
+                                     columns       = 8,
+                                     rows          = 1,
+                                     height        = 'auto',
+                                     object_fit    = 'contain',
+                                     show_label    = True,
+                                     allow_preview = True,
+                                     preview       = False
                                     )
-   outputGallery.select(select)
-
-
+   # outputGallery.select(select)
 
    # ====== Add click event handling for "Generate" button ==================
    buttonGenerate.click(predict,
@@ -443,10 +442,14 @@ with gradio.Blocks(css = css, theme = gradio.themes.Glass(secondary_hue=gradio.t
                      )
 
    # ====== Add click event handling for "Analyze" button ===================
-   buttonAnalyze.click(analyze,
-                       inputs  = [ ],
-                       outputs = [ analysisOutput ]
-                      )
+   # outputGallery.click(analyze,
+   #                     inputs  = [ ],
+   #                     outputs = [ analysisOutput ]
+   #                    )
+   outputGallery.select(analyze,
+                        inputs  = [ ],
+                        outputs = [ analysisOutput ]
+                       )
 
    # ====== Add click event handling for download buttons ===================
    # Using hidden button and JavaScript, to generate download file on-the-fly:

version.py

@@ -33,8 +33,8 @@
 # * Thomas Dreibholz <[email protected]>
 
 DEEPFAKEECGGENPLUS_VERSION_MAJOR = 0
-DEEPFAKEECGGENPLUS_VERSION_MINOR = 5
-DEEPFAKEECGGENPLUS_VERSION_PATCH = "0~d15"
+DEEPFAKEECGGENPLUS_VERSION_MINOR = 6
+DEEPFAKEECGGENPLUS_VERSION_PATCH = "0~beta1"
 DEEPFAKEECGGENPLUS_VERSION       = str(DEEPFAKEECGGENPLUS_VERSION_MAJOR) + '.' + \
                                    str(DEEPFAKEECGGENPLUS_VERSION_MINOR) + '.' + \
                                    str(DEEPFAKEECGGENPLUS_VERSION_PATCH)