GUI improvements.

app.py

@@ -198,47 +198,53 @@ def predict(numberOfECGs:         int = 1,
    return plotList
 
 
-# ###### Download CSV #######################################################
-def downloadCSV(request: gradio.Request) -> pathlib.Path:
+# ###### Generic download ###################################################
+def download(request:      gradio.Request,
+             outputFormat: int) -> pathlib.Path:
+
+   if outputFormat == deepfakeecg.OUTPUT_CSV:
+      ecgResult = Sessions[request.session_hash].Results[Sessions[request.session_hash].Selected]
+      ecgType   = Sessions[request.session_hash].Type
+      fileName  = pathlib.Path(Sessions[request.session_hash].TempDirectory.name) / \
+                     ('ECG-' + str(Sessions[request.session_hash].Selected + 1) + '.csv')
+      deepfakeecg.dataToCSV(ecgResult, ecgType, fileName)
+
+      log(f'Session "{request.session_hash}": Download CSV file {fileName}')
+      return fileName
+
+   elif ( (outputFormat == deepfakeecg.OUTPUT_PDF) or
+          (outputFormat == deepfakeecg.OUTPUT_PDF_ANALYSIS) ):
+
+      ecgResult = Sessions[request.session_hash].Results[Sessions[request.session_hash].Selected]
+      ecgType   = Sessions[request.session_hash].Type
+      fileName  = pathlib.Path(Sessions[request.session_hash].TempDirectory.name) / \
+                     ('ECG-' + str(Sessions[request.session_hash].Selected + 1) + '.pdf')
+      if ecgType == deepfakeecg.DATA_ECG12:
+         outputLeads = [ 'I', 'II', 'III', 'aVL', 'aVR', 'aVF', 'V1', 'V2', 'V3', 'V4' , 'V5' , 'V6' ]
+      else:
+         outputLeads = [ 'I', 'II', 'V1', 'V2', 'V3', 'V4' , 'V5' , 'V6' ]
 
-   ecgResult = Sessions[request.session_hash].Results[Sessions[request.session_hash].Selected]
-   ecgType   = Sessions[request.session_hash].Type
-   fileName  = pathlib.Path(Sessions[request.session_hash].TempDirectory.name) / \
-                  ('ECG-' + str(Sessions[request.session_hash].Selected + 1) + '.csv')
-   deepfakeecg.dataToCSV(ecgResult, ecgType, fileName)
+      deepfakeecg.dataToPDF(ecgResult, ecgType, outputLeads, fileName,
+                           Sessions[request.session_hash].Selected + 1,
+                           outputFormat)
 
-   log(f'Session "{request.session_hash}": Download CSV file {fileName}')
-   return fileName
+      log(f'Session "{request.session_hash}": Download PDF file {fileName}')
+      return fileName
 
 
+# ###### Download CSV #######################################################
+def downloadCSV(request: gradio.Request) -> pathlib.Path:
+   return download(request, deepfakeecg.OUTPUT_CSV)
+
 
 # ###### Download PDF #######################################################
 def downloadPDF(request: gradio.Request) -> pathlib.Path:
+   return download(request, deepfakeecg.OUTPUT_PDF_ANALYSIS)
 
-   ecgResult = Sessions[request.session_hash].Results[Sessions[request.session_hash].Selected]
-   ecgType   = Sessions[request.session_hash].Type
-   fileName  = pathlib.Path(Sessions[request.session_hash].TempDirectory.name) / \
-                  ('ECG-' + str(Sessions[request.session_hash].Selected + 1) + '.pdf')
-   if ecgType == deepfakeecg.DATA_ECG12:
-      outputLeads = [ 'I', 'II', 'III', 'aVL', 'aVR', 'aVF', 'V1', 'V2', 'V3', 'V4' , 'V5' , 'V6' ]
-   else:
-      outputLeads = [ 'I', 'II', 'V1', 'V2', 'V3', 'V4' , 'V5' , 'V6' ]
-
-   deepfakeecg.dataToPDF(ecgResult, ecgType, outputLeads, fileName,
-                         Sessions[request.session_hash].Selected + 1)
-
-   log(f'Session "{request.session_hash}": Download PDF file {fileName}')
-   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}')
+# ###### Download PDF #######################################################
+def downloadPDFwithAnalysis(request: gradio.Request) -> pathlib.Path:
+   return download(request, 'pdf-with-analysis')
 
 
 # ###### Analyze the selected ECG ###########################################
