Update digestR.R

Author: DDesmonts

R/digestR.R

@@ -18956,85 +18956,85 @@ ps <- function(dispPane='co'){
   }
   applyButton <- ttkbutton(genePlotTypeFrame, text='Apply', width=11, command=onApply)
 
-  onDisplayGene <- function()
-  {
-    geneName <- modalDialog(dlg, 'Gene Name Entry', 'Enter the name of the gene you wish to view in detail:', '')
-    if(geneName == 'ID_CANCEL')
-    {
-      return()
-    }else
-    {
-      if(nchar(geneName) == 0)
-      {
-        analyze_genes('')
-      }
-      else if(geneName %in% species$genes$name)
-      {
-        analyze_genes(geneName)
-      }else
-      {
-        log_message(paste0(geneName, ' is not a valid gene of ', species$name))
-      }
-    }
-    
-  }	
-  displayGeneButton <- ttkbutton(genePlotTypeFrame, text='Display Single Gene', width=21, command=onDisplayGene)
-
-# onDisplayGene <- function() {
-#   # Generate a temporary dialog window
-#   geneDialog <- tktoplevel()
-#   tkwm.title(geneDialog, "Gene Name Entry")
-  
-#   # Instruction label
-#   geneLabel <- ttklabel(geneDialog, text = 'Enter the name of the gene you wish to view in detail:')
-#   tkgrid(geneLabel, padx = 10, pady = 5)
-  
-#   # Entry box for manual gene name input
-#   geneEntry <- tkentry(geneDialog, width = 30)
-#   tkgrid(geneEntry, padx = 10, pady = 5)
-  
-#   # Dropdown (combobox) populated with available gene names from species$genes$name
-#   geneNamesList <- species$genes$name  # Assuming this is a list of available gene names
-#   geneDropdown <- ttkcombobox(geneDialog, values = geneNamesList, width = 27)
-#   tkgrid(geneDropdown, padx = 10, pady = 5)
-  
-#   # Function to handle the 'OK' button click
-#   onOK <- function() {
-#     # Get the gene name from either the entry box or dropdown
-#     geneName <- tclvalue(geneEntry)
-#     if (nchar(geneName) == 0) {
-#       geneName <- tclvalue(geneDropdown)  # Fall back to dropdown selection
-#     }
+  # onDisplayGene <- function()
+  # {
+  #   geneName <- modalDialog(dlg, 'Gene Name Entry', 'Enter the name of the gene you wish to view in detail:', '')
+  #   if(geneName == 'ID_CANCEL')
+  #   {
+  #     return()
+  #   }else
+  #   {
+  #     if(nchar(geneName) == 0)
+  #     {
+  #       analyze_genes('')
+  #     }
+  #     else if(geneName %in% species$genes$name)
+  #     {
+  #       analyze_genes(geneName)
+  #     }else
+  #     {
+  #       log_message(paste0(geneName, ' is not a valid gene of ', species$name))
+  #     }
+  #   }
 
-#     if (nchar(geneName) == 0) {
-#       # No gene entered or selected, analyze full proteome
-#       analyze_genes('')
-#     } else if (geneName %in% species$genes$name) {
-#       # Valid gene name, analyze the selected gene
-#       analyze_genes(geneName)
-#     } else {
-#       # Invalid gene name, display error message
-#       log_message(paste0(geneName, ' is not a valid gene of ', species$name))
-#     }
+  # }	
+  # displayGeneButton <- ttkbutton(genePlotTypeFrame, text='Display Single Gene', width=21, command=onDisplayGene)
+
+onDisplayGene <- function() {
+  # Generate a temporary dialog window
+  geneDialog <- tktoplevel()
+  tkwm.title(geneDialog, "Gene Name Entry")
+  
+  # Instruction label
+  geneLabel <- ttklabel(geneDialog, text = 'Enter the name of the gene you wish to view in detail:')
+  tkgrid(geneLabel, padx = 10, pady = 5)
+  
+  # Entry box for manual gene name input
+  geneEntry <- tkentry(geneDialog, width = 30)
+  tkgrid(geneEntry, padx = 10, pady = 5)
+  
+  # Dropdown (combobox) populated with available gene names from species$genes$name
+  geneNamesList <- species$genes$name  # Assuming this is a list of available gene names
+  geneDropdown <- ttkcombobox(geneDialog, values = geneNamesList, width = 27)
+  tkgrid(geneDropdown, padx = 10, pady = 5)
+  
+  # Function to handle the 'OK' button click
+  onOK <- function() {
+    # Get the gene name from either the entry box or dropdown
+    geneName <- tclvalue(geneEntry)
+    if (nchar(geneName) == 0) {
+      geneName <- tclvalue(geneDropdown)  # Fall back to dropdown selection
+    }
+    
+    if (nchar(geneName) == 0) {
+      # No gene entered or selected, analyze full proteome
+      analyze_genes('')
+    } else if (geneName %in% species$genes$name) {
+      # Valid gene name, analyze the selected gene
+      analyze_genes(geneName)
+    } else {
+      # Invalid gene name, display error message
+      log_message(paste0(geneName, ' is not a valid gene of ', species$name))
+    }
 
-#     tkdestroy(geneDialog)  # Close the dialog box
-#   }
+    tkdestroy(geneDialog)  # Close the dialog box
+  }
 
-#   # OK button
-#   okButton <- ttkbutton(geneDialog, text = 'OK', command = onOK)
-#   tkgrid(okButton, padx = 10, pady = 10)
+  # OK button
+  okButton <- ttkbutton(geneDialog, text = 'OK', command = onOK)
+  tkgrid(okButton, padx = 10, pady = 10)
 
-#   # Cancel button
-#   onCancel <- function() {
-#     tkdestroy(geneDialog)  # Close the dialog box without action
-#   }
-#   cancelButton <- ttkbutton(geneDialog, text = 'Cancel', command = onCancel)
-#   tkgrid(cancelButton, padx = 10, pady = 10)
+  # Cancel button
+  onCancel <- function() {
+    tkdestroy(geneDialog)  # Close the dialog box without action
+  }
+  cancelButton <- ttkbutton(geneDialog, text = 'Cancel', command = onCancel)
+  tkgrid(cancelButton, padx = 10, pady = 10)
 
-#   # Keep focus on the dialog
-#   tkfocus(geneDialog)
-# }
-# displayGeneButton <- ttkbutton(genePlotTypeFrame, text='Display Single Gene', width=21, command=onDisplayGene)
+  # Keep focus on the dialog
+  tkfocus(geneDialog)
+}
+displayGeneButton <- ttkbutton(genePlotTypeFrame, text='Display Single Gene', width=21, command=onDisplayGene)
 
   onDisplayProteome <- function()
   {