ml dash

ml/global.R

@@ -56,6 +56,8 @@ split_map = data.frame(
   )
 )
 
+colour_range=c("#605ca8", "#bebddb", "#221e70")
+
 metadata_cols = c("n_training_size", "n_test_size", "n_trainingY_ratio", "n_testY_ratio", "resampling", "n_features")
 
 # hardcoded list of drugs
@@ -159,9 +161,6 @@ makeplot = function(x, # the DataFrame to plot
              , position=position_dodge2(padding=0.1, preserve='total', reverse=TRUE)
     ) +
     coord_cartesian(ylim = c(y_coord_min, 1)) +
-    #scale_fill_manual(values = c("BT" = "#605ca8",
-    #                             "CV" = "#bebddb") ) +
-    #guides=guide_legend(reverse=TRUE) +
     annotation_custom(grob) +
     # doesn't work with plotly but looks nice :-( 
     geom_label(aes_string(label=selection),
@@ -172,15 +171,10 @@ makeplot = function(x, # the DataFrame to plot
                fill="white"
                
     ) +
+    scale_color_manual(values = colour_range) +
+    scale_fill_manual(values = colour_range) +
     
-    # works with plotly but i can't figure out the background yet
-    # geom_text(aes_string(label=selection, group=selection),
-    #           position=position_dodge(width = -0.75),
-    #           vjust = 1.5,
-    #           alpha=0.75,
-    #           
-    # ) +
-    
+
     # add little numbers for the BT bars only
     labs(x="",y=paste(selection,"Score")) +
     theme(
@@ -210,7 +204,21 @@ if (interactive()){
       combined_training_genes = input$combined_training_genes
       
       selected_gene           = combo[combo$drug == selected_drug,'gene']
-      
+      if (combined_data == "FS"){
+        updateRadioButtons(
+          inputId="combined_training_genes",
+          choiceNames = c("One", "Two"),
+          choiceValues = c("1", "2"),
+          selected = "2"
+        )
+      } else{
+        updateRadioButtons(
+          inputId="combined_training_genes",
+          choiceNames = c("Five", "Six"),
+          choiceValues = c("5","6"),
+          selected = "5"
+        )
+      }
       # hide stuff if selected
       if(combined_model == "combined") {
         #if(combined_model == TRUE) {