@@ -412,8 +418,10 @@ with gradio.Blocks(css = css, theme = gradio.themes.Glass(secondary_hue=gradio.t
          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 = gradio.DownloadButton("Download ECG PDF")
             buttonPDF_hidden = gradio.DownloadButton(visible=False, elem_id="download_pdf_hidden")
+            buttonPDFwAnalysis = gradio.DownloadButton("Download ECG+Analysis PDF")
+            buttonPDFwAnalysis_hidden = gradio.DownloadButton(visible=False, elem_id="download_pdfwanalysis_hidden")
 
    # gradio.Markdown('## Output')
 
@@ -430,7 +438,6 @@ with gradio.Blocks(css = css, theme = gradio.themes.Glass(secondary_hue=gradio.t
                                      allow_preview = True,
                                      preview       = False
                                     )
-   # outputGallery.select(select)
 
    # ====== Add click event handling for "Generate" button ==================
    buttonGenerate.click(predict,
@@ -442,10 +449,6 @@ with gradio.Blocks(css = css, theme = gradio.themes.Glass(secondary_hue=gradio.t
                      )
 
    # ====== Add click event handling for "Analyze" button ===================
-   # outputGallery.click(analyze,
-   #                     inputs  = [ ],
-   #                     outputs = [ analysisOutput ]
-   #                    )
    outputGallery.select(analyze,
                         inputs  = [ ],
                         outputs = [ analysisOutput ]
@@ -455,13 +458,23 @@ with gradio.Blocks(css = css, theme = gradio.themes.Glass(secondary_hue=gradio.t
    # Using hidden button and JavaScript, to generate download file on-the-fly:
    # https://github.com/gradio-app/gradio/issues/9230#issuecomment-2323771634
    buttonCSV.click(downloadCSV)
-   buttonCSV.click(fn = downloadCSV, inputs = None, outputs = [ buttonCSV_hidden ]).then(
-                   fn = None, inputs = None, outputs = None,
-                   js = "() => document.querySelector('#download_csv_hidden').click()")
+   buttonCSV.click(fn      = downloadCSV,
+                   inputs  = None,
+                   outputs = [ buttonCSV_hidden ]).then(
+                      fn = None, inputs = None, outputs = None,
+                      js = "() => document.querySelector('#download_csv_hidden').click()")
    buttonPDF.click(downloadPDF)
-   buttonPDF.click(fn = downloadPDF, inputs = None, outputs = [ buttonPDF_hidden ]).then(
-                   fn = None, inputs = None, outputs = None,
-                   js = "() => document.querySelector('#download_pdf_hidden').click()")
+   buttonPDF.click(fn      = downloadPDF,
+                   inputs  = None,
+                   outputs = [ buttonPDF_hidden ]).then(
+                      fn = None, inputs = None, outputs = None,
+                      js = "() => document.querySelector('#download_pdf_hidden').click()")
+   buttonPDFwAnalysis.click(downloadPDFwithAnalysis)
+   buttonPDFwAnalysis.click(fn      = downloadPDFwithAnalysis,
+                            inputs  = None,
+                            outputs = [ buttonPDFwAnalysis_hidden ]).then(
+                               fn = None, inputs = None, outputs = None,
+                               js = "() => document.querySelector('#download_pdfwanalysis_hidden').click()")
 
    # ====== Run on startup ==================================================
    gui.load(predict,

version.py

@@ -34,7 +34,7 @@
 
 DEEPFAKEECGGENPLUS_VERSION_MAJOR = 0
 DEEPFAKEECGGENPLUS_VERSION_MINOR = 6
-DEEPFAKEECGGENPLUS_VERSION_PATCH = "0~beta1"
+DEEPFAKEECGGENPLUS_VERSION_PATCH = "0~beta2"
 DEEPFAKEECGGENPLUS_VERSION       = str(DEEPFAKEECGGENPLUS_VERSION_MAJOR) + '.' + \
                                    str(DEEPFAKEECGGENPLUS_VERSION_MINOR) + '.' + \
                                    str(DEEPFAKEECGGENPLUS_VERSION_PATCH)